This repository has been archived by the owner. It is now read-only.

/synergy-stable-builds forked from symless/synergy-core

Permalink
Browse files

#5657 Removed password log in in activation window

  • Loading branch information...
Jerry (Xinyu Hou)
Jerry (Xinyu Hou) committed Oct 12, 2016
1 parent a6ff907 commit fc879323bc98e2452b9a9adf572524f5b893882e
Unified Split
Showing with 33 additions and 160 deletions.
  1. +19 −75 src/gui/res/ActivationDialog.ui
  2. +14 −81 src/gui/src/ActivationDialog.cpp
  3. +0 −4 src/gui/src/ActivationDialog.h
View
94 src/gui/res/ActivationDialog.ui
@@ -7,92 +7,23 @@
<x>0</x>
<y>0</y>
<width>440</width>
- <height>314</height>
+ <height>214</height>
</rect>
</property>
<property name="windowTitle">
<string>Activate Synergy</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QRadioButton" name="m_pRadioButtonActivate">
+ <widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
- <string>&amp;Account login</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
- </property>
- <property name="horizontalSpacing">
- <number>20</number>
- </property>
- <property name="verticalSpacing">
- <number>10</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>
- <property name="echoMode">
- <enum>QLineEdit::Normal</enum>
- </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="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QRadioButton" name="m_pRadioButtonSubscription">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>&amp;Serial key</string>
+ <string>Serial key</string>
</property>
</widget>
</item>
@@ -109,20 +40,33 @@
<item>
<widget class="QTextEdit" name="m_pTextEditSerialKey">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
</widget>
</item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
View
95 src/gui/src/ActivationDialog.cpp
@@ -20,26 +20,8 @@ ActivationDialog::ActivationDialog(QWidget* parent, AppConfig& appConfig) :
m_appConfig (&appConfig)
{
ui->setupUi(this);
-
- ui->m_pLineEditEmail->setText(appConfig.activateEmail());
- ui->m_pTextEditSerialKey->setText(appConfig.serialKey());
-
- if (!appConfig.serialKey().isEmpty()) {
- ui->m_pRadioButtonActivate->setAutoExclusive(false);
- ui->m_pRadioButtonSubscription->setAutoExclusive(false);
- ui->m_pRadioButtonActivate->setChecked(false);
- ui->m_pRadioButtonSubscription->setChecked(true);
- ui->m_pRadioButtonActivate->setAutoExclusive(true);
- ui->m_pRadioButtonSubscription->setAutoExclusive(true);
- ui->m_pTextEditSerialKey->setFocus();
- ui->m_pTextEditSerialKey->moveCursor(QTextCursor::End);
- } else {
- if (ui->m_pLineEditEmail->text().isEmpty()) {
- ui->m_pLineEditEmail->setFocus();
- } else {
- ui->m_pLineEditPassword->setFocus();
- }
- }
+ ui->m_pTextEditSerialKey->setFocus();
+ ui->m_pTextEditSerialKey->moveCursor(QTextCursor::End);
}
ActivationDialog::~ActivationDialog()
@@ -74,30 +56,6 @@ void ActivationDialog::reject()
}
}
-void ActivationDialog::on_m_pRadioButtonSubscription_toggled(bool checked)
-{
- if (checked) {
- ui->m_pLineEditEmail->setEnabled(false);
- ui->m_pLineEditPassword->setEnabled(false);
- ui->m_pTextEditSerialKey->setEnabled(true);
- ui->m_pTextEditSerialKey->setFocus();
- }
-}
-
-void ActivationDialog::on_m_pRadioButtonActivate_toggled(bool checked)
-{
- if (checked) {
- ui->m_pLineEditEmail->setEnabled(true);
- ui->m_pLineEditPassword->setEnabled(true);
- ui->m_pTextEditSerialKey->setEnabled(false);
- if (ui->m_pLineEditEmail->text().isEmpty()) {
- ui->m_pLineEditEmail->setFocus();
- } else {
- ui->m_pLineEditPassword->setFocus();
- }
- }
-}
-
void ActivationDialog::accept()
{
QMessageBox message;
@@ -108,45 +66,20 @@ void ActivationDialog::accept()
m_appConfig->saveSettings();
try {
- if (ui->m_pRadioButtonActivate->isChecked()) {
- WebClient webClient;
- QString email = ui->m_pLineEditEmail->text();
- QString password = ui->m_pLineEditPassword->text();
-
- if (!webClient.setEmail (email, error)) {
- message.critical (this, "Invalid Email Address", tr("%1").arg(error));
- return;
- }
- else if (!webClient.setPassword (password, error)) {
- message.critical (this, "Invalid Password", tr("%1").arg(error));
- return;
- }
- else if (!webClient.getEdition (edition, error)) {
- FailedLoginDialog failedLoginDialog (this, error);
- failedLoginDialog.exec();
- return;
- }
+ QString serialKey = ui->m_pTextEditSerialKey->toPlainText();
- m_appConfig->setActivateEmail (email);
- m_appConfig->clearSerialKey();
- ui->m_pTextEditSerialKey->clear();
- notifyActivation ("login:" + m_appConfig->activateEmail());
+ if (!m_appConfig->setSerialKey (serialKey, error)) {
+ message.critical(this, "Invalid Serial Key", tr("%1").arg(error));
+ return;
}
- else {
- QString serialKey = ui->m_pTextEditSerialKey->toPlainText();
- if (!m_appConfig->setSerialKey (serialKey, error)) {
- message.critical (this, "Invalid Serial Key", tr("%1").arg(error));
- return;
- }
-
- SubscriptionManager subscriptionManager (this, *m_appConfig, edition);
- if (!subscriptionManager.activateSerial (serialKey)) {
- return;
- }
- m_appConfig->setActivateEmail("");
- notifyActivation ("serial:" + m_appConfig->serialKey());
+ SubscriptionManager subscriptionManager (this, *m_appConfig, edition);
+ if (!subscriptionManager.activateSerial (serialKey)) {
+ return;
}
+ m_appConfig->setActivateEmail("");
+ notifyActivation("serial:" + m_appConfig->serialKey());
+
}
catch (std::exception& e) {
message.critical (this, "Unknown Error",
@@ -159,7 +92,7 @@ void ActivationDialog::accept()
m_appConfig->setEdition(edition);
m_appConfig->saveSettings();
- message.information (this, "Activated!",
- tr("Thanks for activating %1!").arg (getEditionName (edition)));
+ message.information(this, "Activated!",
+ tr("Thanks for activating %1!").arg (getEditionName (edition)));
QDialog::accept();
}
View
4 src/gui/src/ActivationDialog.h
@@ -27,10 +27,6 @@ public slots:
private:
Ui::ActivationDialog *ui;
AppConfig* m_appConfig;
-
-private slots:
- void on_m_pRadioButtonSubscription_toggled(bool checked);
- void on_m_pRadioButtonActivate_toggled(bool checked);
};
#endif // ACTIVATIONDIALOG_H

0 comments on commit fc87932

Please sign in to comment.