Changeset 0ac9690913 in tspsg for src/mainwindow.cpp

Timestamp:

Dec 7, 2009, 5:06:44 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

a218bf2cb2

Parents:

3b1caa32d0

Message:

+ Toolbar state and position is now saved and restored with Main Window state and position.

• Made some small improvements to the code.
• Fixed some errors in the documentation.
• Made source code more "documentation friendly".

File:

• src/mainwindow.cpp (modified) (8 diffs)

src/mainwindow.cpp

@@ -83 +83 @@
         connect(spinCities,SIGNAL(valueChanged(int)),this,SLOT(spinCitiesValueChanged(int)));
         setCentralWidget(tabWidget);
-#ifndef Q_OS_WINCE
-QRect rect = geometry();
-        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())
-                        setWindowState(windowState() | Qt::WindowMaximized);
+#ifndef Q_OS_WINCE
+                restoreGeometry(settings->value("Geometry").toByteArray());
+#endif // Q_OS_WINCE
+                restoreState(settings->value("State").toByteArray());
                 settings->endGroup();
+#ifndef Q_OS_WINCE
         } else {
                 // Centering main window
+QRect rect = geometry();
                 rect.moveCenter(QApplication::desktop()->availableGeometry(this).center());
                 setGeometry(rect);
-        }
 #endif // Q_OS_WINCE
+        }
+
         qsrand(QDateTime().currentDateTime().toTime_t());
-        tspmodel = new CTSPModel();
+        tspmodel = new CTSPModel(this);
         taskView->setModel(tspmodel);
         connect(tspmodel,SIGNAL(numCitiesChanged(int)),this,SLOT(numCitiesChanged(int)));
@@ -440 +442 @@
 }
 
-void MainWindow::closeEvent(QCloseEvent *event)
+void MainWindow::closeEvent(QCloseEvent *ev)
 {
         if (!maybeSave()) {
-                event->ignore();
-                return;
-        }
-        settings->setValue("NumCities",spinCities->value());
+                ev->ignore();
+                return;
+        }
+        settings->setValue("NumCities", spinCities->value());
+
+        // Saving Main Window state
+        if (settings->value("SavePos", false).toBool()) {
+                settings->beginGroup("MainWindow");
 #ifndef Q_OS_WINCE
-        // Saving windows state
-        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("Geometry", saveGeometry());
+#endif // Q_OS_WINCE
+                settings->setValue("State", saveState());
                 settings->endGroup();
         }
-#endif // Q_OS_WINCE
-        QMainWindow::closeEvent(event);
+
+        QMainWindow::closeEvent(ev);
 }
 
@@ -520 +521 @@
 }
 
-bool MainWindow::loadLanguage(QString lang)
+bool MainWindow::loadLanguage(const QString &lang)
 {
 // i18n
 bool ad = false;
-        if (lang.isEmpty()) {
+QString lng = lang;
+        if (lng.isEmpty()) {
                 ad = settings->value("Language","").toString().isEmpty();
-                lang = settings->value("Language",QLocale::system().name()).toString();
+                lng = settings->value("Language",QLocale::system().name()).toString();
         }
 static QTranslator *qtTranslator; // Qt library translator
@@ -541 +543 @@
         }
         translator = new QTranslator();
-        if (lang.compare("en") && !lang.startsWith("en_")) {
+        if (lng.compare("en") && !lng.startsWith("en_")) {
                 // Trying to load system Qt library translation...
-                if (qtTranslator->load("qt_" + lang,QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+                if (qtTranslator->load("qt_" + lng,QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
                         qApp->installTranslator(qtTranslator);
                 else
                         // No luck. Let's try to load bundled one.
-                        if (qtTranslator->load("qt_" + lang,PATH_I18N))
+                        if (qtTranslator->load("qt_" + lng,PATH_I18N))
                                 qApp->installTranslator(qtTranslator);
                         else {
@@ -555 +557 @@
                         }
                 // Now let's load application translation.
-                if (translator->load(lang,PATH_I18N))
+                if (translator->load(lng,PATH_I18N))
                         qApp->installTranslator(translator);
                 else {
@@ -581 +583 @@
 }
 
-void MainWindow::outputMatrix(tMatrix matrix, QStringList &output, int nRow, int nCol)
+void MainWindow::outputMatrix(const tMatrix &matrix, QStringList &output, int nRow, int nCol)
 {
 int n = spinCities->value();
@@ -589 +591 @@
                 line = "<tr>";
                 for (int c = 0; c < n; c++) {
-                        if (matrix[r][c] == INFINITY)
+                        if (matrix.at(r).at(c) == INFINITY)
                                 line += "<td align=\"center\">"INFSTR"</td>";
                         else if ((r == nRow) && (c == nCol))
-                                line += "<td align=\"center\" class=\"selected\">" + QVariant(matrix[r][c]).toString() + "</td>";
+                                line += "<td align=\"center\" class=\"selected\">" + QVariant(matrix.at(r).at(c)).toString() + "</td>";
                         else
-                                line += "<td align=\"center\">" + QVariant(matrix[r][c]).toString() + "</td>";
+                                line += "<td align=\"center\">" + QVariant(matrix.at(r).at(c)).toString() + "</td>";
                 }
                 line += "</tr>";
@@ -626 +628 @@
 }
 
-void MainWindow::setFileName(QString fileName)
+void MainWindow::setFileName(const QString &fileName)
 {
         this->fileName = fileName;