rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed login window to dialog #4168

This commit is contained in:
XinyuHou 2015-02-04 17:30:06 +00:00
parent da68664bda
commit d1c1d79453
12 changed files with 411 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/main/gui.pro
View File

@ -15,7 +15,7 @@ FORMS += res/MainWindowBase.ui \
res/SettingsDialogBase.ui \ res/SettingsDialogBase.ui \
res/SetupWizardBase.ui \ res/SetupWizardBase.ui \
res/AddClientDialogBase.ui \ res/AddClientDialogBase.ui \
res/LoginWindowBase.ui res/LoginDialogBase.ui
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/MainWindow.cpp \ src/MainWindow.cpp \
src/AboutDialog.cpp \ src/AboutDialog.cpp \
@ -52,8 +52,8 @@ SOURCES += src/main.cpp \
src/DataDownloader.cpp \ src/DataDownloader.cpp \
src/AddClientDialog.cpp \ src/AddClientDialog.cpp \
src/CommandProcess.cpp \ src/CommandProcess.cpp \
src/LoginWindow.cpp \ src/LoginAuth.cpp \
src/LoginAuth.cpp src/LoginDialog.cpp
HEADERS += src/MainWindow.h \ HEADERS += src/MainWindow.h \
src/AboutDialog.h \ src/AboutDialog.h \
src/ServerConfig.h \ src/ServerConfig.h \
@ -90,10 +90,10 @@ HEADERS += src/MainWindow.h \
src/DataDownloader.h \ src/DataDownloader.h \
src/AddClientDialog.h \ src/AddClientDialog.h \
src/CommandProcess.h \ src/CommandProcess.h \
src/LoginWindow.h \
src/LoginAuth.h \ src/LoginAuth.h \
src/EditionType.h \ src/EditionType.h \
src/LoginResult.h src/LoginResult.h \
src/LoginDialog.h
RESOURCES += res/Synergy.qrc RESOURCES += res/Synergy.qrc
RC_FILE = res/win/Synergy.rc RC_FILE = res/win/Synergy.rc
macx { macx {

167
src/gui/main/res/LoginDialogBase.ui Normal file
View File

@ -0,0 +1,167 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LoginDialog</class>
<widget class="QDialog" name="LoginDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>359</width>
<height>175</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Synergy</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="Synergy.qrc">:/res/image/about.png</pixmap>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="horizontalSpacing">
<number>20</number>
</property>
<property name="verticalSpacing">
<number>10</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Email:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_pLineEditEmail">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditPassword">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>&lt;a href=&quot;https://synergy-project.org/account/reset/&quot;&gt;Forgot password&lt;/a&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="m_pPushButtonLogin">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Login</string>
</property>
<property name="shortcut">
<string>Return</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="Synergy.qrc"/>
</resources>
<connections/>
</ui>

22
src/gui/main/res/LoginWindow.h
View File

@ -1,22 +0,0 @@
#ifndef LOGINWINDOW_H
#define LOGINWINDOW_H
#include <QMainWindow>
#include "ui_LoginWindowBase.h"
class LoginWindow : public QMainWindow, public Ui::LoginWindowBase
{
Q_OBJECT
public:
LoginWindow(QWidget *parent = 0);
~LoginWindow();
protected:
void changeEvent(QEvent *e);
private:
Ui::LoginWindow *ui;
};
#endif // LOGINWINDOW_H

149
src/gui/main/res/LoginWindowBase.ui
View File

@ -1,149 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LoginWindow</class>
<widget class="QMainWindow" name="LoginWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>200</height>
</rect>
</property>
<property name="windowTitle">
<string>Synergy</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>10</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="Synergy.qrc">:/res/image/about.png</pixmap>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="leftMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="m_pLabelEmail">
<property name="text">
<string>Email:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_pLineEditEmail">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="m_pLabelPassword">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditPassword">
<property name="inputMethodHints">
<set>Qt::ImhHiddenText</set>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<item>
<widget class="QLabel" name="m_pLabelRegister">
<property name="text">
<string>&lt;a href=&quot;http://synergy-project.org/&quot;&gt;Register&lt;/a&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_pPushButtonLogin">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Login</string>
</property>
<property name="shortcut">
<string>Return</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_pPushButtonCancel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Cancel</string>
</property>
<property name="shortcut">
<string>Esc</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources>
<include location="Synergy.qrc"/>
</resources>
<connections/>
</ui>

BIN
src/gui/main/res/image/about.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

2
src/gui/main/src/AppConfig.h
View File

@ -47,7 +47,7 @@ class AppConfig
friend class SettingsDialog; friend class SettingsDialog;
friend class MainWindow; friend class MainWindow;
friend class SetupWizard; friend class SetupWizard;
friend class LoginWindow; friend class LoginDialog;
public: public:
AppConfig(QSettings* settings); AppConfig(QSettings* settings);

18
src/gui/main/src/LoginAuth.cpp
View File

@ -17,7 +17,7 @@
#include "LoginAuth.h" #include "LoginAuth.h"
#include "LoginWindow.h" #include "LoginDialog.h"
#include "AppConfig.h" #include "AppConfig.h"
#include "QUtility.h" #include "QUtility.h"
#include "LoginResult.h" #include "LoginResult.h"
@ -28,16 +28,16 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <stdexcept> #include <stdexcept>
void LoginAuth::checkUserType() void LoginAuth::checkEditionType()
{ {
int edition = Unknown; int edition = Unknown;
int result = doCheckUserType(edition); int result = doCheckEditionType(edition);
m_pLoginWindow->setLoginResult(result); m_pLoginDialog->setLoginResult(result);
m_pLoginWindow->setEditionType(edition); m_pLoginDialog->setEditionType(edition);
emit finished(); emit finished();
} }
int LoginAuth::doCheckUserType(int& edition) int LoginAuth::doCheckEditionType(int& edition)
{ {
QString responseJson; QString responseJson;
@ -47,7 +47,7 @@ int LoginAuth::doCheckUserType(int& edition)
} }
catch (std::exception& e) catch (std::exception& e)
{ {
m_pLoginWindow->setError(e.what()); m_pLoginDialog->setError(e.what());
return ExceptionError; return ExceptionError;
} }
@ -72,12 +72,12 @@ int LoginAuth::doCheckUserType(int& edition)
// replace "\n" with real new lines. // replace "\n" with real new lines.
QString error = errorRegex.cap(1).replace("\\n", "\n"); QString error = errorRegex.cap(1).replace("\\n", "\n");
m_pLoginWindow->setError(error); m_pLoginDialog->setError(error);
return Error; return Error;
} }
} }
m_pLoginWindow->setError(responseJson); m_pLoginDialog->setError(responseJson);
return ServerResponseError; return ServerResponseError;
} }

