NOISSUE revamp the MSA login dialog

It now has a more sensible UI/UX:
- Added a QR code you can scan on your phone to complete the logn flow
- Inverted the progress bar to show that it is a timeout
- Redone the text label so that it does not break the layout when it has multiple lines

Also started working on redoing the accounts/profiles/skins/capes management in general

Author: peterix

CMakeLists.txt

@@ -255,6 +255,7 @@ add_subdirectory(libraries/hoedown) # markdown parser
 add_subdirectory(libraries/launcher) # java based launcher part for Minecraft
 add_subdirectory(libraries/javacheck) # java compatibility checker
 add_subdirectory(libraries/xz-embedded) # xz compression
+add_subdirectory(libraries/qrcode) # library for generating QR codes
 add_subdirectory(libraries/quazip) # zip manipulation library
 add_subdirectory(libraries/rainbow) # Qt extension for colors
 add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader

COPYING.md

@@ -315,6 +315,30 @@ Portions are licensed under MS-PL:
     ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
 
+# qt-qrcodegenerator
+
+    MIT License
+
+    Copyright (c) 2023 Alex Spataru
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
 # tomlc99
 
     MIT License

launcher/CMakeLists.txt

@@ -744,6 +744,8 @@ SET(LAUNCHER_SOURCES
     # GUI - dialogs
     ui/dialogs/AboutDialog.cpp
     ui/dialogs/AboutDialog.h
+    ui/dialogs/AccountsDialog.cpp
+    ui/dialogs/AccountsDialog.h
     ui/dialogs/ProfileSelectDialog.cpp
     ui/dialogs/ProfileSelectDialog.h
     ui/dialogs/ProfileSetupDialog.cpp
@@ -817,6 +819,8 @@ SET(LAUNCHER_SOURCES
     ui/widgets/ProgressWidget.cpp
     ui/widgets/WideBar.h
     ui/widgets/WideBar.cpp
+    ui/widgets/WrapLabel.h
+    ui/widgets/WrapLabel.cpp
 
     # GUI - instance group view
     ui/instanceview/InstanceProxyModel.cpp
@@ -833,50 +837,54 @@ SET(LAUNCHER_SOURCES
 )
 
 qt5_wrap_ui(LAUNCHER_UI
+    ui/dialogs/AboutDialog.ui
+    ui/dialogs/AccountsDialog.ui
+    ui/dialogs/CopyInstanceDialog.ui
+    ui/dialogs/CreateShortcutDialog.ui
+    ui/dialogs/ExportInstanceDialog.ui
+    ui/dialogs/IconPickerDialog.ui
+    ui/dialogs/MSALoginDialog.ui
+    ui/dialogs/ModrinthExportDialog.ui
+    ui/dialogs/NewComponentDialog.ui
+    ui/dialogs/NewInstanceDialog.ui
+    ui/dialogs/NotificationDialog.ui
+    ui/dialogs/ProfileSelectDialog.ui
+    ui/dialogs/ProfileSetupDialog.ui
+    ui/dialogs/ProgressDialog.ui
+    ui/dialogs/SkinUploadDialog.ui
+    ui/dialogs/UpdateDialog.ui
     ui/pages/global/AccountListPage.ui
+    ui/pages/global/ExternalToolsPage.ui
     ui/pages/global/JavaPage.ui
     ui/pages/global/LauncherPage.ui
+    ui/pages/global/MinecraftPage.ui
     ui/pages/global/PasteEEPage.ui
     ui/pages/global/ProxyPage.ui
-    ui/pages/global/MinecraftPage.ui
-    ui/pages/global/ExternalToolsPage.ui
+    ui/pages/instance/GameOptionsPage.ui
+    ui/pages/instance/InstanceSettingsPage.ui
+    ui/pages/instance/LegacyUpgradePage.ui
+    ui/pages/instance/LogPage.ui
     ui/pages/instance/ModFolderPage.ui
     ui/pages/instance/NotesPage.ui
-    ui/pages/instance/LogPage.ui
-    ui/pages/instance/ServersPage.ui
-    ui/pages/instance/GameOptionsPage.ui
     ui/pages/instance/OtherLogsPage.ui
-    ui/pages/instance/InstanceSettingsPage.ui
+    ui/pages/instance/ScreenshotsPage.ui
+    ui/pages/instance/ServersPage.ui
     ui/pages/instance/VersionPage.ui
     ui/pages/instance/WorldListPage.ui
-    ui/pages/instance/LegacyUpgradePage.ui
-    ui/pages/instance/ScreenshotsPage.ui
+    ui/pages/modplatform/ImportPage.ui
+    ui/pages/modplatform/VanillaPage.ui
     ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui
     ui/pages/modplatform/atlauncher/AtlPage.ui
-    ui/pages/modplatform/VanillaPage.ui
-    ui/pages/modplatform/legacy_ftb/Page.ui
     ui/pages/modplatform/import_ftb/FTBAPage.ui
-    ui/pages/modplatform/ImportPage.ui
+    ui/pages/modplatform/legacy_ftb/Page.ui
     ui/pages/modplatform/modrinth/ModrinthPage.ui
     ui/pages/modplatform/technic/TechnicPage.ui
-    ui/widgets/InstanceCardWidget.ui
     ui/widgets/CustomCommands.ui
+    ui/widgets/CustomCommands.ui
+    ui/widgets/InstanceCardWidget.ui
+    ui/widgets/InstanceCardWidget.ui
+    ui/widgets/MCModInfoFrame.ui
     ui/widgets/MCModInfoFrame.ui
-    ui/dialogs/CopyInstanceDialog.ui
-    ui/dialogs/ProfileSetupDialog.ui
-    ui/dialogs/ProgressDialog.ui
-    ui/dialogs/NewInstanceDialog.ui
-    ui/dialogs/NotificationDialog.ui
-    ui/dialogs/UpdateDialog.ui
-    ui/dialogs/NewComponentDialog.ui
-    ui/dialogs/ProfileSelectDialog.ui
-    ui/dialogs/SkinUploadDialog.ui
-    ui/dialogs/ExportInstanceDialog.ui
-    ui/dialogs/IconPickerDialog.ui
-    ui/dialogs/MSALoginDialog.ui
-    ui/dialogs/AboutDialog.ui
-    ui/dialogs/CreateShortcutDialog.ui
-    ui/dialogs/ModrinthExportDialog.ui
 )
 
 qt5_add_resources(LAUNCHER_RESOURCES
@@ -910,6 +918,7 @@ target_link_libraries(Launcher_logic
     tomlc99
     BuildConfig
     Katabasis
+    qrcode
 )
 target_link_libraries(Launcher_logic
     Qt5::Core

launcher/ui/dialogs/AccountsDialog.cpp

@@ -0,0 +1,36 @@
+/* Copyright 2024 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
+
+#include "AccountsDialog.h"
+#include "ui_AccountsDialog.h"
+#include <QIcon>
+#include <QMenu>
+#include "Application.h"
+#include "BuildConfig.h"
+#include "CustomMessageBox.h"
+#include "ProgressDialog.h"
+#include <minecraft/services/SkinDelete.h>
+#include "SkinUploadDialog.h"
+#include "MSALoginDialog.h"
+
+AccountsDialog::AccountsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AccountsDialog)
+{
+    ui->setupUi(this);
+    auto icon = APPLICATION->getThemedIcon("accounts");
+    if(icon.isNull())
+    {
+        icon = APPLICATION->getThemedIcon("noaccount");
+    }
+    setWindowIcon(icon);
+    setWindowTitle(tr("Minecraft Accounts"));
+
+}
+
+AccountsDialog::~AccountsDialog()
+{
+    delete ui;
+}

launcher/ui/dialogs/AccountsDialog.h

@@ -0,0 +1,30 @@
+/* Copyright 2024 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
+#pragma once
+
+#include <QDialog>
+#include "minecraft/auth/AccountList.h"
+
+class QMenu;
+
+namespace Ui
+{
+class AccountsDialog;
+}
+
+class AccountsDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AccountsDialog(QWidget *parent = 0);
+    virtual ~AccountsDialog();
+
+private:
+    Ui::AccountsDialog *ui;
+    shared_qobject_ptr<AccountList> m_accounts;
+};