Changeset 23 in tspsg-svn for trunk

Timestamp:

Jun 22, 2009, 9:44:00 AM (16 years ago)

Author:

laleppa

Message:

Settings saving tweaks.

Location:

trunk/src

Files:

• defines.h (modified) (2 diffs)
• mainwindow.cpp (modified) (3 diffs)
• mainwindow.h (modified) (2 diffs)
• settingsdialog.cpp (modified) (1 diff)
• tspmodel.cpp (modified) (1 diff)

trunk/src/defines.h

@@ -22 +22 @@
  */
 
-#ifndef DEFAULTS_H
-#define DEFAULTS_H
-
-// Ini file name
-#define INI_FILE "tspsg.ini"
+#ifndef DEFINES_H
+#define DEFINES_H
 
 // Default values
@@ -36 +33 @@
 #define DEF_FONT_COLOR Qt::black
 
-#endif // DEFAULTS_H
+#endif // DEFINES_H

trunk/src/mainwindow.cpp

@@ -33 +33 @@
 {
         setupUi(this);
-QSettings settings(INI_FILE,QSettings::IniFormat);
-        spinCities->setValue(settings.value("NumCities",5).toInt());
+        settings = new QSettings(QSettings::IniFormat,QSettings::UserScope,"TSPSG","tspsg");
+        spinCities->setValue(settings->value("NumCities",5).toInt());
         connect(actionSettingsSettings,SIGNAL(triggered()),this,SLOT(ChangeSettings()));
         connect(actionHelpAbout,SIGNAL(triggered()),this,SLOT(showAbout()));
@@ -50 +50 @@
         tabWidget->resize(rect.width(),rect.height() - toolBar->size().height());
 #else
-        if (settings.value("SavePos",false).toBool()) {
+        if (settings->value("SavePos",false).toBool()) {
                 // Loading of saved window state
-                settings.beginGroup("MainWindow");
-                resize(settings.value("Size",size()).toSize());
-                move(settings.value("Position",pos()).toPoint());
-                if (settings.value("Maximized",false).toBool())
+                settings->beginGroup("MainWindow");
+                resize(settings->value("Size",size()).toSize());
+                move(settings->value("Position",pos()).toPoint());
+                if (settings->value("Maximized",false).toBool())
                         setWindowState(windowState() | Qt::WindowMaximized);
-                settings.endGroup();
+                settings->endGroup();
         } else {
                 // Centering main window
@@ -154 +154 @@
 {
         // Saving windows state
-QSettings settings(INI_FILE,QSettings::IniFormat);
-        settings.setValue("NumCities",spinCities->value());
-        if (settings.value("SavePos",false).toBool()) {
-                settings.beginGroup("MainWindow");
-                settings.setValue("Maximized",isMaximized());
+        settings->setValue("NumCities",spinCities->value());
+        if (settings->value("SavePos",false).toBool()) {
+                settings->beginGroup("MainWindow");
+                settings->setValue("Maximized",isMaximized());
                 if (!isMaximized()) {
-                        settings.setValue("Size",size());
-                        settings.setValue("Position",pos());
+                        settings->setValue("Size",size());
+                        settings->setValue("Position",pos());
                 }
-                settings.endGroup();
+                settings->endGroup();
         }
         QMainWindow::closeEvent(event);

trunk/src/mainwindow.h

@@ -26 +26 @@
 
 #include <QMainWindow>
+#include <QSettings>
 #ifdef Q_OS_WINCE
         #include "ui_mainwindow.ce.h"
@@ -53 +54 @@
         void CitiesNumberChanged(int n);
 private:
+        QSettings *settings;
         CTSPModel *tspmodel;
 };

trunk/src/settingsdialog.cpp

@@ -50 +50 @@
         labelHint->setMinimumHeight(labelHint->height());
 #endif // Q_OS_WINCE
-        settings = new QSettings(INI_FILE,QSettings::IniFormat);
+        settings = new QSettings(QSettings::IniFormat,QSettings::UserScope,"TSPSG","tspsg");
         spinRandMin->setValue(settings->value("MinCost",DEF_RAND_MIN).toInt());
         spinRandMax->setValue(settings->value("MaxCost",DEF_RAND_MAX).toInt());

trunk/src/tspmodel.cpp

@@ -29 +29 @@
         : QAbstractTableModel(parent), nCities(0)
 {
-        settings = new QSettings(INI_FILE,QSettings::IniFormat);
+        settings = new QSettings(QSettings::IniFormat,QSettings::UserScope,"TSPSG","tspsg");
 }