Changeset 54 in tspsg-svn for trunk/ui

Timestamp:

Aug 9, 2009, 1:45:19 AM (15 years ago)

Author:

laleppa

Message:

• mainwindow.ui and mainwindow.ce.ui had differences only in printing actions and statusbar, so I merged them into one. Differences are now applied in source code. This will simplify Main Window maintenance.
• Changed #ifndef Q_OS_WINCE to #ifndef QT_NO_PRINTER where relevant.
• Now using method at() instead of operator [] in solving algorithm. This change dramatically decreased solution time (from 13 seconds to 10-40 milliseconds for 20 cities on my PC).
• Increased maximum number of cities to 30. Setting more makes no sense at this moment, because generated solution output is big and inserting it to QTextEdit takes veeeeery long time.
• Translations were updated.

Location:

trunk/ui

Files:

• mainwindow.ce.ui (deleted)
• mainwindow.ui (modified) (8 diffs)

trunk/ui/mainwindow.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>502</width>
-    <height>407</height>
+    <width>344</width>
+    <height>381</height>
    </rect>
   </property>
@@ -15 +15 @@
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../resources/tspsg.qrc">
     <normaloff>:/images/icon.png</normaloff>:/images/icon.png</iconset>
   </property>
@@ -33 +33 @@
       <verstretch>0</verstretch>
      </sizepolicy>
+    </property>
+    <property name="tabPosition">
+     <enum>QTabWidget::North</enum>
     </property>
     <property name="currentIndex">
@@ -268 +271 @@
      <x>0</x>
      <y>0</y>
-     <width>502</width>
+     <width>344</width>
      <height>22</height>
     </rect>
@@ -296 +299 @@
     <addaction name="actionFileSave"/>
     <addaction name="menuFileSaveAs"/>
-    <addaction name="separator"/>
-    <addaction name="actionFilePrintPreview"/>
-    <addaction name="actionFilePrint"/>
     <addaction name="separator"/>
     <addaction name="actionFileExit"/>
@@ -342 +342 @@
    <addaction name="menuHelp"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
    <property name="cursor">
     <cursorShape>ArrowCursor</cursorShape>
+   </property>
+   <property name="windowTitle">
+    <string>Toolbar</string>
    </property>
    <attribute name="toolBarArea">
@@ -357 +359 @@
    <addaction name="actionFileSave"/>
    <addaction name="separator"/>
-   <addaction name="actionFilePrint"/>
    <addaction name="actionSettingsPreferences"/>
    <addaction name="separator"/>
@@ -405 +406 @@
    <property name="shortcut">
     <string>Ctrl+P</string>
-   </property>
-  </action>
-  <action name="actionFileSaveSolutionMatrices">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Solution S&amp;teps</string>
-   </property>
-   <property name="toolTip">
-    <string>Save solution steps</string>
-   </property>
-   <property name="statusTip">
-    <string>Save solution steps only</string>
-   </property>
-  </action>
-  <action name="actionFileSaveSolutionGraph">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Solution &amp;Graph</string>
-   </property>
-   <property name="toolTip">
-    <string>Save solution graph</string>
-   </property>
-   <property name="statusTip">
-    <string>Save solution graph only</string>
    </property>
   </action>