Move mainwindow to app/
This commit is contained in:
parent
d230662924
commit
f5a38892b1
@ -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)
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
#include <QApplication>
|
||||
|
||||
#include "designer-plugins/qtkmainwindow.h"
|
||||
#include "qtkmainwindow.h"
|
||||
#include "qtkscene.h"
|
||||
|
||||
int main(int argc, char * argv[])
|
||||
|
@ -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,
|
@ -14,8 +14,7 @@
|
||||
#include <QMainWindow>
|
||||
#include <QPlainTextEdit>
|
||||
|
||||
#include "debugconsole.h"
|
||||
#include "designer-plugins/qtkwidget.h"
|
||||
#include "designer-plugins/debugconsole.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
@ -310,19 +310,19 @@
|
||||
<customwidget>
|
||||
<class>Qtk::QtkWidget</class>
|
||||
<extends>QOpenGLWidget</extends>
|
||||
<header>qtkwidget.h</header>
|
||||
<header>designer-plugins/qtkwidget.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>Qtk::TreeView</class>
|
||||
<extends>QDockWidget</extends>
|
||||
<header>treeview.h</header>
|
||||
<header>designer-plugins/treeview.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>Qtk::ToolBox</class>
|
||||
<extends>QDockWidget</extends>
|
||||
<header>toolbox.h</header>
|
||||
<header>designer-plugins/toolbox.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
@ -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
|
||||
|
@ -9,13 +9,14 @@
|
||||
#include <QKeyEvent>
|
||||
#include <QMimeData>
|
||||
#include <QVBoxLayout>
|
||||
#include <QMainWindow>
|
||||
|
||||
#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;
|
||||
|
@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#include "toolbox.h"
|
||||
#include "qtkmainwindow.h"
|
||||
#include "app/qtkmainwindow.h"
|
||||
#include "ui_toolbox.h"
|
||||
|
||||
#include <QFormLayout>
|
||||
|
@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#include "treeview.h"
|
||||
#include "qtkmainwindow.h"
|
||||
#include "app/qtkmainwindow.h"
|
||||
#include "ui_treeview.h"
|
||||
|
||||
/*******************************************************************************
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user