Fix opening devtools sample dialogs

Author: cbjeukendrup

src/framework/interactive/CMakeLists.txt

@@ -30,6 +30,10 @@ target_sources(muse_interactive PRIVATE
     api/interactiveapi.cpp
     api/interactiveapi.h
 
+    dev/testdialog.cpp
+    dev/testdialog.h
+    dev/testdialog.ui
+
     internal/iinteractiveprovider.h
     internal/interactive.cpp
     internal/interactive.h

src/framework/ui/dev/testdialog.cpp …framework/interactive/dev/testdialog.cppsrc/framework/ui/dev/testdialog.cpp renamed to src/framework/interactive/dev/testdialog.cpp src/framework/ui/dev/testdialog.cpp renamed to src/framework/interactive/dev/testdialog.cpp

@@ -22,7 +22,7 @@
 #include "testdialog.h"
 #include "ui_testdialog.h"
 
-using namespace muse::ui;
+using namespace muse::interactive;
 
 TestDialog::TestDialog(QWidget* parent)
     : QDialog(parent),

src/framework/ui/dev/testdialog.h …c/framework/interactive/dev/testdialog.hsrc/framework/ui/dev/testdialog.h renamed to src/framework/interactive/dev/testdialog.h src/framework/ui/dev/testdialog.h renamed to src/framework/interactive/dev/testdialog.h

@@ -19,16 +19,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MUSE_UI_TESTDIALOG_H
-#define MUSE_UI_TESTDIALOG_H
+
+#pragma once
 
 #include <QDialog>
 
 namespace Ui {
 class TestDialog;
 }
 
-namespace muse::ui {
+namespace muse::interactive {
 class TestDialog : public QDialog
 {
     Q_OBJECT
@@ -52,5 +52,3 @@ public slots:
     QString m_title;
 };
 }
-
-#endif // MUSE_UI_TESTDIALOG_H

src/framework/ui/dev/testdialog.ui …/framework/interactive/dev/testdialog.uisrc/framework/ui/dev/testdialog.ui renamed to src/framework/interactive/dev/testdialog.ui src/framework/ui/dev/testdialog.ui renamed to src/framework/interactive/dev/testdialog.ui

@@ -27,13 +27,16 @@
 
 #include "internal/interactive.h"
 #include "internal/interactiveuriregister.h"
+#include "types/uri.h"
 
 #ifdef Q_OS_WASM
 #include "internal/platform/web/webinteractive.h"
 #endif
 
 #include "api/interactiveapi.h"
 
+#include "dev/testdialog.h"
+
 using namespace muse::interactive;
 using namespace muse::modularity;
 
@@ -76,5 +79,8 @@ void InteractiveModule::resolveImports()
         ir->registerQmlUri(Uri("muse://interactive/progress"), "Muse.Interactive", "ProgressDialog");
         ir->registerQmlUri(Uri("muse://interactive/selectfile"), "Muse.Interactive", "FileDialog");
         ir->registerQmlUri(Uri("muse://interactive/selectdir"), "Muse.Interactive", "FolderDialog");
+
+        ir->registerQmlUri(Uri("muse://devtools/interactive/sample"), "Muse.Interactive", "SampleDialog");
+        ir->registerWidgetUri<TestDialog>(Uri("muse://devtools/interactive/testdialog"));
     }
 }

src/framework/interactive/interactivemodule.cpp

@@ -88,10 +88,6 @@ target_sources(muse_ui PRIVATE
     view/widgetstatestore.cpp
     view/widgetstatestore.h
     view/widgetutils.h
-
-    dev/testdialog.cpp
-    dev/testdialog.h
-    dev/testdialog.ui
 )
 
 if (OS_IS_MAC)

src/framework/ui/CMakeLists.txt

@@ -53,8 +53,6 @@
 #include "api/navigationapi.h"
 #include "api/keyboardapi.h"
 
-#include "dev/testdialog.h"
-
 #include "muse_framework_config.h"
 
 #include "log.h"