Merge branch 'feature/routesavedialog'

diff --git a/Client/Graphics/SpeedFreak.sumo b/Client/Graphics/SpeedFreak.sumo
new file mode 100644 (file)
index 0000000..918b175
Binary files /dev/null and b/Client/Graphics/SpeedFreak.sumo differ

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

diff --git a/Client/Graphics/imagedata.xml b/Client/Graphics/imagedata.xml
new file mode 100644 (file)
index 0000000..960b7aa
--- /dev/null
+++ b/Client/Graphics/imagedata.xml
@@ -0,0 +1,8 @@
+<image>
+  <name>SpeedFreak.sumo</name>
+  <description/>
+  <tags/>
+  <width>800</width>
+  <height>600</height>
+  <layers>Layer 2,Layer 3,Background,#normal,normal,normal,#1,1,1,#dropShadow,5,45,0,0.75,5,5,1,3,false,false,false,*innerShadow,5,45,0,0.71,5,5,1,3,true,false,false,*null,*null,*bevel,5,22,16777215,0.75,0,0.75,10,10,0.4,3,inner,false,*null,*null,*gradientBevel,50,45,2949138;7995441;10879028;16731904;16764748;16777215,1;1;1;1;1;1,0;51;102;153;204;255,50,50,1,3,inner,false,*gradientGlow,0,45,15397881;14083824;12110291;14213607;16448508,1;1;1;1;1,0;85;127.99;128;255,100,100,1,3,inner,false,*$dropShadow,5,45,0,0.75,5,5,1,3,false,false,false,*null,*null,*null,*bevel,5,45,16777215,0.75,0,0.75,10,10,1,3,inner,false,*colorOverlay,0,0,14868704,1,0,0,1,1,false,false,true,*stroke,0,1,0,0,0,1,false,false,*gradientBevel,50,45,2949138;7995441;10879028;16731904;16764748;16777215,1;1;1;1;1;1,0;51;102;153;204;255,50,50,1,3,inner,false,*null,*$,#true,true,false,#true,true,true</layers>
+</image>
\ No newline at end of file

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

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

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

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

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

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

