move settings dialogs in their own directory

app/CMakeLists.txt

@@ -17,6 +17,7 @@ add_subdirectory(settings)
 add_subdirectory(settings/controllers)
 add_subdirectory(settings/data)
 add_subdirectory(settings/delegates)
+add_subdirectory(settings/dialogs)
 add_subdirectory(settings/handlers)
 add_subdirectory(settings/models)
 add_subdirectory(settings/tools)
@@ -32,7 +33,8 @@ add_subdirectory(wm/tracker)
 
 set(latte_dbusXML dbus/org.kde.LatteDock.xml)
 qt5_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} lattecorona.h Latte::Corona lattedockadaptor)
-ki18n_wrap_ui(lattedock-app_SRCS settings/settingsdialog.ui)
+
+ki18n_wrap_ui(lattedock-app_SRCS settings/dialogs/settingsdialog.ui)
 
 add_executable(latte-dock ${lattedock-app_SRCS})
 

app/layouts/manager.cpp

@@ -29,7 +29,7 @@
 #include "../screenpool.h"
 #include "../layout/abstractlayout.h"
 #include "../layout/centrallayout.h"
-#include "../settings/settingsdialog.h"
+#include "../settings/dialogs/settingsdialog.h"
 #include "../settings/universalsettings.h"
 
 // Qt
@@ -427,7 +427,7 @@ void Manager::importPreset(int presetNo, bool newInstanceIfPresent)
 void Manager::showLatteSettingsDialog(int firstPage, bool toggleCurrentPage)
 {
     if (!m_latteSettingsDialog) {
-        m_latteSettingsDialog = new SettingsDialog(nullptr, m_corona);
+        m_latteSettingsDialog = new Latte::Settings::Dialog::SettingsDialog(nullptr, m_corona);
     }
     m_latteSettingsDialog->show();
 

app/layouts/manager.h

@@ -24,7 +24,7 @@
 // local
 #include "launcherssignals.h"
 #include "synchronizer.h"
-#include "settings/settingsdialog.h"
+#include "settings/dialogs/settingsdialog.h"
 
 // Qt
 #include <QAction>
@@ -149,14 +149,14 @@ private:
 private:
     QStringList m_presetsPaths;
 
-    QPointer<Latte::SettingsDialog> m_latteSettingsDialog;
+    QPointer<Latte::Settings::Dialog::SettingsDialog> m_latteSettingsDialog;
 
     Latte::Corona *m_corona{nullptr};
     Importer *m_importer{nullptr};
     LaunchersSignals *m_launchersSignals{nullptr};
     Synchronizer *m_synchronizer{nullptr};
 
-    friend class Latte::SettingsDialog;
+    friend class Latte::Settings::Dialog::SettingsDialog;
     friend class Synchronizer;
 };
 

app/settings/CMakeLists.txt

@@ -1,6 +1,5 @@
 set(lattedock-app_SRCS
     ${lattedock-app_SRCS}   
-    ${CMAKE_CURRENT_SOURCE_DIR}/settingsdialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/universalsettings.cpp
     PARENT_SCOPE
 )

app/settings/controllers/layoutscontroller.cpp

@@ -22,8 +22,8 @@
 
 // local
 #include "ui_settingsdialog.h"
-#include "../settingsdialog.h"
 #include "../universalsettings.h"
+#include "../dialogs/settingsdialog.h"
 #include "../delegates/activitiesdelegate.h"
 #include "../delegates/backgroundcmbdelegate.h"
 #include "../delegates/checkboxdelegate.h"
@@ -617,11 +617,11 @@ bool Layouts::importLayoutsFromV1ConfigFile(QString file)
                 if (importedlayouts.count() == 1) {
                     m_handler->showInlineMessage(i18n("Layout <b>%0</b> imported successfully...").arg(importedlayouts[0]),
                             KMessageWidget::Information,
-                            SettingsDialog::INFORMATIONINTERVAL);
+                            Settings::Dialog::INFORMATIONINTERVAL);
                 } else {
                     m_handler->showInlineMessage(i18n("Layouts <b>%0</b> imported successfully...").arg(importedlayouts.join(",")),
                                                  KMessageWidget::Information,
-                                                 SettingsDialog::INFORMATIONINTERVAL);
+                                                 Settings::Dialog::INFORMATIONINTERVAL);
                 }
 
                 return true;
@@ -900,7 +900,7 @@ void Layouts::on_nameDuplicatedFrom(const QString &provenId, const QString &tria
 
     m_handler->showInlineMessage(i18nc("settings: layout name used","Layout <b>%0</b> is already used, please provide a different name...").arg(provenLayout.name),
                                  KMessageWidget::Error,
-                                 SettingsDialog::ERRORINTERVAL);
+                                 Settings::Dialog::ERRORINTERVAL);
 
     QModelIndex tIndex = m_proxyModel->index(tRow, Model::Layouts::NAMECOLUMN);
 

