Bugfix: category dublicates

diff --git a/Client/Graphics/start.gif b/Client/Graphics/start.gif
new file mode 100644 (file)
index 0000000..fd8ba3d
Binary files /dev/null and b/Client/Graphics/start.gif differ

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index 58153b5..4cbbf3a 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -2,10 +2,10 @@
     <qresource prefix="/new/prefix1">
         <file>Graphics/meter.png</file>
         <file>Graphics/satellite_vista.png</file>
-       <file>Graphics/route.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_new.png</file>
         <file>Graphics/route_save.png</file>
         <file>Graphics/settings.png</file>
         <file>Graphics/trophy_gold.png</file>
@@ -14,6 +14,6 @@
         <file>Graphics/Speedometer2.png</file>
         <file>Graphics/info.png</file>
         <file>Graphics/speedfreak.png</file>
-        
+        <file>Graphics/start.gif</file>
     </qresource>
 </RCC>

diff --git a/Client/settingsdialog.ui b/Client/settingsdialog.ui
index 0ce677d..772f5f3 100644 (file)
--- a/Client/settingsdialog.ui
+++ b/Client/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>360</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -30,7 +30,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>180</y>
+     <y>190</y>
      <width>371</width>
      <height>31</height>
     </rect>
@@ -61,7 +61,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>20</y>
+     <y>0</y>
      <width>271</width>
      <height>31</height>
     </rect>
@@ -91,36 +91,48 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>50</y>
-     <width>491</width>
-     <height>121</height>
+     <x>40</x>
+     <y>220</y>
+     <width>401</width>
+     <height>101</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout">
+   <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0">
-     <widget class="QLabel" name="regUsernameLabel">
+     <widget class="QLabel" name="setUserUsernameLabel">
       <property name="text">
-       <string>New username:</string>
+       <string>Username:        </string>
       </property>
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QLineEdit" name="regUserNameLineEdit">
+     <widget class="QLineEdit" name="setUserUsernameLineEdit">
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>8</pointsize>
+       </font>
+      </property>
       <property name="maxLength">
        <number>12</number>
       </property>
      </widget>
     </item>
     <item row="1" column="0">
-     <widget class="QLabel" name="regPasswordLabel">
+     <widget class="QLabel" name="setUserPasswordLabel">
       <property name="text">
-       <string>New password:</string>
+       <string>Password:</string>
       </property>
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QLineEdit" name="regPasswordLineEdit">
+     <widget class="QLineEdit" name="setUserPasswordLineEdit">
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>8</pointsize>
+       </font>
+      </property>
       <property name="maxLength">
        <number>255</number>
       </property>
@@ -129,55 +141,66 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="regEMailLabel">
-      <property name="text">
-       <string>Email:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="regEMailLineEdit">
-      <property name="maxLength">
-       <number>255</number>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QLabel" name="labelInfoToUser">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>210</y>
-     <width>491</width>
-     <height>81</height>
+     <y>320</y>
+     <width>501</width>
+     <height>41</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout_2">
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>28</y>
+     <width>401</width>
+     <height>151</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
-     <widget class="QLabel" name="setUserUsernameLabel">
+     <widget class="QLabel" name="regUsernameLabel">
       <property name="text">
-       <string>Username:        </string>
+       <string>New username:</string>
       </property>
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QLineEdit" name="setUserUsernameLineEdit">
+     <widget class="QLineEdit" name="regUserNameLineEdit">
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>8</pointsize>
+       </font>
+      </property>
       <property name="maxLength">
        <number>12</number>
       </property>
      </widget>
     </item>
     <item row="1" column="0">
-     <widget class="QLabel" name="setUserPasswordLabel">
+     <widget class="QLabel" name="regPasswordLabel">
       <property name="text">
-       <string>Password:</string>
+       <string>New password:</string>
       </property>
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QLineEdit" name="setUserPasswordLineEdit">
+     <widget class="QLineEdit" name="regPasswordLineEdit">
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>8</pointsize>
+       </font>
+      </property>
       <property name="maxLength">
        <number>255</number>
       </property>
@@ -186,22 +209,39 @@
       </property>
      </widget>
     </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="regEMailLabel">
+      <property name="text">
+       <string>Email:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="regEMailLineEdit">
+      <property name="font">
+       <font>
+        <family>Bitstream Charter</family>
+        <pointsize>8</pointsize>
+       </font>
+      </property>
+      <property name="maxLength">
+       <number>255</number>
+      </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>
+ <tabstops>
+  <tabstop>regUserNameLineEdit</tabstop>
+  <tabstop>regPasswordLineEdit</tabstop>
+  <tabstop>regEMailLineEdit</tabstop>
+  <tabstop>registratePushButton</tabstop>
+  <tabstop>setUserUsernameLineEdit</tabstop>
+  <tabstop>setUserPasswordLineEdit</tabstop>
+  <tabstop>setUserPushButton</tabstop>
+  <tabstop>pushButtonHelp</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

diff --git a/Client/start.gif b/Client/start.gif
deleted file mode 100644 (file)
index fd8ba3d..0000000
Binary files a/Client/start.gif and /dev/null differ

diff --git a/Client/topresultdialog.cpp b/Client/topresultdialog.cpp
index 245646f..02bbbdc 100644 (file)
--- a/Client/topresultdialog.cpp
+++ b/Client/topresultdialog.cpp
@@ -1,3 +1,12 @@
+/*
+ * Topresultdialog
+ *
+ * @author     Olavi Pulkkinen <olavi.pulkkinena@fudeco.com>
+ * @author     Toni Jussila <toni.jussila@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #include <QDebug>
 #include "topresultdialog.h"
 #include "ui_topresultdialog.h"
@@ -33,6 +42,8 @@ void TopResultDialog::changeEvent(QEvent *e)
 
 void TopResultDialog::on_buttonTopRefresh_clicked()
 {
+    ui->labelTopList->clear();
+    ui->comboBoxTopCategory->clear();
     emit refreshCategoryList();
 }
 
@@ -63,6 +74,7 @@ int TopResultDialog::getLimitNr()
 
 void TopResultDialog::on_comboBoxTopCategory_currentIndexChanged(int index)
 {
+    ui->labelTopList->clear();
     recentCategoryIndex = index;
     emit refreshTopList(index);
 }

diff --git a/Client/topresultdialog.h b/Client/topresultdialog.h
index 8fad9e8..dc49076 100644 (file)
--- a/Client/topresultdialog.h
+++ b/Client/topresultdialog.h
@@ -1,3 +1,12 @@
+/*
+ * Topresultdialog
+ *
+ * @author     Olavi Pulkkinen <olavi.pulkkinena@fudeco.com>
+ * @author     Toni Jussila <toni.jussila@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef TOPRESULTDIALOG_H
 #define TOPRESULTDIALOG_H
 

diff --git a/Client/welcomedialog.cpp b/Client/welcomedialog.cpp
index 871ccfc..f2b3c7e 100644 (file)
--- a/Client/welcomedialog.cpp
+++ b/Client/welcomedialog.cpp
@@ -19,7 +19,7 @@ WelcomeDialog::WelcomeDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     this->setWindowTitle(" ");
-    movie = new QMovie("start.gif");
+    movie = new QMovie("Graphics/start.gif");
     ui->labelWelcome->setMovie(movie);
     movie->start();
     connect(movie,SIGNAL(frameChanged(int)),this,SLOT(stop(int)));