diff options
Diffstat (limited to 'launcher/pages/global')
20 files changed, 93 insertions, 93 deletions
diff --git a/launcher/pages/global/AccountListPage.cpp b/launcher/pages/global/AccountListPage.cpp index 74537712..4f8b8e9c 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 "MultiMC.h" +#include "Launcher.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 = MMC->accounts(); + m_accounts = LAUNCHER->accounts(); ui->listView->setModel(m_accounts.get()); ui->listView->header()->setSectionResizeMode(0, QHeaderView::Stretch); diff --git a/launcher/pages/global/AccountListPage.h b/launcher/pages/global/AccountListPage.h index 4474802e..ee81acd1 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 "MultiMC.h" +#include "Launcher.h" namespace Ui { @@ -43,10 +43,10 @@ public: } QIcon icon() const override { - auto icon = MMC->getThemedIcon("accounts"); + auto icon = LAUNCHER->getThemedIcon("accounts"); if(icon.isNull()) { - icon = MMC->getThemedIcon("noaccount"); + icon = LAUNCHER->getThemedIcon("noaccount"); } return icon; } diff --git a/launcher/pages/global/CustomCommandsPage.cpp b/launcher/pages/global/CustomCommandsPage.cpp index 3b182319..8a5c3445 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 = MMC->settings(); + auto s = LAUNCHER->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 = MMC->settings(); + auto s = LAUNCHER->settings(); commands->initialize( false, true, diff --git a/launcher/pages/global/CustomCommandsPage.h b/launcher/pages/global/CustomCommandsPage.h index 414c3259..ac69a997 100644 --- a/launcher/pages/global/CustomCommandsPage.h +++ b/launcher/pages/global/CustomCommandsPage.h @@ -19,7 +19,7 @@ #include <QDialog> #include "pages/BasePage.h" -#include <MultiMC.h> +#include <Launcher.h> #include "widgets/CustomCommands.h" class CustomCommandsPage : public QWidget, public BasePage @@ -36,7 +36,7 @@ public: } QIcon icon() const override { - return MMC->getThemedIcon("custom-commands"); + return LAUNCHER->getThemedIcon("custom-commands"); } QString id() const override { diff --git a/launcher/pages/global/ExternalToolsPage.cpp b/launcher/pages/global/ExternalToolsPage.cpp index 6a0a38be..7e1a915f 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 "MultiMC.h" +#include "Launcher.h" #include <tools/MCEditTool.h> ExternalToolsPage::ExternalToolsPage(QWidget *parent) : @@ -51,7 +51,7 @@ ExternalToolsPage::~ExternalToolsPage() void ExternalToolsPage::loadSettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->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 = MMC->settings(); + auto s = LAUNCHER->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 (!MMC->profilers()["jprofiler"]->check(cooked_dir, &error)) + if (!LAUNCHER->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 (!MMC->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error)) + if (!LAUNCHER->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 (!MMC->profilers()["jvisualvm"]->check(cooked_dir, &error)) + if (!LAUNCHER->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 (!MMC->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error)) + if (!LAUNCHER->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 (!MMC->mcedit()->check(cooked_dir, error)) + if (!LAUNCHER->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 (!MMC->mcedit()->check(ui->mceditPathEdit->text(), error)) + if (!LAUNCHER->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 0fc8ebe1..1d99273a 100644 --- a/launcher/pages/global/ExternalToolsPage.h +++ b/launcher/pages/global/ExternalToolsPage.h @@ -18,7 +18,7 @@ #include <QWidget> #include "pages/BasePage.h" -#include <MultiMC.h> +#include <Launcher.h> namespace Ui { class ExternalToolsPage; @@ -38,10 +38,10 @@ public: } QIcon icon() const override { - auto icon = MMC->getThemedIcon("externaltools"); + auto icon = LAUNCHER->getThemedIcon("externaltools"); if(icon.isNull()) { - icon = MMC->getThemedIcon("loadermods"); + icon = LAUNCHER->getThemedIcon("loadermods"); } return icon; } diff --git a/launcher/pages/global/JavaPage.cpp b/launcher/pages/global/JavaPage.cpp index cde0e035..dd158fcd 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 "MultiMC.h" +#include "Launcher.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 = MMC->settings(); + auto s = LAUNCHER->settings(); // Memory int min = ui->minMemSpinBox->value(); @@ -79,7 +79,7 @@ void JavaPage::applySettings() } void JavaPage::loadSettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->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(MMC->javalist().get(), tr("Select a Java version"), this, true); + VersionSelectDialog vselect(LAUNCHER->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 832f460b..93a586cd 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 <MultiMC.h> +#include <Launcher.h> #include <QObjectPtr.h> class SettingsObject; @@ -43,7 +43,7 @@ public: } QIcon icon() const override { - return MMC->getThemedIcon("java"); + return LAUNCHER->getThemedIcon("java"); } QString id() const override { diff --git a/launcher/pages/global/LanguagePage.cpp b/launcher/pages/global/LanguagePage.cpp index ae3168cc..409bf7d0 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 = MMC->settings(); + auto settings = LAUNCHER->settings(); QString key = mainWidget->getSelectedLanguageKey(); settings->set("Language", key); } diff --git a/launcher/pages/global/LanguagePage.h b/launcher/pages/global/LanguagePage.h index ca8eecc6..22db8f94 100644 --- a/launcher/pages/global/LanguagePage.h +++ b/launcher/pages/global/LanguagePage.h @@ -17,7 +17,7 @@ #include <memory> #include "pages/BasePage.h" -#include <MultiMC.h> +#include <Launcher.h> #include <QWidget> class LanguageSelectionWidget; @@ -36,7 +36,7 @@ public: } QIcon icon() const override { - return MMC->getThemedIcon("language"); + return LAUNCHER->getThemedIcon("language"); } QString id() const override { diff --git a/launcher/pages/global/MultiMCPage.cpp b/launcher/pages/global/LauncherPage.cpp index 5d43b187..5f8d87d8 100644 --- a/launcher/pages/global/MultiMCPage.cpp +++ b/launcher/pages/global/LauncherPage.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "MultiMCPage.h" -#include "ui_MultiMCPage.h" +#include "LauncherPage.h" +#include "ui_LauncherPage.h" #include <QFileDialog> #include <QMessageBox> @@ -25,7 +25,7 @@ #include "settings/SettingsObject.h" #include <FileSystem.h> -#include "MultiMC.h" +#include "Launcher.h" #include "BuildConfig.h" #include "themes/ITheme.h" @@ -41,7 +41,7 @@ enum InstSortMode Sort_LastLaunch }; -MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCPage) +LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::LauncherPage) { ui->setupUi(this); auto origForeground = ui->fontPreview->palette().color(ui->fontPreview->foregroundRole()); @@ -53,20 +53,20 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat()); - m_languageModel = MMC->translations(); + m_languageModel = LAUNCHER->translations(); loadSettings(); if(BuildConfig.UPDATER_ENABLED) { - QObject::connect(MMC->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &MultiMCPage::refreshUpdateChannelList); + QObject::connect(LAUNCHER->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList); - if (MMC->updateChecker()->hasChannels()) + if (LAUNCHER->updateChecker()->hasChannels()) { refreshUpdateChannelList(); } else { - MMC->updateChecker()->updateChanList(false); + LAUNCHER->updateChecker()->updateChanList(false); } } else @@ -89,19 +89,19 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP } } -MultiMCPage::~MultiMCPage() +LauncherPage::~LauncherPage() { delete ui; delete defaultFormat; } -bool MultiMCPage::apply() +bool LauncherPage::apply() { applySettings(); return true; } -void MultiMCPage::on_instDirBrowseBtn_clicked() +void LauncherPage::on_instDirBrowseBtn_clicked() { QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"), ui->instDirTextBox->text()); @@ -133,7 +133,7 @@ void MultiMCPage::on_instDirBrowseBtn_clicked() } } -void MultiMCPage::on_iconsDirBrowseBtn_clicked() +void LauncherPage::on_iconsDirBrowseBtn_clicked() { QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Folder"), ui->iconsDirTextBox->text()); @@ -144,7 +144,7 @@ void MultiMCPage::on_iconsDirBrowseBtn_clicked() ui->iconsDirTextBox->setText(cooked_dir); } } -void MultiMCPage::on_modsDirBrowseBtn_clicked() +void LauncherPage::on_modsDirBrowseBtn_clicked() { QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), ui->modsDirTextBox->text()); @@ -155,7 +155,7 @@ void MultiMCPage::on_modsDirBrowseBtn_clicked() ui->modsDirTextBox->setText(cooked_dir); } } -void MultiMCPage::on_migrateDataFolderMacBtn_clicked() +void LauncherPage::on_migrateDataFolderMacBtn_clicked() { QFile file(QDir::current().absolutePath() + "/dontmovemacdata"); file.remove(); @@ -163,7 +163,7 @@ void MultiMCPage::on_migrateDataFolderMacBtn_clicked() qApp->quit(); } -void MultiMCPage::refreshUpdateChannelList() +void LauncherPage::refreshUpdateChannelList() { // Stop listening for selection changes. It's going to change a lot while we update it and // we don't need to update the @@ -171,7 +171,7 @@ void MultiMCPage::refreshUpdateChannelList() QObject::disconnect(ui->updateChannelComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateChannelSelectionChanged(int))); - QList<UpdateChecker::ChannelListEntry> channelList = MMC->updateChecker()->getChannelList(); + QList<UpdateChecker::ChannelListEntry> channelList = LAUNCHER->updateChecker()->getChannelList(); ui->updateChannelComboBox->clear(); int selection = -1; for (int i = 0; i < channelList.count(); i++) @@ -208,15 +208,15 @@ void MultiMCPage::refreshUpdateChannelList() ui->updateChannelComboBox->setEnabled(true); } -void MultiMCPage::updateChannelSelectionChanged(int index) +void LauncherPage::updateChannelSelectionChanged(int index) { refreshUpdateChannelDesc(); } -void MultiMCPage::refreshUpdateChannelDesc() +void LauncherPage::refreshUpdateChannelDesc() { // Get the channel list. - QList<UpdateChecker::ChannelListEntry> channelList = MMC->updateChecker()->getChannelList(); + QList<UpdateChecker::ChannelListEntry> channelList = LAUNCHER->updateChecker()->getChannelList(); int selectedIndex = ui->updateChannelComboBox->currentIndex(); if (selectedIndex < 0) { @@ -235,9 +235,9 @@ void MultiMCPage::refreshUpdateChannelDesc() } } -void MultiMCPage::applySettings() +void LauncherPage::applySettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->settings(); if (ui->resetNotificationsBtn->isChecked()) { @@ -283,7 +283,7 @@ void MultiMCPage::applySettings() if(original != s->get("IconTheme")) { - MMC->setIconTheme(s->get("IconTheme").toString()); + LAUNCHER->setIconTheme(s->get("IconTheme").toString()); } auto originalAppTheme = s->get("ApplicationTheme").toString(); @@ -291,7 +291,7 @@ void MultiMCPage::applySettings() if(originalAppTheme != newAppTheme) { s->set("ApplicationTheme", newAppTheme); - MMC->setApplicationTheme(newAppTheme, false); + LAUNCHER->setApplicationTheme(newAppTheme, false); } // Console settings @@ -328,9 +328,9 @@ void MultiMCPage::applySettings() s->set("Analytics", ui->analyticsCheck->isChecked()); } } -void MultiMCPage::loadSettings() +void LauncherPage::loadSettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->settings(); // Updates ui->autoUpdateCheckBox->setChecked(s->get("AutoUpdate").toBool()); m_currentUpdateChannel = s->get("UpdateChannel").toString(); @@ -375,7 +375,7 @@ void MultiMCPage::loadSettings() { auto currentTheme = s->get("ApplicationTheme").toString(); - auto themes = MMC->getValidApplicationThemes(); + auto themes = LAUNCHER->getValidApplicationThemes(); int idx = 0; for(auto &theme: themes) { @@ -392,12 +392,12 @@ void MultiMCPage::loadSettings() ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool()); ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool()); ui->showConsoleErrorCheck->setChecked(s->get("ShowConsoleOnError").toBool()); - QString fontFamily = MMC->settings()->get("ConsoleFont").toString(); + QString fontFamily = LAUNCHER->settings()->get("ConsoleFont").toString(); QFont consoleFont(fontFamily); ui->consoleFont->setCurrentFont(consoleFont); bool conversionOk = true; - int fontSize = MMC->settings()->get("ConsoleFontSize").toInt(&conversionOk); + int fontSize = LAUNCHER->settings()->get("ConsoleFontSize").toInt(&conversionOk); if(!conversionOk) { fontSize = 11; @@ -430,7 +430,7 @@ void MultiMCPage::loadSettings() } } -void MultiMCPage::refreshFontPreview() +void LauncherPage::refreshFontPreview() { int fontSize = ui->fontSizeBox->value(); QString fontFamily = ui->consoleFont->currentFont().family(); diff --git a/launcher/pages/global/MultiMCPage.h b/launcher/pages/global/LauncherPage.h index fae75bf2..e622ec48 100644 --- a/launcher/pages/global/MultiMCPage.h +++ b/launcher/pages/global/LauncherPage.h @@ -20,7 +20,7 @@ #include "java/JavaChecker.h" #include "pages/BasePage.h" -#include <MultiMC.h> +#include <Launcher.h> #include "ColorCache.h" #include <translations/TranslationsModel.h> @@ -29,32 +29,32 @@ class SettingsObject; namespace Ui { -class MultiMCPage; +class LauncherPage; } -class MultiMCPage : public QWidget, public BasePage +class LauncherPage : public QWidget, public BasePage { Q_OBJECT public: - explicit MultiMCPage(QWidget *parent = 0); - ~MultiMCPage(); + explicit LauncherPage(QWidget *parent = 0); + ~LauncherPage(); QString displayName() const override { - return "MultiMC"; + return "Launcher"; } QIcon icon() const override { - return MMC->getThemedIcon("multimc"); + return LAUNCHER->getThemedIcon("launcher"); } QString id() const override { - return "multimc-settings"; + return "launcher-settings"; } QString helpPage() const override { - return "MultiMC-settings"; + return "Launcher-settings"; } bool apply() override; @@ -87,7 +87,7 @@ slots: void updateChannelSelectionChanged(int index); private: - Ui::MultiMCPage *ui; + Ui::LauncherPage *ui; /*! * Stores the currently selected update channel. diff --git a/launcher/pages/global/MultiMCPage.ui b/launcher/pages/global/LauncherPage.ui index 4ad20242..62a66d73 100644 --- a/launcher/pages/global/MultiMCPage.ui +++ b/launcher/pages/global/LauncherPage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MultiMCPage</class> - <widget class="QWidget" name="MultiMCPage"> + <class>LauncherPage</class> + <widget class="QWidget" name="LauncherPage"> <property name="geometry"> <rect> <x>0</x> @@ -54,7 +54,7 @@ <item> <widget class="QCheckBox" name="autoUpdateCheckBox"> <property name="text"> - <string>Check for updates when MultiMC starts?</string> + <string>Check for updates on start?</string> </property> </widget> </item> @@ -160,7 +160,7 @@ <item> <widget class="QPushButton" name="migrateDataFolderMacBtn"> <property name="text"> - <string>Move MultiMC data to new location (will restart MultiMC)</string> + <string>Move the data to new location (will restart the launcher)</string> </property> </widget> </item> @@ -187,7 +187,7 @@ <item> <widget class="QGroupBox" name="groupBox_3"> <property name="title"> - <string>MultiMC notifications</string> + <string>Launcher notifications</string> </property> <layout class="QVBoxLayout" name="verticalLayout_5"> <item> @@ -515,9 +515,9 @@ <property name="text"> <string><html><head/> <body> -<p>MultiMC sends anonymous usage statistics on every start of the application.</p><p>The following data is collected:</p> +<p>The launcher sends anonymous usage statistics on every start of the application.</p><p>The following data is collected:</p> <ul> -<li>MultiMC version.</li> +<li>Launcher version.</li> <li>Operating system name, version and architecture.</li> <li>CPU architecture (kernel architecture on linux).</li> <li>Size of system memory.</li> diff --git a/launcher/pages/global/MinecraftPage.cpp b/launcher/pages/global/MinecraftPage.cpp index 6c9bd307..2830dc7c 100644 --- a/launcher/pages/global/MinecraftPage.cpp +++ b/launcher/pages/global/MinecraftPage.cpp @@ -21,7 +21,7 @@ #include <QTabBar> #include "settings/SettingsObject.h" -#include "MultiMC.h" +#include "Launcher.h" MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage) { @@ -57,7 +57,7 @@ void MinecraftPage::on_maximizedCheckBox_clicked(bool checked) void MinecraftPage::applySettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->settings(); // Window Size s->set("LaunchMaximized", ui->maximizedCheckBox->isChecked()); @@ -75,7 +75,7 @@ void MinecraftPage::applySettings() void MinecraftPage::loadSettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->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 5e781aed..0fc6cc8e 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 <MultiMC.h> +#include <Launcher.h> class SettingsObject; @@ -43,7 +43,7 @@ public: } QIcon icon() const override { - return MMC->getThemedIcon("minecraft"); + return LAUNCHER->getThemedIcon("minecraft"); } QString id() const override { diff --git a/launcher/pages/global/PasteEEPage.cpp b/launcher/pages/global/PasteEEPage.cpp index f932dede..9f7a7efb 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 "MultiMC.h" +#include "Launcher.h" PasteEEPage::PasteEEPage(QWidget *parent) : QWidget(parent), @@ -42,7 +42,7 @@ PasteEEPage::~PasteEEPage() void PasteEEPage::loadSettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->settings(); QString keyToUse = s->get("PasteEEAPIKey").toString(); if(keyToUse == "multimc") { @@ -57,7 +57,7 @@ void PasteEEPage::loadSettings() void PasteEEPage::applySettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->settings(); QString pasteKeyToUse; if (ui->customButton->isChecked()) diff --git a/launcher/pages/global/PasteEEPage.h b/launcher/pages/global/PasteEEPage.h index 001decdb..c99cd51e 100644 --- a/launcher/pages/global/PasteEEPage.h +++ b/launcher/pages/global/PasteEEPage.h @@ -18,7 +18,7 @@ #include <QWidget> #include "pages/BasePage.h" -#include <MultiMC.h> +#include <Launcher.h> namespace Ui { class PasteEEPage; @@ -38,7 +38,7 @@ public: } QIcon icon() const override { - return MMC->getThemedIcon("log"); + return LAUNCHER->getThemedIcon("log"); } QString id() const override { diff --git a/launcher/pages/global/ProxyPage.cpp b/launcher/pages/global/ProxyPage.cpp index 809059ff..d4e767e1 100644 --- a/launcher/pages/global/ProxyPage.cpp +++ b/launcher/pages/global/ProxyPage.cpp @@ -19,7 +19,7 @@ #include <QTabBar> #include "settings/SettingsObject.h" -#include "MultiMC.h" +#include "Launcher.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 = MMC->settings(); + auto s = LAUNCHER->settings(); // Proxy QString proxyType = "None"; @@ -82,7 +82,7 @@ void ProxyPage::applySettings() } void ProxyPage::loadSettings() { - auto s = MMC->settings(); + auto s = LAUNCHER->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 ff94ec49..90c33c9d 100644 --- a/launcher/pages/global/ProxyPage.h +++ b/launcher/pages/global/ProxyPage.h @@ -19,7 +19,7 @@ #include <QDialog> #include "pages/BasePage.h" -#include <MultiMC.h> +#include <Launcher.h> namespace Ui { @@ -40,7 +40,7 @@ public: } QIcon icon() const override { - return MMC->getThemedIcon("proxy"); + return LAUNCHER->getThemedIcon("proxy"); } QString id() const override { diff --git a/launcher/pages/global/ProxyPage.ui b/launcher/pages/global/ProxyPage.ui index 69fcef1e..347fa86c 100644 --- a/launcher/pages/global/ProxyPage.ui +++ b/launcher/pages/global/ProxyPage.ui @@ -39,7 +39,7 @@ <item> <widget class="QLabel" name="proxyPlainTextWarningLabel_2"> <property name="text"> - <string>This only applies to MultiMC. Minecraft does not accept proxy settings.</string> + <string>This only applies to the launcher. Minecraft does not accept proxy settings.</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -166,7 +166,7 @@ <item row="2" column="0" colspan="2"> <widget class="QLabel" name="proxyPlainTextWarningLabel"> <property name="text"> - <string>Note: Proxy username and password are stored in plain text inside MultiMC's configuration file!</string> + <string>Note: Proxy username and password are stored in plain text inside the launcher's configuration file!</string> </property> <property name="wordWrap"> <bool>true</bool> |