10
src/gui/main/src/LoginAuth.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <QObject> #include <QObject>
class LoginWindow; class LoginDialog;
class AppConfig; class AppConfig;
class LoginAuth : public QObject class LoginAuth : public QObject
@ -29,13 +29,13 @@ class LoginAuth : public QObject
Q_OBJECT Q_OBJECT
public: public:
int doCheckUserType(int& edition); int doCheckEditionType(int& edition);
void setEmail(QString email) { m_Email = email; } void setEmail(QString email) { m_Email = email; }
void setPassword(QString password) { m_Password = password; } void setPassword(QString password) { m_Password = password; }
void setLoginWindow(LoginWindow* w) { m_pLoginWindow = w; } void setLoginDialog(LoginDialog* d) { m_pLoginDialog = d; }
public slots: public slots:
void checkUserType(); void checkEditionType();
signals: signals:
void finished(); void finished();
@ -46,7 +46,7 @@ private:
private: private:
QString m_Email; QString m_Email;
QString m_Password; QString m_Password;
LoginWindow* m_pLoginWindow; LoginDialog* m_pLoginDialog;
}; };
#endif // LOGINAUTH_H #endif // LOGINAUTH_H

350
src/gui/main/src/LoginWindow.cpp → src/gui/main/src/LoginDialog.cpp
View File

