From f5a38892b1111e5615feb4811c739208c98a64d3 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sat, 15 Mar 2025 11:18:12 -0400 Subject: [PATCH] Move mainwindow to app/ --- src/app/CMakeLists.txt | 6 +++++- src/app/main.cpp | 2 +- src/{designer-plugins => app}/qtkmainwindow.cpp | 2 ++ src/{designer-plugins => app}/qtkmainwindow.h | 3 +-- src/{designer-plugins => app}/qtkmainwindow.ui | 6 +++--- src/designer-plugins/CMakeLists.txt | 1 - src/designer-plugins/qtkwidget.cpp | 3 ++- src/designer-plugins/toolbox.cpp | 2 +- src/designer-plugins/treeview.cpp | 2 +- src/qtk/scene.cpp | 4 ++-- 10 files changed, 18 insertions(+), 13 deletions(-) rename src/{designer-plugins => app}/qtkmainwindow.cpp (98%) rename src/{designer-plugins => app}/qtkmainwindow.h (98%) rename src/{designer-plugins => app}/qtkmainwindow.ui (98%) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 110e8b0..c02195f 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -9,7 +9,11 @@ # Qtk Application ################################################################################ -set(QTK_GUI_SOURCES qtkscene.cpp qtkscene.h main.cpp) +set(QTK_GUI_SOURCES + qtkmainwindow.cpp qtkmainwindow.h qtkmainwindow.ui + qtkscene.cpp qtkscene.h + main.cpp +) qt_add_executable(qtk_gui ${QTK_GUI_SOURCES}) target_link_libraries(qtk_gui PRIVATE qtk_plugin_library) diff --git a/src/app/main.cpp b/src/app/main.cpp index d0a7906..5371f85 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -8,7 +8,7 @@ #include -#include "designer-plugins/qtkmainwindow.h" +#include "qtkmainwindow.h" #include "qtkscene.h" int main(int argc, char * argv[]) diff --git a/src/designer-plugins/qtkmainwindow.cpp b/src/app/qtkmainwindow.cpp similarity index 98% rename from src/designer-plugins/qtkmainwindow.cpp rename to src/app/qtkmainwindow.cpp index dee16ef..d8bf0af 100644 --- a/src/designer-plugins/qtkmainwindow.cpp +++ b/src/app/qtkmainwindow.cpp @@ -39,6 +39,8 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent) &Qtk::Scene::sceneUpdated, this, &MainWindow::refreshScene); + + // Update the ToolBox details panel when an item is double-clicked. connect(qtkWidget, &Qtk::QtkWidget::objectFocusChanged, ui_->qtk__ToolBox, diff --git a/src/designer-plugins/qtkmainwindow.h b/src/app/qtkmainwindow.h similarity index 98% rename from src/designer-plugins/qtkmainwindow.h rename to src/app/qtkmainwindow.h index f6321f3..4d3d413 100644 --- a/src/designer-plugins/qtkmainwindow.h +++ b/src/app/qtkmainwindow.h @@ -14,8 +14,7 @@ #include #include -#include "debugconsole.h" -#include "designer-plugins/qtkwidget.h" +#include "designer-plugins/debugconsole.h" namespace Ui { diff --git a/src/designer-plugins/qtkmainwindow.ui b/src/app/qtkmainwindow.ui similarity index 98% rename from src/designer-plugins/qtkmainwindow.ui rename to src/app/qtkmainwindow.ui index 494ce37..d31489c 100644 --- a/src/designer-plugins/qtkmainwindow.ui +++ b/src/app/qtkmainwindow.ui @@ -310,19 +310,19 @@ Qtk::QtkWidget QOpenGLWidget -
qtkwidget.h
+
designer-plugins/qtkwidget.h
1
Qtk::TreeView QDockWidget -
treeview.h
+
designer-plugins/treeview.h
1
Qtk::ToolBox QDockWidget -
toolbox.h
+
designer-plugins/toolbox.h
1
diff --git a/src/designer-plugins/CMakeLists.txt b/src/designer-plugins/CMakeLists.txt index 6574dd1..357bd30 100644 --- a/src/designer-plugins/CMakeLists.txt +++ b/src/designer-plugins/CMakeLists.txt @@ -15,7 +15,6 @@ set( debugconsole.cpp debugconsole.ui toolbox.cpp toolbox.ui treeview.cpp treeview.ui - qtkmainwindow.cpp qtkmainwindow.h qtkmainwindow.ui ) set( QTK_PLUGIN_LIBRARY_HEADERS diff --git a/src/designer-plugins/qtkwidget.cpp b/src/designer-plugins/qtkwidget.cpp index 25eab74..1fd5bec 100644 --- a/src/designer-plugins/qtkwidget.cpp +++ b/src/designer-plugins/qtkwidget.cpp @@ -9,13 +9,14 @@ #include #include #include +#include #include "qtk/input.h" #include "qtk/scene.h" #include "qtk/shape.h" #include "debugconsole.h" -#include "qtkmainwindow.h" +#include "app/qtkmainwindow.h" #include "qtkwidget.h" using namespace Qtk; diff --git a/src/designer-plugins/toolbox.cpp b/src/designer-plugins/toolbox.cpp index 9118052..c3a7ab7 100644 --- a/src/designer-plugins/toolbox.cpp +++ b/src/designer-plugins/toolbox.cpp @@ -8,7 +8,7 @@ */ #include "toolbox.h" -#include "qtkmainwindow.h" +#include "app/qtkmainwindow.h" #include "ui_toolbox.h" #include diff --git a/src/designer-plugins/treeview.cpp b/src/designer-plugins/treeview.cpp index 17a9a08..f9172f7 100644 --- a/src/designer-plugins/treeview.cpp +++ b/src/designer-plugins/treeview.cpp @@ -8,7 +8,7 @@ */ #include "treeview.h" -#include "qtkmainwindow.h" +#include "app/qtkmainwindow.h" #include "ui_treeview.h" /******************************************************************************* diff --git a/src/qtk/scene.cpp b/src/qtk/scene.cpp index e0b9afa..67ba4e4 100644 --- a/src/qtk/scene.cpp +++ b/src/qtk/scene.cpp @@ -43,7 +43,7 @@ template <> MeshRenderer * Scene::addObject(MeshRenderer * object) { initSceneObjectName(object); mMeshes.push_back(object); - sceneUpdated(mSceneName); + emit sceneUpdated(mSceneName); return object; } @@ -51,7 +51,7 @@ template <> Model * Scene::addObject(Model * object) { initSceneObjectName(object); mModels.push_back(object); - sceneUpdated(mSceneName); + emit sceneUpdated(mSceneName); return object; }