projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bugs 5711 and 5832. Now graph's line wont draw out of the diagram and messagebo...
[speedfreak]
/
Client
/
settingsdialog.h
diff --git
a/Client/settingsdialog.h
b/Client/settingsdialog.h
index
8263515
..
4c62817
100644
(file)
--- a/
Client/settingsdialog.h
+++ b/
Client/settingsdialog.h
@@
-10,8
+10,9
@@
#define SETTINGSDIALOG_H
#include <QDialog>
#define SETTINGSDIALOG_H
#include <QDialog>
-
#include "instructionsdialog.h"
#include "instructionsdialog.h"
+#include <helpsettingsdialog.h>
+#include <registerdialog.h>
namespace Ui {
class SettingsDialog;
namespace Ui {
class SettingsDialog;
@@
-22,36
+23,34
@@
class SettingsDialog : public QDialog {
public:
SettingsDialog(QWidget *parent = 0);
~SettingsDialog();
public:
SettingsDialog(QWidget *parent = 0);
~SettingsDialog();
- void setRegUserName(QString username);
- void setRegPassword(QString password);
- void setRegEmail(QString email);
- QString getRegUserName();
- QString getRegPassword();
- QString getRegEmail();
+ HelpSettingsDialog *helpSettingsDialog;
+ RegisterDialog *registerDialog;
void setUserName(QString username);
void setPassword(QString password);
QString getUserName();
QString getPassword();
void setLabelInfoToUser(QString infoText);
void setUserName(QString username);
void setPassword(QString password);
QString getUserName();
QString getPassword();
void setLabelInfoToUser(QString infoText);
+ void usernameOk(bool isOk);
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;
- QString regUsername;
- QString regPassword;
- QString regEmail;
QString username;
QString password;
private slots:
QString username;
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 killDialog();
+ void registrate();
};
#endif // SETTINGSDIALOG_H
};
#endif // SETTINGSDIALOG_H