saves the collapsing state with the project / clean up code

include/ControllerRackView.h

@@ -2,6 +2,7 @@
  * ControllerRackView.h - view for song's controllers
  *
  * Copyright (c) 2008-2009 Paul Giblock <drfaygo/at/gmail.com>
+ * Copyright (c) 2019 Steffen Baranowsky <BaraMGB/at/freenet.de>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -83,6 +84,7 @@ private slots:
 
 private:
 	QVector<ControllerView *> m_controllerViews;
+	QVector<bool> m_collapsingStateOnLoad;
 
 	QScrollArea * m_scrollArea;
 	QVBoxLayout * m_scrollAreaLayout;

include/ControllerView.h

@@ -2,6 +2,7 @@
  * ControllerView.h - view-component for an control
  *
  * Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
+ * Copyright (c) 2019 Steffen Baranowsky <BaraMGB/at/freenet.de>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -56,10 +57,9 @@ class ControllerView : public QFrame, public ModelView
 
 	bool isCollapsed() const;
 
-public slots:
 
-	void collapseController();
-	void expandController();
+public slots:
+	void collapseController(bool collapse);
 	void toggleCollapseController();
 
 	void rename();
@@ -82,7 +82,7 @@ public slots:
 	virtual void paintEvent(QPaintEvent *);
 	virtual void contextMenuEvent(QContextMenuEvent *);
 	virtual void modelChanged();
-	virtual void mouseDoubleClickEvent(QMouseEvent *);
+	virtual void mouseDoubleClickEvent(QMouseEvent *me);
 	virtual void dragEnterEvent( QDragEnterEvent * dee );
 	virtual void dropEvent( QDropEvent * de );
 
@@ -95,6 +95,6 @@ public slots:
 	QLineEdit * m_nameLineEdit;
 	QPushButton * m_collapseButton;
 	Controller * m_modelC;
-} ;
+};
 
 #endif

src/gui/widgets/ControllerRackView.cpp

@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008-2009 Paul Giblock <drfaygo/at/gmail.com>
  * Copyright (c) 2010-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2019 Steffen Baranowsky <BaraMGB/at/freenet.de>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -45,7 +46,8 @@
 
 
 ControllerRackView::ControllerRackView() :
