X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcarmainwindow.ui;h=8c0e7f035c6c00355dc1754a70ab09b149bcd937;hp=e5f7a8a1313abcaff44bc2cd2f59b4518deb7208;hb=b8104711348ebb86e8c93b23067af8f699870626;hpb=431e1a47738b2f723789de366eead08c4e2b5fd2

diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index e5f7a8a..8c0e7f0 100644
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -127,9 +127,9 @@
      <widget class="QListView" name="listViewStartTabAccelerationCategories">
       <property name="geometry">
        <rect>
-        <x>0</x>
+        <x>20</x>
         <y>10</y>
-        <width>151</width>
+        <width>251</width>
         <height>301</height>
        </rect>
       </property>
@@ -137,9 +137,9 @@
      <widget class="QWidget" name="layoutWidget">
       <property name="geometry">
        <rect>
-        <x>160</x>
+        <x>320</x>
         <y>10</y>
-        <width>311</width>
+        <width>161</width>
         <height>301</height>
        </rect>
       </property>
@@ -180,7 +180,7 @@
       <property name="geometry">
        <rect>
         <x>520</x>
-        <y>40</y>
+        <y>120</y>
         <width>201</width>
         <height>71</height>
        </rect>
@@ -201,7 +201,7 @@
       <property name="geometry">
        <rect>
         <x>520</x>
-        <y>180</y>
+        <y>230</y>
         <width>201</width>
         <height>71</height>
        </rect>
@@ -218,6 +218,27 @@
        <string>Manual start</string>
       </property>
      </widget>
+     <widget class="QPushButton" name="calibrateButton">
+      <property name="geometry">
+       <rect>
+        <x>520</x>
+        <y>20</y>
+        <width>201</width>
+        <height>61</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>Calibrate</string>
+      </property>
+     </widget>
     </widget>
     <widget class="QWidget" name="settingsTab">
      <attribute name="title">
@@ -270,7 +291,7 @@
      <widget class="QLabel" name="labelMeasureTabHeader">
       <property name="geometry">
        <rect>
-        <x>40</x>
+        <x>20</x>
         <y>10</y>
         <width>261</width>
         <height>41</height>
@@ -329,7 +350,7 @@
      <widget class="QLabel" name="labelMeasureTabTimeHeader">
       <property name="geometry">
        <rect>
-        <x>25</x>
+        <x>20</x>
         <y>70</y>
         <width>60</width>
         <height>41</height>
@@ -369,7 +390,7 @@
      <widget class="QLabel" name="labelMeasureTabSpeedHeader">
       <property name="geometry">
        <rect>
-        <x>25</x>
+        <x>20</x>
         <y>160</y>
         <width>81</width>
         <height>41</height>
@@ -446,6 +467,19 @@
        <string>0</string>
       </property>
      </widget>
+     <widget class="QPushButton" name="pushButtonShowResultDialog">
+      <property name="geometry">
+       <rect>
+        <x>470</x>
+        <y>140</y>
+        <width>161</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Show diagram</string>
+      </property>
+     </widget>
     </widget>
     <widget class="QWidget" name="tab">
      <attribute name="title">
@@ -456,86 +490,159 @@
        <rect>
         <x>20</x>
         <y>20</y>
-        <width>94</width>
-        <height>22</height>
+        <width>191</width>
+        <height>41</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>GPS on</string>
       </property>
+      <property name="iconSize">
+       <size>
+        <width>16</width>
+        <height>16</height>
+       </size>
+      </property>
      </widget>
      <widget class="QPushButton" name="startRecPushButton">
       <property name="geometry">
        <rect>
-        <x>30</x>
-        <y>76</y>
-        <width>151</width>
-        <height>51</height>
+        <x>10</x>
+        <y>80</y>
+        <width>201</width>
+        <height>61</height>
        </rect>
       </property>
-      <property name="text">
-       <string>Start recording</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="stopRecPushButton">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>150</y>
-        <width>151</width>
-        <height>51</height>
-       </rect>
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>16</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
       </property>
       <property name="text">
-       <string>Stop recording</string>
+       <string>Start recording</string>
       </property>
      </widget>
      <widget class="QPushButton" name="drawRoutePushButton">
       <property name="geometry">
        <rect>
-        <x>30</x>
-        <y>220</y>
-        <width>151</width>
-        <height>51</height>
+        <x>10</x>
+        <y>160</y>
+        <width>201</width>
+        <height>61</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>Draw route</string>
       </property>
      </widget>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <property name="geometry">
        <rect>
         <x>310</x>
         <y>16</y>
-        <width>221</width>
-        <height>211</height>
+        <width>461</width>
+        <height>291</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QLabel" name="labelRouteTabGPSStatus">
          <property name="text">
-          <string>Label GPS Status</string>
+          <string>GPS Status</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRouteTabGPSUpdateTime">
+         <property name="text">
+          <string>GPS Update time</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRouteTabGPSTime">
+         <property name="text">
+          <string>GPS Time</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="labelRouteTabLatitude">
          <property name="text">
-          <string>Label Latitude</string>
+          <string>Latitude</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="labelRouteTabLongitude">
          <property name="text">
-          <string>Label Longitude</string>
+          <string>Longitude</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRouteTabSpeed">
+         <property name="text">
+          <string>Speed</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRouteTabAcceleration">
+         <property name="text">
+          <string>Acceleration</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelRouteTabRecStatus">
+         <property name="text">
+          <string>Rec status</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
+     <widget class="QPushButton" name="sendRoutePushButton">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>240</y>
+        <width>201</width>
+        <height>61</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>Send route</string>
+      </property>
+     </widget>
     </widget>
    </widget>
    <widget class="QPushButton" name="registratePushButton">
@@ -551,6 +658,19 @@
      <string>Registrate</string>
     </property>
    </widget>
+   <widget class="QLabel" name="labelInfoToUser">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>370</y>
+      <width>461</width>
+      <height>41</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">