app/settings/dialogs/CMakeLists.txt

@@ -0,0 +1,5 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/settingsdialog.cpp
+    PARENT_SCOPE
+)

app/settings/dialogs/settingsdialog.cpp

@@ -22,18 +22,18 @@
 #include "settingsdialog.h"
 
 // local
-#include "universalsettings.h"
 #include "ui_settingsdialog.h"
-#include "../lattecorona.h"
-#include "../screenpool.h"
-#include "../layout/centrallayout.h"
-#include "../layouts/importer.h"
-#include "../layouts/manager.h"
-#include "../layouts/synchronizer.h"
-#include "../liblatte2/types.h"
-#include "../plasma/extended/theme.h"
-#include "data/layoutdata.h"
-#include "tools/settingstools.h"
+#include "../universalsettings.h"
+#include "../data/layoutdata.h"
+#include "../tools/settingstools.h"
+#include "../../lattecorona.h"
+#include "../../screenpool.h"
+#include "../../layout/centrallayout.h"
+#include "../../layouts/importer.h"
+#include "../../layouts/manager.h"
+#include "../../layouts/synchronizer.h"
+#include "../../liblatte2/types.h"
+#include "../../plasma/extended/theme.h"
 
 // Qt
 #include <QButtonGroup>
@@ -55,11 +55,8 @@
 #define TWINCHECKED "Checked"
 
 namespace Latte {
-
-const int SettingsDialog::INFORMATIONINTERVAL;
-const int SettingsDialog::INFORMATIONWITHACTIONINTERVAL;
-const int SettingsDialog::WARNINGINTERVAL;
-const int SettingsDialog::ERRORINTERVAL;
+namespace Settings {
+namespace Dialog {
 
 SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona)
     : QDialog(parent),
@@ -303,11 +300,11 @@ void SettingsDialog::on_import_fullconfiguration()
     connect(importFileDialog, &QFileDialog::finished, importFileDialog, &QFileDialog::deleteLater);
 
     connect(importFileDialog, &QFileDialog::fileSelected, this, [&](const QString & file) {
-        Layouts::Importer::LatteFileVersion version = Layouts::Importer::fileVersion(file);
+        Latte::Layouts::Importer::LatteFileVersion version = Latte::Layouts::Importer::fileVersion(file);
         qDebug() << "VERSION :::: " << version;
 
-        if (version == Layouts::Importer::ConfigVersion2
-                || version == Layouts::Importer::ConfigVersion1) {
+        if (version == Latte::Layouts::Importer::ConfigVersion2
+                || version == Latte::Layouts::Importer::ConfigVersion1) {
             auto msg = new QMessageBox(this);
             msg->setIcon(QMessageBox::Warning);
             msg->setWindowTitle(i18n("Import: Full Configuration File"));
@@ -389,7 +386,7 @@ void SettingsDialog::on_export_fullconfiguration()
 
             showInlineMessage(i18n("Full configuration export succeeded..."),
                               KMessageWidget::Information,
-                              SettingsDialog::INFORMATIONWITHACTIONINTERVAL,
+                              Settings::Dialog::INFORMATIONWITHACTIONINTERVAL,
                               actions);
         } else {
             showExportConfigurationError();
@@ -787,4 +784,6 @@ void SettingsDialog::saveConfig()
     m_storage.writeEntry("downloadWindowSize", m_downloadWindowSize);
 }
 
+}
+}
 }//end of namespace

app/settings/dialogs/settingsdialog.h

@@ -24,9 +24,9 @@
 
 // local
 #include "../liblatte2/types.h"
-#include "controllers/layoutscontroller.h"
-#include "handlers/tablayoutshandler.h"
-#include "handlers/tabpreferenceshandler.h"
+#include "../controllers/layoutscontroller.h"
+#include "../handlers/tablayoutshandler.h"
+#include "../handlers/tabpreferenceshandler.h"
 
 // Qt
 #include <QObject>
@@ -55,16 +55,18 @@ class CentralLayout;
 }
 
 namespace Latte {
+namespace Settings {
+namespace Dialog {
+
+static const int INFORMATIONINTERVAL = 3000;
+static const int INFORMATIONWITHACTIONINTERVAL = 5000;
+static const int WARNINGINTERVAL = 3500;
+static const int ERRORINTERVAL = 4000;
 
 class SettingsDialog : public QDialog
 {
     Q_OBJECT
 public:
-    static const int INFORMATIONINTERVAL = 3000;
-    static const int INFORMATIONWITHACTIONINTERVAL = 5000;
-    static const int WARNINGINTERVAL = 3500;
-    static const int ERRORINTERVAL = 4000;
-
     SettingsDialog(QWidget *parent, Latte::Corona *corona);
     ~SettingsDialog();
 
@@ -175,6 +177,8 @@ private:
 
 };
 
+}
+}
 }
 
 #endif // SETTINGSDIALOG_H

app/settings/handlers/tablayoutshandler.cpp

@@ -22,8 +22,8 @@
 
 //! local
 #include "ui_settingsdialog.h"
-#include "../settingsdialog.h"
 #include "../universalsettings.h"
+#include "../dialogs/settingsdialog.h"
 #include "../controllers/layoutscontroller.h"
 #include "../views/layoutstableview.h"
 #include "../../lattecorona.h"
@@ -48,7 +48,7 @@ namespace Latte {
 namespace Settings {
 namespace Handler {
 
-TabLayouts::TabLayouts(Latte::SettingsDialog *parent)
+TabLayouts::TabLayouts(Settings::Dialog::SettingsDialog *parent)
     : Generic(parent),
       m_parentDialog(parent),
       m_corona(m_parentDialog->corona()),
@@ -205,7 +205,7 @@ Latte::Corona *TabLayouts::corona() const
     return m_corona;
 }
 
-Latte::SettingsDialog *TabLayouts::dialog() const
+Settings::Dialog::SettingsDialog *TabLayouts::dialog() const
 {
     return m_parentDialog;
 }
@@ -258,7 +258,7 @@ void TabLayouts::on_switch_layout()
     if (m_layoutsController->dataAreChanged()) {
         showInlineMessage(i18nc("settings:not permitted switching layout","You need to <b>apply</b> your changes first to switch layout..."),
                           KMessageWidget::Warning,
-                          SettingsDialog::WARNINGINTERVAL);
+                          Settings::Dialog::WARNINGINTERVAL);
         return;
     }
 
@@ -394,7 +394,7 @@ void TabLayouts::on_new_layout()
             Settings::Data::Layout newlayout = m_layoutsController->addLayoutForFile(preset, presetName, true);
             showInlineMessage(i18nc("settings:layout added successfully","Layout <b>%0</b> added successfully...").arg(newlayout.name),
                               KMessageWidget::Information,
-                              SettingsDialog::INFORMATIONINTERVAL);
+                              Settings::Dialog::INFORMATIONINTERVAL);
             break;
         }
     }
