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
1f7a9fe
..
4f5858b
100644
(file)
--- a/
Client/settingsdialog.h
+++ b/
Client/settingsdialog.h
@@
-10,8
+10,8
@@
#define SETTINGSDIALOG_H
#include <QDialog>
#define SETTINGSDIALOG_H
#include <QDialog>
-
#include "instructionsdialog.h"
#include "instructionsdialog.h"
+#include <helpsettingsdialog.h>
namespace Ui {
class SettingsDialog;
namespace Ui {
class SettingsDialog;
@@
-22,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);
@@
-53,8
+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 killHelpDialog();
};
#endif // SETTINGSDIALOG_H
};
#endif // SETTINGSDIALOG_H