Move misc to ui library

friction2d · Mar 11, 2024 · e7bd9eb · e7bd9eb
1 parent 57cab32
commit e7bd9eb
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -274,7 +274,6 @@ set(
     GUI/namedcontainer.cpp
     #GUI/BrushWidgets/brushwidget.cpp
     GUI/Settings/labeledslider.cpp
-    GUI/uilayout.cpp
     GUI/toolbox.cpp
 )
 
@@ -326,7 +325,6 @@ set(
     GUI/timelinehighlightwidget.h
     GUI/timelinewidget.h
     GUI/timelinewrappernode.h
-    GUI/toolbutton.h
     GUI/twocolumnlayout.h
     GUI/welcomedialog.h
     GUI/widgetstack.h
@@ -395,8 +393,6 @@ set(
     #GUI/BrushWidgets/brushwidget.h
     boxtypemenu.h
     GUI/Settings/labeledslider.h
-    GUI/uilayout.h
-    GUI/vlabel.h
 )
 
 set(

diff --git a/src/app/GUI/mainwindow.h b/src/app/GUI/mainwindow.h
@@ -51,8 +51,8 @@
 #include "GUI/qdoubleslider.h"
 #include "window.h"
 #include "GUI/aboutwidget.h"
-#include "GUI/uilayout.h"
-#include "GUI/toolbutton.h"
+#include "widgets/uilayout.h"
+#include "widgets/toolbutton.h"
 
 class VideoEncoder;
 class RenderWidget;

diff --git a/src/app/GUI/toolbox.cpp b/src/app/GUI/toolbox.cpp
@@ -24,7 +24,7 @@
 #include "mainwindow.h"
 
 #include "appsupport.h"
-#include "vlabel.h"
+#include "widgets/vlabel.h"
 
 void MainWindow::setupToolBox()
 {

diff --git a/src/app/GUI/welcomedialog.cpp b/src/app/GUI/welcomedialog.cpp
@@ -30,7 +30,7 @@
 #include <QPainter>
 #include <QLabel>
 
-#include "toolbutton.h"
+#include "widgets/toolbutton.h"
 #include "appsupport.h"
 
 WelcomeDialog::WelcomeDialog(QMenu *recentMenu,

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -40,6 +40,7 @@ set(
     widgets/alignwidget.cpp
     widgets/assetswidget.cpp
     widgets/buttonbase.cpp
+    widgets/uilayout.cpp
 )
 
 set(
@@ -49,6 +50,9 @@ set(
     widgets/alignwidget.h
     widgets/assetswidget.h
     widgets/buttonbase.h
+    widgets/toolbutton.h
+    widgets/uilayout.h
+    widgets/vlabel.h
 )
 
 if(NOT WIN32)

diff --git a/src/app/GUI/toolbutton.h → src/ui/widgets/toolbutton.h b/src/app/GUI/toolbutton.h → src/ui/widgets/toolbutton.h
@@ -24,6 +24,8 @@
 #ifndef TOOLBUTTON_H
 #define TOOLBUTTON_H
 
+#include "ui_global.h"
+
 #include <QToolButton>
 #include <QEvent>
 #include <QDropEvent>
@@ -33,7 +35,7 @@
 #include <QList>
 #include <QUrl>
 
-class ToolButton : public QToolButton
+class UI_EXPORT ToolButton : public QToolButton
 {
     Q_OBJECT
 public:

diff --git a/src/app/GUI/uilayout.cpp → src/ui/widgets/uilayout.cpp b/src/app/GUI/uilayout.cpp → src/ui/widgets/uilayout.cpp
diff --git a/src/app/GUI/uilayout.h → src/ui/widgets/uilayout.h b/src/app/GUI/uilayout.h → src/ui/widgets/uilayout.h
@@ -24,12 +24,14 @@
 #ifndef UILAYOUT_H
 #define UILAYOUT_H
 
+#include "ui_global.h"
+
 #include <QWidget>
 #include <QSplitter>
 #include <QVBoxLayout>
 #include <vector>
 
-class UIDock : public QWidget
+class UI_EXPORT UIDock : public QWidget
 {
     Q_OBJECT
 
@@ -69,7 +71,7 @@ class UIDock : public QWidget
     void writeSettings();
 };
 
-class UILayout : public QSplitter
+class UI_EXPORT UILayout : public QSplitter
 {
     Q_OBJECT
 

diff --git a/src/app/GUI/vlabel.h → src/ui/widgets/vlabel.h b/src/app/GUI/vlabel.h → src/ui/widgets/vlabel.h
@@ -24,11 +24,13 @@
 #ifndef VLABEL_H
 #define VLABEL_H
 
+#include "ui_global.h"
+
 #include <QLabel>
 #include <QStylePainter>
 #include <QPaintEvent>
 
-class VLabel : public QLabel
+class UI_EXPORT VLabel : public QLabel
 {
     Q_OBJECT