Added custom button for users dialog and changed place of www-button. Www-button...

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

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

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index 18601a1..069f511 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -28,5 +28,7 @@
         <file>Graphics/route_selected.png</file>
         <file>Graphics/info_selected.png</file>
         <file>Graphics/route_load.png</file>
+        <file>Graphics/users.png</file>
+        <file>Graphics/users_selected.png</file>
     </qresource>
 </RCC>

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index f86681c..60aa94f 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -110,25 +110,24 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(customButtonSettings, SIGNAL(OpenDialog()), this, SLOT(OpenSettingsDialog()));
     customButtonSettings->show();
 
-    //Create icon for www page button
+    //Create icon for users dialog button
     icon = new QIcon();
-    icon->addFile(QString(":/new/prefix1/Graphics/applications_internet.png"), QSize(125,125), QIcon::Normal, QIcon::Off);
-    icon->addFile(QString(":/new/prefix1/Graphics/applications_internet_selected.png"), QSize(125,125), QIcon::Normal, QIcon::On);
-
-    //WWW page button
+    icon->addFile(QString(":/new/prefix1/Graphics/users.png"), QSize(125,125), QIcon::Normal, QIcon::Off);
+    icon->addFile(QString(":/new/prefix1/Graphics/users_selected.png"), QSize(125,125), QIcon::Normal, QIcon::On);
 
-    customButtonWWW = new CustomButton(this,icon);
+    //Users dialog button
+    customButtonUsers = new CustomButton(this,icon);
     delete icon;
 
     buttons_x += 140;
-    customButtonWWW->setGeometry(buttons_x,buttons_y,130,130);
-    connect(customButtonWWW, SIGNAL(OpenDialog()), this, SLOT(OpenWWWPage()));
-    customButtonWWW->show();
+    customButtonUsers->setGeometry(buttons_x,buttons_y,130,130);
+    connect(customButtonUsers, SIGNAL(OpenDialog()), this, SLOT(openUsersDialog()));
+    customButtonUsers->show();
 
     //Create icon for help dialog button
     icon = new QIcon();
-    icon->addFile(QString(":/new/prefix1/Graphics/info.png"), QSize(105,105), QIcon::Normal, QIcon::Off);
-    icon->addFile(QString(":/new/prefix1/Graphics/info_selected.png"), QSize(105,105), QIcon::Normal, QIcon::On);
+    icon->addFile(QString(":/new/prefix1/Graphics/info.png"), QSize(85,85), QIcon::Normal, QIcon::Off);
+    icon->addFile(QString(":/new/prefix1/Graphics/info_selected.png"), QSize(85,85), QIcon::Normal, QIcon::On);
 
     //Help dialog button
 
@@ -138,6 +137,21 @@ MainWindow::MainWindow(QWidget *parent) :
     customButtonHelp->setGeometry(670,10,105,105);
     connect(customButtonHelp, SIGNAL(OpenDialog()), this, SLOT(OpenHelpDialog()));
     customButtonHelp->show();
+
+
+    //Create icon for www page button
+    icon = new QIcon();
+    icon->addFile(QString(":/new/prefix1/Graphics/applications_internet.png"), QSize(85,85), QIcon::Normal, QIcon::Off);
+    icon->addFile(QString(":/new/prefix1/Graphics/applications_internet_selected.png"), QSize(85,85), QIcon::Normal, QIcon::On);
+
+    //WWW page button
+    customButtonWWW = new CustomButton(this,icon);
+    delete icon;
+
+    customButtonWWW->setGeometry(670,320,105,105);
+    connect(customButtonWWW, SIGNAL(OpenDialog()), this, SLOT(OpenWWWPage()));
+    customButtonWWW->show();
+
 }
 
 /**
@@ -418,7 +432,7 @@ void MainWindow::OpenSettingsDialog()
   */
 void MainWindow::OpenWWWPage()
 {
-    QDesktopServices::openUrl(QUrl("http://garage.maemo.org/projects/speedfreak/"));
+    QDesktopServices::openUrl(QUrl("http://www.speedfreak-app.com/"));
 }
 /**
   * This slot function opens the main help dialog
@@ -465,7 +479,7 @@ void MainWindow::requestGetUsers()
     }
 }
 
-void MainWindow::on_pushButtonUsers_clicked()
+void MainWindow::openUsersDialog()
 {
     if(!usersDialog)
         usersDialog = new UsersDialog;

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index 9a5854e..94f093c 100644 (file)
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -64,9 +64,9 @@ private:
     CustomButton* customButtonSettings;
     CustomButton* customButtonWWW;
     CustomButton* customButtonHelp;
+    CustomButton* customButtonUsers;
 
-private slots:
-    void on_pushButtonUsers_clicked();    
+private slots:    
     void clientRequestCategoryList();
     void clientRequestTopList(int index);
     void clientSendRoute(QString,QString,int);
@@ -86,6 +86,7 @@ private slots:
     void OpenSettingsDialog();
     void requestGetUserInfo(QString);
     void requestGetUsers();
+    void openUsersDialog();
 };
 
 #endif // MAINWINDOW_H

diff --git a/Client/mainwindow.ui b/Client/mainwindow.ui
index 84af0cd..2eb3cc6 100644 (file)
--- a/Client/mainwindow.ui
+++ b/Client/mainwindow.ui
@@ -17,8 +17,8 @@
    <widget class="QLabel" name="label">
     <property name="geometry">
      <rect>
-      <x>270</x>
-      <y>280</y>
+      <x>180</x>
+      <y>300</y>
       <width>461</width>
       <height>121</height>
      </rect>
@@ -33,19 +33,6 @@
      <bool>true</bool>
     </property>
    </widget>
-   <widget class="QPushButton" name="pushButtonUsers">
-    <property name="geometry">
-     <rect>
-      <x>170</x>
-      <y>20</y>
-      <width>93</width>
-      <height>27</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Users</string>
-    </property>
-   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">

diff --git a/Client/usersdialog.cpp b/Client/usersdialog.cpp
index c61c5d1..a3602e3 100644 (file)
--- a/Client/usersdialog.cpp
+++ b/Client/usersdialog.cpp
@@ -40,6 +40,10 @@ void UsersDialog::on_listWidgetUsers_itemClicked(QListWidgetItem* item)
     QString name;
     name = item->text();
 
+    ui->labelManufacter->clear();
+    ui->labelType->clear();
+    ui->labelModel->clear();
+    ui->plainTextEditDescription->clear();
     emit getUserInfo(item->text());
 }