From: Toni Jussila Date: Tue, 20 Apr 2010 08:06:00 +0000 (+0300) Subject: Merge branch 'bugfix/categorylist' X-Git-Tag: help~13 X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=6bc1089e0f7de459eca37fdec9c61b08de94a6de;hp=f31a65d2249d6ddf024f9427e2036e2565ed747b Merge branch 'bugfix/categorylist' --- diff --git a/Client/Graphics/settingsDialog.png b/Client/Graphics/settingsDialog.png new file mode 100644 index 0000000..8c9c2a3 Binary files /dev/null and b/Client/Graphics/settingsDialog.png differ diff --git a/Client/graphics.qrc b/Client/graphics.qrc index cf5b651..50b60bc 100644 --- a/Client/graphics.qrc +++ b/Client/graphics.qrc @@ -20,6 +20,7 @@ Graphics/route_stop.png Graphics/trophy_gold_refresh.png Graphics/sf_2.png - Graphics/measuringDialog.png + Graphics/measuringDialog.png + Graphics/settingsDialog.png diff --git a/Client/helpdialog.cpp b/Client/helpdialog.cpp index 92ffcc2..e63eb35 100644 --- a/Client/helpdialog.cpp +++ b/Client/helpdialog.cpp @@ -10,6 +10,7 @@ HelpDialog::HelpDialog(QWidget *parent) : helpAccelerationDialog = NULL; helpRoutingDialog = NULL; creditsDialog = NULL; + helpSettingsDialog = NULL; } HelpDialog::~HelpDialog() @@ -65,3 +66,12 @@ void HelpDialog::on_pushButtonCredits_clicked() } creditsDialog->show(); } + +void HelpDialog::on_pushButtonHelpSettings_clicked() +{ + if(!helpSettingsDialog) + { + helpSettingsDialog = new HelpSettingsDialog; + } + helpSettingsDialog->show(); +} diff --git a/Client/helpdialog.h b/Client/helpdialog.h index 2348d5c..9ca31aa 100644 --- a/Client/helpdialog.h +++ b/Client/helpdialog.h @@ -6,6 +6,7 @@ #include #include #include "creditsdialog.h" +#include namespace Ui { class HelpDialog; @@ -21,6 +22,7 @@ public: HelpAccelerationDialog *helpAccelerationDialog; HelpRoutingDialog *helpRoutingDialog; CreditsDialog *creditsDialog; + HelpSettingsDialog *helpSettingsDialog; protected: void changeEvent(QEvent *e); @@ -30,6 +32,7 @@ private: private slots: + void on_pushButtonHelpSettings_clicked(); void on_pushButtonCredits_clicked(); void on_pushButtonHelpRoute_clicked(); void on_pushButtonHelpAccelerate_clicked(); diff --git a/Client/helpdialog.ui b/Client/helpdialog.ui index 89c3412..5b21f08 100644 --- a/Client/helpdialog.ui +++ b/Client/helpdialog.ui @@ -130,32 +130,6 @@ - - - - 140 - 300 - 61 - 61 - - - - true - - - - - - - :/new/prefix1/Graphics/applications_internet.png:/new/prefix1/Graphics/applications_internet.png - - - - 55 - 55 - - - @@ -215,7 +189,7 @@ 230 310 - 171 + 261 41 @@ -225,14 +199,14 @@ - WWW-page + Speed freak's home page - 432 - 306 + 620 + 290 111 51 @@ -241,6 +215,25 @@ Credits + + + + 140 + 300 + 55 + 55 + + + + + + + :/new/prefix1/Graphics/applications_internet.png + + + true + + diff --git a/Client/helpsettingsdialog.cpp b/Client/helpsettingsdialog.cpp new file mode 100644 index 0000000..65b18f3 --- /dev/null +++ b/Client/helpsettingsdialog.cpp @@ -0,0 +1,63 @@ +#include "helpsettingsdialog.h" +#include "ui_helpsettingsdialog.h" + +HelpSettingsDialog::HelpSettingsDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::HelpSettingsDialog) +{ + ui->setupUi(this); + pageCounter = 0; + + ui->labelInfo2->hide(); + ui->labelLast->hide(); + ui->pushButtonLast->hide(); +} + +HelpSettingsDialog::~HelpSettingsDialog() +{ + delete ui; +} + +void HelpSettingsDialog::changeEvent(QEvent *e) +{ + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} + +void HelpSettingsDialog::on_pushButtonNext_clicked() +{ + pageCounter ++; + + if(pageCounter == 1) + { + ui->labelNext->hide(); + ui->pushButtonNext->hide(); + ui->labelInfo1->hide(); + + ui->labelInfo2->show(); + ui->labelLast->show(); + ui->pushButtonLast->show(); + } +} + +void HelpSettingsDialog::on_pushButtonLast_clicked() +{ + pageCounter --; + + if(pageCounter == 0) + { + ui->labelInfo2->hide(); + ui->labelLast->hide(); + ui->pushButtonLast->hide(); + + ui->labelNext->show(); + ui->pushButtonNext->show(); + ui->labelInfo1->show(); + } +} diff --git a/Client/helpsettingsdialog.h b/Client/helpsettingsdialog.h new file mode 100644 index 0000000..945adbd --- /dev/null +++ b/Client/helpsettingsdialog.h @@ -0,0 +1,28 @@ +#ifndef HELPSETTINGSDIALOG_H +#define HELPSETTINGSDIALOG_H + +#include + +namespace Ui { + class HelpSettingsDialog; +} + +class HelpSettingsDialog : public QDialog { + Q_OBJECT +public: + HelpSettingsDialog(QWidget *parent = 0); + ~HelpSettingsDialog(); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::HelpSettingsDialog *ui; + int pageCounter; + +private slots: + void on_pushButtonLast_clicked(); + void on_pushButtonNext_clicked(); +}; + +#endif // HELPSETTINGSDIALOG_H diff --git a/Client/helpsettingsdialog.ui b/Client/helpsettingsdialog.ui new file mode 100644 index 0000000..5eba07a --- /dev/null +++ b/Client/helpsettingsdialog.ui @@ -0,0 +1,138 @@ + + + HelpSettingsDialog + + + + 0 + 0 + 800 + 380 + + + + Help for settings + + + + + 540 + 320 + 81 + 61 + + + + < + + + + + + 670 + 320 + 81 + 61 + + + + > + + + + + + 690 + 290 + 62 + 17 + + + + Next + + + + + + 560 + 290 + 62 + 17 + + + + Last + + + + + + 20 + 10 + 431 + 321 + + + + Speed freak communicates with server. +If you want send your results to server +or view other users results you need to +register to server. + +1. For registering: Set user name, +password and valid e-mail address to +the fields. Press Register-button and +your registering will be confirmed. + + + + + + 500 + 50 + 291 + 211 + + + + + + + :/new/prefix1/Graphics/settingsDialog.png + + + true + + + Qt::LinksAccessibleByMouse + + + + + + 20 + 10 + 421 + 351 + + + + 2. After succesful registering you need +to put username and password to the +fields and press Set user button. After +that you are logged in and can send +own results to the server. + +NOTE: If you are registered your user- +name before you just need to set your +username and password in to the Set user +fields and press Set user -button. + + + + + + + + diff --git a/Client/speedfreak.pro b/Client/speedfreak.pro index ce4c5e7..22ebcb8 100644 --- a/Client/speedfreak.pro +++ b/Client/speedfreak.pro @@ -36,7 +36,8 @@ SOURCES += main.cpp \ helpdialog.cpp \ helpresultsdialog.cpp \ helpaccelerationdialog.cpp \ - helproutingdialog.cpp + helproutingdialog.cpp \ + helpsettingsdialog.cpp HEADERS += mainwindow.h \ creditsdialog.h \ routedialog.h \ @@ -63,7 +64,8 @@ HEADERS += mainwindow.h \ helpdialog.h \ helpresultsdialog.h \ helpaccelerationdialog.h \ - helproutingdialog.h + helproutingdialog.h \ + helpsettingsdialog.h FORMS += mainwindow.ui \ creditsdialog.ui \ routedialog.ui \ @@ -79,7 +81,8 @@ FORMS += mainwindow.ui \ helpdialog.ui \ helpresultsdialog.ui \ helpaccelerationdialog.ui \ - helproutingdialog.ui + helproutingdialog.ui \ + helpsettingsdialog.ui RESOURCES += graphics.qrc contains(QT_CONFIG, hildon):CONFIG += hildon CONFIG += link_pkgconfig diff --git a/documents/API.txt b/documents/API.txt index e29585d..cf28452 100644 --- a/documents/API.txt +++ b/documents/API.txt @@ -119,6 +119,22 @@ category that result belongs to. Below is example of XML: +Sending route +============= + +URL: + +Below is example of XML: + + + + + + + + + + Logout ======