Move mainwindow to app/

This commit is contained in:
Shaun Reed 2025-03-15 11:18:12 -04:00
parent d230662924
commit f5a38892b1
10 changed files with 18 additions and 13 deletions

View File

@ -9,7 +9,11 @@
# Qtk Application # 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}) qt_add_executable(qtk_gui ${QTK_GUI_SOURCES})
target_link_libraries(qtk_gui PRIVATE qtk_plugin_library) target_link_libraries(qtk_gui PRIVATE qtk_plugin_library)

View File

@ -8,7 +8,7 @@
#include <QApplication> #include <QApplication>
#include "designer-plugins/qtkmainwindow.h" #include "qtkmainwindow.h"
#include "qtkscene.h" #include "qtkscene.h"
int main(int argc, char * argv[]) int main(int argc, char * argv[])

View File

@ -39,6 +39,8 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent)
&Qtk::Scene::sceneUpdated, &Qtk::Scene::sceneUpdated,
this, this,
&MainWindow::refreshScene); &MainWindow::refreshScene);
// Update the ToolBox details panel when an item is double-clicked.
connect(qtkWidget, connect(qtkWidget,
&Qtk::QtkWidget::objectFocusChanged, &Qtk::QtkWidget::objectFocusChanged,
ui_->qtk__ToolBox, ui_->qtk__ToolBox,

View File

@ -14,8 +14,7 @@
#include <QMainWindow> #include <QMainWindow>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include "debugconsole.h" #include "designer-plugins/debugconsole.h"
#include "designer-plugins/qtkwidget.h"
namespace Ui namespace Ui
{ {

View File

@ -310,19 +310,19 @@
<customwidget> <customwidget>
<class>Qtk::QtkWidget</class> <class>Qtk::QtkWidget</class>
<extends>QOpenGLWidget</extends> <extends>QOpenGLWidget</extends>
<header>qtkwidget.h</header> <header>designer-plugins/qtkwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>Qtk::TreeView</class> <class>Qtk::TreeView</class>
<extends>QDockWidget</extends> <extends>QDockWidget</extends>
<header>treeview.h</header> <header>designer-plugins/treeview.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>Qtk::ToolBox</class> <class>Qtk::ToolBox</class>
<extends>QDockWidget</extends> <extends>QDockWidget</extends>
<header>toolbox.h</header> <header>designer-plugins/toolbox.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -15,7 +15,6 @@ set(
debugconsole.cpp debugconsole.ui debugconsole.cpp debugconsole.ui
toolbox.cpp toolbox.ui toolbox.cpp toolbox.ui
treeview.cpp treeview.ui treeview.cpp treeview.ui
qtkmainwindow.cpp qtkmainwindow.h qtkmainwindow.ui
) )
set( set(
QTK_PLUGIN_LIBRARY_HEADERS QTK_PLUGIN_LIBRARY_HEADERS

View File

@ -9,13 +9,14 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QMimeData> #include <QMimeData>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QMainWindow>
#include "qtk/input.h" #include "qtk/input.h"
#include "qtk/scene.h" #include "qtk/scene.h"
#include "qtk/shape.h" #include "qtk/shape.h"
#include "debugconsole.h" #include "debugconsole.h"
#include "qtkmainwindow.h" #include "app/qtkmainwindow.h"
#include "qtkwidget.h" #include "qtkwidget.h"
using namespace Qtk; using namespace Qtk;

View File

@ -8,7 +8,7 @@
*/ */
#include "toolbox.h" #include "toolbox.h"
#include "qtkmainwindow.h" #include "app/qtkmainwindow.h"
#include "ui_toolbox.h" #include "ui_toolbox.h"
#include <QFormLayout> #include <QFormLayout>

View File

@ -8,7 +8,7 @@
*/ */
#include "treeview.h" #include "treeview.h"
#include "qtkmainwindow.h" #include "app/qtkmainwindow.h"
#include "ui_treeview.h" #include "ui_treeview.h"
/******************************************************************************* /*******************************************************************************

View File

@ -43,7 +43,7 @@ template <> MeshRenderer * Scene::addObject(MeshRenderer * object)
{ {
initSceneObjectName(object); initSceneObjectName(object);
mMeshes.push_back(object); mMeshes.push_back(object);
sceneUpdated(mSceneName); emit sceneUpdated(mSceneName);
return object; return object;
} }
@ -51,7 +51,7 @@ template <> Model * Scene::addObject(Model * object)
{ {
initSceneObjectName(object); initSceneObjectName(object);
mModels.push_back(object); mModels.push_back(object);
sceneUpdated(mSceneName); emit sceneUpdated(mSceneName);
return object; return object;
} }