Changeset 95 in tspsg-svn for trunk/src/mainwindow.cpp

Timestamp:

Feb 27, 2010, 2:13:50 PM (15 years ago)

Author:

laleppa

Message:

+ Added Symmetric mode: in this mode the cost of travel from city 1 to city 2 and vice versa is the same.
+ Added the ability to reset all settings to their defaults: hold Shift while clicking Save button in Settings Dialog.

• Better SIP show/hide handling under wince: no need to resize the Main Window, when it isn't active.

File:

• trunk/src/mainwindow.cpp (modified) (5 diffs)

trunk/src/mainwindow.cpp

@@ -71 +71 @@
 
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+        // Centering main window
+QRect rect = geometry();
+        rect.moveCenter(QApplication::desktop()->availableGeometry(this).center());
+        setGeometry(rect);
         if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
                 // Loading of saved window state
@@ -77 +81 @@
                 restoreState(settings->value("State").toByteArray());
                 settings->endGroup();
-        } else {
-                // Centering main window
-QRect rect = geometry();
-                rect.moveCenter(QApplication::desktop()->availableGeometry(this).center());
-                setGeometry(rect);
         }
 #else
@@ -500 +499 @@
 
 #ifdef Q_OS_WINCE
+void MainWindow::changeEvent(QEvent *ev)
+{
+        if ((ev->type() == QEvent::ActivationChange) && isActiveWindow())
+                desktopResized(0);
+
+        QWidget::changeEvent(ev);
+}
+
 void MainWindow::desktopResized(int screen)
 {
-        if (screen != 0)
+        if ((screen != 0) || !isActiveWindow())
                 return;
 
 QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
         if (currentGeometry != availableGeometry) {
+                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
                 /*!
                  * \hack HACK: This hack checks whether \link QDesktopWidget::availableGeometry() availableGeometry()\endlink's \c top + \c hegiht = \link QDesktopWidget::screenGeometry() screenGeometry()\endlink's \c height.
@@ -519 +527 @@
                         setGeometry(availableGeometry);
                 }
-        }
-        currentGeometry = availableGeometry;
+                currentGeometry = availableGeometry;
+                QApplication::restoreOverrideCursor();
+        }
 }
 #endif // Q_OS_WINCE
@@ -557 +566 @@
                 return;
         }
-        settings->setValue("NumCities", spinCities->value());
-
-        // Saving Main Window state
-        if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
-                settings->beginGroup("MainWindow");
+        if (!settings->value("SettingsReset", false).toBool()) {
+                settings->setValue("NumCities", spinCities->value());
+
+                // Saving Main Window state
+                if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
+                        settings->beginGroup("MainWindow");
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-                settings->setValue("Geometry", saveGeometry());
+                        settings->setValue("Geometry", saveGeometry());
 #endif // Q_OS_WINCE
-                settings->setValue("State", saveState());
-                settings->endGroup();
+                        settings->setValue("State", saveState());
+                        settings->endGroup();
+                }
+        } else {
+                settings->remove("SettingsReset");
         }