Redesign of the Controller Rack

data/themes/default/style.css

@@ -137,6 +137,10 @@ QMenu::indicator:selected {
 	background-color: #101213;
 }
 
+ControllerView {
+	background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 #636c7a, stop:1 #343840);
+}
+
 PianoRoll {
 	background-color: #141616;
 	qproperty-backgroundShade: rgba(255, 255, 255, 10);

include/ControllerRackView.h

@@ -25,11 +25,12 @@
 #ifndef CONTROLLER_RACK_VIEW_H
 #define CONTROLLER_RACK_VIEW_H
 
-#include <QWidget>
 #include <QCloseEvent>
+#include <QMdiSubWindow>
+#include <QWidget>
 
-#include "SerializingObject.h"
 #include "lmms_basics.h"
+#include "SerializingObject.h"
 
 
 class QPushButton;
@@ -55,29 +56,41 @@ class ControllerRackView : public QWidget, public SerializingObject
 		return "ControllerRackView";
 	}
 
+	QMdiSubWindow *subWin() const;
+
+	bool allExpanded() const;
+	bool allCollapsed() const;
 
 public slots:
 	void deleteController( ControllerView * _view );
+	void collapsingAll();
+	void expandAll();
 	void onControllerAdded( Controller * );
 	void onControllerRemoved( Controller * );
+	void onControllerCollapsed();
+	void setAllExpanded(bool allExpanded);
+	void setAllCollapsed(bool allCollapsed);
 
 protected:
 	virtual void closeEvent( QCloseEvent * _ce );
+	virtual void resizeEvent( QResizeEvent * re );
+	virtual void paintEvent( QPaintEvent * pe );
 
 private slots:
 	void addController();
-
+	void moveControllerUp(ControllerView * cv);
+	void moveControllerDown(ControllerView * cv);
 
 private:
 	QVector<ControllerView *> m_controllerViews;
 
 	QScrollArea * m_scrollArea;
 	QVBoxLayout * m_scrollAreaLayout;
 	QPushButton * m_addButton;
+	QMdiSubWindow * m_subWin;
 
-	// Stores the index of where to insert the next ControllerView.
-	// Needed so that the StretchItem always stays at the last position.
-	int m_nextIndex;
+	bool m_allExpanded;
+	bool m_allCollapsed;
 } ;
 
 #endif

include/ControllerView.h

@@ -26,13 +26,14 @@
 #define CONTROLLER_VIEW_H
 
 #include <QFrame>
+#include <QLabel>
 
 #include "AutomatableModel.h"
 #include "Controller.h"
 #include "ModelView.h"
 
 class QGroupBox;
-class QLabel;
+class QLineEdit;
 class QPushButton;
 class QMdiSubWindow;
 
@@ -58,28 +59,44 @@ class ControllerView : public QFrame, public ModelView
 
 
 public slots:
-	void editControls();
+
+	void collapseController();
+	void expandController();
 	void deleteController();
 	void displayHelp();
-	void closeControls();
-	void renameController();
+	void toggleCollapseController();
+	void renameFinished();
+	void rename();
+	void moveUp();
+	void moveDown();
+
 
 signals:
 	void deleteController( ControllerView * _view );
+	void controllerCollapsed();
+	void collapseAll();
+	void expandAll();
+	void controllerMoveUp(ControllerView * view);
+	void controllerMoveDown(ControllerView * view);
 
 
 protected:
+	virtual void paintEvent( QPaintEvent * event );
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
 	virtual void modelChanged();
 	virtual void mouseDoubleClickEvent( QMouseEvent * event );
+	virtual void dragEnterEvent( QDragEnterEvent * dee );
+	virtual void dropEvent( QDropEvent * de );
 
 
 private:
-	QMdiSubWindow * m_subWindow;
 	ControllerDialog * m_controllerDlg;
-	QLabel * m_nameLabel;
+	const int m_titleBarHeight;
 	bool m_show;
-
+	QLabel * controllerTypeLabel;
+	QLineEdit * m_nameLineEdit;
+	QPushButton * m_collapse;
+	Controller * m_modelC;
 } ;
 
 #endif

include/PeakController.h

@@ -49,6 +49,7 @@ class EXPORT PeakController : public Controller
 	virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
 	virtual void loadSettings( const QDomElement & _this );
 	virtual QString nodeName() const;
+	PeakControllerEffect *getPeakControllerEffect();
 
 	static void initGetControllerBySetting();
 	static PeakController * getControllerBySetting( const QDomElement & _this );
@@ -87,7 +88,7 @@ class PeakControllerDialog : public ControllerDialog
 {
 	Q_OBJECT
 public:
-	PeakControllerDialog( Controller * _controller, QWidget * _parent );
+	PeakControllerDialog(PeakController *_controller, QWidget * _parent );
 	virtual ~PeakControllerDialog();
 
 protected:

plugins/peak_controller_effect/CMakeLists.txt

@@ -1,3 +1,3 @@
 INCLUDE(BuildPlugin)
 
-BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h peak_controller_effect_control_dialog.h EMBEDDED_RESOURCES artwork.png logo.png)
+BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h peak_controller_effect_control_dialog.h peak_controller_effect_control_dialog.h EMBEDDED_RESOURCES artwork.png logo.png)

plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp

@@ -42,7 +42,7 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 	setWindowIcon( embed::getIconPixmap( "controller" ) );
 	setAutoFillBackground( true );
 	QPalette pal;
-	pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) );
+	pal.setBrush( backgroundRole(), QBrush(  embed::getIconPixmap( "peak_controller_artwork" ) ) );
 	setPalette( pal );
 	setFixedSize( 240, 80 );
 

plugins/peak_controller_effect/peak_controller_effect_control_dialog.h

@@ -35,7 +35,6 @@ class LedCheckBox;
 
 class PeakControllerEffectControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	PeakControllerEffectControlDialog(
 				PeakControllerEffectControls * _controls );

src/core/PeakController.cpp

@@ -248,6 +248,11 @@ QString PeakController::nodeName() const
 	return( "Peakcontroller" );
 }
 
+PeakControllerEffect * PeakController::getPeakControllerEffect()
+{
+	return m_peakEffect;
+}
+
 
 
 ControllerDialog * PeakController::createDialog( QWidget * _parent )

src/gui/PeakControllerDialog.cpp

@@ -27,31 +27,36 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QMdiArea>
+#include <QMdiSubWindow>
 #include <QPainter>
 
 #include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
+#include "Engine.h"
 #include "MainWindow.h"
 #include "ToolTip.h"
 
 #include "PeakController.h"
+#include "ControllerDialog.h"
 #include "Knob.h"
 #include "TempoSyncKnob.h"
+#include "PixmapButton.h"
+#include "plugins/peak_controller_effect/peak_controller_effect.h"
+#include "plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp"
+#include "EffectControlDialog.h"
+#include <QLayout>
 
 
-PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _parent ) :
+PeakControllerDialog::PeakControllerDialog( PeakController * _model, QWidget * _parent ) :
 	ControllerDialog( _model, _parent )
 {
+	EffectControlDialog * dlg = _model->getPeakControllerEffect()->controls()->createView();
 	setWindowTitle( tr( "PEAK" ) );
 	setWindowIcon( embed::getIconPixmap( "controller" ) );
-	setFixedSize( 256, 64 );
-
-	ToolTip::add( this, tr( "LFO Controller" ) );
-
-	QLabel * l = new QLabel( this );
-	l->setText( "Use FX's controls" );
-	l->move(10, 10);
+	setFixedSize( dlg->size() );
+	dlg->setParent( this );
+	dlg->show();
 
 	setModel( _model );
 }