Move to ui

friction2d · Mar 15, 2024 · 9a95319 · 9a95319
1 parent 3b8e30b
commit 9a95319
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -203,7 +203,6 @@ set(
     GUI/timelinehighlightwidget.cpp
     GUI/timelinewidget.cpp
     GUI/timelinewrappernode.cpp
-    GUI/twocolumnlayout.cpp
     GUI/welcomedialog.cpp
     GUI/widgetstack.cpp
     GUI/ColorWidgets/colorlabel.cpp
@@ -314,7 +313,6 @@ set(
     GUI/timelinehighlightwidget.h
     GUI/timelinewidget.h
     GUI/timelinewrappernode.h
-    GUI/twocolumnlayout.h
     GUI/welcomedialog.h
     GUI/widgetstack.h
     GUI/ColorWidgets/colorlabel.h

diff --git a/src/app/GUI/Dialogs/applyexpressiondialog.cpp b/src/app/GUI/Dialogs/applyexpressiondialog.cpp
@@ -28,7 +28,7 @@
 #include <QDialogButtonBox>
 #include <QLabel>
 
-#include "GUI/twocolumnlayout.h"
+#include "widgets/twocolumnlayout.h"
 #include "GUI/global.h"
 #include "canvas.h"
 #include "Private/document.h"

diff --git a/src/app/GUI/Dialogs/durationrectsettingsdialog.cpp b/src/app/GUI/Dialogs/durationrectsettingsdialog.cpp
@@ -24,7 +24,7 @@
 // Fork of enve - Copyright (C) 2016-2020 Maurycy Liebner
 
 #include "durationrectsettingsdialog.h"
-#include "../twocolumnlayout.h"
+#include "widgets/twocolumnlayout.h"
 
 #include <QDialogButtonBox>
 

diff --git a/src/app/GUI/Dialogs/exportsvgdialog.cpp b/src/app/GUI/Dialogs/exportsvgdialog.cpp
@@ -27,7 +27,7 @@
 #include "canvas.h"
 #include "svgexporter.h"
 #include "GUI/edialogs.h"
-#include "GUI/twocolumnlayout.h"
+#include "widgets/twocolumnlayout.h"
 #include "appsupport.h"
 
 #include <QVBoxLayout>

diff --git a/src/app/GUI/RenderWidgets/outputsettingsdialog.h b/src/app/GUI/RenderWidgets/outputsettingsdialog.h
@@ -34,7 +34,7 @@
 #include <QGroupBox>
 #include <QCheckBox>
 #include "renderinstancesettings.h"
-#include "GUI/twocolumnlayout.h"
+#include "widgets/twocolumnlayout.h"
 #define COMPLIENCE FF_COMPLIANCE_NORMAL
 
 class OutputSettingsDialog : public QDialog {

diff --git a/src/app/GUI/Settings/canvassettingswidget.cpp b/src/app/GUI/Settings/canvassettingswidget.cpp
@@ -28,7 +28,7 @@
 #include "Private/esettings.h"
 #include "labeledslider.h"
 #include "GUI/coloranimatorbutton.h"
-#include "GUI/twocolumnlayout.h"
+#include "widgets/twocolumnlayout.h"
 
 #include <QLabel>
 

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -42,6 +42,7 @@ set(
     widgets/ecombobox.cpp
     widgets/editablecombobox.cpp
     widgets/buttonbase.cpp
+    widgets/twocolumnlayout.cpp
     widgets/uilayout.cpp
 )
 
@@ -55,6 +56,7 @@ set(
     widgets/ecombobox.h
     widgets/editablecombobox.h
     widgets/toolbutton.h
+    widgets/twocolumnlayout.h
     widgets/uilayout.h
     widgets/vlabel.h
 )

diff --git a/src/app/GUI/twocolumnlayout.cpp → src/ui/widgets/twocolumnlayout.cpp b/src/app/GUI/twocolumnlayout.cpp → src/ui/widgets/twocolumnlayout.cpp
diff --git a/src/app/GUI/twocolumnlayout.h → src/ui/widgets/twocolumnlayout.h b/src/app/GUI/twocolumnlayout.h → src/ui/widgets/twocolumnlayout.h
@@ -25,17 +25,22 @@
 
 #ifndef TWOCOLUMNLAYOUT_H
 #define TWOCOLUMNLAYOUT_H
+
+#include "ui_global.h"
+
 #include <QHBoxLayout>
-class TwoColumnLayout : public QHBoxLayout {
+
+class UI_EXPORT TwoColumnLayout : public QHBoxLayout
+{
 public:
     TwoColumnLayout();
 
     void addWidgetToFirstColumn(QWidget *wid);
     void addWidgetToSecondColumn(QWidget *wid);
     void addPair(QWidget *column1, QWidget *column2);
     void addPair(QWidget *column1, QLayout *column2);
-
     void addSpacing(const int size);
+
 protected:
     QVBoxLayout *mLayout1 = nullptr;
     QVBoxLayout *mLayout2 = nullptr;