Route dialog height.

Merge branch 'development/ui'

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

diff --git a/Client/Graphics/route_new.png b/Client/Graphics/route_new.png
new file mode 100755 (executable)
index 0000000..a8af9c8
Binary files /dev/null and b/Client/Graphics/route_new.png differ

diff --git a/Client/Graphics/route_save.png b/Client/Graphics/route_save.png
new file mode 100755 (executable)
index 0000000..0f687ce
Binary files /dev/null and b/Client/Graphics/route_save.png differ

diff --git a/Client/creditsdialog.ui b/Client/creditsdialog.ui
index 05fc8ce..c8f684b 100644 (file)
--- a/Client/creditsdialog.ui
+++ b/Client/creditsdialog.ui
@@ -343,6 +343,36 @@
       </property>
      </widget>
     </item>
+    <item row="1" column="4">
+     <widget class="QLabel" name="label_24">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Delacro</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="5">
+     <widget class="QLabel" name="label_25">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>David Lanham</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index dc2693c..58153b5 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -1,10 +1,12 @@
 <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>
@@ -12,5 +14,6 @@
         <file>Graphics/Speedometer2.png</file>
         <file>Graphics/info.png</file>
         <file>Graphics/speedfreak.png</file>
+        
     </qresource>
 </RCC>

diff --git a/Client/routedialog.cpp b/Client/routedialog.cpp
index fb96e81..6edb716 100644 (file)
--- a/Client/routedialog.cpp
+++ b/Client/routedialog.cpp
@@ -171,6 +171,12 @@ RouteDialog::RouteDialog(QWidget *parent) :
     this->setWindowTitle("Route");
     left = 5; top = 5; right = 495; bottom = 295; // Limits in screen coordinates
 
+    //Button settings
+    ui->sendPushButton->setAutoFillBackground(true);
+    ui->sendPushButton->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+    ui->newPushButton->setAutoFillBackground(true);
+    ui->newPushButton->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+
     // Send rout to server button disable/enable.
     ui->sendPushButton->setEnabled(false);
     if (loginSaved())

diff --git a/Client/routedialog.ui b/Client/routedialog.ui
index 1ee53ab..563cd7c 100644 (file)
--- a/Client/routedialog.ui
+++ b/Client/routedialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,54 +16,80 @@
   <widget class="QPushButton" name="newPushButton">
    <property name="geometry">
     <rect>
-     <x>520</x>
-     <y>6</y>
-     <width>101</width>
-     <height>41</height>
+     <x>670</x>
+     <y>110</y>
+     <width>90</width>
+     <height>90</height>
     </rect>
    </property>
    <property name="text">
-    <string>New</string>
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/route_new.png</normaloff>:/new/prefix1/Graphics/route_new.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>85</width>
+     <height>85</height>
+    </size>
    </property>
   </widget>
   <widget class="QPushButton" name="sendPushButton">
    <property name="geometry">
     <rect>
-     <x>520</x>
-     <y>56</y>
-     <width>101</width>
-     <height>41</height>
+     <x>670</x>
+     <y>10</y>
+     <width>90</width>
+     <height>90</height>
     </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">
@@ -79,6 +105,8 @@
    </property>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
  <connections/>
 </ui>