diff --git a/Client/creditsdialog.cpp b/Client/creditsdialog.cpp
index 83a4036..eaba0f1 100644 (file)
--- a/Client/creditsdialog.cpp
+++ b/Client/creditsdialog.cpp
@@ -1,3 +1,11 @@
+/*
+ * Credits Dialog
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #include "creditsdialog.h"
 #include "ui_creditsdialog.h"
 

diff --git a/Client/creditsdialog.h b/Client/creditsdialog.h
index ab26e76..69c15e3 100644 (file)
--- a/Client/creditsdialog.h
+++ b/Client/creditsdialog.h
@@ -1,3 +1,11 @@
+/*
+ * Credits Dialog
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef CREDITSDIALOG_H
 #define CREDITSDIALOG_H
 

diff --git a/Client/creditsdialog.ui b/Client/creditsdialog.ui
index dc89027..eaf031b 100644 (file)
--- a/Client/creditsdialog.ui
+++ b/Client/creditsdialog.ui
@@ -17,7 +17,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>20</y>
+     <y>10</y>
      <width>761</width>
      <height>61</height>
     </rect>
@@ -37,7 +37,7 @@
   <widget class="QLabel" name="label_10">
    <property name="geometry">
     <rect>
-     <x>80</x>
+     <x>70</x>
      <y>90</y>
      <width>661</width>
      <height>51</height>
@@ -50,13 +50,29 @@
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QLabel" name="label_11">
+   <property name="geometry">
+    <rect>
+     <x>70</x>
+     <y>250</y>
+     <width>661</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Graphics and icons by:</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QWidget" name="">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>150</y>
-     <width>741</width>
-     <height>201</height>
+     <y>140</y>
+     <width>751</width>
+     <height>101</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
@@ -90,6 +106,36 @@
       </property>
      </widget>
     </item>
+    <item row="0" column="2">
+     <widget class="QLabel" name="label_8">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Tiina Kivilinna-Korhola</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="3">
+     <widget class="QLabel" name="label_5">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Janne Änäkkälä</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
     <item row="1" column="0">
      <widget class="QLabel" name="label_3">
       <property name="font">
@@ -120,7 +166,22 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
+    <item row="1" column="2">
+     <widget class="QLabel" name="label_9">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Olavi Pulkkinen</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="3">
      <widget class="QLabel" name="label_4">
       <property name="font">
        <font>
@@ -135,45 +196,57 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QLabel" name="label_8">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>300</y>
+     <width>751</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0">
+     <widget class="QLabel" name="label_17">
       <property name="font">
        <font>
         <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
-       <string>Tiina Kivilinna-Korhola</string>
+       <string>barrymieny</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="label_5">
+    <item row="0" column="1">
+     <widget class="QLabel" name="label_16">
       <property name="font">
        <font>
         <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
-       <string>Janne Änäkkälä</string>
+       <string>WebIconSet.com</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QLabel" name="label_9">
+    <item row="0" column="2">
+     <widget class="QLabel" name="label_15">
       <property name="font">
        <font>
         <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
-       <string>Olavi Pulkkinen</string>
+       <string>GCIMan</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
new file mode 100644 (file)
index 0000000..36b139d
--- /dev/null
+++ b/Client/graphics.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/new/prefix1">
+        <file>Graphics/meter.png</file>
+        <file>Graphics/route.png</file>
+        <file>Graphics/Speedometer .png</file>
+    </qresource>
+</RCC>

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index c19d5d1..91ca8a4 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -1,3 +1,11 @@
+/*
+ * Mainwindow for speedFreak project
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index f949630..3299ba8 100644 (file)
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -1,3 +1,11 @@
+/*
+ * Mainwindow for speedFreak project
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 

diff --git a/Client/mainwindow.ui b/Client/mainwindow.ui
index c1137bb..0f5cbe2 100644 (file)
--- a/Client/mainwindow.ui
+++ b/Client/mainwindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>SpeedFreak</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <widget class="QPushButton" name="pushButtonAccelerate">
@@ -24,7 +24,17 @@
      </rect>
     </property>
     <property name="text">
-     <string>Accelerate</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset resource="graphics.qrc">
+      <normaloff>:/new/prefix1/Graphics/Speedometer .png</normaloff>:/new/prefix1/Graphics/Speedometer .png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>125</width>
+      <height>125</height>
+     </size>
     </property>
    </widget>
    <widget class="QPushButton" name="pushButtonRoute">
@@ -37,7 +47,17 @@
      </rect>
     </property>
     <property name="text">
-     <string>Route</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset resource="graphics.qrc">
+      <normaloff>:/new/prefix1/Graphics/route.png</normaloff>:/new/prefix1/Graphics/route.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>125</width>
+      <height>125</height>
+     </size>
     </property>
    </widget>
    <widget class="QPushButton" name="pushButtonResults">
@@ -114,6 +134,8 @@
   <widget class="QStatusBar" name="statusBar"/>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
  <connections/>
 </ui>

diff --git a/Client/speedfreak.pro b/Client/speedfreak.pro
index 3fed9f7..3d53060 100644 (file)
--- a/Client/speedfreak.pro
+++ b/Client/speedfreak.pro
@@ -16,3 +16,4 @@ FORMS += mainwindow.ui \
     creditsdialog.ui \
     routedialog.ui \
     routesavedialog.ui
+RESOURCES += graphics.qrc

diff --git a/Client/speedfreak.pro.user b/Client/speedfreak.pro.user
index b6637b1..37bd8d7 100644 (file)
--- a/Client/speedfreak.pro.user
+++ b/Client/speedfreak.pro.user
@@ -58,6 +58,7 @@
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
    <value key="QtVersionId" type="int">0</value>
    <value key="ToolChain" type="int">0</value>
+   <value key="addQDumper" type=""></value>
    <value key="buildConfiguration" type="int">2</value>
   </valuemap>
  </data>
@@ -66,6 +67,7 @@
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
    <value key="QtVersionId" type="int">0</value>
+   <value key="addQDumper" type=""></value>
    <value key="buildConfiguration" type="int">0</value>
   </valuemap>
  </data>