Feature: Detach window

include/ControllerDialog.h

@@ -26,8 +26,7 @@
 #ifndef LMMS_GUI_CONTROLLER_DIALOG_H
 #define LMMS_GUI_CONTROLLER_DIALOG_H
 
-#include <QWidget>
-
+#include "DetachableWidget.h"
 #include "ModelView.h"
 
 namespace lmms
@@ -38,24 +37,12 @@ class Controller;
 namespace gui
 {
 
-class ControllerDialog : public QWidget, public ModelView
+class ControllerDialog : public DetachableWidget, public ModelView
 {
-    Q_OBJECT
 public:
-	ControllerDialog( Controller * _controller, QWidget * _parent );
-
+	ControllerDialog(Controller* controller, QWidget* parent);
 	~ControllerDialog() override = default;
-
-
-signals:
-	void closed();
-
-
-protected:
-	void closeEvent( QCloseEvent * _ce ) override;
-
-} ;
-
+};
 
 } // namespace gui
 

include/ControllerRackView.h

@@ -25,18 +25,14 @@
 #ifndef LMMS_GUI_CONTROLLER_RACK_VIEW_H
 #define LMMS_GUI_CONTROLLER_RACK_VIEW_H
 
-#include <QWidget>
-#include <QCloseEvent>
-
+#include "DetachableWidget.h"
 #include "SerializingObject.h"
 #include "lmms_basics.h"
 
-
 class QPushButton;
 class QScrollArea;
 class QVBoxLayout;
 
-
 namespace lmms
 {
 
@@ -47,8 +43,7 @@ namespace gui
 
 class ControllerView;
 
-
-class ControllerRackView : public QWidget, public SerializingObject
+class ControllerRackView : public DetachableWidget, public SerializingObject
 {
 	Q_OBJECT
 public:
@@ -71,9 +66,6 @@ public slots:
 	void addController(Controller* controller);
 	void removeController(Controller* controller);
 
-protected:
-	void closeEvent( QCloseEvent * _ce ) override;
-
 private slots:
 	void addController();
 

include/DetachableWidget.h

@@ -0,0 +1,49 @@
+/*
+ * DetachableWidget.h - Allows a widget to be detached from
+ *                      LMMS's main window
+ *
+ * Copyright (c) 2023 Dalton Messmer <messmer.dalton/at/gmail.com>
+ *
+ * This file is part of LMMS - https://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 LMMS_GUI_DETACHABLE_WIDGET
+#define LMMS_GUI_DETACHABLE_WIDGET
+
+#include <QWidget>
+
+#include "lmms_export.h"
+
+namespace lmms::gui {
+
+class LMMS_EXPORT DetachableWidget : public QWidget
+{
+	Q_OBJECT
+public:
+	using QWidget::QWidget;
+
+	void closeEvent(QCloseEvent* ce) override;
+
+signals:
+	void closed();
+};
+
+} // namespace lmms::gui
+
+#endif // LMMS_GUI_DETACHABLE_WIDGET

include/DetachableWindow.h

@@ -0,0 +1,49 @@
+/*
+ * DetachableWindow.h - Allows a window to be detached from
+ *                      LMMS's main window
+ *
+ * Copyright (c) 2023 Dalton Messmer <messmer.dalton/at/gmail.com>
+ *
+ * This file is part of LMMS - https://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 LMMS_GUI_DETACHABLE_WINDOW
+#define LMMS_GUI_DETACHABLE_WINDOW
+
+#include <QMainWindow>
+
+#include "lmms_export.h"
+
+namespace lmms::gui {
+
+class LMMS_EXPORT DetachableWindow : public QMainWindow
+{
+	Q_OBJECT
+public:
+	using QMainWindow::QMainWindow;
+
+	void closeEvent(QCloseEvent* ce) override;
+
+signals:
+	void closed();
+};
+
+} // namespace lmms::gui
+
+#endif // LMMS_GUI_DETACHABLE_WINDOW

include/Editor.h

@@ -25,9 +25,10 @@
 #ifndef LMMS_GUI_EDITOR_H
 #define LMMS_GUI_EDITOR_H
 
-#include <QMainWindow>
 #include <QToolBar>
 
+#include "DetachableWindow.h"
+
 class QAction;
 
 namespace lmms::gui
@@ -45,7 +46,7 @@ class DropToolBar;
 ///
 /// Those editors include the Song Editor, the Automation Editor, B&B Editor,
 /// and the Piano Roll.
-class Editor : public QMainWindow
+class Editor : public DetachableWindow
 {
 	Q_OBJECT
 public:
@@ -56,7 +57,6 @@ class Editor : public QMainWindow
 	DropToolBar * addDropToolBar(Qt::ToolBarArea whereToAdd, QString const & windowTitle);
 	DropToolBar * addDropToolBar(QWidget * parent, Qt::ToolBarArea whereToAdd, QString const & windowTitle);
 
-	void closeEvent(QCloseEvent * event) override;
 protected slots:
 	virtual void play() {}
 	virtual void record() {}

include/EffectControlDialog.h

@@ -26,39 +26,28 @@
 #ifndef LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 #define LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 
-#include <QWidget>
-
+#include "DetachableWidget.h"
 #include "ModelView.h"
 
 namespace lmms
 {
 
 class EffectControls;
 
-
 namespace gui
 {
 
-class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
+class LMMS_EXPORT EffectControlDialog : public DetachableWidget, public ModelView
 {
-	Q_OBJECT
 public:
-	EffectControlDialog( EffectControls * _controls );
+	EffectControlDialog(EffectControls* controls);
 	~EffectControlDialog() override = default;
 
-	virtual bool isResizable() const {return false;}
-
-
-signals:
-	void closed();
-
+	virtual bool isResizable() const { return false; }
 
 protected:
-	void closeEvent( QCloseEvent * _ce ) override;
-
-	EffectControls * m_effectControls;
-
-} ;
+	EffectControls* m_effectControls;
+};
 
 } // namespace gui
 

include/MicrotunerConfig.h

@@ -25,10 +25,9 @@
 #ifndef LMMS_GUI_MICROTUNER_CONFIG_H
 #define LMMS_GUI_MICROTUNER_CONFIG_H
 
-#include <QWidget>
-
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
+#include "DetachableWidget.h"
 #include "SerializingObject.h"
 
 class QLineEdit;
@@ -38,7 +37,7 @@ namespace lmms::gui
 {
 
 
-class LMMS_EXPORT MicrotunerConfig : public QWidget, public SerializingObject
+class LMMS_EXPORT MicrotunerConfig : public DetachableWidget, public SerializingObject
 {
 	Q_OBJECT
 public:
@@ -59,9 +58,6 @@ public slots:
 	void updateScaleForm();
 	void updateKeymapForm();
 
-protected:
-	void closeEvent(QCloseEvent *ce) override;
-
 private slots:
 	bool loadScaleFromFile();
 	bool loadKeymapFromFile();