New background and button picture.

diff --git a/Client/Graphics/Speedometer_calibrate.png b/Client/Graphics/Speedometer_calibrate.png
new file mode 100644 (file)
index 0000000..91f305e
Binary files /dev/null and b/Client/Graphics/Speedometer_calibrate.png differ

diff --git a/Client/Graphics/Speedometer_start.png b/Client/Graphics/Speedometer_start.png
new file mode 100644 (file)
index 0000000..3730bd9
Binary files /dev/null and b/Client/Graphics/Speedometer_start.png differ

diff --git a/Client/Graphics/route_new.png b/Client/Graphics/route_new.png
old mode 100755 (executable)
new mode 100644 (file)
index a8af9c8..0edfb53
Binary files a/Client/Graphics/route_new.png and b/Client/Graphics/route_new.png differ

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

diff --git a/Client/Graphics/route_save.png b/Client/Graphics/route_save.png
old mode 100755 (executable)
new mode 100644 (file)
index 0f687ce..10205ef
Binary files a/Client/Graphics/route_save.png and b/Client/Graphics/route_save.png differ

diff --git a/Client/Graphics/route_start.png b/Client/Graphics/route_start.png
new file mode 100644 (file)
index 0000000..d12f8c1
Binary files /dev/null and b/Client/Graphics/route_start.png differ

diff --git a/Client/Graphics/route_stop.png b/Client/Graphics/route_stop.png
old mode 100755 (executable)
new mode 100644 (file)
index ab1b03e..2d64293
Binary files a/Client/Graphics/route_stop.png and b/Client/Graphics/route_stop.png differ

diff --git a/Client/Graphics/sf.png b/Client/Graphics/sf.png
new file mode 100644 (file)
index 0000000..d6a03b6
Binary files /dev/null and b/Client/Graphics/sf.png differ

diff --git a/Client/Graphics/trophy_gold_refresh.png b/Client/Graphics/trophy_gold_refresh.png
new file mode 100644 (file)
index 0000000..341f1e4
Binary files /dev/null and b/Client/Graphics/trophy_gold_refresh.png differ

diff --git a/Client/accelerationstart.cpp b/Client/accelerationstart.cpp
index 0a67211..11dbf85 100644 (file)
--- a/Client/accelerationstart.cpp
+++ b/Client/accelerationstart.cpp
@@ -23,6 +23,12 @@ accelerationstart::accelerationstart(QWidget *parent) :
     ui->categorComboBox->addItem("0 - 20 km/h",20);
     ui->categorComboBox->addItem("0 - 40 km/h");
     ui->categorComboBox->addItem("0 - 100 km/h");
+
+    //Button settings
+    ui->buttonCalib->setAutoFillBackground(true);
+    ui->buttonCalib->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+    ui->buttonStart->setAutoFillBackground(true);
+    ui->buttonStart->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 }
 
 accelerationstart::~accelerationstart()

diff --git a/Client/accelerationstartdialog.ui b/Client/accelerationstartdialog.ui
index 76af4e5..4e17e91 100644 (file)
--- a/Client/accelerationstartdialog.ui
+++ b/Client/accelerationstartdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,40 +16,78 @@
   <widget class="QComboBox" name="categorComboBox">
    <property name="geometry">
     <rect>
-     <x>50</x>
-     <y>140</y>
+     <x>140</x>
+     <y>160</y>
      <width>221</width>
      <height>51</height>
     </rect>
    </property>
   </widget>
-  <widget class="QPushButton" name="buttonCalib">
+  <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>310</x>
-     <y>130</y>
-     <width>171</width>
-     <height>71</height>
+     <x>0</x>
+     <y>230</y>
+     <width>150</width>
+     <height>150</height>
     </rect>
    </property>
    <property name="text">
-    <string>Calibrate</string>
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
    </property>
   </widget>
-  <widget class="QPushButton" name="buttonStart">
+  <widget class="QWidget" name="">
    <property name="geometry">
     <rect>
-     <x>520</x>
-     <y>130</y>
-     <width>181</width>
-     <height>71</height>
+     <x>590</x>
+     <y>0</y>
+     <width>201</width>
+     <height>381</height>
     </rect>
    </property>
