feat(login): add offline and ely.by accounts in setup wizard (#72)

Signed-off-by: so5iso4ka <so5iso4ka@icloud.com>

Author: so5iso4ka

launcher/ui/setupwizard/LoginWizardPage.cpp

@@ -1,6 +1,8 @@
 #include "LoginWizardPage.h"
 #include "minecraft/auth/AccountList.h"
+#include "ui/dialogs/ElybyLoginDialog.h"
 #include "ui/dialogs/MSALoginDialog.h"
+#include "ui/dialogs/OfflineLoginDialog.h"
 #include "ui_LoginWizardPage.h"
 
 #include "Application.h"
@@ -27,7 +29,7 @@ void LoginWizardPage::retranslate()
     ui->retranslateUi(this);
 }
 
-void LoginWizardPage::on_pushButton_clicked()
+void LoginWizardPage::on_addMicrosoftButton_clicked()
 {
     wizard()->hide();
     auto account = MSALoginDialog::newAccount(nullptr);
@@ -42,3 +44,35 @@ void LoginWizardPage::on_pushButton_clicked()
         }
     }
 }
+
+void LoginWizardPage::on_addElybyButton_clicked()
+{
+    wizard()->hide();
+    auto account = ElybyLoginDialog::newAccount(nullptr, "Please enter your username and password of Elyby account.");
+    wizard()->show();
+    if (account) {
+        APPLICATION->accounts()->addAccount(account);
+        APPLICATION->accounts()->setDefaultAccount(account);
+        if (wizard()->currentId() == wizard()->pageIds().last()) {
+            wizard()->accept();
+        } else {
+            wizard()->next();
+        }
+    }
+}
+
+void LoginWizardPage::on_addOfflineButton_clicked()
+{
+    wizard()->hide();
+    auto account = OfflineLoginDialog::newAccount(nullptr, "Please enter your desired username to add your offline account.");
+    wizard()->show();
+    if (account) {
+        APPLICATION->accounts()->addAccount(account);
+        APPLICATION->accounts()->setDefaultAccount(account);
+        if (wizard()->currentId() == wizard()->pageIds().last()) {
+            wizard()->accept();
+        } else {
+            wizard()->next();
+        }
+    }
+}

launcher/ui/setupwizard/LoginWizardPage.h

@@ -16,8 +16,11 @@ class LoginWizardPage : public BaseWizardPage {
     void initializePage() override;
     bool validatePage() override;
     void retranslate() override;
+
    private slots:
-    void on_pushButton_clicked();
+    void on_addMicrosoftButton_clicked();
+    void on_addElybyButton_clicked();
+    void on_addOfflineButton_clicked();
 
    private:
     Ui::LoginWizardPage* ui;

launcher/ui/setupwizard/LoginWizardPage.ui

@@ -17,10 +17,12 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Add Microsoft account&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Add
+       account&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+      </string>
      </property>
      <property name="textFormat">
-      <enum>Qt::RichText</enum>
+      <enum>Qt::TextFormat::RichText</enum>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -30,7 +32,8 @@
    <item>
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>In order to play Minecraft, you must have at least one Microsoft account logged in. Do you want to log in now?</string>
+      <string>In order to play Minecraft, you must have at least one account logged in. Do you want to log in now?
+      </string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -40,21 +43,35 @@
    <item>
     <widget class="Line" name="line">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QPushButton" name="pushButton">
+    <widget class="QPushButton" name="addMicrosoftButton">
      <property name="text">
       <string>Add Microsoft account</string>
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QPushButton" name="addElybyButton">
+     <property name="text">
+      <string>Add Ely.by account</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="addOfflineButton">
+     <property name="text">
+      <string>Add Offline account</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -68,7 +85,4 @@
  </widget>
  <resources/>
  <connections/>
- <buttongroups>
-  <buttongroup name="buttonGroup"/>
- </buttongroups>
 </ui>