From: Toni Jussila <toni.jussila@fudeco.com>
Date: Wed, 31 Mar 2010 11:09:56 +0000 (+0300)
Subject: Route dialog height.
X-Git-Tag: v0.2-RC1~11
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=2def6ac6fbe568b654a15a6317f30c73969f1dad

Route dialog height.

Merge branch 'development/ui'

Conflicts:
	Client/graphics.qrc
	Client/routedialog.ui
---

2def6ac6fbe568b654a15a6317f30c73969f1dad
diff --cc Client/graphics.qrc
index dc2693c,6771c3c..58153b5
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@@ -1,16 -1,17 +1,19 @@@
  <RCC>
      <qresource prefix="/new/prefix1">
          <file>Graphics/meter.png</file>
--        <file>Graphics/route.png</file>
          <file>Graphics/satellite_vista.png</file>
++	<file>Graphics/route.png</file>
          <file>Graphics/route_play.png</file>
          <file>Graphics/route_stop.png</file>
++	<file>Graphics/route_new.png</file>
++        <file>Graphics/route_save.png</file>
          <file>Graphics/settings.png</file>
          <file>Graphics/trophy_gold.png</file>
          <file>Graphics/applications_internet.png</file>
          <file>Graphics/Speedometer.png</file>
          <file>Graphics/Speedometer2.png</file>
          <file>Graphics/info.png</file>
 -        <file>Graphics/route_new.png</file>
 -        <file>Graphics/route_save.png</file>
 +        <file>Graphics/speedfreak.png</file>
++        
      </qresource>
  </RCC>
diff --cc Client/routedialog.ui
index 1ee53ab,cdf0dba..563cd7c
--- a/Client/routedialog.ui
+++ b/Client/routedialog.ui
@@@ -36,49 -46,54 +46,67 @@@
      </rect>
     </property>
     <property name="text">
-     <string>Send</string>
+     <string/>
     </property>
-   </widget>
-   <widget class="QLabel" name="maxSpeedLabel">
-    <property name="geometry">
-     <rect>
-      <x>531</x>
-      <y>106</y>
-      <width>91</width>
-      <height>31</height>
-     </rect>
+    <property name="icon">
+     <iconset resource="graphics.qrc">
+      <normaloff>:/new/prefix1/Graphics/route_save.png</normaloff>:/new/prefix1/Graphics/route_save.png</iconset>
     </property>
-    <property name="text">
-     <string>Max speed</string>
+    <property name="iconSize">
+     <size>
+      <width>85</width>
+      <height>85</height>
+     </size>
     </property>
    </widget>
-   <widget class="QLabel" name="speedValueLabel">
+   <widget class="QWidget" name="">
     <property name="geometry">
      <rect>
-      <x>531</x>
-      <y>146</y>
-      <width>91</width>
-      <height>41</height>
+      <x>660</x>
+      <y>210</y>
+      <width>121</width>
+      <height>81</height>
      </rect>
     </property>
-    <property name="text">
-     <string>TextLabel</string>
-    </property>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="maxSpeedLabel">
+       <property name="text">
+        <string>Max speed</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="speedValueLabel">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </widget>
 +  <widget class="QLabel" name="labelInfoToUser">
 +   <property name="geometry">
 +    <rect>
 +     <x>10</x>
 +     <y>310</y>
 +     <width>521</width>
 +     <height>51</height>
 +    </rect>
 +   </property>
 +   <property name="text">
 +    <string/>
 +   </property>
 +  </widget>
   </widget>
-  <resources/>
+  <resources>
+   <include location="graphics.qrc"/>
+  </resources>
   <connections/>
  </ui>