-   <property name="text">
-    <string>Start</string>
-   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QPushButton" name="buttonCalib">
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="graphics.qrc">
+        <normaloff>:/new/prefix1/Graphics/Speedometer_calibrate.png</normaloff>:/new/prefix1/Graphics/Speedometer_calibrate.png</iconset>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>125</width>
+        <height>125</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="buttonStart">
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="graphics.qrc">
+        <normaloff>:/new/prefix1/Graphics/Speedometer_start.png</normaloff>:/new/prefix1/Graphics/Speedometer_start.png</iconset>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>125</width>
+        <height>125</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+   </layout>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
  <connections/>
 </ui>

diff --git a/Client/accrealtimedialog.ui b/Client/accrealtimedialog.ui
index c1d135c..895392f 100644 (file)
--- a/Client/accrealtimedialog.ui
+++ b/Client/accrealtimedialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -123,6 +123,27 @@
     <bool>true</bool>
    </property>
   </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>230</y>
+     <width>150</width>
+     <height>150</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+   </property>
+  </widget>
+  <zorder>label</zorder>
+  <zorder>horizontalLayoutWidget</zorder>
+  <zorder>horizontalLayoutWidget_2</zorder>
+  <zorder>buttonAbort</zorder>
+  <zorder>pictureLabel</zorder>
  </widget>
  <resources>
   <include location="graphics.qrc"/>

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index 4cbbf3a..19ed929 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -3,10 +3,6 @@
         <file>Graphics/meter.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>
@@ -15,5 +11,13 @@
         <file>Graphics/info.png</file>
         <file>Graphics/speedfreak.png</file>
         <file>Graphics/start.gif</file>
+        <file>Graphics/sf.png</file>
+        <file>Graphics/Speedometer_calibrate.png</file>
+        <file>Graphics/Speedometer_start.png</file>
+        <file>Graphics/route_new.png</file>
+        <file>Graphics/route_save.png</file>
+        <file>Graphics/route_start.png</file>
+        <file>Graphics/route_stop.png</file>
+        <file>Graphics/trophy_gold_refresh.png</file>
     </qresource>
 </RCC>

diff --git a/Client/mainwindow.ui b/Client/mainwindow.ui
index 7e248ae..0bec122 100644 (file)
--- a/Client/mainwindow.ui
+++ b/Client/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>440</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/Client/routesavedialog.cpp b/Client/routesavedialog.cpp
index fd9853f..e0bfe7b 100644 (file)
--- a/Client/routesavedialog.cpp
+++ b/Client/routesavedialog.cpp
@@ -25,12 +25,12 @@ RouteSaveDialog::RouteSaveDialog(QWidget *parent) :
     //Button settings
     buttonStatus = true;
     pixmapRouteStop = new QPixmap("Graphics/route_stop.png");
-    pixmapRoutePlay = new QPixmap("Graphics/route_play.png");
+    pixmapRouteStart = new QPixmap("Graphics/route_start.png");
     iconRouteStop = new QIcon(*pixmapRouteStop);
-    iconRoutePlay = new QIcon(*pixmapRoutePlay);
+    iconRouteStart = new QIcon(*pixmapRouteStart);
     QSize iconSize(125, 125);
     ui->buttonRouteStartStop->setIconSize(iconSize);
-    ui->buttonRouteStartStop->setIcon(*iconRoutePlay);
+    ui->buttonRouteStartStop->setIcon(*iconRouteStart);
     ui->buttonRouteStartStop->setAutoFillBackground(true);
     ui->buttonRouteStartStop->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 
@@ -70,9 +70,9 @@ RouteSaveDialog::~RouteSaveDialog()
     delete gpsData;
     delete routeDialog;
     delete pixmapRouteStop;
-    delete pixmapRoutePlay;
+    delete pixmapRouteStart;
     delete iconRouteStop;
-    delete iconRoutePlay;
+    delete iconRouteStart;
 }
 
 void RouteSaveDialog::changeEvent(QEvent *e)
