aboutsummaryrefslogtreecommitdiff
path: root/launcher/pages/global
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/pages/global')
-rw-r--r--launcher/pages/global/AccountListPage.cpp41
-rw-r--r--launcher/pages/global/AccountListPage.h8
-rw-r--r--launcher/pages/global/CustomCommandsPage.cpp4
-rw-r--r--launcher/pages/global/CustomCommandsPage.h4
-rw-r--r--launcher/pages/global/ExternalToolsPage.cpp18
-rw-r--r--launcher/pages/global/ExternalToolsPage.h6
-rw-r--r--launcher/pages/global/JavaPage.cpp8
-rw-r--r--launcher/pages/global/JavaPage.h4
-rw-r--r--launcher/pages/global/LanguagePage.cpp2
-rw-r--r--launcher/pages/global/LanguagePage.h4
-rw-r--r--launcher/pages/global/LauncherPage.cpp28
-rw-r--r--launcher/pages/global/LauncherPage.h4
-rw-r--r--launcher/pages/global/MinecraftPage.cpp6
-rw-r--r--launcher/pages/global/MinecraftPage.h4
-rw-r--r--launcher/pages/global/PasteEEPage.cpp6
-rw-r--r--launcher/pages/global/PasteEEPage.h4
-rw-r--r--launcher/pages/global/ProxyPage.cpp8
-rw-r--r--launcher/pages/global/ProxyPage.h4
18 files changed, 85 insertions, 78 deletions
diff --git a/launcher/pages/global/AccountListPage.cpp b/launcher/pages/global/AccountListPage.cpp
index bf5ab633..d0138dcc 100644
--- a/launcher/pages/global/AccountListPage.cpp
+++ b/launcher/pages/global/AccountListPage.cpp
@@ -32,7 +32,7 @@
#include "minecraft/auth/AccountTask.h"
#include "minecraft/services/SkinDelete.h"
-#include "Launcher.h"
+#include "Application.h"
#include "BuildConfig.h"
#include <dialogs/MSALoginDialog.h>
@@ -50,7 +50,7 @@ AccountListPage::AccountListPage(QWidget *parent)
ui->listView->setEmptyMode(VersionListView::String);
ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
- m_accounts = LAUNCHER->accounts();
+ m_accounts = APPLICATION->accounts();
ui->listView->setModel(m_accounts.get());
ui->listView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -68,7 +68,8 @@ AccountListPage::AccountListPage(QWidget *parent)
connect(ui->listView, &VersionListView::customContextMenuRequested, this, &AccountListPage::ShowContextMenu);
connect(m_accounts.get(), &AccountList::listChanged, this, &AccountListPage::listChanged);
- connect(m_accounts.get(), &AccountList::activeAccountChanged, this, &AccountListPage::listChanged);
+ connect(m_accounts.get(), &AccountList::listActivityChanged, this, &AccountListPage::listChanged);
+ connect(m_accounts.get(), &AccountList::defaultAccountChanged, this, &AccountListPage::listChanged);
updateButtonStates();
@@ -117,11 +118,11 @@ void AccountListPage::on_actionAddMojang_triggered()
tr("Please enter your Mojang account email and password to add your account.")
);
- if (account != nullptr)
+ if (account)
{
m_accounts->addAccount(account);
if (m_accounts->count() == 1) {
- m_accounts->setActiveAccount(account);
+ m_accounts->setDefaultAccount(account);
}
}
}
@@ -145,11 +146,11 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
tr("Please enter your Mojang account email and password to add your account.")
);
- if (account != nullptr)
+ if (account)
{
m_accounts->addAccount(account);
if (m_accounts->count() == 1) {
- m_accounts->setActiveAccount(account);
+ m_accounts->setDefaultAccount(account);
}
}
}
@@ -187,27 +188,34 @@ void AccountListPage::on_actionSetDefault_triggered()
{
QModelIndex selected = selection.first();
MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
- m_accounts->setActiveAccount(account);
+ m_accounts->setDefaultAccount(account);
}
}
void AccountListPage::on_actionNoDefault_triggered()
{
- m_accounts->setActiveAccount(nullptr);
+ m_accounts->setDefaultAccount(nullptr);
}
void AccountListPage::updateButtonStates()
{
// If there is no selection, disable buttons that require something selected.
QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+ bool hasSelection = selection.size() > 0;
+ bool accountIsReady = false;
+ if (hasSelection)
+ {
+ QModelIndex selected = selection.first();
+ MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
+ accountIsReady = !account->isActive();
+ }
+ ui->actionRemove->setEnabled(accountIsReady);
+ ui->actionSetDefault->setEnabled(accountIsReady);
+ ui->actionUploadSkin->setEnabled(accountIsReady);
+ ui->actionDeleteSkin->setEnabled(accountIsReady);
+ ui->actionRefresh->setEnabled(accountIsReady);
- ui->actionRemove->setEnabled(selection.size() > 0);
- ui->actionSetDefault->setEnabled(selection.size() > 0);
- ui->actionUploadSkin->setEnabled(selection.size() > 0);
- ui->actionDeleteSkin->setEnabled(selection.size() > 0);
- ui->actionRefresh->setEnabled(selection.size() > 0);
-
- if(m_accounts->activeAccount().get() == nullptr) {
+ if(m_accounts->defaultAccount().get() == nullptr) {
ui->actionNoDefault->setEnabled(false);
ui->actionNoDefault->setChecked(true);
}
@@ -215,7 +223,6 @@ void AccountListPage::updateButtonStates()
ui->actionNoDefault->setEnabled(true);
ui->actionNoDefault->setChecked(false);
}
-
}
void AccountListPage::on_actionUploadSkin_triggered()
diff --git a/launcher/pages/global/AccountListPage.h b/launcher/pages/global/AccountListPage.h
index ee81acd1..eb131ea8 100644
--- a/launcher/pages/global/AccountListPage.h
+++ b/launcher/pages/global/AccountListPage.h
@@ -21,7 +21,7 @@
#include "pages/BasePage.h"
#include "minecraft/auth/AccountList.h"
-#include "Launcher.h"
+#include "Application.h"
namespace Ui
{
@@ -43,10 +43,10 @@ public:
}
QIcon icon() const override
{
- auto icon = LAUNCHER->getThemedIcon("accounts");
+ auto icon = APPLICATION->getThemedIcon("accounts");
if(icon.isNull())
{
- icon = LAUNCHER->getThemedIcon("noaccount");
+ icon = APPLICATION->getThemedIcon("noaccount");
}
return icon;
}
@@ -80,6 +80,6 @@ protected slots:
private:
void changeEvent(QEvent * event) override;
QMenu * createPopupMenu() override;
- std::shared_ptr<AccountList> m_accounts;
+ shared_qobject_ptr<AccountList> m_accounts;
Ui::AccountListPage *ui;
};
diff --git a/launcher/pages/global/CustomCommandsPage.cpp b/launcher/pages/global/CustomCommandsPage.cpp
index 8a5c3445..8541e3c1 100644
--- a/launcher/pages/global/CustomCommandsPage.cpp
+++ b/launcher/pages/global/CustomCommandsPage.cpp
@@ -32,7 +32,7 @@ bool CustomCommandsPage::apply()
void CustomCommandsPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
s->set("PreLaunchCommand", commands->prelaunchCommand());
s->set("WrapperCommand", commands->wrapperCommand());
s->set("PostExitCommand", commands->postexitCommand());
@@ -40,7 +40,7 @@ void CustomCommandsPage::applySettings()
void CustomCommandsPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
commands->initialize(
false,
true,
diff --git a/launcher/pages/global/CustomCommandsPage.h b/launcher/pages/global/CustomCommandsPage.h
index ac69a997..f81b192a 100644
--- a/launcher/pages/global/CustomCommandsPage.h
+++ b/launcher/pages/global/CustomCommandsPage.h
@@ -19,7 +19,7 @@
#include <QDialog>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
#include "widgets/CustomCommands.h"
class CustomCommandsPage : public QWidget, public BasePage
@@ -36,7 +36,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("custom-commands");
+ return APPLICATION->getThemedIcon("custom-commands");
}
QString id() const override
{
diff --git a/launcher/pages/global/ExternalToolsPage.cpp b/launcher/pages/global/ExternalToolsPage.cpp
index 7e1a915f..41d900aa 100644
--- a/launcher/pages/global/ExternalToolsPage.cpp
+++ b/launcher/pages/global/ExternalToolsPage.cpp
@@ -24,7 +24,7 @@
#include "settings/SettingsObject.h"
#include "tools/BaseProfiler.h"
#include <FileSystem.h>
-#include "Launcher.h"
+#include "Application.h"
#include <tools/MCEditTool.h>
ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
@@ -51,7 +51,7 @@ ExternalToolsPage::~ExternalToolsPage()
void ExternalToolsPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString());
ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString());
ui->mceditPathEdit->setText(s->get("MCEditPath").toString());
@@ -61,7 +61,7 @@ void ExternalToolsPage::loadSettings()
}
void ExternalToolsPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
s->set("JProfilerPath", ui->jprofilerPathEdit->text());
s->set("JVisualVMPath", ui->jvisualvmPathEdit->text());
@@ -93,7 +93,7 @@ void ExternalToolsPage::on_jprofilerPathBtn_clicked()
break;
}
QString cooked_dir = FS::NormalizePath(raw_dir);
- if (!LAUNCHER->profilers()["jprofiler"]->check(cooked_dir, &error))
+ if (!APPLICATION->profilers()["jprofiler"]->check(cooked_dir, &error))
{
QMessageBox::critical(this, tr("Error"), tr("Error while checking JProfiler install:\n%1").arg(error));
continue;
@@ -108,7 +108,7 @@ void ExternalToolsPage::on_jprofilerPathBtn_clicked()
void ExternalToolsPage::on_jprofilerCheckBtn_clicked()
{
QString error;
- if (!LAUNCHER->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error))
+ if (!APPLICATION->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error))
{
QMessageBox::critical(this, tr("Error"), tr("Error while checking JProfiler install:\n%1").arg(error));
}
@@ -130,7 +130,7 @@ void ExternalToolsPage::on_jvisualvmPathBtn_clicked()
break;
}
QString cooked_dir = FS::NormalizePath(raw_dir);
- if (!LAUNCHER->profilers()["jvisualvm"]->check(cooked_dir, &error))
+ if (!APPLICATION->profilers()["jvisualvm"]->check(cooked_dir, &error))
{
QMessageBox::critical(this, tr("Error"), tr("Error while checking JVisualVM install:\n%1").arg(error));
continue;
@@ -145,7 +145,7 @@ void ExternalToolsPage::on_jvisualvmPathBtn_clicked()
void ExternalToolsPage::on_jvisualvmCheckBtn_clicked()
{
QString error;
- if (!LAUNCHER->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error))
+ if (!APPLICATION->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error))
{
QMessageBox::critical(this, tr("Error"), tr("Error while checking JVisualVM install:\n%1").arg(error));
}
@@ -171,7 +171,7 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
break;
}
QString cooked_dir = FS::NormalizePath(raw_dir);
- if (!LAUNCHER->mcedit()->check(cooked_dir, error))
+ if (!APPLICATION->mcedit()->check(cooked_dir, error))
{
QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error));
continue;
@@ -186,7 +186,7 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
void ExternalToolsPage::on_mceditCheckBtn_clicked()
{
QString error;
- if (!LAUNCHER->mcedit()->check(ui->mceditPathEdit->text(), error))
+ if (!APPLICATION->mcedit()->check(ui->mceditPathEdit->text(), error))
{
QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error));
}
diff --git a/launcher/pages/global/ExternalToolsPage.h b/launcher/pages/global/ExternalToolsPage.h
index 1d99273a..9571ce75 100644
--- a/launcher/pages/global/ExternalToolsPage.h
+++ b/launcher/pages/global/ExternalToolsPage.h
@@ -18,7 +18,7 @@
#include <QWidget>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui {
class ExternalToolsPage;
@@ -38,10 +38,10 @@ public:
}
QIcon icon() const override
{
- auto icon = LAUNCHER->getThemedIcon("externaltools");
+ auto icon = APPLICATION->getThemedIcon("externaltools");
if(icon.isNull())
{
- icon = LAUNCHER->getThemedIcon("loadermods");
+ icon = APPLICATION->getThemedIcon("loadermods");
}
return icon;
}
diff --git a/launcher/pages/global/JavaPage.cpp b/launcher/pages/global/JavaPage.cpp
index dd158fcd..fe545636 100644
--- a/launcher/pages/global/JavaPage.cpp
+++ b/launcher/pages/global/JavaPage.cpp
@@ -29,7 +29,7 @@
#include "settings/SettingsObject.h"
#include <FileSystem.h>
-#include "Launcher.h"
+#include "Application.h"
#include <sys.h>
JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
@@ -55,7 +55,7 @@ bool JavaPage::apply()
void JavaPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Memory
int min = ui->minMemSpinBox->value();
@@ -79,7 +79,7 @@ void JavaPage::applySettings()
}
void JavaPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Memory
int min = s->get("MinMemAlloc").toInt();
int max = s->get("MaxMemAlloc").toInt();
@@ -104,7 +104,7 @@ void JavaPage::on_javaDetectBtn_clicked()
{
JavaInstallPtr java;
- VersionSelectDialog vselect(LAUNCHER->javalist().get(), tr("Select a Java version"), this, true);
+ VersionSelectDialog vselect(APPLICATION->javalist().get(), tr("Select a Java version"), this, true);
vselect.setResizeOn(2);
vselect.exec();
diff --git a/launcher/pages/global/JavaPage.h b/launcher/pages/global/JavaPage.h
index 93a586cd..56a1d36b 100644
--- a/launcher/pages/global/JavaPage.h
+++ b/launcher/pages/global/JavaPage.h
@@ -19,7 +19,7 @@
#include <QDialog>
#include "pages/BasePage.h"
#include "JavaCommon.h"
-#include <Launcher.h>
+#include <Application.h>
#include <QObjectPtr.h>
class SettingsObject;
@@ -43,7 +43,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("java");
+ return APPLICATION->getThemedIcon("java");
}
QString id() const override
{
diff --git a/launcher/pages/global/LanguagePage.cpp b/launcher/pages/global/LanguagePage.cpp
index 409bf7d0..142517db 100644
--- a/launcher/pages/global/LanguagePage.cpp
+++ b/launcher/pages/global/LanguagePage.cpp
@@ -26,7 +26,7 @@ bool LanguagePage::apply()
void LanguagePage::applySettings()
{
- auto settings = LAUNCHER->settings();
+ auto settings = APPLICATION->settings();
QString key = mainWidget->getSelectedLanguageKey();
settings->set("Language", key);
}
diff --git a/launcher/pages/global/LanguagePage.h b/launcher/pages/global/LanguagePage.h
index 22db8f94..c269cefc 100644
--- a/launcher/pages/global/LanguagePage.h
+++ b/launcher/pages/global/LanguagePage.h
@@ -17,7 +17,7 @@
#include <memory>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
#include <QWidget>
class LanguageSelectionWidget;
@@ -36,7 +36,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("language");
+ return APPLICATION->getThemedIcon("language");
}
QString id() const override
{
diff --git a/launcher/pages/global/LauncherPage.cpp b/launcher/pages/global/LauncherPage.cpp
index 5f8d87d8..b77a9e81 100644
--- a/launcher/pages/global/LauncherPage.cpp
+++ b/launcher/pages/global/LauncherPage.cpp
@@ -25,7 +25,7 @@
#include "settings/SettingsObject.h"
#include <FileSystem.h>
-#include "Launcher.h"
+#include "Application.h"
#include "BuildConfig.h"
#include "themes/ITheme.h"
@@ -53,20 +53,20 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat());
- m_languageModel = LAUNCHER->translations();
+ m_languageModel = APPLICATION->translations();
loadSettings();
if(BuildConfig.UPDATER_ENABLED)
{
- QObject::connect(LAUNCHER->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
+ QObject::connect(APPLICATION->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
- if (LAUNCHER->updateChecker()->hasChannels())
+ if (APPLICATION->updateChecker()->hasChannels())
{
refreshUpdateChannelList();
}
else
{
- LAUNCHER->updateChecker()->updateChanList(false);
+ APPLICATION->updateChecker()->updateChanList(false);
}
}
else
@@ -171,7 +171,7 @@ void LauncherPage::refreshUpdateChannelList()
QObject::disconnect(ui->updateChannelComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(updateChannelSelectionChanged(int)));
- QList<UpdateChecker::ChannelListEntry> channelList = LAUNCHER->updateChecker()->getChannelList();
+ QList<UpdateChecker::ChannelListEntry> channelList = APPLICATION->updateChecker()->getChannelList();
ui->updateChannelComboBox->clear();
int selection = -1;
for (int i = 0; i < channelList.count(); i++)
@@ -216,7 +216,7 @@ void LauncherPage::updateChannelSelectionChanged(int index)
void LauncherPage::refreshUpdateChannelDesc()
{
// Get the channel list.
- QList<UpdateChecker::ChannelListEntry> channelList = LAUNCHER->updateChecker()->getChannelList();
+ QList<UpdateChecker::ChannelListEntry> channelList = APPLICATION->updateChecker()->getChannelList();
int selectedIndex = ui->updateChannelComboBox->currentIndex();
if (selectedIndex < 0)
{
@@ -237,7 +237,7 @@ void LauncherPage::refreshUpdateChannelDesc()
void LauncherPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
if (ui->resetNotificationsBtn->isChecked())
{
@@ -283,7 +283,7 @@ void LauncherPage::applySettings()
if(original != s->get("IconTheme"))
{
- LAUNCHER->setIconTheme(s->get("IconTheme").toString());
+ APPLICATION->setIconTheme(s->get("IconTheme").toString());
}
auto originalAppTheme = s->get("ApplicationTheme").toString();
@@ -291,7 +291,7 @@ void LauncherPage::applySettings()
if(originalAppTheme != newAppTheme)
{
s->set("ApplicationTheme", newAppTheme);
- LAUNCHER->setApplicationTheme(newAppTheme, false);
+ APPLICATION->setApplicationTheme(newAppTheme, false);
}
// Console settings
@@ -330,7 +330,7 @@ void LauncherPage::applySettings()
}
void LauncherPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Updates
ui->autoUpdateCheckBox->setChecked(s->get("AutoUpdate").toBool());
m_currentUpdateChannel = s->get("UpdateChannel").toString();
@@ -375,7 +375,7 @@ void LauncherPage::loadSettings()
{
auto currentTheme = s->get("ApplicationTheme").toString();
- auto themes = LAUNCHER->getValidApplicationThemes();
+ auto themes = APPLICATION->getValidApplicationThemes();
int idx = 0;
for(auto &theme: themes)
{
@@ -392,12 +392,12 @@ void LauncherPage::loadSettings()
ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
ui->showConsoleErrorCheck->setChecked(s->get("ShowConsoleOnError").toBool());
- QString fontFamily = LAUNCHER->settings()->get("ConsoleFont").toString();
+ QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
QFont consoleFont(fontFamily);
ui->consoleFont->setCurrentFont(consoleFont);
bool conversionOk = true;
- int fontSize = LAUNCHER->settings()->get("ConsoleFontSize").toInt(&conversionOk);
+ int fontSize = APPLICATION->settings()->get("ConsoleFontSize").toInt(&conversionOk);
if(!conversionOk)
{
fontSize = 11;
diff --git a/launcher/pages/global/LauncherPage.h b/launcher/pages/global/LauncherPage.h
index e622ec48..62a4f84c 100644
--- a/launcher/pages/global/LauncherPage.h
+++ b/launcher/pages/global/LauncherPage.h
@@ -20,7 +20,7 @@
#include "java/JavaChecker.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
#include "ColorCache.h"
#include <translations/TranslationsModel.h>
@@ -46,7 +46,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("launcher");
+ return APPLICATION->getThemedIcon("launcher");
}
QString id() const override
{
diff --git a/launcher/pages/global/MinecraftPage.cpp b/launcher/pages/global/MinecraftPage.cpp
index 342941f4..c763f8ac 100644
--- a/launcher/pages/global/MinecraftPage.cpp
+++ b/launcher/pages/global/MinecraftPage.cpp
@@ -21,7 +21,7 @@
#include <QTabBar>
#include "settings/SettingsObject.h"
-#include "Launcher.h"
+#include "Application.h"
MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
{
@@ -56,7 +56,7 @@ void MinecraftPage::on_maximizedCheckBox_clicked(bool checked)
void MinecraftPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Window Size
s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
@@ -75,7 +75,7 @@ void MinecraftPage::applySettings()
void MinecraftPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Window Size
ui->maximizedCheckBox->setChecked(s->get("LaunchMaximized").toBool());
diff --git a/launcher/pages/global/MinecraftPage.h b/launcher/pages/global/MinecraftPage.h
index 0fc6cc8e..96a90f6e 100644
--- a/launcher/pages/global/MinecraftPage.h
+++ b/launcher/pages/global/MinecraftPage.h
@@ -20,7 +20,7 @@
#include "java/JavaChecker.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
class SettingsObject;
@@ -43,7 +43,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("minecraft");
+ return APPLICATION->getThemedIcon("minecraft");
}
QString id() const override
{
diff --git a/launcher/pages/global/PasteEEPage.cpp b/launcher/pages/global/PasteEEPage.cpp
index 9f7a7efb..4b375d9a 100644
--- a/launcher/pages/global/PasteEEPage.cpp
+++ b/launcher/pages/global/PasteEEPage.cpp
@@ -23,7 +23,7 @@
#include "settings/SettingsObject.h"
#include "tools/BaseProfiler.h"
-#include "Launcher.h"
+#include "Application.h"
PasteEEPage::PasteEEPage(QWidget *parent) :
QWidget(parent),
@@ -42,7 +42,7 @@ PasteEEPage::~PasteEEPage()
void PasteEEPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
QString keyToUse = s->get("PasteEEAPIKey").toString();
if(keyToUse == "multimc")
{
@@ -57,7 +57,7 @@ void PasteEEPage::loadSettings()
void PasteEEPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
QString pasteKeyToUse;
if (ui->customButton->isChecked())
diff --git a/launcher/pages/global/PasteEEPage.h b/launcher/pages/global/PasteEEPage.h
index c99cd51e..0ea74e7c 100644
--- a/launcher/pages/global/PasteEEPage.h
+++ b/launcher/pages/global/PasteEEPage.h
@@ -18,7 +18,7 @@
#include <QWidget>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui {
class PasteEEPage;
@@ -38,7 +38,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("log");
+ return APPLICATION->getThemedIcon("log");
}
QString id() const override
{
diff --git a/launcher/pages/global/ProxyPage.cpp b/launcher/pages/global/ProxyPage.cpp
index d4e767e1..622b8ef3 100644
--- a/launcher/pages/global/ProxyPage.cpp
+++ b/launcher/pages/global/ProxyPage.cpp
@@ -19,7 +19,7 @@
#include <QTabBar>
#include "settings/SettingsObject.h"
-#include "Launcher.h"
+#include "Application.h"
#include "Env.h"
ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
@@ -58,7 +58,7 @@ void ProxyPage::proxyChanged(int)
void ProxyPage::applySettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Proxy
QString proxyType = "None";
@@ -77,12 +77,12 @@ void ProxyPage::applySettings()
s->set("ProxyUser", ui->proxyUserEdit->text());
s->set("ProxyPass", ui->proxyPassEdit->text());
- ENV.updateProxySettings(proxyType, ui->proxyAddrEdit->text(), ui->proxyPortEdit->value(),
+ ENV->updateProxySettings(proxyType, ui->proxyAddrEdit->text(), ui->proxyPortEdit->value(),
ui->proxyUserEdit->text(), ui->proxyPassEdit->text());
}
void ProxyPage::loadSettings()
{
- auto s = LAUNCHER->settings();
+ auto s = APPLICATION->settings();
// Proxy
QString proxyType = s->get("ProxyType").toString();
if (proxyType == "Default")
diff --git a/launcher/pages/global/ProxyPage.h b/launcher/pages/global/ProxyPage.h
index 90c33c9d..91f1fbaa 100644
--- a/launcher/pages/global/ProxyPage.h
+++ b/launcher/pages/global/ProxyPage.h
@@ -19,7 +19,7 @@
#include <QDialog>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui
{
@@ -40,7 +40,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("proxy");
+ return APPLICATION->getThemedIcon("proxy");
}
QString id() const override
{
generated by cgit (git 2.46.0) at 2025-02-02 19:02:57 +0000