CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: reformat

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2023-08-02 18:35:35 +02:00
parent ce2ca13815
commit 1d468ac35a
594 changed files with 16040 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
launcher/ui/setupwizard/BaseWizardPage.h
View File

@ -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);

40
launcher/ui/setupwizard/JavaWizardPage.cpp
View File

@ -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();
}

18
launcher/ui/setupwizard/JavaWizardPage.h
View File

@ -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;
};

13
launcher/ui/setupwizard/LanguageWizardPage.cpp
View File

@ -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()
{

13
launcher/ui/setupwizard/LanguageWizardPage.h
View File

@ -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;
};

11
launcher/ui/setupwizard/PasteWizardPage.cpp
View File

@ -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)

13
launcher/ui/setupwizard/PasteWizardPage.h
View File

@ -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

47
launcher/ui/setupwizard/SetupWizard.cpp
View File

@ -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() {}

21
launcher/ui/setupwizard/SetupWizard.h
View File

@ -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();
};