Changeset 26 in tspsg-svn

Timestamp:

Jun 22, 2009, 5:42:56 PM (16 years ago)

Author:

laleppa

Message:

+ Status tip for font color selection button in settings.

• Number of cities wasn't saved in wince version.

Location:

trunk

Files:

• src/mainwindow.cpp (modified) (2 diffs)
• src/mainwindow.h (modified) (1 diff)
• tspsg.pri (modified) (1 diff)
• ui/settingsdialog.ce.ui (modified) (1 diff)
• ui/settingsdialog.ui (modified) (2 diffs)

trunk/src/mainwindow.cpp

@@ -150 +150 @@
 }
 
-#ifndef Q_OS_WINCE
 void MainWindow::closeEvent(QCloseEvent *event)
 {
+        settings->setValue("NumCities",spinCities->value());
+#ifndef Q_OS_WINCE
         // Saving windows state
-        settings->setValue("NumCities",spinCities->value());
         if (settings->value("SavePos",false).toBool()) {
                 settings->beginGroup("MainWindow");
@@ -164 +164 @@
                 settings->endGroup();
         }
+#endif // Q_OS_WINCE
         QMainWindow::closeEvent(event);
 }
-#endif // Q_OS_WINCE

trunk/src/mainwindow.h

@@ -41 +41 @@
 public:
         MainWindow(QWidget *parent = 0);
-#ifndef Q_OS_WINCE
         void closeEvent(QCloseEvent *event);
-#endif // Q_OS_WINCE
 private slots:
         void ChangeSettings();

trunk/tspsg.pri

@@ -12 +12 @@
 
 #Header files
-HEADERS += src/mainwindow.h \
+HEADERS += src/defines.h \
+        src/mainwindow.h \
         src/settingsdialog.h \
         src/tspmodel.h \

trunk/ui/settingsdialog.ce.ui

@@ -196 +196 @@
         <item>
          <widget class="QPushButton" name="buttonColor">
+          <property name="statusTip">
+           <string>Задать цвет шрифта, используемого при печати</string>
+          </property>
           <property name="text">
            <string>&amp;Цвет...</string>

trunk/ui/settingsdialog.ui

@@ -285 +285 @@
                   <cursorShape>PointingHandCursor</cursorShape>
                  </property>
+                 <property name="statusTip">
+                  <string>Задать цвет шрифта, используемого при печати</string>
+                 </property>
                  <property name="text">
                   <string>&amp;Цвет...</string>
@@ -454 +457 @@
  <resources>
   <include location="../resources/tspsg.qrc"/>
-  <include location="../resources/tspsg.qrc"/>
  </resources>
  <connections/>