debauchee/barrier
1
1
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2024-12-26 20:53:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "changed login window to dialog #4168"

Browse Source 
This reverts commit d1c1d79453.
This commit is contained in:
XinyuHou 2015-02-05 11:44:04 +00:00
parent 52005f0905
commit c81fa7db52
12 changed files with 439 additions and 411 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/SetupWizardBase.ui \
res/AddClientDialogBase.ui \
res/LoginDialogBase.ui
res/LoginWindowBase.ui
SOURCES += src/main.cpp \
src/MainWindow.cpp \
src/AboutDialog.cpp \
@ -52,8 +52,8 @@ SOURCES += src/main.cpp \
src/DataDownloader.cpp \
src/AddClientDialog.cpp \
src/CommandProcess.cpp \
src/LoginAuth.cpp \
src/LoginDialog.cpp
src/LoginWindow.cpp \
src/LoginAuth.cpp
HEADERS += src/MainWindow.h \
src/AboutDialog.h \
src/ServerConfig.h \
@ -90,10 +90,10 @@ HEADERS += src/MainWindow.h \
src/DataDownloader.h \
src/AddClientDialog.h \
src/CommandProcess.h \
src/LoginWindow.h \
src/LoginAuth.h \
src/EditionType.h \
src/LoginResult.h \
src/LoginDialog.h
src/LoginResult.h
RESOURCES += res/Synergy.qrc
RC_FILE = res/win/Synergy.rc
macx {

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

@ -1,167 +0,0 @@
<?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 Normal file
View File

@ -0,0 +1,22 @@
#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 Normal file
View File

@ -0,0 +1,149 @@
<?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: 2.2 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

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

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

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

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

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

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

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

@ -1,49 +0,0 @@
#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

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

@ -1,4 +1,22 @@
#include "LoginDialog.h"
/*
* 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/>.
*/
#include "LoginWindow.h"
#include "ui_LoginWindowBase.h"
#include "MainWindow.h"
#include "SetupWizard.h"
@ -10,17 +28,13 @@
#include <QMessageBox>
#include <QCloseEvent>
#include <QThread>
#include <QDesktopServices>
#include <QUrl>
static const char registerUrl[] = "http://synergy-project.org";
LoginDialog::LoginDialog(
LoginWindow::LoginWindow(
MainWindow* mainWindow,
SetupWizard* setupWizard,
bool wizardShouldRun,
QWidget *parent) :
QDialog(parent),
QMainWindow(parent),
m_pMainWindow(mainWindow),
m_pSetupWizard(setupWizard),
m_WizardShouldRun(wizardShouldRun),
@ -30,18 +44,18 @@ LoginDialog::LoginDialog(
m_AppConfig(m_pMainWindow->appConfig())
{
setupUi(this);
setFixedSize(size());
m_pLineEditEmail->setText(m_AppConfig.userEmail());
}
LoginDialog::~LoginDialog()
LoginWindow::~LoginWindow()
{
if (m_pLoginAuth != NULL) {
delete m_pLoginAuth;
}
}
void LoginDialog::showNext()
void LoginWindow::showNext()
{
if (m_LoginResult == ExceptionError) {
QMessageBox::critical(
@ -52,9 +66,9 @@ void LoginDialog::showNext()
"following details.\n\n%1").arg(m_Error));
}
else if (m_LoginResult == InvalidEmailPassword) {
QMessageBox::warning(
QMessageBox::critical(
this,
tr("Warning"),
tr("Error"),
tr("Login failed, invalid email or password."));
}
else if (m_LoginResult == Error) {
@ -84,8 +98,8 @@ void LoginDialog::showNext()
QString mac = getFirstMacAddress();
QString hashSrc = m_pLineEditEmail->text() + mac;
QString hashResult = hash(hashSrc);
//m_AppConfig.setUserToken(hashResult);
//m_AppConfig.setEditionType(m_EditionType);
m_AppConfig.setUserToken(hashResult);
m_AppConfig.setEditionType(m_EditionType);
}
}
m_pMainWindow->show();
@ -98,11 +112,9 @@ void LoginDialog::showNext()
m_EditionType = Unknown;
m_pPushButtonLogin->setEnabled(true);
m_pPushButtonLogin->setDefault(true);
m_pLineEditEmail->setEnabled(true);
m_pLineEditPassword->setEnabled(true);
}
bool LoginDialog::validEmailPassword()
bool LoginWindow::validEmailPassword()
{
if (m_pLineEditEmail->text().isEmpty() ||
m_pLineEditPassword->text().isEmpty()) {
@ -116,9 +128,9 @@ bool LoginDialog::validEmailPassword()
return true;
}
void LoginDialog::changeEvent(QEvent *e)
void LoginWindow::changeEvent(QEvent *e)
{
QDialog::changeEvent(e);
QMainWindow::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
retranslateUi(this);
@ -127,24 +139,21 @@ void LoginDialog::changeEvent(QEvent *e)
break;
}
}
void LoginDialog::closeEvent(QCloseEvent *event)
void LoginWindow::closeEvent(QCloseEvent *event)
{
event->accept();
showNext();
}
void LoginDialog::on_m_pPushButtonLogin_clicked()
void LoginWindow::on_m_pPushButtonLogin_clicked()
{
if (validEmailPassword()) {
if (m_pLoginAuth == NULL) {
m_pLoginAuth = new LoginAuth();
m_pLoginAuth->setLoginDialog(this);
m_pLoginAuth->setLoginWindow(this);
}
m_pPushButtonLogin->setEnabled(false);
m_pLineEditEmail->setEnabled(false);
m_pLineEditPassword->setEnabled(false);
QString email = m_pLineEditEmail->text();
QString password = m_pLineEditPassword->text();
@ -159,14 +168,11 @@ void LoginDialog::on_m_pPushButtonLogin_clicked()
m_pLoginAuth->moveToThread(thread);
thread->start();
QMetaObject::invokeMethod(m_pLoginAuth, "checkEditionType", Qt::QueuedConnection);
QMetaObject::invokeMethod(m_pLoginAuth, "checkUserType", Qt::QueuedConnection);
}
}
void LoginDialog::keyPressEvent(QKeyEvent* e) {
if(e->key() != Qt::Key_Escape)
QDialog::keyPressEvent(e);
else {
close();
}
void LoginWindow::on_m_pPushButtonCancel_clicked()
{
showNext();
}

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

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