@@ -103,7 +103,7 @@ void RouteSaveDialog::on_buttonRouteStartStop_clicked()
     else
     {
         buttonStatus = true;
-        ui->buttonRouteStartStop->setIcon(*iconRoutePlay);
+        ui->buttonRouteStartStop->setIcon(*iconRouteStart);
 
         //Satellite picture and label
         ui->labelRouteSatelliteStatus->setText("Searching satellite");

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index 5112c4b..6906bdd 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -40,9 +40,9 @@ private:
     RouteDialog *routeDialog;
     QString gpsSpeed;
     QPixmap *pixmapRouteStop;
-    QPixmap *pixmapRoutePlay;
+    QPixmap *pixmapRouteStart;
     QIcon *iconRouteStop;
-    QIcon *iconRoutePlay;
+    QIcon *iconRouteStart;
     bool buttonStatus;
 
 private slots:

diff --git a/Client/routesavedialog.ui b/Client/routesavedialog.ui
index f141299..960bd15 100644 (file)
--- a/Client/routesavedialog.ui
+++ b/Client/routesavedialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>360</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="font">
@@ -27,7 +27,7 @@
   <widget class="QPushButton" name="buttonRouteStartStop">
    <property name="geometry">
     <rect>
-     <x>600</x>
+     <x>650</x>
      <y>170</y>
      <width>130</width>
      <height>130</height>
@@ -38,7 +38,7 @@
    </property>
    <property name="icon">
     <iconset resource="graphics.qrc">
-     <normaloff>:/new/prefix1/Graphics/route_play.png</normaloff>:/new/prefix1/Graphics/route_play.png</iconset>
+     <normaloff>:/new/prefix1/Graphics/route_start.png</normaloff>:/new/prefix1/Graphics/route_start.png</iconset>
    </property>
    <property name="iconSize">
     <size>
@@ -166,6 +166,22 @@
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>230</y>
+     <width>150</width>
+     <height>150</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+   </property>
+  </widget>
  </widget>
  <resources>
   <include location="graphics.qrc"/>

diff --git a/Client/settingsdialog.ui b/Client/settingsdialog.ui
index 772f5f3..03d9af6 100644 (file)
--- a/Client/settingsdialog.ui
+++ b/Client/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>360</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,8 +16,8 @@
   <widget class="QPushButton" name="pushButtonHelp">
    <property name="geometry">
     <rect>
-     <x>520</x>
-     <y>310</y>
+     <x>540</x>
+     <y>180</y>
      <width>221</width>
      <height>51</height>
     </rect>
@@ -29,8 +29,8 @@
   <widget class="QLabel" name="setUserLabel">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>190</y>
+     <x>50</x>
+     <y>210</y>
      <width>371</width>
      <height>31</height>
     </rect>
@@ -47,8 +47,8 @@
   <widget class="QPushButton" name="setUserPushButton">
    <property name="geometry">
     <rect>
-     <x>520</x>
-     <y>220</y>
+     <x>540</x>
+     <y>270</y>
      <width>221</width>
      <height>51</height>
     </rect>
@@ -60,7 +60,7 @@
   <widget class="QLabel" name="registrateLabel">
    <property name="geometry">
     <rect>
-     <x>10</x>
+     <x>40</x>
      <y>0</y>
      <width>271</width>
      <height>31</height>
@@ -78,8 +78,8 @@
   <widget class="QPushButton" name="registratePushButton">
    <property name="geometry">
     <rect>
-     <x>520</x>
-     <y>60</y>
+     <x>540</x>
+     <y>80</y>
      <width>221</width>
      <height>51</height>
     </rect>
@@ -91,8 +91,8 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>40</x>
-     <y>220</y>
+     <x>100</x>
+     <y>240</y>
      <width>401</width>
      <height>101</height>
     </rect>
@@ -110,7 +110,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>8</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -130,7 +130,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>8</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -156,10 +156,10 @@
     <string/>
    </property>
   </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>40</x>
+     <x>100</x>
      <y>28</y>
      <width>401</width>
      <height>151</height>
@@ -178,7 +178,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>8</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -198,7 +198,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>8</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -221,7 +221,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>8</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -231,6 +231,31 @@
     </item>
    </layout>
   </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>230</y>
+     <width>150</width>
+     <height>150</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+   </property>
+  </widget>
+  <zorder>label</zorder>
+  <zorder>pushButtonHelp</zorder>
+  <zorder>setUserLabel</zorder>
+  <zorder>setUserPushButton</zorder>
+  <zorder>registrateLabel</zorder>
+  <zorder>registratePushButton</zorder>
+  <zorder>layoutWidget</zorder>
+  <zorder>labelInfoToUser</zorder>
+  <zorder>layoutWidget</zorder>
  </widget>
  <tabstops>
   <tabstop>regUserNameLineEdit</tabstop>
@@ -242,6 +267,8 @@
   <tabstop>setUserPushButton</tabstop>
   <tabstop>pushButtonHelp</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
  <connections/>
 </ui>

diff --git a/Client/topresultdialog.cpp b/Client/topresultdialog.cpp
index 02bbbdc..b7cfdd4 100644 (file)
--- a/Client/topresultdialog.cpp
+++ b/Client/topresultdialog.cpp
@@ -20,6 +20,10 @@ TopResultDialog::TopResultDialog(QWidget *parent) :
 
     //Set the amount of requested top results here, untill there is user input
     setLimitNr(10);
+
+    //Button settings
+    ui->buttonTopRefresh->setAutoFillBackground(true);
+    ui->buttonTopRefresh->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 }
 
 TopResultDialog::~TopResultDialog()

