Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

9 files changed, 81 insertions, 125 deletions

diff --git a/launcher/ui/setupwizard/BaseWizardPage.h b/launcher/ui/setupwizard/BaseWizardPage.h
index 72dbecfd..80cc6496 100644
--- a/launcher/ui/setupwizard/BaseWizardPage.h
+++ b/launcher/ui/setupwizard/BaseWizardPage.h
@@ -1,31 +1,21 @@
 #pragma once
 
-#include <QWizardPage>
 #include <QEvent>
+#include <QWizardPage>
 
-class BaseWizardPage : public QWizardPage
-{
-public:
-    explicit BaseWizardPage(QWidget *parent = Q_NULLPTR)
-        : QWizardPage(parent)
-    {
-    }
-    virtual ~BaseWizardPage() {};
+class BaseWizardPage : public QWizardPage {
+   public:
+    explicit BaseWizardPage(QWidget* parent = Q_NULLPTR) : QWizardPage(parent) {}
+    virtual ~BaseWizardPage(){};
 
-    virtual bool wantsRefreshButton()
-    {
-        return false;
-    }
-    virtual void refresh()
-    {
-    }
+    virtual bool wantsRefreshButton() { return false; }
+    virtual void refresh() {}
 
-protected:
+   protected:
     virtual void retranslate() = 0;
-    void changeEvent(QEvent * event) override
+    void changeEvent(QEvent* event) override
     {
-        if (event->type() == QEvent::LanguageChange)
-        {
+        if (event->type() == QEvent::LanguageChange) {
             retranslate();
         }
         QWizardPage::changeEvent(event);
diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp
index 2b70c47c..e2c44437 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/JavaWizardPage.cpp
@@ -1,29 +1,27 @@
 #include "JavaWizardPage.h"
 #include "Application.h"
 
-#include <QVBoxLayout>
+#include <QFileDialog>
 #include <QGroupBox>
-#include <QSpinBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QToolButton>
-#include <QFileDialog>
+#include <QVBoxLayout>
 
 #include <sys.h>
 
 #include "FileSystem.h"
+#include "JavaCommon.h"
 #include "java/JavaInstall.h"
 #include "java/JavaUtils.h"
-#include "JavaCommon.h"
 
-#include "ui/widgets/VersionSelectWidget.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/widgets/JavaSettingsWidget.h"
+#include "ui/widgets/VersionSelectWidget.h"
 
-
-JavaWizardPage::JavaWizardPage(QWidget *parent)
-    :BaseWizardPage(parent)
+JavaWizardPage::JavaWizardPage(QWidget* parent) : BaseWizardPage(parent)
 {
     setupUi();
 }
@@ -31,7 +29,7 @@ JavaWizardPage::JavaWizardPage(QWidget *parent)
 void JavaWizardPage::setupUi()
 {
     setObjectName(QStringLiteral("javaPage"));
-    QVBoxLayout * layout = new QVBoxLayout(this);
+    QVBoxLayout* layout = new QVBoxLayout(this);
 
     m_java_widget = new JavaSettingsWidget(this);
     layout->addWidget(m_java_widget);
@@ -59,30 +57,23 @@ bool JavaWizardPage::validatePage()
 {
     auto settings = APPLICATION->settings();
     auto result = m_java_widget->validate();
-    switch(result)
-    {
+    switch (result) {
         default:
-        case JavaSettingsWidget::ValidationStatus::Bad:
-        {
+        case JavaSettingsWidget::ValidationStatus::Bad: {
             return false;
         }
-        case JavaSettingsWidget::ValidationStatus::AllOK:
-        {
+        case JavaSettingsWidget::ValidationStatus::AllOK: {
             settings->set("JavaPath", m_java_widget->javaPath());
             return true;
         }
-        case JavaSettingsWidget::ValidationStatus::JavaBad:
-        {
+        case JavaSettingsWidget::ValidationStatus::JavaBad: {
             // Memory
             auto s = APPLICATION->settings();
             s->set("MinMemAlloc", m_java_widget->minHeapSize());
             s->set("MaxMemAlloc", m_java_widget->maxHeapSize());
-            if (m_java_widget->permGenEnabled())
-            {
+            if (m_java_widget->permGenEnabled()) {
                 s->set("PermGen", m_java_widget->permGenSize());
-            }
-            else
-            {
+            } else {
                 s->reset("PermGen");
             }
             return true;
@@ -93,7 +84,8 @@ bool JavaWizardPage::validatePage()
 void JavaWizardPage::retranslate()
 {
     setTitle(tr("Java"));
-    setSubTitle(tr("You do not have a working Java set up yet or it went missing.\n"
-        "Please select one of the following or browse for a Java executable."));
+    setSubTitle(
+        tr("You do not have a working Java set up yet or it went missing.\n"
+           "Please select one of the following or browse for a Java executable."));
     m_java_widget->retranslate();
 }
diff --git a/launcher/ui/setupwizard/JavaWizardPage.h b/launcher/ui/setupwizard/JavaWizardPage.h
index 0d749039..6c083dc9 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.h
+++ b/launcher/ui/setupwizard/JavaWizardPage.h
@@ -4,26 +4,22 @@
 
 class JavaSettingsWidget;
 
-class JavaWizardPage : public BaseWizardPage
-{
+class JavaWizardPage : public BaseWizardPage {
     Q_OBJECT
-public:
-    explicit JavaWizardPage(QWidget *parent = Q_NULLPTR);
+   public:
+    explicit JavaWizardPage(QWidget* parent = Q_NULLPTR);
 
-    virtual ~JavaWizardPage()
-    {
-    };
+    virtual ~JavaWizardPage(){};
 
     bool wantsRefreshButton() override;
     void refresh() override;
     void initializePage() override;
     bool validatePage() override;
 
-protected: /* methods */
+   protected: /* methods */
     void setupUi();
     void retranslate() override;
 
-private: /* data */
-    JavaSettingsWidget *m_java_widget = nullptr;
+   private: /* data */
+    JavaSettingsWidget* m_java_widget = nullptr;
 };
-
diff --git a/launcher/ui/setupwizard/LanguageWizardPage.cpp b/launcher/ui/setupwizard/LanguageWizardPage.cpp
index 6bd19b6f..09cdb807 100644
--- a/launcher/ui/setupwizard/LanguageWizardPage.cpp
+++ b/launcher/ui/setupwizard/LanguageWizardPage.cpp
@@ -2,25 +2,22 @@
 #include <Application.h>
 #include <translations/TranslationsModel.h>
 
-#include "ui/widgets/LanguageSelectionWidget.h"
-#include <QVBoxLayout>
 #include <BuildConfig.h>
+#include <QVBoxLayout>
+#include "ui/widgets/LanguageSelectionWidget.h"
 
-LanguageWizardPage::LanguageWizardPage(QWidget *parent)
-    : BaseWizardPage(parent)
+LanguageWizardPage::LanguageWizardPage(QWidget* parent) : BaseWizardPage(parent)
 {
     setObjectName(QStringLiteral("languagePage"));
     auto layout = new QVBoxLayout(this);
     mainWidget = new LanguageSelectionWidget(this);
-    layout->setContentsMargins(0,0,0,0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(mainWidget);
 
     retranslate();
 }
 
-LanguageWizardPage::~LanguageWizardPage()
-{
-}
+LanguageWizardPage::~LanguageWizardPage() {}
 
 bool LanguageWizardPage::wantsRefreshButton()
 {
diff --git a/launcher/ui/setupwizard/LanguageWizardPage.h b/launcher/ui/setupwizard/LanguageWizardPage.h
index 45a0e5c0..44a06239 100644
--- a/launcher/ui/setupwizard/LanguageWizardPage.h
+++ b/launcher/ui/setupwizard/LanguageWizardPage.h
@@ -4,11 +4,10 @@
 
 class LanguageSelectionWidget;
 
-class LanguageWizardPage : public BaseWizardPage
-{
+class LanguageWizardPage : public BaseWizardPage {
     Q_OBJECT
-public:
-    explicit LanguageWizardPage(QWidget *parent = Q_NULLPTR);
+   public:
+    explicit LanguageWizardPage(QWidget* parent = Q_NULLPTR);
 
     virtual ~LanguageWizardPage();
 
@@ -18,9 +17,9 @@ public:
 
     bool validatePage() override;
 
-protected:
+   protected:
     void retranslate() override;
 
-private:
-    LanguageSelectionWidget *mainWidget = nullptr;
+   private:
+    LanguageSelectionWidget* mainWidget = nullptr;
 };
diff --git a/launcher/ui/setupwizard/PasteWizardPage.cpp b/launcher/ui/setupwizard/PasteWizardPage.cpp
index 0f47da4b..777fd3a4 100644
--- a/launcher/ui/setupwizard/PasteWizardPage.cpp
+++ b/launcher/ui/setupwizard/PasteWizardPage.cpp
@@ -4,9 +4,7 @@
 #include "Application.h"
 #include "net/PasteUpload.h"
 
-PasteWizardPage::PasteWizardPage(QWidget *parent) :
-    BaseWizardPage(parent),
-    ui(new Ui::PasteWizardPage)
+PasteWizardPage::PasteWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::PasteWizardPage)
 {
     ui->setupUi(this);
 }
@@ -16,17 +14,14 @@ PasteWizardPage::~PasteWizardPage()
     delete ui;
 }
 
-void PasteWizardPage::initializePage()
-{
-}
+void PasteWizardPage::initializePage() {}
 
 bool PasteWizardPage::validatePage()
 {
     auto s = APPLICATION->settings();
     QString prevPasteURL = s->get("PastebinURL").toString();
     s->reset("PastebinURL");
-    if (ui->previousSettingsRadioButton->isChecked())
-    {
+    if (ui->previousSettingsRadioButton->isChecked()) {
         bool usingDefaultBase = prevPasteURL == PasteUpload::PasteTypes.at(PasteUpload::PasteType::NullPointer).defaultBase;
         s->set("PastebinType", PasteUpload::PasteType::NullPointer);
         if (!usingDefaultBase)
diff --git a/launcher/ui/setupwizard/PasteWizardPage.h b/launcher/ui/setupwizard/PasteWizardPage.h
index 513a14cb..dece81c4 100644
--- a/launcher/ui/setupwizard/PasteWizardPage.h
+++ b/launcher/ui/setupwizard/PasteWizardPage.h
@@ -8,20 +8,19 @@ namespace Ui {
 class PasteWizardPage;
 }
 
-class PasteWizardPage : public BaseWizardPage
-{
+class PasteWizardPage : public BaseWizardPage {
     Q_OBJECT
 
-public:
-    explicit PasteWizardPage(QWidget *parent = nullptr);
+   public:
+    explicit PasteWizardPage(QWidget* parent = nullptr);
     ~PasteWizardPage();
 
     void initializePage() override;
     bool validatePage() override;
     void retranslate() override;
 
-private:
-    Ui::PasteWizardPage *ui;
+   private:
+    Ui::PasteWizardPage* ui;
 };
 
-#endif // PASTEDEFAULTSCONFIRMATIONWIZARD_H
+#endif  // PASTEDEFAULTSCONFIRMATIONWIZARD_H
diff --git a/launcher/ui/setupwizard/SetupWizard.cpp b/launcher/ui/setupwizard/SetupWizard.cpp
index 0a47334f..4e5bd1dc 100644
--- a/launcher/ui/setupwizard/SetupWizard.cpp
+++ b/launcher/ui/setupwizard/SetupWizard.cpp
@@ -1,16 +1,16 @@
 #include "SetupWizard.h"
 
-#include "LanguageWizardPage.h"
 #include "JavaWizardPage.h"
+#include "LanguageWizardPage.h"
 
-#include "translations/TranslationsModel.h"
 #include <Application.h>
 #include <FileSystem.h>
+#include "translations/TranslationsModel.h"
 
-#include <QAbstractButton>
 #include <BuildConfig.h>
+#include <QAbstractButton>
 
-SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent)
+SetupWizard::SetupWizard(QWidget* parent) : QWizard(parent)
 {
     setObjectName(QStringLiteral("SetupWizard"));
     resize(620, 660);
@@ -33,17 +33,17 @@ void SetupWizard::retranslate()
     setWindowTitle(tr("%1 Quick Setup").arg(BuildConfig.LAUNCHER_DISPLAYNAME));
 }
 
-BaseWizardPage * SetupWizard::getBasePage(int id)
+BaseWizardPage* SetupWizard::getBasePage(int id)
 {
-    if(id == -1)
+    if (id == -1)
         return nullptr;
     auto pagePtr = page(id);
-    if(!pagePtr)
+    if (!pagePtr)
         return nullptr;
-    return dynamic_cast<BaseWizardPage *>(pagePtr);
+    return dynamic_cast<BaseWizardPage*>(pagePtr);
 }
 
-BaseWizardPage * SetupWizard::getCurrentBasePage()
+BaseWizardPage* SetupWizard::getCurrentBasePage()
 {
     return getBasePage(currentId());
 }
@@ -51,38 +51,29 @@ BaseWizardPage * SetupWizard::getCurrentBasePage()
 void SetupWizard::pageChanged(int id)
 {
     auto basePagePtr = getBasePage(id);
-    if(!basePagePtr)
-    {
+    if (!basePagePtr) {
         return;
     }
-    if(basePagePtr->wantsRefreshButton())
-    {
-        setButtonLayout({QWizard::CustomButton1, QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton});
+    if (basePagePtr->wantsRefreshButton()) {
+        setButtonLayout({ QWizard::CustomButton1, QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton });
         auto customButton = button(QWizard::CustomButton1);
-        connect(customButton, &QAbstractButton::clicked, [&](){
+        connect(customButton, &QAbstractButton::clicked, [&]() {
             auto basePagePtr = getCurrentBasePage();
-            if(basePagePtr)
-            {
+            if (basePagePtr) {
                 basePagePtr->refresh();
             }
         });
-    }
-    else
-    {
-        setButtonLayout({QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton});
+    } else {
+        setButtonLayout({ QWizard::Stretch, QWizard::BackButton, QWizard::NextButton, QWizard::FinishButton });
     }
 }
 
-
-void SetupWizard::changeEvent(QEvent *event)
+void SetupWizard::changeEvent(QEvent* event)
 {
-    if (event->type() == QEvent::LanguageChange)
-    {
+    if (event->type() == QEvent::LanguageChange) {
         retranslate();
     }
     QWizard::changeEvent(event);
 }
 
-SetupWizard::~SetupWizard()
-{
-}
+SetupWizard::~SetupWizard() {}
diff --git a/launcher/ui/setupwizard/SetupWizard.h b/launcher/ui/setupwizard/SetupWizard.h
index 9b8adb4d..c26c59fd 100644
--- a/launcher/ui/setupwizard/SetupWizard.h
+++ b/launcher/ui/setupwizard/SetupWizard.h
@@ -17,29 +17,26 @@
 
 #include <QWizard>
 
-namespace Ui
-{
+namespace Ui {
 class SetupWizard;
 }
 
 class BaseWizardPage;
 
-class SetupWizard : public QWizard
-{
+class SetupWizard : public QWizard {
     Q_OBJECT
 
-public: /* con/destructors */
-    explicit SetupWizard(QWidget *parent = 0);
+   public: /* con/destructors */
+    explicit SetupWizard(QWidget* parent = 0);
     virtual ~SetupWizard();
 
-    void changeEvent(QEvent * event) override;
-    BaseWizardPage *getBasePage(int id);
-    BaseWizardPage *getCurrentBasePage();
+    void changeEvent(QEvent* event) override;
+    BaseWizardPage* getBasePage(int id);
+    BaseWizardPage* getCurrentBasePage();
 
-private slots:
+   private slots:
     void pageChanged(int id);
 
-private: /* methods */
+   private: /* methods */
     void retranslate();
 };
-