diff --git a/src/gui/res/ActivationDialog.ui b/src/gui/res/ActivationDialog.ui
index fb700f91..d11a1a9f 100644
--- a/src/gui/res/ActivationDialog.ui
+++ b/src/gui/res/ActivationDialog.ui
@@ -7,7 +7,7 @@
0
0
440
- 314
+ 214
@@ -15,7 +15,7 @@
-
-
+
75
@@ -23,76 +23,7 @@
- &Account login
-
-
- true
-
-
-
- -
-
-
- QFormLayout::AllNonFixedFieldsGrow
-
-
- 20
-
-
- 10
-
-
-
-
-
- Email:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QLineEdit::Normal
-
-
-
- -
-
-
- Password:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QLineEdit::Password
-
-
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- &Serial key
+ Serial key
@@ -109,20 +40,33 @@
-
- false
+ true
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html>
+</style></head><body style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;">
+<p style="-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;"><br /></p></body></html>
false
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
index 40251019..2170ef86 100644
--- a/src/gui/src/ActivationDialog.cpp
+++ b/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();
+ QString serialKey = ui->m_pTextEditSerialKey->toPlainText();
- 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;
- }
-
- 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();
}
diff --git a/src/gui/src/ActivationDialog.h b/src/gui/src/ActivationDialog.h
index 6fb926cc..0f3328ac 100644
--- a/src/gui/src/ActivationDialog.h
+++ b/src/gui/src/ActivationDialog.h
@@ -27,10 +27,6 @@ protected:
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