From d4b522b6cb5281df02da54cd9e0f6445770e7ec7 Mon Sep 17 00:00:00 2001
From: bexnoss <82064510+bexnoss@users.noreply.github.com>
Date: Wed, 12 Jan 2022 10:36:26 +0100
Subject: Add offline mode UI

---
 launcher/ui/pages/global/AccountListPage.cpp | 17 +++++++++++++++++
 launcher/ui/pages/global/AccountListPage.h   |  1 +
 launcher/ui/pages/global/AccountListPage.ui  |  6 ++++++
 3 files changed, 24 insertions(+)

(limited to 'launcher/ui/pages/global')

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index b8da6c75..b9aa7628 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -24,6 +24,7 @@
 #include "net/NetJob.h"
 
 #include "ui/dialogs/ProgressDialog.h"
+#include "ui/dialogs/OfflineLoginDialog.h"
 #include "ui/dialogs/LoginDialog.h"
 #include "ui/dialogs/MSALoginDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
@@ -153,6 +154,22 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
     }
 }
 
+void AccountListPage::on_actionAddOffline_triggered()
+{
+    MinecraftAccountPtr account = OfflineLoginDialog::newAccount(
+        this,
+        tr("Please enter your desired username to add your offline account.")
+    );
+
+    if (account)
+    {
+        m_accounts->addAccount(account);
+        if (m_accounts->count() == 1) {
+            m_accounts->setDefaultAccount(account);
+        }
+    }
+}
+
 void AccountListPage::on_actionRemove_triggered()
 {
     QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h
index 1c65e708..841c3fd2 100644
--- a/launcher/ui/pages/global/AccountListPage.h
+++ b/launcher/ui/pages/global/AccountListPage.h
@@ -62,6 +62,7 @@ public:
 public slots:
     void on_actionAddMojang_triggered();
     void on_actionAddMicrosoft_triggered();
+    void on_actionAddOffline_triggered();
     void on_actionRemove_triggered();
     void on_actionRefresh_triggered();
     void on_actionSetDefault_triggered();
diff --git a/launcher/ui/pages/global/AccountListPage.ui b/launcher/ui/pages/global/AccountListPage.ui
index 29738c02..d21a92e2 100644
--- a/launcher/ui/pages/global/AccountListPage.ui
+++ b/launcher/ui/pages/global/AccountListPage.ui
@@ -54,6 +54,7 @@
    </attribute>
    <addaction name="actionAddMicrosoft"/>
    <addaction name="actionAddMojang"/>
+   <addaction name="actionAddOffline"/>
    <addaction name="actionRefresh"/>
    <addaction name="actionRemove"/>
    <addaction name="actionSetDefault"/>
@@ -103,6 +104,11 @@
     <string>Add Microsoft</string>
    </property>
   </action>
+  <action name="actionAddOffline">
+   <property name="text">
+    <string>Add Offline</string>
+   </property>
+  </action>
   <action name="actionRefresh">
    <property name="text">
     <string>Refresh</string>
-- 
cgit 


From 395e2655648dbb80d089077e6a6b2530f4876c63 Mon Sep 17 00:00:00 2001
From: bexnoss <82064510+bexnoss@users.noreply.github.com>
Date: Fri, 14 Jan 2022 00:01:05 +0100
Subject: Add offline mode disclaimer

---
 launcher/ui/pages/global/AccountListPage.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'launcher/ui/pages/global')

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index b9aa7628..1c27d5b7 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -158,7 +158,13 @@ void AccountListPage::on_actionAddOffline_triggered()
 {
     MinecraftAccountPtr account = OfflineLoginDialog::newAccount(
         this,
-        tr("Please enter your desired username to add your offline account.")
+        tr("Please enter your desired username to add your offline account. <br>"
+           "<br>"
+           "It is required by Mojang that you own Minecraft BEFORE you may use offline mode. <br>"
+           "The PolyMC organization denounces piracy and takes NO LIABILITY WHATSOEVER <br>"
+           "for any illegal activity that may occur in usage of the offline mode feature. <br></b>"
+           "<br>"
+           "By continuing you promise that you own a Minecraft account.")
     );
 
     if (account)
-- 
cgit 


From cdaa397dcffb92ae6a9c659047a87d49286dee4f Mon Sep 17 00:00:00 2001
From: bexnoss <82064510+bexnoss@users.noreply.github.com>
Date: Fri, 14 Jan 2022 14:19:31 +0100
Subject: Reword offline mode disclaimer

---
 launcher/ui/pages/global/AccountListPage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'launcher/ui/pages/global')

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 1c27d5b7..ad88812a 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -161,8 +161,8 @@ void AccountListPage::on_actionAddOffline_triggered()
         tr("Please enter your desired username to add your offline account. <br>"
            "<br>"
            "It is required by Mojang that you own Minecraft BEFORE you may use offline mode. <br>"
-           "The PolyMC organization denounces piracy and takes NO LIABILITY WHATSOEVER <br>"
-           "for any illegal activity that may occur in usage of the offline mode feature. <br></b>"
+           "The PolyMC developers denounce piracy and take NO LIABILITY WHATSOEVER for <br>"
+           "any illegal activity that may occur in usage of the offline mode feature. <br>"
            "<br>"
            "By continuing you promise that you own a Minecraft account.")
     );
-- 
cgit