projects / speedfreak / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 5786051)
Added load route button picture.
authorToni Jussila <toni.jussila@gmail.com>
Thu, 20 May 2010 07:14:39 +0000 (10:14 +0300)
committerToni Jussila <toni.jussila@gmail.com>
Thu, 20 May 2010 07:14:39 +0000 (10:14 +0300)
Client/Graphics/label_black.png [new file with mode: 0755] patch | blob
Client/Graphics/route_load.png [new file with mode: 0644] patch | blob
Client/graphics.qrc patch | blob | history
Client/routesavedialog.cpp patch | blob | history
Client/routesavedialog.ui patch | blob | history
Client/speedfreak.pro.user patch | blob | history

diff --git a/Client/Graphics/label_black.png b/Client/Graphics/label_black.png
new file mode 100755 (executable)
index 0000000..d793a40
Binary files /dev/null and b/Client/Graphics/label_black.png differ
diff --git a/Client/Graphics/route_load.png b/Client/Graphics/route_load.png
new file mode 100644 (file)
index 0000000..b9f950d
Binary files /dev/null and b/Client/Graphics/route_load.png differ
diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index e25bf47..18601a1 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -27,5 +27,6 @@
         <file>Graphics/applications_internet_selected.png</file>
         <file>Graphics/route_selected.png</file>
         <file>Graphics/info_selected.png</file>
+        <file>Graphics/route_load.png</file>
     </qresource>
 </RCC>
diff --git a/Client/routesavedialog.cpp b/Client/routesavedialog.cpp
index acbe051..3119b30 100644 (file)
--- a/Client/routesavedialog.cpp
+++ b/Client/routesavedialog.cpp
@@ -62,6 +62,8 @@ RouteSaveDialog::RouteSaveDialog(QWidget *parent) :
     ui->buttonRouteStartStop->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
     ui->pushButtonInfo->setAutoFillBackground(true);
     ui->pushButtonInfo->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+    ui->buttonLoadRoute->setAutoFillBackground(true);
+    ui->buttonLoadRoute->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 
     //Satellite picture and label
     ui->labelRouteSatelliteStatus->setVisible(0);
diff --git a/Client/routesavedialog.ui b/Client/routesavedialog.ui
index 9d5d500..03f2f56 100644 (file)
--- a/Client/routesavedialog.ui
+++ b/Client/routesavedialog.ui
@@ -27,8 +27,8 @@
   <widget class="QPushButton" name="buttonRouteStartStop">
    <property name="geometry">
     <rect>
-     <x>650</x>
-     <y>170</y>
+     <x>660</x>
+     <y>60</y>
      <width>130</width>
      <height>130</height>
     </rect>
@@ -148,7 +148,7 @@
   <widget class="QLabel" name="labelGpsSpeed">
    <property name="geometry">
     <rect>
-     <x>390</x>
+     <x>410</x>
      <y>60</y>
      <width>241</width>
      <height>91</height>
@@ -234,7 +234,7 @@
   <widget class="QLabel" name="labelGpsAvgSpeed">
    <property name="geometry">
     <rect>
-     <x>340</x>
+     <x>360</x>
      <y>130</y>
      <width>291</width>
      <height>91</height>
@@ -255,7 +255,7 @@
   <widget class="QLabel" name="labelDistance">
    <property name="geometry">
     <rect>
-     <x>390</x>
+     <x>410</x>
      <y>210</y>
      <width>241</width>
      <height>91</height>
@@ -276,14 +276,24 @@
   <widget class="QPushButton" name="buttonLoadRoute">
    <property name="geometry">
     <rect>
-     <x>670</x>
-     <y>320</y>
-     <width>96</width>
-     <height>27</height>
+     <x>660</x>
+     <y>200</y>
+     <width>130</width>
+     <height>130</height>
     </rect>
    </property>
    <property name="text">
-    <string>Load</string>
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/route_load.png</normaloff>:/new/prefix1/Graphics/route_load.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>125</width>
+     <height>125</height>
+    </size>
    </property>
   </widget>
  </widget>
diff --git a/Client/speedfreak.pro.user b/Client/speedfreak.pro.user
index d4093ca..33f85a5 100644 (file)
--- a/Client/speedfreak.pro.user
+++ b/Client/speedfreak.pro.user
@@ -76,46 +76,45 @@
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
    <valuelist key="abstractProcess.Environment" type="QVariantList">
-    <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-qiZb4Pleu0,guid=dfa9e6bbffd50dabf30f2a694bda6acd</value>
+    <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-2lBuzFmOho,guid=25dce992e75cf8b3f499a7d14bf22670</value>
     <value type="QString">DESKTOP_SESSION=gnome</value>
     <value type="QString">DISPLAY=:0.0</value>
     <value type="QString">GDMSESSION=gnome</value>
     <value type="QString">GDM_KEYBOARD_LAYOUT=fi</value>
