Move all settings logic to the preferences dialog

Read and write the settings only from the preferences dialog. Remove all the copies of some settings which were stored in nearly every dialog class individually. Simplify the settings dialog code by removing all those not really needed slots.
josuecorrea · Mar 17, 2013 · 2165e54 · 2165e54
1 parent 066356e
commit 2165e54
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 208 deletions.
diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
@@ -5,6 +5,7 @@
 #include <QShortcut>
 #include "sqlitedb.h"
 #include <src/qhexedit.h>
+#include "PreferencesDialog.h"
 
 EditDialog::EditDialog(QWidget* parent)
     : QDialog(parent),
@@ -70,7 +71,7 @@ void EditDialog::importData()
     QString fileName = QFileDialog::getOpenFileName(
                 this,
                 tr("Choose a file"),
-                defaultlocation,
+                PreferencesDialog::getSettingsValue("db", "defaultlocation").toString(),
                 tr("Text files(*.txt);;Image files(%1);;All files(*)").arg(image_formats));
     if(QFile::exists(fileName))
     {
@@ -91,7 +92,7 @@ void EditDialog::exportData()
     QString fileName = QFileDialog::getSaveFileName(
                 this,
                 tr("Choose a filename to export data"),
-                defaultlocation,
+                PreferencesDialog::getSettingsValue("db", "defaultlocation").toString(),
                 tr("Text files(*.txt);;All files(*)"));
 
     if(fileName.size() > 0)

diff --git a/src/EditDialog.h b/src/EditDialog.h
@@ -16,8 +16,6 @@ class EditDialog : public QDialog
     explicit EditDialog(QWidget* parent = 0);
     ~EditDialog();
 
-    QString defaultlocation;
-
 public:
     int getCurrentCol() { return curCol; }
     int getCurrentRow() { return curRow; }

diff --git a/src/ExportCsvDialog.cpp b/src/ExportCsvDialog.cpp
@@ -5,12 +5,12 @@
 #include "ExportCsvDialog.h"
 #include "ui_ExportCsvDialog.h"
 #include "sqlitedb.h"
+#include "PreferencesDialog.h"
 
-ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, const QString& deflocation, QWidget* parent)
+ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent)
     : QDialog(parent),
       ui(new Ui::ExportCsvDialog),
-      pdb(db),
-      defaultLocation(deflocation)
+      pdb(db)
 {
     // Create UI
     ui->setupUi(this);
@@ -32,7 +32,7 @@ void ExportCsvDialog::accept()
     QString fileName = QFileDialog::getSaveFileName(
                 this,
                 tr("Choose a filename to export data"),
-                defaultLocation,
+                PreferencesDialog::getSettingsValue("db", "defaultlocation").toString(),
                 tr("Text files(*.csv *.txt)"));
 
     // Only if the user hasn't clicked the cancel button

diff --git a/src/ExportCsvDialog.h b/src/ExportCsvDialog.h
@@ -13,7 +13,7 @@ class ExportCsvDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ExportCsvDialog(DBBrowserDB* db, const QString& deflocation, QWidget* parent = 0);
+    explicit ExportCsvDialog(DBBrowserDB* db, QWidget* parent = 0);
     ~ExportCsvDialog();
 
 private slots:
@@ -22,7 +22,6 @@ private slots:
 private:
     Ui::ExportCsvDialog* ui;
     DBBrowserDB* pdb;
-    QString defaultLocation;
 };
 
 #endif
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -1,7 +1,6 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
-#include <QtGui/QFileDialog>
-#include <QSettings>
+#include <QFileDialog>
 #include <QFile>
 #include <QApplication>
 #include <QTextStream>
@@ -35,7 +34,6 @@ MainWindow::MainWindow(QWidget* parent)
     init();
 
     activateFields(false);
-    updatePreferences();
     resetBrowser();
     updateRecentFileActions();
 }
@@ -108,10 +106,9 @@ void MainWindow::init()
     connect(editWin, SIGNAL(updateRecordText(int, int, QByteArray)), this, SLOT(updateRecordText(int, int , QByteArray)));
 
     // Load window settings
-    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
-    restoreGeometry(settings.value("MainWindow/geometry").toByteArray());
-    restoreState(settings.value("MainWindow/windowState").toByteArray());
-    ui->comboLogSubmittedBy->setCurrentIndex(ui->comboLogSubmittedBy->findText(settings.value("SQLLogDock/Log", "Application").toString()));
+    restoreGeometry(PreferencesDialog::getSettingsValue("MainWindow", "geometry").toByteArray());
+    restoreState(PreferencesDialog::getSettingsValue("MainWindow", "windowState").toByteArray());
+    ui->comboLogSubmittedBy->setCurrentIndex(ui->comboLogSubmittedBy->findText(PreferencesDialog::getSettingsValue("SQLLogDock", "Log").toString()));
 
     // Set other window settings
     setAcceptDrops(true);
