projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
[speedfreak]
/
Client
/
settingsdialog.h
diff --git
a/Client/settingsdialog.h
b/Client/settingsdialog.h
index
7e2096e
..
4f5858b
100644
(file)
--- a/
Client/settingsdialog.h
+++ b/
Client/settingsdialog.h
@@
-1,9
+1,17
@@
+/*
+ * SettingsDialog class
+ *
+ * @author Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+ * @copyright (c) 2010 Speed Freak team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
#include <QDialog>
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
#include <QDialog>
-
#include "instructionsdialog.h"
#include "instructionsdialog.h"
+#include <helpsettingsdialog.h>
namespace Ui {
class SettingsDialog;
namespace Ui {
class SettingsDialog;
@@
-14,6
+22,7
@@
class SettingsDialog : public QDialog {
public:
SettingsDialog(QWidget *parent = 0);
~SettingsDialog();
public:
SettingsDialog(QWidget *parent = 0);
~SettingsDialog();
+ HelpSettingsDialog *helpSettingsDialog;
void setRegUserName(QString username);
void setRegPassword(QString password);
void setRegEmail(QString email);
void setRegUserName(QString username);
void setRegPassword(QString password);
void setRegEmail(QString email);
@@
-25,17
+34,19
@@
public:
QString getUserName();
QString getPassword();
void setLabelInfoToUser(QString infoText);
QString getUserName();
QString getPassword();
void setLabelInfoToUser(QString infoText);
+ void usernameOk(bool isOk);
+ void clearRegisterLineEdits();
signals:
void sendregistration();
void userNameChanged();
signals:
void sendregistration();
void userNameChanged();
+ void logout();
protected:
void changeEvent(QEvent *e);
private:
Ui::SettingsDialog *ui;
protected:
void changeEvent(QEvent *e);
private:
Ui::SettingsDialog *ui;
- InstructionsDialog *instructionsDialog;
QString regUsername;
QString regPassword;
QString regEmail;
QString regUsername;
QString regPassword;
QString regEmail;
@@
-43,9
+54,10
@@
private:
QString password;
private slots:
QString password;
private slots:
+ void on_pushButtonInfo_clicked();
void on_setUserPushButton_clicked();
void on_registratePushButton_clicked();
void on_setUserPushButton_clicked();
void on_registratePushButton_clicked();
- void on_pushButtonHelp_clicked();
+ void killHelpDialog();
};
#endif // SETTINGSDIALOG_H
};
#endif // SETTINGSDIALOG_H