-	QWidget()
+	QWidget(),
+	m_collapsingStateOnLoad()
 {
 	setWindowIcon(embed::getIconPixmap("controller"));
 	setWindowTitle(tr("Controller Rack"));
@@ -102,9 +104,14 @@ ControllerRackView::~ControllerRackView()
 
 
 
-void ControllerRackView::saveSettings(QDomDocument &,
-							QDomElement & parent)
+void ControllerRackView::saveSettings(QDomDocument &, QDomElement & parent)
 {
+	parent.setAttribute(QString("controllerCount"), m_controllerViews.size());
+	for (auto i = 1; i <= m_controllerViews.size(); i++)
+	{
+		bool collapsed = m_controllerViews.at(i - 1)->isCollapsed();
+		parent.setAttribute(QString("controllerView") + QString::number(i), collapsed);
+	}
 	MainWindow::saveWidgetState(this, parent);
 }
 
@@ -113,6 +120,12 @@ void ControllerRackView::saveSettings(QDomDocument &,
 
 void ControllerRackView::loadSettings(const QDomElement & _this)
 {
+	int controllerCount = _this.attribute(QString("controllerCount")).toInt();
+	for (auto i = 1; i <= controllerCount; i++)
+	{
+		bool collapsingState = _this.attribute(QString("controllerView") + QString::number(i)).toInt();
+		m_collapsingStateOnLoad.append(collapsingState);
+	}
 	MainWindow::restoreWidgetState(this, _this);
 }
 
@@ -123,15 +136,15 @@ void ControllerRackView::deleteController(ControllerView * view)
 {
 	Controller * c = view->getController();
 
-	if(c->connectionCount() > 0)
+	if (c->connectionCount() > 0)
 	{
 		QMessageBox msgBox;
 		msgBox.setIcon(QMessageBox::Question);
 		msgBox.setWindowTitle(tr("Confirm Delete"));
 		msgBox.setText(tr("Confirm delete? There are existing connection(s) "
 				"associated with this controller. There is no way to undo."));
 		msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-		if(msgBox.exec() != QMessageBox::Ok)
+		if (msgBox.exec() != QMessageBox::Ok)
 		{
 			return;
 		}
@@ -147,7 +160,7 @@ void ControllerRackView::collapsingAll()
 {
 	for (auto &it : m_controllerViews)
 	{
-		it->collapseController();
+		it->collapseController(true);
 	}
 }
 
@@ -158,7 +171,7 @@ void ControllerRackView::expandAll()
 {
 	for (auto &it : m_controllerViews)
 	{
-		it->expandController();
+		it->collapseController(false);
 	}
 }
 
@@ -175,8 +188,15 @@ void ControllerRackView::onControllerAdded(Controller * controller)
 	connect(controllerView, SIGNAL(controllerMoveUp(ControllerView*)), this, SLOT(moveControllerUp(ControllerView*)));
 	connect(controllerView, SIGNAL(controllerMoveDown(ControllerView*)), this, SLOT(moveControllerDown(ControllerView*)));
 	m_controllerViews.append(controllerView);
-	int n = m_scrollAreaLayout->count() - 1; //-1 because the stretch?
+	int n = m_scrollAreaLayout->count() - 1;
 	m_scrollAreaLayout->insertWidget(n, controllerView);
+	if (Engine::getSong()->isLoadingProject())
+	{
+		if (m_collapsingStateOnLoad.at(m_controllerViews.size() - 1))
+		{
+			controllerView->collapseController(true);
+		}
+	}
 
 	update();
 }
@@ -207,7 +227,7 @@ void ControllerRackView::onControllerRemoved(Controller * removedController)
 
 void ControllerRackView::onControllerCollapsed()
 {
-	//we hide the scrollbar and test in update() if a scrollbar is needed
+	//we hide the scrollbar and let update() test if a scrollbar is needed
 	m_scrollArea->verticalScrollBar()->hide();
 	update();
 }
@@ -250,6 +270,9 @@ void ControllerRackView::moveControllerDown(ControllerView *cv)
 	}
 }
 
+
+
+
 const QVector<ControllerView *> ControllerRackView::controllerViews() const
 {
 	return m_controllerViews;

src/gui/widgets/ControllerView.cpp

@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2008-2009 Paul Giblock <drfaygo/at/gmail.com>
  * Copyright (c) 2011-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2019 Steffen Baranowsky <BaraMGB/at/freenet.de>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -113,22 +114,21 @@ bool ControllerView::isCollapsed() const
 
 
 
-void ControllerView::collapseController()
+void ControllerView::collapseController(bool collapse)
 {
-	m_collapseButton->setIcon(embed::getIconPixmap("stepper-left"));
-	m_controllerDlg->hide();
-	setFixedHeight(m_titleBarHeight);
-	emit controllerCollapsed();
-}
-
-
-
-
-void ControllerView::expandController()
-{
-	m_controllerDlg->show();
-	setFixedHeight(m_controllerDlg->height() + m_titleBarHeight + 1);
-	m_collapseButton->setIcon(embed::getIconPixmap("stepper-down"));
+	if (collapse)
+	{
+		m_collapseButton->setIcon(embed::getIconPixmap("stepper-left"));
+		m_controllerDlg->hide();
+		setFixedHeight(m_titleBarHeight);
+		emit controllerCollapsed();
+	}
+	else
+	{
+		m_controllerDlg->show();
+		setFixedHeight(m_controllerDlg->height() + m_titleBarHeight + 1);
+		m_collapseButton->setIcon(embed::getIconPixmap("stepper-down"));
+	}
 }
 
 
@@ -144,14 +144,7 @@ void ControllerView::deleteController()
 
 void ControllerView::toggleCollapseController()
 {
-	if(m_controllerDlg->isHidden())
-	{
-		expandController();
-	}
-	else
-	{
-		collapseController();
-	}
+	collapseController(!m_controllerDlg->isHidden());
 }
 
 
@@ -198,17 +191,20 @@ void ControllerView::moveDown()
 
 
 
-void ControllerView::mouseDoubleClickEvent(QMouseEvent *)
+void ControllerView::mouseDoubleClickEvent(QMouseEvent * me)
 {
-	rename();
+	if (me->y() <= m_titleBarHeight)
+	{
+		rename();
+	}
 }
 
 
 
 
 void ControllerView::dragEnterEvent(QDragEnterEvent *dee)
 {
-	StringPairDrag::processDragEnterEvent(dee, "float_value,automatable_model" );
+	StringPairDrag::processDragEnterEvent(dee, "automatable_model" );
 }
 
 
@@ -221,21 +217,23 @@ void ControllerView::dropEvent(QDropEvent * de)
 	if (type == "automatable_model")
 	{
 		AutomatableModel * mod = dynamic_cast<AutomatableModel *>(Engine::projectJournal()->journallingObject(val.toInt()));
-		if (m_modelC->hasModel(mod))
-		{
-			QMessageBox::warning(this, tr("LMMS"), tr("Cycle Detected."));
-		}
-
-		if (mod != NULL && m_modelC->hasModel(mod) == false)
+		if (mod != nullptr)
 		{
-			if (mod->controllerConnection())
+			if (m_modelC->hasModel(mod))
 			{
-				mod->controllerConnection()->setController(getController());
+				QMessageBox::warning(this, tr("LMMS"), tr("Cycle Detected."));
 			}
 			else
 			{
-				ControllerConnection * cc = new ControllerConnection(getController());
-				mod->setControllerConnection(cc);
+				if (mod->controllerConnection())
+				{
+					mod->controllerConnection()->setController(getController());
+				}
+				else
+				{
+					ControllerConnection * cc = new ControllerConnection(getController());
+					mod->setControllerConnection(cc);
+				}
 			}
 		}
 	}
@@ -253,9 +251,9 @@ void ControllerView::modelChanged()
 
 void ControllerView::paintEvent(QPaintEvent*)
 {
-	QPainter p( this );
-	QRect rect( 1, 1, width()-2, m_titleBarHeight );
-	p.fillRect( rect, p.background() );
+	QPainter p(this);
+	QRect rect(1, 1, width() - 2, m_titleBarHeight);
+	p.fillRect(rect, p.background());
 }
 
 
@@ -278,6 +276,8 @@ void ControllerView::contextMenuEvent(QContextMenuEvent *)
 	contextMenu->addAction(embed::getIconPixmap("stepper-down"), tr("Move &down"), this, SLOT(moveDown())
 						   )->setDisabled(gui->getControllerRackView()->controllerViews().last() == this);
 	contextMenu->addSeparator();
+
 	contextMenu->exec(QCursor::pos());
+
 	delete contextMenu;
 }