X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=Client%2Fcarmainwindow.ui;h=41a386fd543356fb38dfb151bf65b55612b4c417;hb=a7967f2ca03a3ab17a76e021813bed2fe4f32db1;hp=0df2dae6c5102266495ec97ab7c184f874fd6bfb;hpb=c8fb4f6aec72451dfccaad473150d1e72ae964d8;p=speedfreak

diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index 0df2dae..41a386f 100644
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -18,7 +18,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>0</y>
       <width>781</width>
       <height>361</height>
      </rect>
@@ -125,7 +125,7 @@
       </layout>
      </widget>
     </widget>
-    <widget class="QWidget" name="tab">
+    <widget class="QWidget" name="tabTop">
      <attribute name="title">
       <string>Top</string>
      </attribute>
@@ -228,8 +228,8 @@
        <rect>
         <x>20</x>
         <y>30</y>
-        <width>141</width>
-        <height>17</height>
+        <width>521</width>
+        <height>31</height>
        </rect>
       </property>
       <property name="text">
@@ -240,9 +240,9 @@
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>60</y>
-        <width>93</width>
-        <height>27</height>
+        <y>76</y>
+        <width>151</width>
+        <height>41</height>
        </rect>
       </property>
       <property name="text">
@@ -250,6 +250,155 @@
       </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>40</x>
+        <y>240</y>
+        <width>161</width>
+        <height>51</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>370</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="geometry">
+       <rect>
+        <x>370</x>
+        <y>240</y>
+        <width>161</width>
+        <height>51</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Send result</string>
+      </property>
+     </widget>
+     <widget class="QWidget" name="layoutWidget">
+      <property name="geometry">
+       <rect>
+        <x>40</x>
+        <y>60</y>
+        <width>171</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayoutMeasureTabTime">
+       <item>
+        <widget class="QLabel" name="labelMeasureTabTimeHeader">
+         <property name="text">
+          <string>Time:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelMeasureTabTime">
+         <property name="text">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="layoutWidget">
+      <property name="geometry">
+       <rect>
+        <x>40</x>
+        <y>160</y>
+        <width>171</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayoutMeasureTabSpeed">
+       <item>
+        <widget class="QLabel" name="labelMeasureTabSpeedHeader">
+         <property name="text">
+          <string>Speed:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelMeasureTabSpeed">
+         <property name="text">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="layoutWidget">
+      <property name="geometry">
+       <rect>
+        <x>370</x>
+        <y>60</y>
+        <width>151</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="labelMeasureTabResultHeader_2">
+         <property name="text">
+          <string>Time:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelMeasureTabResult">
+         <property name="text">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
    </widget>
    <widget class="QWidget" name="layoutWidget">
     <property name="geometry">
@@ -294,10 +443,10 @@
    <widget class="QPushButton" name="registratePushButton">
     <property name="geometry">
      <rect>
-      <x>690</x>
+      <x>642</x>
       <y>0</y>
-      <width>93</width>
-      <height>27</height>
+      <width>141</width>
+      <height>31</height>
      </rect>
     </property>
     <property name="text">