X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=Client%2Fcarmainwindow.ui;h=ad01fd9bac7ef052de2b15ccd3652f748d1c6318;hb=829b561da4e4e4b6b781783e84246508485ad4c6;hp=75ca6ab92a93f348a82e51c59d1bd74807dfce3c;hpb=93cfba3f8bf9649fff7f71602558042151f92e8f;p=speedfreak

diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index 75ca6ab..ad01fd9 100644
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -11,73 +11,31 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>CarMainWindow</string>
+   <string>Speed freak</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <widget class="QTabWidget" name="tabWidget">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>10</y>
+      <x>0</x>
+      <y>0</y>
       <width>781</width>
       <height>361</height>
      </rect>
     </property>
     <property name="currentIndex">
-     <number>2</number>
+     <number>1</number>
     </property>
     <widget class="QWidget" name="StartTab">
      <attribute name="title">
       <string>Start</string>
      </attribute>
-     <widget class="QWidget" name="layoutWidget">
-      <property name="geometry">
-       <rect>
-        <x>590</x>
-        <y>220</y>
-        <width>171</width>
-        <height>91</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QPushButton" name="autoStartButton">
-         <property name="font">
-          <font>
-           <family>Bitstream Charter</family>
-           <pointsize>16</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Auto start</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="manualStartButton">
-         <property name="font">
-          <font>
-           <family>Bitstream Charter</family>
-           <pointsize>16</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Manual start</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QListView" name="listView">
+     <widget class="QListView" name="listViewStartTabAccelerationCategories">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>10</y>
-        <width>261</width>
+        <width>151</width>
         <height>301</height>
        </rect>
       </property>
@@ -85,7 +43,7 @@
      <widget class="QWidget" name="layoutWidget">
       <property name="geometry">
        <rect>
-        <x>270</x>
+        <x>160</x>
         <y>10</y>
         <width>311</width>
         <height>301</height>
@@ -100,7 +58,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="minLineEdit"/>
+        <widget class="QLineEdit" name="lineEditStartTabMin"/>
        </item>
        <item>
         <widget class="QLabel" name="stopLabel">
@@ -110,7 +68,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="maxLineEdit"/>
+        <widget class="QLineEdit" name="lineEditStartTabMax"/>
        </item>
        <item>
         <widget class="QLabel" name="unitLabel">
@@ -120,22 +78,64 @@
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="unitComboBox"/>
+        <widget class="QComboBox" name="comboBoxStartTabUnits"/>
        </item>
       </layout>
      </widget>
+     <widget class="QPushButton" name="autoStartButton">
+      <property name="geometry">
+       <rect>
+        <x>520</x>
+        <y>40</y>
+        <width>201</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>16</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Auto start</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="manualStartButton">
+      <property name="geometry">
+       <rect>
+        <x>520</x>
+        <y>180</y>
+        <width>201</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>16</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Manual start</string>
+      </property>
+     </widget>
     </widget>
-    <widget class="QWidget" name="tab">
+    <widget class="QWidget" name="tabTop">
      <attribute name="title">
       <string>Top</string>
      </attribute>
      <widget class="QPushButton" name="buttonTopRefresh">
       <property name="geometry">
        <rect>
-        <x>20</x>
-        <y>270</y>
-        <width>169</width>
-        <height>37</height>
+        <x>10</x>
+        <y>210</y>
+        <width>221</width>
+        <height>71</height>
        </rect>
       </property>
       <property name="font">
@@ -197,73 +197,264 @@
        </item>
       </layout>
      </widget>
+     <widget class="QLabel" name="labelTopList">
+      <property name="geometry">
+       <rect>
+        <x>380</x>
+        <y>10</y>
+        <width>371</width>
+        <height>311</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>9</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>TopList</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      </property>
+     </widget>
     </widget>
     <widget class="QWidget" name="settingsTab">
      <attribute name="title">
       <string>Settings</string>
      </attribute>
+     <widget class="QLabel" name="userNameLabel">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>30</y>
+        <width>531</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>User:</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="setUserPushButton">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>140</y>
+        <width>201</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Set User</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="tabMeasureResult">
+     <attribute name="title">
+      <string>Measure</string>
+     </attribute>
+     <widget class="QPushButton" name="pushButtonMeasureTabAbort">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>230</y>
+        <width>160</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Abort</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabHeader">
+      <property name="geometry">
+       <rect>
+        <x>40</x>
+        <y>10</y>
+        <width>261</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Accelerate to 40 km/h</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabResultHeader">
+      <property name="geometry">
+       <rect>
+        <x>470</x>
+        <y>10</y>
+        <width>101</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Results:</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButtonSendResult">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>470</x>
+        <y>230</y>
+        <width>160</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Send result</string>
+      </property>
+      <property name="checkable">
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabTimeHeader">
+      <property name="geometry">
+       <rect>
+        <x>25</x>
+        <y>70</y>
+        <width>60</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Time:</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabTime">
+      <property name="geometry">
+       <rect>
+        <x>129</x>
+        <y>60</y>
+        <width>71</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>14</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>0</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabSpeedHeader">
+      <property name="geometry">
+       <rect>
+        <x>25</x>
+        <y>160</y>
+        <width>81</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Speed:</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabSpeed">
+      <property name="geometry">
+       <rect>
+        <x>129</x>
+        <y>160</y>
+        <width>51</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>14</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>0</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabResultHeader_2">
+      <property name="geometry">
+       <rect>
+        <x>470</x>
+        <y>60</y>
+        <width>71</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Time:</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="labelMeasureTabResult">
+      <property name="geometry">
+       <rect>
+        <x>570</x>
+        <y>60</y>
+        <width>61</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>14</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>0</string>
+      </property>
+     </widget>
     </widget>
-   </widget>
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>380</y>
-      <width>781</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="view1Button">
-       <property name="text">
-        <string>View1</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="view2Button">
-       <property name="text">
-        <string>View2</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="view3Button">
-       <property name="text">
-        <string>View3</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="view4Button">
-       <property name="text">
-        <string>View4</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QPushButton" name="loginLogoutButton">
-    <property name="geometry">
-     <rect>
-      <x>690</x>
-      <y>0</y>
-      <width>93</width>
-      <height>27</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Login</string>
-    </property>
    </widget>
    <widget class="QPushButton" name="registratePushButton">
     <property name="geometry">
      <rect>
-      <x>580</x>
-      <y>0</y>
-      <width>93</width>
-      <height>27</height>
+      <x>520</x>
+      <y>370</y>
+      <width>231</width>
+      <height>41</height>
      </rect>
     </property>
     <property name="text">