Merge pull request #1426 from LMMS/ed_refac

Editor Refactoring

data/themes/default/style.css

@@ -378,9 +378,17 @@ QWidget#mainToolbar {
 
 QToolBar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
+	border: none;
+	padding: 1px;
+	spacing: 0;
+}
+
+QToolBar::separator {
+	border: none;
+	width: 5px;
 }
 
-QToolButton, ToolButton {
+QToolButton {
 	padding: 1px 1px 1px 1px;
 	border-radius: 2px;
 	border: 1px solid rgba(0,0,0,32);
@@ -391,12 +399,12 @@ QToolButton, ToolButton {
 
 /* separate corner rounding for play and stop buttons! */
 
-ToolButton#playButton {
+QToolButton#playButton {
 	border-top-left-radius: 5px 15px;
 	border-bottom-left-radius: 5px 15px;
 }
 
-ToolButton#stopButton {
+QToolButton#stopButton {
 	border-top-right-radius: 5px 15px;
 	border-bottom-right-radius: 5px 15px;
 }
@@ -405,20 +413,20 @@ ToolButton#stopButton {
 
 /* all tool buttons */
 
-QToolButton:hover, ToolButton:hover {
+QToolButton:hover {
 	background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 );
 	border: 1px solid rgba(0,0,0,128);
 	color: white;
 }
 
-QToolButton:pressed, ToolButton:pressed {
+QToolButton:pressed {
 	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #969696 );
 	padding: 2px 1px 0px 1px;
 	border: 1px solid rgba(0,0,0,128);
 	color: white;
 }
 
-QToolButton:checked, ToolButton:checked  {
+QToolButton:checked  {
 	background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.8 #c9c9c9, stop:1 #c0c0c0 );
 	border-radius: 3px;
 	padding: 2px 1px 0px 1px;

include/AboutDialog.h

@@ -34,7 +34,7 @@
 class AboutDialog : public QDialog, public Ui::AboutDialog
 {
 public:
-	AboutDialog( void );
+	AboutDialog(QWidget* parent=0);
 
 } ;
 

include/ActionGroup.h

@@ -0,0 +1,57 @@
+/*
+ * Editor.h - declaration of Editor class
+ *
+ * Copyright (c) 2014 Lukas W <lukaswhl/at/gmail.com>
+ *
+ * This file is part of LMMS - http://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+#ifndef ACTION_GROUP_H
+#define ACTION_GROUP_H
+
+#include <QActionGroup>
+
+/// \brief Convenience subclass of QActionGroup
+///
+/// This class provides the same functionality as QActionGroup, but in addition
+/// has the actionTriggered(int) signal.
+/// It also sets every added action's checkable property to true.
+class ActionGroup : public QActionGroup
+{
+	Q_OBJECT
+public:
+	ActionGroup(QObject* parent);
+
+	QAction* addAction(QAction *a);
+	QAction* addAction(const QString &text);
+	QAction* addAction(const QIcon &icon, const QString &text);
+
+signals:
+	/// This signal is emitted when the action at the given index is triggered.
+	void triggered(int index);
+
+private slots:
+	void actionTriggered_(QAction* action);
+
+private:
+	QList<QAction*> m_actions;
+};
+
+#endif