Merge pull request #48 from feragon/lcui

lcUI cleanup and reorganisation
LibreCAD · Apr 26, 2016 · b92ae63 · b92ae63
2 parents ca6222e + f5417b8
commit b92ae63
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 257 deletions.
diff --git a/lcUI/CMakeLists.txt b/lcUI/CMakeLists.txt
@@ -23,8 +23,6 @@ SET(QT_USE_QTDESIGNER ON)
 set(UI_hdrs
 cadmdichild.h
 const.h
-imainwindow.h
-testform.h
 luainterface.h
 operations/circlecreateoperation.h
 operations/groupoperations.h
@@ -34,33 +32,28 @@ operations/linecreateoperation.h
 operations/operationmanager.h
 operations/qsnappedstate.h
 operations/trimoperation.h
-ui/clicommand.h
-ui/lcmaintoolbar.h
-ui/luascript.h
+widgets/clicommand.h
+widgets/luascript.h
 lua/qtbridge.h
 lua/luaqobject.h)
 
 set(UI_srcs
 cadmdichild.cpp
 main.cpp
-testform.cpp
 luainterface.cpp
 operations/circlecreateoperation.cpp
 operations/linecreateoperation.cpp
 operations/operationmanager.cpp
 operations/qsnappedstate.cpp
 operations/trimoperation.cpp
-ui/clicommand.cpp
-ui/lcmaintoolbar.cpp
-ui/luascript.cpp
+widgets/clicommand.cpp
+widgets/luascript.cpp
 lua/qtbridge.cpp
 lua/luaqobject.cpp)
 
 QT5_WRAP_UI(UI_HEADERS
-testform.ui
-ui/clicommand.ui
-ui/lcmaintoolbar.ui
-ui/luascript.ui)
+widgets/clicommand.ui
+widgets/luascript.ui)
 
 qt5_add_resources(UI_RESOURCES
 ui/resource.qrc)

diff --git a/lcUI/cadmdichild.cpp b/lcUI/cadmdichild.cpp
@@ -21,7 +21,6 @@
 #include "cad/interface/snapable.h"
 
 #include "cadmdichild.h"
-#include "testform.h"
 #include <QFileDialog>
 #include <cad/operations/builder.h>
 #include <QMessageBox>

diff --git a/lcUI/imainwindow.h b/lcUI/imainwindow.h
diff --git a/lcUI/lua/qtbridge.h b/lcUI/lua/qtbridge.h
@@ -25,7 +25,7 @@ extern "C"
 #include "cadmdichild.h"
 #include "documentcanvas.h"
 #include "lcadviewer.h"
-#include "ui/luascript.h"
+#include "widgets/luascript.h"
 
 #include "luainterface.h"
 #include "luaqobject.h"

diff --git a/lcUI/testform.cpp b/lcUI/testform.cpp
diff --git a/lcUI/testform.h b/lcUI/testform.h
diff --git a/lcUI/testform.ui b/lcUI/testform.ui
diff --git a/lcUI/ui/lcmaintoolbar.cpp b/lcUI/ui/lcmaintoolbar.cpp
diff --git a/lcUI/ui/lcmaintoolbar.h b/lcUI/ui/lcmaintoolbar.h
diff --git a/lcUI/ui/clicommand.cpp → lcUI/widgets/clicommand.cpp b/lcUI/ui/clicommand.cpp → lcUI/widgets/clicommand.cpp
diff --git a/lcUI/ui/clicommand.h → lcUI/widgets/clicommand.h b/lcUI/ui/clicommand.h → lcUI/widgets/clicommand.h
diff --git a/lcUI/ui/clicommand.ui → lcUI/widgets/clicommand.ui b/lcUI/ui/clicommand.ui → lcUI/widgets/clicommand.ui
diff --git a/lcUI/ui/luascript.cpp → lcUI/widgets/luascript.cpp b/lcUI/ui/luascript.cpp → lcUI/widgets/luascript.cpp
diff --git a/lcUI/ui/luascript.h → lcUI/widgets/luascript.h b/lcUI/ui/luascript.h → lcUI/widgets/luascript.h
@@ -3,7 +3,7 @@
 #include <QDockWidget>
 #include <QMdiArea>
 #include <QMdiSubWindow>
-#include <imainwindow.h>
+#include "cadmdichild.h"
 
 namespace Ui {
     class LuaScript;

diff --git a/lcUI/ui/luascript.ui → lcUI/widgets/luascript.ui b/lcUI/ui/luascript.ui → lcUI/widgets/luascript.ui