-    <value type="QString">GDM_LANG=fi_FI.UTF-8</value>
+    <value type="QString">GDM_LANG=en_US.UTF-8</value>
     <value type="QString">GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
-    <value type="QString">GNOME_KEYRING_PID=1664</value>
-    <value type="QString">GNOME_KEYRING_SOCKET=/tmp/keyring-BU1Ggo/socket</value>
+    <value type="QString">GNOME_KEYRING_SOCKET=/tmp/keyring-0yAgOn/socket</value>
     <value type="QString">GTK_MODULES=canberra-gtk-module</value>
     <value type="QString">GTK_RC_FILES=/etc/gtk/gtkrc:/home/oppilas/.gtkrc-1.2-gnome2</value>
     <value type="QString">HOME=/home/oppilas</value>
-    <value type="QString">LANG=fi_FI.UTF-8</value>
-    <value type="QString">LD_LIBRARY_PATH=/opt/qtsdk-2010.02/lib/qtcreator:</value>
+    <value type="QString">LANG=en_US.UTF-8</value>
+    <value type="QString">LD_LIBRARY_PATH=/home/oppilas/qtsdk-2010.02/lib/qtcreator:</value>
     <value type="QString">LOGNAME=oppilas</value>
     <value type="QString">ORBIT_SOCKETDIR=/tmp/orbit-oppilas</value>
-    <value type="QString">PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
-    <value type="QString">PWD=/home/oppilas</value>
-    <value type="QString">QTDIR=/usr/share/qt4</value>
-    <value type="QString">SESSION_MANAGER=local/ubuntu:@/tmp/.ICE-unix/1679,unix/ubuntu:/tmp/.ICE-unix/1679</value>
+    <value type="QString">PATH=/home/oppilas/qtsdk-2010.02/qt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
+    <value type="QString">PWD=/home/oppilas/qtsdk-2010.02/bin</value>
+    <value type="QString">QTDIR=/home/oppilas/qtsdk-2010.02/qt</value>
+    <value type="QString">SESSION_MANAGER=local/oppilas-laptop:@/tmp/.ICE-unix/1088,unix/oppilas-laptop:/tmp/.ICE-unix/1088</value>
     <value type="QString">SHELL=/bin/bash</value>
     <value type="QString">SPEECHD_PORT=7560</value>
-    <value type="QString">SSH_AGENT_PID=1719</value>
-    <value type="QString">SSH_AUTH_SOCK=/tmp/keyring-BU1Ggo/socket.ssh</value>
+    <value type="QString">SSH_AGENT_PID=1263</value>
+    <value type="QString">SSH_AUTH_SOCK=/tmp/keyring-0yAgOn/socket.ssh</value>
     <value type="QString">USER=oppilas</value>
     <value type="QString">USERNAME=oppilas</value>
-    <value type="QString">XAUTHORITY=/var/run/gdm/auth-for-oppilas-CUBiAz/database</value>
+    <value type="QString">XAUTHORITY=/var/run/gdm/auth-for-oppilas-LVv1Px/database</value>
     <value type="QString">XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
-    <value type="QString">XDG_SESSION_COOKIE=7bed32bdbfbd7579c7bbdbcd4bbc8b02-1272605389.226561-886088294</value>
+    <value type="QString">XDG_SESSION_COOKIE=23a758d518c25a79610bdb914bbdcbcc-1274160748.385631-1690458805</value>
    </valuelist>
    <valuelist key="abstractProcess.arguments" type="QVariantList">
-    <value type="QString">/scratchbox/users/oppilas/home/oppilas/qt_codes/garage.git/speedfreak/Client/speedfreak.pro</value>
+    <value type="QString">/scratchbox/users/oppilas/home/oppilas/qt-codes/github.git/SpeedFreak/Client/speedfreak.pro</value>
     <value type="QString">-spec</value>
     <value type="QString">linux-g++</value>
     <value type="QString">-r</value>
     <value type="QString">CONFIG+=debug</value>
    </valuelist>
-   <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value>
-   <value key="abstractProcess.enabled" type="bool">false</value>
-   <value key="abstractProcess.workingDirectory" type="QString">/scratchbox/users/oppilas/home/oppilas/qt_codes/garage.git/speedfreak/Client</value>
+   <value key="abstractProcess.command" type="QString">/home/oppilas/qtsdk-2010.02/qt/bin/qmake</value>
+   <value key="abstractProcess.enabled" type="bool">true</value>
+   <value key="abstractProcess.workingDirectory" type="QString">/scratchbox/users/oppilas/home/oppilas/qt-codes/github.git/SpeedFreak/Client</value>
   </valuemap>
  </data>
  <data>