@@ -432,7 +432,7 @@ void TabLayouts::on_download_layout()
                     Settings::Data::Layout downloaded = m_layoutsController->addLayoutForFile(entryFile);
                     showInlineMessage(i18nc("settings:layout downloaded successfully","Layout <b>%0</b> downloaded successfully...").arg(downloaded.name),
                                       KMessageWidget::Information,
-                                      SettingsDialog::INFORMATIONINTERVAL);
+                                      Settings::Dialog::INFORMATIONINTERVAL);
                     break;
                 }
             }
@@ -459,14 +459,14 @@ void TabLayouts::on_remove_layout()
     if (selectedLayout.isActive) {
         showInlineMessage(i18nc("settings: active layout remove","<b>Active</b> layouts can not be removed..."),
                           KMessageWidget::Error,
-                          SettingsDialog::WARNINGINTERVAL);
+                          Settings::Dialog::WARNINGINTERVAL);
         return;
     }
 
     if (selectedLayout.isLocked) {
         showInlineMessage(i18nc("settings: locked layout remove","Locked layouts can not be removed..."),
                           KMessageWidget::Error,
-                          SettingsDialog::WARNINGINTERVAL);
+                          Settings::Dialog::WARNINGINTERVAL);
         return;
     }
 
@@ -532,7 +532,7 @@ void TabLayouts::on_import_layout()
             Settings::Data::Layout importedlayout = m_layoutsController->addLayoutForFile(file);
             showInlineMessage(i18nc("settings:layout imported successfully","Layout <b>%0</b> imported successfully...").arg(importedlayout.name),
                               KMessageWidget::Information,
-                              SettingsDialog::INFORMATIONINTERVAL);
+                              Settings::Dialog::INFORMATIONINTERVAL);
         } else if (version == Latte::Layouts::Importer::ConfigVersion1) {
             if (!m_layoutsController->importLayoutsFromV1ConfigFile(file)) {
                 showInlineMessage(i18nc("settings:deprecated layouts import failed","Import layouts from deprecated version <b>failed</b>..."),
@@ -619,7 +619,7 @@ void TabLayouts::on_export_layout()
 
             showInlineMessage(i18nc("settings:layout export success","Layout <b>%0</b> export succeeded...").arg(selectedLayout.name),
                               KMessageWidget::Information,
-                              SettingsDialog::INFORMATIONWITHACTIONINTERVAL,
+                              Settings::Dialog::INFORMATIONWITHACTIONINTERVAL,
                               actions);
         } else if (file.endsWith(".latterc")) {
             auto showExportConfigurationError = [this]() {
@@ -642,7 +642,7 @@ void TabLayouts::on_export_layout()
 
                 showInlineMessage(i18n("Full configuration export succeeded..."),
                                   KMessageWidget::Information,
-                                  SettingsDialog::INFORMATIONWITHACTIONINTERVAL,
+                                  Settings::Dialog::INFORMATIONWITHACTIONINTERVAL,
                                   actions);
             } else {
                 showExportConfigurationError();
@@ -683,11 +683,11 @@ void TabLayouts::on_layoutFilesDropped(const QStringList &paths)
     if (layoutNames.count() == 1) {
         showInlineMessage(i18nc("settings:layout imported successfully","Layout <b>%0</b> imported successfully...").arg(layoutNames[0]),
                 KMessageWidget::Information,
-                SettingsDialog::INFORMATIONINTERVAL);
+                Settings::Dialog::INFORMATIONINTERVAL);
     } else if (layoutNames.count() > 1) {
         showInlineMessage(i18nc("settings:layouts imported successfully","Layouts <b>%0</b> imported successfully...").arg(layoutNames.join(", )")),
                           KMessageWidget::Information,
-                          SettingsDialog::INFORMATIONINTERVAL);
+                          Settings::Dialog::INFORMATIONINTERVAL);
     }
 }
 

app/settings/handlers/tablayoutshandler.h

@@ -38,12 +38,15 @@ class SettingsDialog;
 
 namespace Latte {
 class Corona;
-class SettingsDialog;
 
 namespace Settings {
 namespace Controller {
 class Layouts;
 }
+
+namespace Dialog{
+class SettingsDialog;
+}
 }
 }
 
@@ -59,7 +62,7 @@ class TabLayouts : public Generic
 {
     Q_OBJECT
 public:
-    TabLayouts(Latte::SettingsDialog *parent);
+    TabLayouts(Dialog::SettingsDialog *parent);
     ~TabLayouts();
 
     bool dataAreChanged() const override;
@@ -71,7 +74,7 @@ public:
     void save() override;
 
     Latte::Corona *corona() const;
-    Latte::SettingsDialog *dialog() const;
+    Dialog::SettingsDialog *dialog() const;
     Ui::SettingsDialog *ui() const;
 
     void showInlineMessage(const QString &msg, const KMessageWidget::MessageType &type, const int &hideInterval = 0, QList<QAction *> actions = QList<QAction *>()) override;
@@ -110,7 +113,7 @@ private:
     bool isHoveringLayoutsTable(const QPoint &pos);
 
 private:
-    Latte::SettingsDialog *m_parentDialog{nullptr};
+    Settings::Dialog::SettingsDialog *m_parentDialog{nullptr};
     Ui::SettingsDialog *m_ui{nullptr};
     Latte::Corona *m_corona{nullptr};
 

app/settings/handlers/tabpreferenceshandler.cpp

@@ -22,8 +22,8 @@
 
 //! local
 #include "ui_settingsdialog.h"
-#include "../settingsdialog.h"
 #include "../universalsettings.h"
+#include "../dialogs/settingsdialog.h"
 #include "../../lattecorona.h"
 #include "../../plasma/extended/theme.h"
 #include "../../../liblatte2/types.h"
@@ -33,7 +33,7 @@ namespace Settings {
 namespace Handler {
 
 
-TabPreferences::TabPreferences(Latte::SettingsDialog *parent)
+TabPreferences::TabPreferences(Latte::Settings::Dialog::SettingsDialog *parent)
     : Generic(parent),
       m_parentDialog(parent),
       m_corona(m_parentDialog->corona()),

app/settings/handlers/tabpreferenceshandler.h

@@ -37,8 +37,12 @@ class SettingsDialog;
 
 namespace Latte {
 class Corona;
+namespace Settings {
+namespace Dialog {
 class SettingsDialog;
 }
+}
+}
 
 namespace Latte {
 namespace Settings {
@@ -52,7 +56,7 @@ class TabPreferences : public Generic
 {
     Q_OBJECT
 public:
-    TabPreferences(Latte::SettingsDialog *parent);
+    TabPreferences(Latte::Settings::Dialog::SettingsDialog *parent);
 
     bool dataAreChanged() const override;
     bool inDefaultValues() const override;
@@ -72,7 +76,7 @@ private slots:
     void updateUi();
 
 private:
-    Latte::SettingsDialog *m_parentDialog{nullptr};
+    Latte::Settings::Dialog::SettingsDialog *m_parentDialog{nullptr};
     Ui::SettingsDialog *m_ui{nullptr};
     Latte::Corona *m_corona{nullptr};