Move scene settings dialog to ui

friction2d · Mar 15, 2024 · af194d2 · af194d2
1 parent 0ffc89d
commit af194d2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -165,12 +165,11 @@ set(
     #GUI/BrushWidgets/brushlabel.cpp
     GUI/ColorWidgets/bookmarkedcolors.cpp
     GUI/ColorWidgets/paintcolorwidget.cpp
-    GUI/Dialogs/animationtopaintdialog.cpp
+    #GUI/Dialogs/animationtopaintdialog.cpp
     GUI/Dialogs/applyexpressiondialog.cpp
     GUI/Dialogs/dialogsinterfaceimpl.cpp
     GUI/Dialogs/durationrectsettingsdialog.cpp
     GUI/Dialogs/exportsvgdialog.cpp
-    GUI/Dialogs/scenesettingsdialog.cpp
     GUI/Expressions/expressiondialog.cpp
     GUI/Expressions/expressioneditor.cpp
     GUI/Expressions/expressionhighlighter.cpp
@@ -267,12 +266,11 @@ set(
     #GUI/BrushWidgets/brushlabel.h
     GUI/ColorWidgets/bookmarkedcolors.h
     GUI/ColorWidgets/paintcolorwidget.h
-    GUI/Dialogs/animationtopaintdialog.h
+    #GUI/Dialogs/animationtopaintdialog.h
     GUI/Dialogs/applyexpressiondialog.h
     GUI/Dialogs/dialogsinterfaceimpl.h
     GUI/Dialogs/durationrectsettingsdialog.h
     GUI/Dialogs/exportsvgdialog.h
-    GUI/Dialogs/scenesettingsdialog.h
     GUI/Expressions/expressiondialog.h
     GUI/Expressions/expressioneditor.h
     GUI/Expressions/expressionhighlighter.h

diff --git a/src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp b/src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp
@@ -36,9 +36,9 @@
 #include "GUI/mainwindow.h"
 #include "GUI/Expressions/expressiondialog.h"
 #include "GUI/Dialogs/durationrectsettingsdialog.h"
-#include "GUI/Dialogs/animationtopaintdialog.h"
+//#include "GUI/Dialogs/animationtopaintdialog.h"
 #include "GUI/Dialogs/applyexpressiondialog.h"
-#include "GUI/Dialogs/scenesettingsdialog.h"
+#include "dialogs/scenesettingsdialog.h"
 
 DialogsInterfaceImpl DialogsInterfaceImpl::sInstance;
 

diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -57,7 +57,7 @@
 #include "Sound/soundcomposition.h"
 #include "GUI/BoxesList/boxsinglewidget.h"
 #include "memoryhandler.h"
-#include "GUI/Dialogs/scenesettingsdialog.h"
+#include "dialogs/scenesettingsdialog.h"
 #include "importhandler.h"
 #include "GUI/edialogs.h"
 #include "eimporters.h"

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -36,6 +36,7 @@ include_directories(
 
 set(
     SOURCES
+    dialogs/scenesettingsdialog.cpp
     widgets/actionbutton.cpp
     widgets/alignwidget.cpp
     widgets/assetswidget.cpp
@@ -56,6 +57,7 @@ set(
 set(
     HEADERS
     ui_global.h
+    dialogs/scenesettingsdialog.h
     widgets/actionbutton.h
     widgets/alignwidget.h
     widgets/assetswidget.h

diff --git a/src/app/GUI/Dialogs/scenesettingsdialog.cpp → src/ui/dialogs/scenesettingsdialog.cpp b/src/app/GUI/Dialogs/scenesettingsdialog.cpp → src/ui/dialogs/scenesettingsdialog.cpp
diff --git a/src/app/GUI/Dialogs/scenesettingsdialog.h → src/ui/dialogs/scenesettingsdialog.h b/src/app/GUI/Dialogs/scenesettingsdialog.h → src/ui/dialogs/scenesettingsdialog.h
@@ -26,6 +26,8 @@
 #ifndef SCENESETTINGSDIALOG_H
 #define SCENESETTINGSDIALOG_H
 
+#include "ui_global.h"
+
 #include <QDialog>
 #include <QVBoxLayout>
 #include <QPushButton>
@@ -38,13 +40,13 @@
 #include "smartPointers/ememory.h"
 #include "framerange.h"
 
-
 class Document;
 class Canvas;
 class ColorAnimator;
 class ColorAnimatorButton;
 
-class SceneSettingsDialog : public QDialog {
+class UI_EXPORT SceneSettingsDialog : public QDialog
+{
 public:
     SceneSettingsDialog(Canvas * const canvas,
                          QWidget * const parent = nullptr);
@@ -70,6 +72,7 @@ class SceneSettingsDialog : public QDialog {
     void applySettingsToCanvas(Canvas * const canvas) const;
 
     static void sNewSceneDialog(Document &document, QWidget * const parent);
+
 private:
     bool validate();