From: Toni Jussila Date: Mon, 31 May 2010 09:15:13 +0000 (+0300) Subject: Merge branch 'package' X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=de616097f82e70dcfc4bdcc50fb0d1c368c1ac0c;hp=16f76b90231274365c45d9efa6d662a819ac525d Merge branch 'package' --- diff --git a/Client/Graphics/userspic.png b/Client/Graphics/userspic.png new file mode 100644 index 0000000..97233ec Binary files /dev/null and b/Client/Graphics/userspic.png differ diff --git a/Client/graphics.qrc b/Client/graphics.qrc index 069f511..792be43 100644 --- a/Client/graphics.qrc +++ b/Client/graphics.qrc @@ -30,5 +30,6 @@ Graphics/route_load.png Graphics/users.png Graphics/users_selected.png + Graphics/userspic.png diff --git a/Client/helpdialog.cpp b/Client/helpdialog.cpp index e5e3dea..016829e 100644 --- a/Client/helpdialog.cpp +++ b/Client/helpdialog.cpp @@ -24,6 +24,7 @@ HelpDialog::HelpDialog(QWidget *parent) : helpRoutingDialog = NULL; creditsDialog = NULL; helpSettingsDialog = NULL; + helpUsersDialog = NULL; } /** @@ -150,4 +151,24 @@ void HelpDialog::killHelpDialogs() delete helpSettingsDialog; helpSettingsDialog = NULL; } + + if(helpUsersDialog) + { + qDebug() << "__Help kill: helpUsersDialog"; + delete helpUsersDialog; + helpUsersDialog = NULL; + } +} + +/** + * This slot function called when ever help users button clicked. + */ +void HelpDialog::on_pushButtonHelpUsers_clicked() +{ + if(!helpUsersDialog) + { + helpUsersDialog = new HelpUsersDialog; + } + connect(helpUsersDialog, SIGNAL(rejected()), this, SLOT(killHelpDialogs())); + helpUsersDialog->show(); } diff --git a/Client/helpdialog.h b/Client/helpdialog.h index de88a27..be23a1c 100644 --- a/Client/helpdialog.h +++ b/Client/helpdialog.h @@ -16,6 +16,7 @@ #include #include #include "creditsdialog.h" +#include namespace Ui { class HelpDialog; @@ -32,6 +33,7 @@ public: HelpRoutingDialog *helpRoutingDialog; CreditsDialog *creditsDialog; HelpSettingsDialog *helpSettingsDialog; + HelpUsersDialog *helpUsersDialog; protected: void changeEvent(QEvent *e); @@ -41,6 +43,7 @@ private: private slots: + void on_pushButtonHelpUsers_clicked(); void on_pushButtonHelpSettings_clicked(); void on_pushButtonCredits_clicked(); void on_pushButtonHelpRoute_clicked(); diff --git a/Client/helpdialog.ui b/Client/helpdialog.ui index 5b21f08..9a2c0f4 100644 --- a/Client/helpdialog.ui +++ b/Client/helpdialog.ui @@ -20,7 +20,7 @@ 230 - 30 + 10 231 41 @@ -38,9 +38,9 @@ 140 - 20 - 61 - 61 + 10 + 50 + 50 @@ -56,8 +56,8 @@ - 60 - 60 + 50 + 50 @@ -65,9 +65,9 @@ 140 - 90 - 61 - 61 + 70 + 50 + 50 @@ -79,8 +79,8 @@ - 60 - 60 + 50 + 50 @@ -88,9 +88,9 @@ 140 - 160 - 61 - 61 + 130 + 50 + 50 @@ -102,8 +102,8 @@ - 60 - 60 + 50 + 50 @@ -111,9 +111,9 @@ 140 - 230 - 61 - 61 + 190 + 50 + 50 @@ -125,8 +125,8 @@ - 55 - 55 + 50 + 50 @@ -134,7 +134,7 @@ 230 - 100 + 80 261 41 @@ -152,7 +152,7 @@ 230 - 170 + 140 171 41 @@ -170,7 +170,7 @@ 230 - 240 + 190 171 41 @@ -219,9 +219,9 @@ 140 - 300 - 55 - 55 + 310 + 50 + 50 @@ -234,6 +234,47 @@ true + + + + 230 + 250 + 171 + 41 + + + + + Bitstream Charter + + + + Users view + + + + + + 140 + 250 + 50 + 50 + + + + + + + + :/new/prefix1/Graphics/users.png:/new/prefix1/Graphics/users.png + + + + 50 + 50 + + + diff --git a/Client/helpusersdialog.cpp b/Client/helpusersdialog.cpp new file mode 100644 index 0000000..1e6ade4 --- /dev/null +++ b/Client/helpusersdialog.cpp @@ -0,0 +1,26 @@ +#include "helpusersdialog.h" +#include "ui_helpusersdialog.h" + +HelpUsersDialog::HelpUsersDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::HelpUsersDialog) +{ + ui->setupUi(this); +} + +HelpUsersDialog::~HelpUsersDialog() +{ + delete ui; +} + +void HelpUsersDialog::changeEvent(QEvent *e) +{ + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} diff --git a/Client/helpusersdialog.h b/Client/helpusersdialog.h new file mode 100644 index 0000000..f497b7a --- /dev/null +++ b/Client/helpusersdialog.h @@ -0,0 +1,23 @@ +#ifndef HELPUSERSDIALOG_H +#define HELPUSERSDIALOG_H + +#include + +namespace Ui { + class HelpUsersDialog; +} + +class HelpUsersDialog : public QDialog { + Q_OBJECT +public: + HelpUsersDialog(QWidget *parent = 0); + ~HelpUsersDialog(); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::HelpUsersDialog *ui; +}; + +#endif // HELPUSERSDIALOG_H diff --git a/Client/helpusersdialog.ui b/Client/helpusersdialog.ui new file mode 100644 index 0000000..950f3b5 --- /dev/null +++ b/Client/helpusersdialog.ui @@ -0,0 +1,58 @@ + + + HelpUsersDialog + + + + 0 + 0 + 800 + 380 + + + + Help for users view + + + + + 20 + 20 + 431 + 321 + + + + Users view lists all registered users +and by clicking the wanted username +it gives information about user. + + + + + + 490 + 80 + 291 + 211 + + + + + + + :/new/prefix1/Graphics/userspic.png + + + true + + + Qt::LinksAccessibleByMouse + + + + + + + + diff --git a/Client/speedfreak.pro b/Client/speedfreak.pro index b5682e5..6b0ea01 100644 --- a/Client/speedfreak.pro +++ b/Client/speedfreak.pro @@ -42,7 +42,8 @@ SOURCES += main.cpp \ profiledialog.cpp \ filereader.cpp \ usersdialog.cpp \ - registerdialog.cpp + registerdialog.cpp \ + helpusersdialog.cpp HEADERS += mainwindow.h \ creditsdialog.h \ routedialog.h \ @@ -75,7 +76,8 @@ HEADERS += mainwindow.h \ profiledialog.h \ filereader.h \ usersdialog.h \ - registerdialog.h + registerdialog.h \ + helpusersdialog.h FORMS += mainwindow.ui \ creditsdialog.ui \ routedialog.ui \ @@ -94,8 +96,9 @@ FORMS += mainwindow.ui \ helproutingdialog.ui \ helpsettingsdialog.ui \ profiledialog.ui \ - usersdialog.ui \ - registerdialog.ui + usersdialog.ui \ + registerdialog.ui \ + helpusersdialog.ui RESOURCES += graphics.qrc contains(QT_CONFIG, hildon):CONFIG += hildon CONFIG += link_pkgconfig