@@ -136,7 +133,7 @@ void MainWindow::fileOpen(const QString & fileName)
         wFile = QFileDialog::getOpenFileName(
                     this,
                     tr("Choose a database file"),
-                    defaultlocation);
+                    PreferencesDialog::getSettingsValue("db", "defaultlocation").toString());
     }
     if(QFile::exists(wFile) )
     {
@@ -163,7 +160,7 @@ void MainWindow::fileOpen()
 
 void MainWindow::fileNew()
 {
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Choose a filename to save under"), defaultlocation);
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Choose a filename to save under"), PreferencesDialog::getSettingsValue("db", "defaultlocation").toString());
     if(!fileName.isEmpty())
     {
         if(QFile::exists(fileName))
@@ -366,10 +363,9 @@ void MainWindow::fileExit()
 
 void MainWindow::closeEvent( QCloseEvent* event )
 {
-    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
-    settings.setValue("MainWindow/geometry", saveGeometry());
-    settings.setValue("MainWindow/windowState", saveState());
-    settings.setValue("SQLLogDock/Log", ui->comboLogSubmittedBy->currentText());
+    PreferencesDialog::setSettingsValue("MainWindow", "geometry", saveGeometry());
+    PreferencesDialog::setSettingsValue("MainWindow", "windowState", saveState());
+    PreferencesDialog::setSettingsValue("SQLLogDock", "Log", ui->comboLogSubmittedBy->currentText());
     fileExit();
     QMainWindow::closeEvent(event);
 }
@@ -832,7 +828,7 @@ void MainWindow::importTableFromCSV()
     QString wFile = QFileDialog::getOpenFileName(
                 this,
                 tr("Choose a text file"),
-                defaultlocation,
+                PreferencesDialog::getSettingsValue("db", "defaultlocation").toString(),
                 tr("Text files(*.csv *.txt);;All files(*)"));
 
     if (QFile::exists(wFile) )
@@ -849,7 +845,7 @@ void MainWindow::importTableFromCSV()
 
 void MainWindow::exportTableToCSV()
 {
-    ExportCsvDialog dialog(&db, defaultlocation, this);
+    ExportCsvDialog dialog(&db, this);
     dialog.exec();
 }
 
@@ -883,7 +879,7 @@ void MainWindow::exportDatabaseToSQL()
     QString fileName = QFileDialog::getSaveFileName(
                 this,
                 tr("Choose a filename to export"),
-                defaultlocation,
+                PreferencesDialog::getSettingsValue("db", "defaultlocation").toString(),
                 tr("Text files(*.sql *.txt)"));
 
     if(fileName.size())
@@ -900,7 +896,7 @@ void MainWindow::importDatabaseFromSQL()
     QString fileName = QFileDialog::getOpenFileName(
                 this,
                 tr("Choose a file to import"),
-                defaultlocation,
+                PreferencesDialog::getSettingsValue("db", "defaultlocation").toString(),
                 tr("Text files(*.sql *.txt);;All files(*)"));
 
     if (fileName.size() > 0)
@@ -911,7 +907,7 @@ void MainWindow::importDatabaseFromSQL()
             QString newDBfile = QFileDialog::getSaveFileName(
                         this,
                         tr("Choose a filename to save under"),
-                        defaultlocation);
+                        PreferencesDialog::getSettingsValue("db", "defaultlocation").toString());
             if (QFile::exists(newDBfile) )
             {
                 QString err = tr("File %1 already exists. Please choose a different name.").arg(newDBfile);
@@ -936,20 +932,11 @@ void MainWindow::openPreferences()
     PreferencesDialog dialog(this);
     if(dialog.exec())
     {
-        updatePreferences();
+        db.setDefaultNewData(PreferencesDialog::getSettingsValue("db", "defaultnewdata").toString());
         resetBrowser();
     }
 }
 
-void MainWindow::updatePreferences()
-{
-    PreferencesDialog prefs(this);
-
-    db.setDefaultNewData(prefs.defaultnewdata);
-    defaultlocation= prefs.defaultlocation;
-    editWin->defaultlocation = defaultlocation;
-}
-
 //******************************************************************
 //** Tree Events
 //******************************************************************
@@ -1046,10 +1033,7 @@ void MainWindow::openRecentFile()
 
 void MainWindow::updateRecentFileActions()
 {
-    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
-    QStringList files = settings.value("recentFileList").toStringList();
-
-
+    QStringList files = PreferencesDialog::getSettingsValue("General", "recentFileList").toStringList();
     int numRecentFiles = qMin(files.size(), (int)MaxRecentFiles);
 
     for (int i = 0; i < numRecentFiles; ++i) {
@@ -1070,14 +1054,13 @@ void MainWindow::setCurrentFile(const QString &fileName)
     setWindowTitle( QApplication::applicationName() +" - "+fileName);
     activateFields(true);
 
-    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
-    QStringList files = settings.value("recentFileList").toStringList();
+    QStringList files = PreferencesDialog::getSettingsValue("General", "recentFileList").toStringList();
     files.removeAll(fileName);
     files.prepend(fileName);
     while (files.size() > MaxRecentFiles)
         files.removeLast();
 
-    settings.setValue("recentFileList", files);
+    PreferencesDialog::setSettingsValue("General", "recentFileList", files);
 
     foreach (QWidget *widget, QApplication::topLevelWidgets()) {
         MainWindow *mainWin = qobject_cast<MainWindow *>(widget);

diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -74,7 +74,6 @@ class MainWindow : public QMainWindow
     EditDialog* editWin;
     FindDialog* findWin;
     QIntValidator* gotoValidator;
-    QString defaultlocation;
 
     DBBrowserDB db;
 
@@ -139,7 +138,6 @@ private slots:
     virtual void exportDatabaseToSQL();
     virtual void importDatabaseFromSQL();
     virtual void openPreferences();
-    virtual void updatePreferences();
     virtual void openRecentFile();
     virtual void loadPragmas();
     virtual void updatePragmaUi();