WPandaSettings: Remove mainwindow dependence

The WPandaSetting is static now.

app/bewaveddolphin.cpp

@@ -34,7 +34,6 @@
 
 #include "ui_bewaveddolphin.h"
 #include "WPandaSettings.h"
-#include "mainwindow.h"
 
 SignalModel::SignalModel(int rows, int inputs, int columns, QObject *parent)
     : QStandardItemModel(rows, columns, parent)
@@ -79,9 +78,9 @@ BewavedDolphin::BewavedDolphin(Editor *editor, QWidget *parent)
     setWindowTitle("Bewaved Dolphin Simulator");
     setWindowFlags(Qt::Window);
 
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        restoreGeometry(GlobalProperties::settingToByteArray(mainwindow->settings()->bdGeometry()));
-    }
+    // TODO: remove geometry from settings save
+    auto settings = WPandaSettings::self();
+    restoreGeometry(GlobalProperties::settingToByteArray(settings->bdGeometry()));
 
     m_gv = new GraphicsView(this);
     m_ui->verticalLayout->addWidget(m_gv);
@@ -104,9 +103,9 @@ BewavedDolphin::BewavedDolphin(Editor *editor, QWidget *parent)
 
 BewavedDolphin::~BewavedDolphin()
 {
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        mainwindow->settings()->setBdGeometry(GlobalProperties::settingToIntList(saveGeometry()));
-    }
+    // TODO: remove geometry from settings save
+    auto settings = WPandaSettings::self();
+    settings->setBdGeometry(GlobalProperties::settingToIntList(saveGeometry()));
 
     delete m_ui;
 }

app/mainwindow.cpp

@@ -50,7 +50,7 @@ MainWindow::MainWindow(QWidget *parent, const QString &filename)
     , m_dolphinFilename("none")
     , m_bd(nullptr)
     , m_translator(nullptr)   
-    , m_settings(new WPandaSettings)
+    , m_settings(WPandaSettings::self())
 {
     COMMENT("WIRED PANDA Version = " << APP_VERSION << " OR " << GlobalProperties::version, 0);
     m_ui->setupUi(this);
@@ -190,7 +190,7 @@ MainWindow::~MainWindow()
     m_settings->save();
 
     delete m_ui;
-    }
+}
 
 void MainWindow::on_actionExit_triggered()
 {
@@ -1030,13 +1030,13 @@ void MainWindow::on_actionSave_Local_Project_triggered()
         bool dir_res = QDir().mkpath(path + "/boxes");
         if (!dir_res) {
             std::cerr << tr("Error creating ICs directory.").toStdString() << std::endl;
-    }
+        }
     }
     if (!QDir(path + "/skins").exists()) {
         bool dir_res = QDir().mkpath(path + "/skins");
         if (!dir_res) {
             std::cerr << tr("Error creating skins directory.").toStdString() << std::endl;
-    }
+        }
     }
     COMMENT("Saving ics and skins to local directories.", 0);
     if (!m_editor->saveLocal(path)) {

app/mainwindow.h

@@ -82,8 +82,6 @@ class MainWindow : public QMainWindow
     QString getDolphinFilename();
     void setDolphinFilename(const QString &filename);
 
-    WPandaSettings *settings();
-
 signals:
     void addRecentIcFile(const QString &fname);
     void addRecentFile(const QString &fname);

app/recentfilescontroller.cpp

@@ -9,16 +9,14 @@
 
 #include "common.h"
 #include "WPandaSettings.h"
-#include "mainwindow.h"
 
 RecentFilesController::RecentFilesController(QObject *parent, bool saveSetting)
     : QObject(parent)
     , m_saveSetting(saveSetting)
 {
     if (m_saveSetting) {
-        if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-            m_files = mainwindow->settings()->recentFileList();
-        }
+        auto settings = WPandaSettings::self();
+        m_files = settings->recentFileList();
     }
 }
 
@@ -60,8 +58,7 @@ QStringList RecentFilesController::getRecentFiles()
 void RecentFilesController::saveRecentFiles()
 {
     if (m_saveSetting) {
-        if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-            mainwindow->settings()->setRecentFileList(m_files);
-        }
+        auto settings = WPandaSettings::self();
+        settings->setRecentFileList(m_files);
     }
 }

