From a29858c439e7612bf7139ebbfed1d2c86afccd57 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Wed, 21 Oct 2015 17:06:38 -0700
Subject: [PATCH] Add subscription section in activation page #4715

---
 src/gui/res/SetupWizardBase.ui | 58 +++++++++++++++++++++++++++++++++-
 src/gui/src/SetupWizard.cpp    | 13 ++++++++
 src/gui/src/SetupWizard.h      |  1 +
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/gui/res/SetupWizardBase.ui b/src/gui/res/SetupWizardBase.ui
index f6a4f40b..03e00510 100644
--- a/src/gui/res/SetupWizardBase.ui
+++ b/src/gui/res/SetupWizardBase.ui
@@ -128,7 +128,7 @@
     <item>
      <widget class="QRadioButton" name="m_pRadioButtonActivate">
       <property name="text">
-       <string>&amp;Activate now...</string>
+       <string>Log in</string>
       </property>
       <property name="checked">
        <bool>true</bool>
@@ -210,6 +210,62 @@
       </item>
      </layout>
     </item>
+    <item>
+     <spacer name="verticalSpacer_8">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Fixed</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>10</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="radioButton">
+      <property name="text">
+       <string>Subscription</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QFormLayout" name="formLayout_2">
+      <property name="horizontalSpacing">
+       <number>20</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>10</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Serial Key:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="m_pLineEditSerialKey">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>400</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
     <item>
      <spacer name="verticalSpacer_5">
       <property name="orientation">
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index 5bb400fb..29b3b9ce 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -60,6 +60,8 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
 
 	m_pLineEditEmail->setText(appConfig.activateEmail());
 
+	m_pLineEditSerialKey->setEnabled(false);
+
 }
 
 SetupWizard::~SetupWizard()
@@ -206,6 +208,7 @@ void SetupWizard::on_m_pRadioButtonSkip_toggled(bool checked)
 	if (checked) {
 		m_pLineEditEmail->setEnabled(false);
 		m_pLineEditPassword->setEnabled(false);
+		m_pLineEditSerialKey->setEnabled(false);
 	}
 }
 
@@ -214,5 +217,15 @@ void SetupWizard::on_m_pRadioButtonActivate_toggled(bool checked)
 	if (checked) {
 		m_pLineEditEmail->setEnabled(true);
 		m_pLineEditPassword->setEnabled(true);
+		m_pLineEditSerialKey->setEnabled(false);
+	}
+}
+
+void SetupWizard::on_radioButton_toggled(bool checked)
+{
+	if (checked) {
+		m_pLineEditEmail->setEnabled(false);
+		m_pLineEditPassword->setEnabled(false);
+		m_pLineEditSerialKey->setEnabled(true);
 	}
 }
diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h
index 1f379b69..7bdf57a1 100644
--- a/src/gui/src/SetupWizard.h
+++ b/src/gui/src/SetupWizard.h
@@ -47,6 +47,7 @@ private:
 	PluginWizardPage* m_pPluginPage;
 
 private slots:
+	void on_radioButton_toggled(bool checked);
 	void on_m_pRadioButtonActivate_toggled(bool checked);
 	void on_m_pRadioButtonSkip_toggled(bool checked);
 	void on_m_pComboLanguage_currentIndexChanged(int index);