diff --git a/src/gui/res/SetupWizardBase.ui b/src/gui/res/SetupWizardBase.ui index 7508560b..24dea659 100644 --- a/src/gui/res/SetupWizardBase.ui +++ b/src/gui/res/SetupWizardBase.ui @@ -229,45 +229,12 @@ - Subscription + Serial key - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 20 - - - 10 - - - - - Serial Key: - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - + diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp index e6ada683..f5a40b6c 100644 --- a/src/gui/src/SetupWizard.cpp +++ b/src/gui/src/SetupWizard.cpp @@ -62,9 +62,9 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) : AppConfig& appConfig = m_MainWindow.appConfig(); m_pLineEditEmail->setText(appConfig.activateEmail()); - m_pLineEditSerialKey->setText(appConfig.serialKey()); + m_pTextEditSerialKey->setText(appConfig.serialKey()); - m_pLineEditSerialKey->setEnabled(false); + m_pTextEditSerialKey->setEnabled(false); } @@ -120,7 +120,7 @@ bool SetupWizard::validateCurrentPage() } } else if (m_pRadioButtonSubscription->isChecked()) { - if (m_pLineEditSerialKey->text().isEmpty()) { + if (m_pTextEditSerialKey->toPlainText().isEmpty()) { message.setText(tr("Please enter your subscription serial key.")); message.exec(); return false; @@ -128,7 +128,7 @@ bool SetupWizard::validateCurrentPage() else { // create subscription file in profile directory SubscriptionManager subscriptionManager(this, m_MainWindow.appConfig(), m_Edition); - if (!subscriptionManager.activateSerial(m_pLineEditSerialKey->text())) { + if (!subscriptionManager.activateSerial(m_pTextEditSerialKey->toPlainText())) { return false; } @@ -206,9 +206,9 @@ void SetupWizard::accept() if (m_pRadioButtonSubscription->isChecked()) { - appConfig.setSerialKey(m_pLineEditSerialKey->text()); + appConfig.setSerialKey(m_pTextEditSerialKey->toPlainText()); - notifyActivation("serial:" + m_pLineEditSerialKey->text()); + notifyActivation("serial:" + m_pTextEditSerialKey->toPlainText()); } if (m_pRadioButtonSkip->isChecked()) @@ -274,7 +274,7 @@ void SetupWizard::on_m_pRadioButtonSkip_toggled(bool checked) if (checked) { m_pLineEditEmail->setEnabled(false); m_pLineEditPassword->setEnabled(false); - m_pLineEditSerialKey->setEnabled(false); + m_pTextEditSerialKey->setEnabled(false); } } @@ -283,7 +283,7 @@ void SetupWizard::on_m_pRadioButtonActivate_toggled(bool checked) if (checked) { m_pLineEditEmail->setEnabled(true); m_pLineEditPassword->setEnabled(true); - m_pLineEditSerialKey->setEnabled(false); + m_pTextEditSerialKey->setEnabled(false); } } @@ -292,6 +292,6 @@ void SetupWizard::on_m_pRadioButtonSubscription_toggled(bool checked) if (checked) { m_pLineEditEmail->setEnabled(false); m_pLineEditPassword->setEnabled(false); - m_pLineEditSerialKey->setEnabled(true); + m_pTextEditSerialKey->setEnabled(true); } }