Redesign of the Controller Rack

include/ControllerView.h

@@ -32,7 +32,7 @@
 #include "ModelView.h"
 
 class QGroupBox;
-class QLabel;
+class QLineEdit;
 class QPushButton;
 class QMdiSubWindow;
 
@@ -58,28 +58,30 @@ class ControllerView : public QFrame, public ModelView
 
 
 public slots:
-	void editControls();
+
 	void deleteController();
 	void displayHelp();
-	void closeControls();
-	void renameController();
+	void collapseController();
+	void renameFinished();
+	void rename();
+
 
 signals:
 	void deleteController( ControllerView * _view );
 
 
 protected:
+	virtual void paintEvent( QPaintEvent * event );
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
 	virtual void modelChanged();
 	virtual void mouseDoubleClickEvent( QMouseEvent * event );
 
 
 private:
-	QMdiSubWindow * m_subWindow;
 	ControllerDialog * m_controllerDlg;
-	QLabel * m_nameLabel;
+	QLineEdit * m_nameLineEdit;
+	QPushButton * m_collapse;
 	bool m_show;
-
 } ;
 
 #endif

include/PeakController.h

@@ -52,6 +52,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 );
@@ -90,7 +91,7 @@ class PeakControllerDialog : public ControllerDialog
 {
 	Q_OBJECT
 public:
-	PeakControllerDialog( Controller * _controller, QWidget * _parent );
+	PeakControllerDialog(PeakController *_controller, QWidget * _parent );
 	virtual ~PeakControllerDialog();
 
 protected:

src/core/PeakController.cpp

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

src/gui/PeakControllerDialog.cpp

@@ -42,20 +42,20 @@
 #include "Knob.h"
 #include "TempoSyncKnob.h"
 #include "PixmapButton.h"
+#include "plugins/peak_controller_effect/peak_controller_effect.h"
+#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 );
 }

src/gui/widgets/ControllerRackView.cpp

@@ -54,10 +54,16 @@ ControllerRackView::ControllerRackView( ) :
 	m_scrollArea = new QScrollArea( this );
 	m_scrollArea->setPalette( QApplication::palette( m_scrollArea ) );
 	m_scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+	m_scrollArea->setFrameStyle( QFrame::Plain );
+	m_scrollArea->setFrameShadow( QFrame::Plain );
+
 
 	QWidget * scrollAreaWidget = new QWidget( m_scrollArea );
 	m_scrollAreaLayout = new QVBoxLayout( scrollAreaWidget );
 	m_scrollAreaLayout->addStretch();
+	m_scrollAreaLayout->setMargin( 0 );
+	m_scrollAreaLayout->setSpacing( 0 );
+//	m_scrollAreaLayout->setContentsMargins( 0, 0, 0, 0 );
 	scrollAreaWidget->setLayout( m_scrollAreaLayout );
 
 	m_scrollArea->setWidget( scrollAreaWidget );
@@ -76,7 +82,8 @@ ControllerRackView::ControllerRackView( ) :
 	QVBoxLayout * layout = new QVBoxLayout();
 	layout->addWidget( m_scrollArea );
 	layout->addWidget( m_addButton );
-	this->setLayout( layout );
+	layout->setMargin( 0 );
+	setLayout( layout );
 
 	QMdiSubWindow * subWin = gui->mainWindow()->addWindowedWidget( this );
 
@@ -86,8 +93,9 @@ ControllerRackView::ControllerRackView( ) :
 	subWin->setWindowFlags( flags );
 
 	subWin->setAttribute( Qt::WA_DeleteOnClose, false );
-	subWin->move( 680, 310 );
-	subWin->resize(400, 200);
+	subWin->move( 680, 60 );
+	subWin->resize( 400, 262 );
+	subWin->setFixedWidth( 262 );
 }
 
 
@@ -103,7 +111,7 @@ ControllerRackView::~ControllerRackView()
 void ControllerRackView::saveSettings( QDomDocument & _doc,
 							QDomElement & _this )
 {
-	MainWindow::saveWidgetState( this, _this, QSize( 400, 300) );
+	MainWindow::saveWidgetState( this, _this, QSize( 400, 300 ) );
 }
 
 
@@ -213,5 +221,4 @@ void ControllerRackView::closeEvent( QCloseEvent * _ce )
 		hide();
 	}
 	_ce->ignore();
- }
-
+}