From 1732fb1000a7fabd0d97aaaa0d89c57c2b17fe1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Fri, 15 Mar 2024 23:33:28 +0100 Subject: [PATCH] move dialog to ui --- src/app/CMakeLists.txt | 2 -- src/app/GUI/mainwindow.cpp | 2 +- src/ui/CMakeLists.txt | 2 ++ src/{app/GUI/Dialogs => ui/dialogs}/exportsvgdialog.cpp | 0 src/{app/GUI/Dialogs => ui/dialogs}/exportsvgdialog.h | 4 +++- 5 files changed, 6 insertions(+), 4 deletions(-) rename src/{app/GUI/Dialogs => ui/dialogs}/exportsvgdialog.cpp (100%) rename src/{app/GUI/Dialogs => ui/dialogs}/exportsvgdialog.h (95%) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 7bda1d506..65a665e57 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -168,7 +168,6 @@ set( GUI/Dialogs/applyexpressiondialog.cpp GUI/Dialogs/dialogsinterfaceimpl.cpp GUI/Dialogs/durationrectsettingsdialog.cpp - GUI/Dialogs/exportsvgdialog.cpp GUI/Expressions/expressiondialog.cpp GUI/Expressions/expressioneditor.cpp GUI/Expressions/expressionhighlighter.cpp @@ -263,7 +262,6 @@ set( GUI/Dialogs/applyexpressiondialog.h GUI/Dialogs/dialogsinterfaceimpl.h GUI/Dialogs/durationrectsettingsdialog.h - GUI/Dialogs/exportsvgdialog.h GUI/Expressions/expressiondialog.h GUI/Expressions/expressioneditor.h GUI/Expressions/expressionhighlighter.h diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp index 5f895dc30..f2aff3257 100644 --- a/src/app/GUI/mainwindow.cpp +++ b/src/app/GUI/mainwindow.cpp @@ -61,7 +61,7 @@ #include "importhandler.h" #include "GUI/edialogs.h" #include "eimporters.h" -#include "Dialogs/exportsvgdialog.h" +#include "dialogs/exportsvgdialog.h" #include "widgets/alignwidget.h" #include "welcomedialog.h" #include "Boxes/textbox.h" diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 6501875e6..c49c47f95 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -36,6 +36,7 @@ include_directories( set( SOURCES + dialogs/exportsvgdialog.cpp dialogs/scenesettingsdialog.cpp optimalscrollarena/minimalscrollwidget.cpp optimalscrollarena/scrollarea.cpp @@ -63,6 +64,7 @@ set( set( HEADERS ui_global.h + dialogs/exportsvgdialog.h dialogs/scenesettingsdialog.h optimalscrollarena/minimalscrollwidget.h optimalscrollarena/scrollarea.h diff --git a/src/app/GUI/Dialogs/exportsvgdialog.cpp b/src/ui/dialogs/exportsvgdialog.cpp similarity index 100% rename from src/app/GUI/Dialogs/exportsvgdialog.cpp rename to src/ui/dialogs/exportsvgdialog.cpp diff --git a/src/app/GUI/Dialogs/exportsvgdialog.h b/src/ui/dialogs/exportsvgdialog.h similarity index 95% rename from src/app/GUI/Dialogs/exportsvgdialog.h rename to src/ui/dialogs/exportsvgdialog.h index bf1daab28..e021a49a6 100644 --- a/src/app/GUI/Dialogs/exportsvgdialog.h +++ b/src/ui/dialogs/exportsvgdialog.h @@ -22,6 +22,8 @@ #ifndef EXPORTSVGDIALOG_H #define EXPORTSVGDIALOG_H +#include "ui_global.h" + #include #include #include @@ -31,7 +33,7 @@ class SceneChooser; class ComplexTask; -class ExportSvgDialog : public QDialog +class UI_EXPORT ExportSvgDialog : public QDialog { public: ExportSvgDialog(QWidget* const parent = nullptr);