@@ -123,35 +122,34 @@
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
    <valuelist key="abstractProcess.Environment" type="QVariantList">
-    <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-qiZb4Pleu0,guid=dfa9e6bbffd50dabf30f2a694bda6acd</value>
+    <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-2lBuzFmOho,guid=25dce992e75cf8b3f499a7d14bf22670</value>
     <value type="QString">DESKTOP_SESSION=gnome</value>
     <value type="QString">DISPLAY=:0.0</value>
     <value type="QString">GDMSESSION=gnome</value>
     <value type="QString">GDM_KEYBOARD_LAYOUT=fi</value>
-    <value type="QString">GDM_LANG=fi_FI.UTF-8</value>
+    <value type="QString">GDM_LANG=en_US.UTF-8</value>
     <value type="QString">GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
-    <value type="QString">GNOME_KEYRING_PID=1664</value>
-    <value type="QString">GNOME_KEYRING_SOCKET=/tmp/keyring-BU1Ggo/socket</value>
+    <value type="QString">GNOME_KEYRING_SOCKET=/tmp/keyring-0yAgOn/socket</value>
     <value type="QString">GTK_MODULES=canberra-gtk-module</value>
     <value type="QString">GTK_RC_FILES=/etc/gtk/gtkrc:/home/oppilas/.gtkrc-1.2-gnome2</value>
     <value type="QString">HOME=/home/oppilas</value>
-    <value type="QString">LANG=fi_FI.UTF-8</value>
-    <value type="QString">LD_LIBRARY_PATH=/opt/qtsdk-2010.02/lib/qtcreator:</value>
+    <value type="QString">LANG=en_US.UTF-8</value>
+    <value type="QString">LD_LIBRARY_PATH=/home/oppilas/qtsdk-2010.02/lib/qtcreator:</value>
     <value type="QString">LOGNAME=oppilas</value>
     <value type="QString">ORBIT_SOCKETDIR=/tmp/orbit-oppilas</value>
-    <value type="QString">PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
-    <value type="QString">PWD=/home/oppilas</value>
-    <value type="QString">QTDIR=/usr/share/qt4</value>
-    <value type="QString">SESSION_MANAGER=local/ubuntu:@/tmp/.ICE-unix/1679,unix/ubuntu:/tmp/.ICE-unix/1679</value>
+    <value type="QString">PATH=/home/oppilas/qtsdk-2010.02/qt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
+    <value type="QString">PWD=/home/oppilas/qtsdk-2010.02/bin</value>
+    <value type="QString">QTDIR=/home/oppilas/qtsdk-2010.02/qt</value>
+    <value type="QString">SESSION_MANAGER=local/oppilas-laptop:@/tmp/.ICE-unix/1088,unix/oppilas-laptop:/tmp/.ICE-unix/1088</value>
     <value type="QString">SHELL=/bin/bash</value>
     <value type="QString">SPEECHD_PORT=7560</value>
-    <value type="QString">SSH_AGENT_PID=1719</value>
-    <value type="QString">SSH_AUTH_SOCK=/tmp/keyring-BU1Ggo/socket.ssh</value>
+    <value type="QString">SSH_AGENT_PID=1263</value>
+    <value type="QString">SSH_AUTH_SOCK=/tmp/keyring-0yAgOn/socket.ssh</value>
     <value type="QString">USER=oppilas</value>
     <value type="QString">USERNAME=oppilas</value>
-    <value type="QString">XAUTHORITY=/var/run/gdm/auth-for-oppilas-CUBiAz/database</value>
+    <value type="QString">XAUTHORITY=/var/run/gdm/auth-for-oppilas-LVv1Px/database</value>
     <value type="QString">XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
-    <value type="QString">XDG_SESSION_COOKIE=7bed32bdbfbd7579c7bbdbcd4bbc8b02-1272605389.226561-886088294</value>
+    <value type="QString">XDG_SESSION_COOKIE=23a758d518c25a79610bdb914bbdcbcc-1274160748.385631-1690458805</value>
    </valuelist>
    <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value>
    <valuelist key="abstractProcess.arguments" type="QVariantList">
@@ -159,7 +157,7 @@
    </valuelist>
    <value key="abstractProcess.command" type="QString">/usr/bin/make</value>
    <value key="abstractProcess.enabled" type="bool">true</value>
-   <value key="abstractProcess.workingDirectory" type="QString">/scratchbox/users/oppilas/home/oppilas/qt_codes/garage.git/speedfreak/Client</value>
+   <value key="abstractProcess.workingDirectory" type="QString">/scratchbox/users/oppilas/home/oppilas/qt-codes/github.git/SpeedFreak/Client</value>
   </valuemap>
  </data>
  <data>
Unnamed repository; edit this file to name it for gitweb.