app/settings/WPandaSettings.kcfgc

@@ -4,3 +4,4 @@ Mutators=true
 DefaultValueGetters=true
 MemberVariables=private
 GlobalEnums=true
+Singleton=true

app/simplewaveform.cpp

@@ -26,7 +26,6 @@
 
 #include "input.h"
 #include "WPandaSettings.h"
-#include "mainwindow.h"
 
 using namespace QtCharts;
 
@@ -47,16 +46,17 @@ SimpleWaveform::SimpleWaveform(Editor *editor, QWidget *parent)
     setModal(true);
     m_sortingMode = SortingMode::INCREASING;
 
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        restoreGeometry(GlobalProperties::settingToByteArray(mainwindow->settings()->swGeometry()));
-    }
+    // TODO: Remove save geometry
+    auto settings = WPandaSettings::self();
+    restoreGeometry(GlobalProperties::settingToByteArray(settings->swGeometry()));
 }
 
 SimpleWaveform::~SimpleWaveform()
 {
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        mainwindow->settings()->setSwGeometry(GlobalProperties::settingToIntList(saveGeometry()));
-    }
+    // TODO: Remove save geometry
+    auto settings = WPandaSettings::self();
+    settings->setSwGeometry(GlobalProperties::settingToIntList(saveGeometry()));
+
     delete m_ui;
 }
 
@@ -200,9 +200,8 @@ bool SimpleWaveform::saveToTxt(QTextStream &outStream, Editor *editor)
 // por linha de comando, o resultado poderia ser salvo em arquivo.
 void SimpleWaveform::showWaveform()
 {
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        m_sortingMode = static_cast<SortingMode>(mainwindow->settings()->sortingType());
-    }
+    auto settings = WPandaSettings::self();
+    m_sortingMode = static_cast<SortingMode>(settings->sortingType());
 
     switch (m_sortingMode) {
     case SortingMode::DECREASING:
@@ -363,27 +362,24 @@ void SimpleWaveform::showWaveform()
 void SimpleWaveform::on_radioButton_Position_clicked()
 {
     m_sortingMode = SortingMode::POSITION;
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        mainwindow->settings()->setSortingType(static_cast<int>(m_sortingMode));
-    }
+    auto settings = WPandaSettings::self();
+    settings->setSortingType(static_cast<int>(m_sortingMode));
     showWaveform();
 }
 
 void SimpleWaveform::on_radioButton_Increasing_clicked()
 {
     m_sortingMode = SortingMode::INCREASING;
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        mainwindow->settings()->setSortingType(static_cast<int>(m_sortingMode));
-    }
+    auto settings = WPandaSettings::self();
+    settings->setSortingType(static_cast<int>(m_sortingMode));
     showWaveform();
 }
 
 void SimpleWaveform::on_radioButton_Decreasing_clicked()
 {
     m_sortingMode = SortingMode::DECREASING;
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        mainwindow->settings()->setSortingType(static_cast<int>(m_sortingMode));
-    }
+    auto settings = WPandaSettings::self();
+    settings->setSortingType(static_cast<int>(m_sortingMode));
     showWaveform();
 }
 

app/thememanager.cpp

@@ -3,7 +3,6 @@
 
 #include "thememanager.h"
 #include "WPandaSettings.h"
-#include "mainwindow.h"
 
 #include <QApplication>
 
@@ -19,9 +18,8 @@ void ThemeManager::setTheme(const Theme &theme)
     m_attrs.setTheme(theme);
     if (m_theme != theme) {
         m_theme = theme;
-        if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-            mainwindow->settings()->setTheme(static_cast<int>(theme));
-        }
+        auto settings = WPandaSettings::self();
+        settings->setTheme(static_cast<int>(theme));
         emit themeChanged();
     }
 }
@@ -40,9 +38,8 @@ ThemeManager::ThemeManager(QObject *parent)
     : QObject(parent)
     , m_theme(Theme::Panda_Light)
 {
-    if (auto mainwindow = qobject_cast<MainWindow *>(this->parent())) {
-        m_theme = static_cast<Theme>(mainwindow->settings()->theme());
-    }
+    auto settings = WPandaSettings::self();
+    m_theme = static_cast<Theme>(settings->theme());
     setTheme(m_theme);
 }