diff --git a/Client/topresultdialog.ui b/Client/topresultdialog.ui
index 79b110e..dfbd2db 100644 (file)
--- a/Client/topresultdialog.ui
+++ b/Client/topresultdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,10 +16,10 @@
   <widget class="QPushButton" name="buttonTopRefresh">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>70</y>
-     <width>221</width>
-     <height>71</height>
+     <x>650</x>
+     <y>20</y>
+     <width>130</width>
+     <height>130</height>
     </rect>
    </property>
    <property name="font">
@@ -31,34 +31,25 @@
     </font>
    </property>
    <property name="text">
-    <string>Refresh list</string>
-   </property>
-  </widget>
-  <widget class="QListView" name="listViewTopList">
-   <property name="geometry">
-    <rect>
-     <x>280</x>
-     <y>0</y>
-     <width>491</width>
-     <height>251</height>
-    </rect>
+    <string/>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>10</pointsize>
-    </font>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/trophy_gold_refresh.png</normaloff>:/new/prefix1/Graphics/trophy_gold_refresh.png</iconset>
    </property>
-   <property name="flow">
-    <enum>QListView::LeftToRight</enum>
+   <property name="iconSize">
+    <size>
+     <width>125</width>
+     <height>125</height>
+    </size>
    </property>
   </widget>
   <widget class="QLabel" name="labelTopList">
    <property name="geometry">
     <rect>
-     <x>300</x>
-     <y>0</y>
-     <width>451</width>
+     <x>150</x>
+     <y>70</y>
+     <width>471</width>
      <height>251</height>
     </rect>
    </property>
@@ -71,14 +62,14 @@
     <string/>
    </property>
    <property name="alignment">
-    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
    </property>
   </widget>
   <widget class="QLabel" name="labelCategory">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>200</y>
+     <y>0</y>
      <width>221</width>
      <height>51</height>
     </rect>
@@ -96,9 +87,9 @@
   <widget class="QComboBox" name="comboBoxTopCategory">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>260</y>
-     <width>601</width>
+     <x>140</x>
+     <y>10</y>
+     <width>491</width>
      <height>41</height>
     </rect>
    </property>
@@ -106,9 +97,9 @@
   <widget class="QLabel" name="labelInfoToUser">
    <property name="geometry">
     <rect>
-     <x>10</x>
+     <x>120</x>
      <y>310</y>
-     <width>521</width>
+     <width>671</width>
      <height>51</height>
     </rect>
    </property>
@@ -116,7 +107,31 @@
     <string/>
    </property>
   </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>230</y>
+     <width>150</width>
+     <height>150</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+   </property>
+  </widget>
+  <zorder>label</zorder>
+  <zorder>buttonTopRefresh</zorder>
+  <zorder>labelTopList</zorder>
+  <zorder>labelCategory</zorder>
+  <zorder>comboBoxTopCategory</zorder>
+  <zorder>labelInfoToUser</zorder>
  </widget>
- <resources/>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
  <connections/>
 </ui>