@ -1,178 +1,172 @@
/* #include "LoginDialog.h"
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2015 Synergy Si Ltd. #include "MainWindow.h"
* #include "SetupWizard.h"
* This package is free software; you can redistribute it and/or #include "LoginAuth.h"
* modify it under the terms of the GNU General Public License #include "LoginResult.h"
* found in the file COPYING that should have accompanied this file. #include "EditionType.h"
* #include "QUtility.h"
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of #include <QMessageBox>
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #include <QCloseEvent>
* GNU General Public License for more details. #include <QThread>
* #include <QDesktopServices>
* You should have received a copy of the GNU General Public License #include <QUrl>
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ static const char registerUrl[] = "http://synergy-project.org";
#include "LoginWindow.h" LoginDialog::LoginDialog(
#include "ui_LoginWindowBase.h" MainWindow* mainWindow,
SetupWizard* setupWizard,
#include "MainWindow.h" bool wizardShouldRun,
#include "SetupWizard.h" QWidget *parent) :
#include "LoginAuth.h" QDialog(parent),
#include "LoginResult.h" m_pMainWindow(mainWindow),
#include "EditionType.h" m_pSetupWizard(setupWizard),
#include "QUtility.h" m_WizardShouldRun(wizardShouldRun),
m_pLoginAuth(NULL),
#include <QMessageBox> m_LoginResult(Ok),
#include <QCloseEvent> m_EditionType(Unknown),
#include <QThread> m_AppConfig(m_pMainWindow->appConfig())
{
LoginWindow::LoginWindow( setupUi(this);
MainWindow* mainWindow, setFixedSize(size());
SetupWizard* setupWizard, m_pLineEditEmail->setText(m_AppConfig.userEmail());
bool wizardShouldRun, }
QWidget *parent) :
QMainWindow(parent), LoginDialog::~LoginDialog()
m_pMainWindow(mainWindow), {
m_pSetupWizard(setupWizard), if (m_pLoginAuth != NULL) {
m_WizardShouldRun(wizardShouldRun), delete m_pLoginAuth;
m_pLoginAuth(NULL), }
m_LoginResult(Ok), }
m_EditionType(Unknown),
m_AppConfig(m_pMainWindow->appConfig()) void LoginDialog::showNext()
{ {
setupUi(this); if (m_LoginResult == ExceptionError) {
QMessageBox::critical(
m_pLineEditEmail->setText(m_AppConfig.userEmail()); this,
} tr("Error"),
tr("Sorry, an error occured while trying to sign in. "
LoginWindow::~LoginWindow() "Please contact the help desk, and provide the "
{ "following details.\n\n%1").arg(m_Error));
if (m_pLoginAuth != NULL) { }
delete m_pLoginAuth; else if (m_LoginResult == InvalidEmailPassword) {
} QMessageBox::warning(
} this,
tr("Warning"),
void LoginWindow::showNext() tr("Login failed, invalid email or password."));
{ }
if (m_LoginResult == ExceptionError) { else if (m_LoginResult == Error) {
QMessageBox::critical( QMessageBox::critical(
this, this,
tr("Error"), tr("Error"),
tr("Sorry, an error occured while trying to sign in. " tr("Login failed, an error occurred.\n\n%1").arg(m_Error));
"Please contact the help desk, and provide the " }
"following details.\n\n%1").arg(m_Error)); else if (m_LoginResult == ServerResponseError) {
} QMessageBox::critical(
else if (m_LoginResult == InvalidEmailPassword) { this,
QMessageBox::critical( "Error",
this, tr("Login failed, an error occurred.\n\nServer response:\n\n%1")
tr("Error"), .arg(m_Error));
tr("Login failed, invalid email or password.")); }
} else {
else if (m_LoginResult == Error) { hide();
QMessageBox::critical( if (m_WizardShouldRun) {
this, m_pSetupWizard->show();
tr("Error"), }
tr("Login failed, an error occurred.\n\n%1").arg(m_Error)); else {
} m_pMainWindow->setEditionType(m_EditionType);
else if (m_LoginResult == ServerResponseError) { if (!m_pLineEditEmail->text().isEmpty()) {
QMessageBox::critical( m_AppConfig.setUserEmail(m_pLineEditEmail->text());
this,
"Error", if (m_EditionType != Unknown) {
tr("Login failed, an error occurred.\n\nServer response:\n\n%1") QString mac = getFirstMacAddress();
.arg(m_Error)); QString hashSrc = m_pLineEditEmail->text() + mac;
} QString hashResult = hash(hashSrc);
else { //m_AppConfig.setUserToken(hashResult);
hide(); //m_AppConfig.setEditionType(m_EditionType);
if (m_WizardShouldRun) { }
m_pSetupWizard->show(); }
} m_pMainWindow->show();
else { }
m_pMainWindow->setEditionType(m_EditionType); }
if (!m_pLineEditEmail->text().isEmpty()) {
m_AppConfig.setUserEmail(m_pLineEditEmail->text()); delete m_pLoginAuth;
m_pLoginAuth = NULL;
if (m_EditionType != Unknown) { m_LoginResult = Ok;
QString mac = getFirstMacAddress(); m_EditionType = Unknown;
QString hashSrc = m_pLineEditEmail->text() + mac; m_pPushButtonLogin->setEnabled(true);
QString hashResult = hash(hashSrc); m_pPushButtonLogin->setDefault(true);
m_AppConfig.setUserToken(hashResult); m_pLineEditEmail->setEnabled(true);
m_AppConfig.setEditionType(m_EditionType); m_pLineEditPassword->setEnabled(true);
} }
}
m_pMainWindow->show(); bool LoginDialog::validEmailPassword()
} {
} if (m_pLineEditEmail->text().isEmpty() ||
m_pLineEditPassword->text().isEmpty()) {
delete m_pLoginAuth; QMessageBox::warning(
m_pLoginAuth = NULL; this,
m_LoginResult = Ok; "Warning",
m_EditionType = Unknown; tr("Please fill in your email and password."));
m_pPushButtonLogin->setEnabled(true); return false;
m_pPushButtonLogin->setDefault(true); }
}
return true;
bool LoginWindow::validEmailPassword() }
{
if (m_pLineEditEmail->text().isEmpty() || void LoginDialog::changeEvent(QEvent *e)
m_pLineEditPassword->text().isEmpty()) { {
QMessageBox::warning( QDialog::changeEvent(e);
this, switch (e->type()) {
"Warning", case QEvent::LanguageChange:
tr("Please fill in your email and password.")); retranslateUi(this);
return false; break;
} default:
break;
return true; }
} }
void LoginWindow::changeEvent(QEvent *e) void LoginDialog::closeEvent(QCloseEvent *event)
{ {
QMainWindow::changeEvent(e); event->accept();
switch (e->type()) { showNext();
case QEvent::LanguageChange: }
retranslateUi(this);
break; void LoginDialog::on_m_pPushButtonLogin_clicked()
default: {
break; if (validEmailPassword()) {
} if (m_pLoginAuth == NULL) {
} m_pLoginAuth = new LoginAuth();
void LoginWindow::closeEvent(QCloseEvent *event) m_pLoginAuth->setLoginDialog(this);
{ }
event->accept();
showNext(); m_pPushButtonLogin->setEnabled(false);
} m_pLineEditEmail->setEnabled(false);
m_pLineEditPassword->setEnabled(false);
void LoginWindow::on_m_pPushButtonLogin_clicked()
{ QString email = m_pLineEditEmail->text();
if (validEmailPassword()) { QString password = m_pLineEditPassword->text();
if (m_pLoginAuth == NULL) { m_pLoginAuth->setEmail(email);
m_pLoginAuth = new LoginAuth(); m_pLoginAuth->setPassword(password);
m_pLoginAuth->setLoginWindow(this);
} QThread* thread = new QThread;
connect(m_pLoginAuth, SIGNAL(finished()), this, SLOT(showNext()));
m_pPushButtonLogin->setEnabled(false); connect(m_pLoginAuth, SIGNAL(finished()), thread, SLOT(quit()));
connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
QString email = m_pLineEditEmail->text();
QString password = m_pLineEditPassword->text(); m_pLoginAuth->moveToThread(thread);
m_pLoginAuth->setEmail(email); thread->start();
m_pLoginAuth->setPassword(password);
QMetaObject::invokeMethod(m_pLoginAuth, "checkEditionType", Qt::QueuedConnection);
QThread* thread = new QThread; }
connect(m_pLoginAuth, SIGNAL(finished()), this, SLOT(showNext())); }
connect(m_pLoginAuth, SIGNAL(finished()), thread, SLOT(quit()));
connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); void LoginDialog::keyPressEvent(QKeyEvent* e) {
if(e->key() != Qt::Key_Escape)
m_pLoginAuth->moveToThread(thread); QDialog::keyPressEvent(e);
thread->start(); else {
close();
QMetaObject::invokeMethod(m_pLoginAuth, "checkUserType", Qt::QueuedConnection); }
} }
}
void LoginWindow::on_m_pPushButtonCancel_clicked()
{
showNext();
}

49
src/gui/main/src/LoginDialog.h Normal file
View File

@ -0,0 +1,49 @@
#ifndef LOGINDIALOG_H
#define LOGINDIALOG_H
#include "ui_LoginDialogBase.h"
#include <QDialog>
class MainWindow;
class SetupWizard;
class LoginAuth;
class AppConfig;
class LoginDialog : public QDialog, public Ui::LoginDialog {
Q_OBJECT
public:
LoginDialog(MainWindow* mainWindow,
SetupWizard* setupWizard,
bool wizardShouldRun,
QWidget *parent = 0);
~LoginDialog();
void setLoginResult(int result) { m_LoginResult = result; }
void setEditionType(int type) { m_EditionType = type; }
void setError(QString error) { m_Error = error; }
protected:
void changeEvent(QEvent *e);
void closeEvent(QCloseEvent *event);
void keyPressEvent(QKeyEvent *e);
private slots:
void on_m_pPushButtonLogin_clicked();
void showNext();
private:
bool validEmailPassword();
private:
MainWindow* m_pMainWindow;
SetupWizard* m_pSetupWizard;
bool m_WizardShouldRun;
LoginAuth* m_pLoginAuth;
int m_LoginResult;
int m_EditionType;
QString m_Error;
AppConfig& m_AppConfig;
};
#endif // LOGINDIALOG_H

67
src/gui/main/src/LoginWindow.h
View File

@ -1,67 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2015 Synergy Si Ltd.
*
* This package is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* found in the file COPYING that should have accompanied this file.
*
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LOGINWINDOW_H
#define LOGINWINDOW_H
#include <QMainWindow>
#include "ui_LoginWindowBase.h"
class MainWindow;
class SetupWizard;
class LoginAuth;
class AppConfig;
class LoginWindow : public QMainWindow, public Ui::LoginWindow
{
Q_OBJECT
public:
LoginWindow(MainWindow* mainWindow,
SetupWizard* setupWizard,
bool wizardShouldRun,
QWidget *parent = 0);
~LoginWindow();
void setLoginResult(int result) { m_LoginResult = result; }
void setEditionType(int type) { m_EditionType = type; }
void setError(QString error) { m_Error = error; }
protected:
void changeEvent(QEvent *e);
void closeEvent(QCloseEvent *event);
private slots:
void on_m_pPushButtonCancel_clicked();
void on_m_pPushButtonLogin_clicked();
void showNext();
private:
bool validEmailPassword();
private:
MainWindow* m_pMainWindow;
SetupWizard* m_pSetupWizard;
bool m_WizardShouldRun;
LoginAuth* m_pLoginAuth;
int m_LoginResult;
int m_EditionType;
QString m_Error;
AppConfig& m_AppConfig;
};
#endif // LOGINWINDOW_H

6
src/gui/main/src/main.cpp
View File

@ -23,7 +23,7 @@
#include "MainWindow.h" #include "MainWindow.h"
#include "AppConfig.h" #include "AppConfig.h"
#include "SetupWizard.h" #include "SetupWizard.h"
#include "LoginWindow.h" #include "LoginDialog.h"
#include "QUtility.h" #include "QUtility.h"
#include "LoginResult.h" #include "LoginResult.h"
@ -95,7 +95,7 @@ int main(int argc, char* argv[])
MainWindow mainWindow(settings, appConfig); MainWindow mainWindow(settings, appConfig);
SetupWizard setupWizard(mainWindow, true); SetupWizard setupWizard(mainWindow, true);
LoginWindow loginWindow( LoginDialog loginDialog(
&mainWindow, &mainWindow,
&setupWizard, &setupWizard,
appConfig.wizardShouldRun()); appConfig.wizardShouldRun());
@ -109,7 +109,7 @@ int main(int argc, char* argv[])
mainWindow.show(); mainWindow.show();
} }
else { else {
loginWindow.show(); loginDialog.show();
} }
return app.exec(); return app.exec();