aboutsummaryrefslogtreecommitdiff
path: root/launcher/pages/instance
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/pages/instance')
-rw-r--r--launcher/pages/instance/GameOptionsPage.h4
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.cpp14
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.h4
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.cpp6
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.h4
-rw-r--r--launcher/pages/instance/LogPage.cpp6
-rw-r--r--launcher/pages/instance/LogPage.h4
-rw-r--r--launcher/pages/instance/ModFolderPage.cpp4
-rw-r--r--launcher/pages/instance/ModFolderPage.h4
-rw-r--r--launcher/pages/instance/NotesPage.h6
-rw-r--r--launcher/pages/instance/OtherLogsPage.cpp4
-rw-r--r--launcher/pages/instance/OtherLogsPage.h4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.cpp4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.h4
-rw-r--r--launcher/pages/instance/ServersPage.cpp4
-rw-r--r--launcher/pages/instance/ServersPage.h4
-rw-r--r--launcher/pages/instance/VersionPage.cpp24
-rw-r--r--launcher/pages/instance/WorldListPage.cpp8
-rw-r--r--launcher/pages/instance/WorldListPage.h4
19 files changed, 58 insertions, 58 deletions
diff --git a/launcher/pages/instance/GameOptionsPage.h b/launcher/pages/instance/GameOptionsPage.h
index ca7e31b1..31e7b2dd 100644
--- a/launcher/pages/instance/GameOptionsPage.h
+++ b/launcher/pages/instance/GameOptionsPage.h
@@ -19,7 +19,7 @@
#include <QString>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui
{
@@ -46,7 +46,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("settings");
+ return APPLICATION->getThemedIcon("settings");
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/InstanceSettingsPage.cpp b/launcher/pages/instance/InstanceSettingsPage.cpp
index c83832c6..730fcbbd 100644
--- a/launcher/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/pages/instance/InstanceSettingsPage.cpp
@@ -7,7 +7,7 @@
#include "dialogs/VersionSelectDialog.h"
#include "JavaCommon.h"
-#include "Launcher.h"
+#include "Application.h"
#include <java/JavaInstallList.h>
#include <FileSystem.h>
@@ -22,8 +22,8 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
auto sysMB = Sys::getSystemRam() / Sys::mebibyte;
ui->maxMemSpinBox->setMaximum(sysMB);
connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
- connect(LAUNCHER, &Launcher::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
- connect(LAUNCHER, &Launcher::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
+ connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
+ connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
loadSettings();
}
@@ -41,13 +41,13 @@ void InstanceSettingsPage::globalSettingsButtonClicked(bool)
{
switch(ui->settingsTabs->currentIndex()) {
case 0:
- LAUNCHER->ShowGlobalSettings(this, "java-settings");
+ APPLICATION->ShowGlobalSettings(this, "java-settings");
return;
case 1:
- LAUNCHER->ShowGlobalSettings(this, "minecraft-settings");
+ APPLICATION->ShowGlobalSettings(this, "minecraft-settings");
return;
case 2:
- LAUNCHER->ShowGlobalSettings(this, "custom-commands");
+ APPLICATION->ShowGlobalSettings(this, "custom-commands");
return;
}
}
@@ -278,7 +278,7 @@ void InstanceSettingsPage::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/instance/InstanceSettingsPage.h b/launcher/pages/instance/InstanceSettingsPage.h
index a039101c..88169a67 100644
--- a/launcher/pages/instance/InstanceSettingsPage.h
+++ b/launcher/pages/instance/InstanceSettingsPage.h
@@ -22,7 +22,7 @@
#include <QObjectPtr.h>
#include "pages/BasePage.h"
#include "JavaCommon.h"
-#include "Launcher.h"
+#include "Application.h"
class JavaChecker;
namespace Ui
@@ -43,7 +43,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("instance-settings");
+ return APPLICATION->getThemedIcon("instance-settings");
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/LegacyUpgradePage.cpp b/launcher/pages/instance/LegacyUpgradePage.cpp
index b12174fa..21444756 100644
--- a/launcher/pages/instance/LegacyUpgradePage.cpp
+++ b/launcher/pages/instance/LegacyUpgradePage.cpp
@@ -4,7 +4,7 @@
#include "InstanceList.h"
#include "minecraft/legacy/LegacyInstance.h"
#include "minecraft/legacy/LegacyUpgradeTask.h"
-#include "Launcher.h"
+#include "Application.h"
#include "dialogs/CustomMessageBox.h"
#include "dialogs/ProgressDialog.h"
@@ -38,9 +38,9 @@ void LegacyUpgradePage::on_upgradeButton_clicked()
QString newName = tr("%1 (Migrated)").arg(m_inst->name());
auto upgradeTask = new LegacyUpgradeTask(m_inst);
upgradeTask->setName(newName);
- upgradeTask->setGroup(LAUNCHER->instances()->getInstanceGroup(m_inst->id()));
+ upgradeTask->setGroup(APPLICATION->instances()->getInstanceGroup(m_inst->id()));
upgradeTask->setIcon(m_inst->iconKey());
- unique_qobject_ptr<Task> task(LAUNCHER->instances()->wrapInstanceTask(upgradeTask));
+ unique_qobject_ptr<Task> task(APPLICATION->instances()->wrapInstanceTask(upgradeTask));
runModalTask(task.get());
}
diff --git a/launcher/pages/instance/LegacyUpgradePage.h b/launcher/pages/instance/LegacyUpgradePage.h
index d8e98f6b..f4b7b57c 100644
--- a/launcher/pages/instance/LegacyUpgradePage.h
+++ b/launcher/pages/instance/LegacyUpgradePage.h
@@ -19,7 +19,7 @@
#include "minecraft/legacy/LegacyInstance.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
#include "tasks/Task.h"
namespace Ui
@@ -40,7 +40,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("checkupdate");
+ return APPLICATION->getThemedIcon("checkupdate");
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/LogPage.cpp b/launcher/pages/instance/LogPage.cpp
index 2846dc51..b9046b62 100644
--- a/launcher/pages/instance/LogPage.cpp
+++ b/launcher/pages/instance/LogPage.cpp
@@ -1,7 +1,7 @@
#include "LogPage.h"
#include "ui_LogPage.h"
-#include "Launcher.h"
+#include "Application.h"
#include <QIcon>
#include <QScrollBar>
@@ -125,9 +125,9 @@ LogPage::LogPage(InstancePtr instance, QWidget *parent)
// set up fonts in the log proxy
{
- QString fontFamily = LAUNCHER->settings()->get("ConsoleFont").toString();
+ QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
bool conversionOk = false;
- 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/instance/LogPage.h b/launcher/pages/instance/LogPage.h
index 285296cd..270a533a 100644
--- a/launcher/pages/instance/LogPage.h
+++ b/launcher/pages/instance/LogPage.h
@@ -20,7 +20,7 @@
#include "BaseInstance.h"
#include "launch/LaunchTask.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui
{
@@ -42,7 +42,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("log");
+ return APPLICATION->getThemedIcon("log");
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/ModFolderPage.cpp b/launcher/pages/instance/ModFolderPage.cpp
index caa81958..6d496e55 100644
--- a/launcher/pages/instance/ModFolderPage.cpp
+++ b/launcher/pages/instance/ModFolderPage.cpp
@@ -22,7 +22,7 @@
#include <QAbstractItemModel>
#include <QMenu>
-#include "Launcher.h"
+#include "Application.h"
#include "dialogs/CustomMessageBox.h"
#include <GuiUtil.h>
#include "minecraft/mod/ModFolderModel.h"
@@ -301,7 +301,7 @@ void ModFolderPage::on_actionAdd_triggered()
tr("Select %1",
"Select whatever type of files the page contains. Example: 'Loader Mods'")
.arg(m_displayName),
- m_fileSelectionFilter.arg(m_displayName), LAUNCHER->settings()->get("CentralModsDir").toString(),
+ m_fileSelectionFilter.arg(m_displayName), APPLICATION->settings()->get("CentralModsDir").toString(),
this->parentWidget());
if (!list.empty())
{
diff --git a/launcher/pages/instance/ModFolderPage.h b/launcher/pages/instance/ModFolderPage.h
index 38fcc6a5..7a81f63a 100644
--- a/launcher/pages/instance/ModFolderPage.h
+++ b/launcher/pages/instance/ModFolderPage.h
@@ -19,7 +19,7 @@
#include "minecraft/MinecraftInstance.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
class ModFolderModel;
namespace Ui
@@ -54,7 +54,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon(m_iconName);
+ return APPLICATION->getThemedIcon(m_iconName);
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/NotesPage.h b/launcher/pages/instance/NotesPage.h
index 1bdb352d..23d2684a 100644
--- a/launcher/pages/instance/NotesPage.h
+++ b/launcher/pages/instance/NotesPage.h
@@ -19,7 +19,7 @@
#include "BaseInstance.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui
{
@@ -39,9 +39,9 @@ public:
}
virtual QIcon icon() const override
{
- auto icon = LAUNCHER->getThemedIcon("notes");
+ auto icon = APPLICATION->getThemedIcon("notes");
if(icon.isNull())
- icon = LAUNCHER->getThemedIcon("news");
+ icon = APPLICATION->getThemedIcon("news");
return icon;
}
virtual QString id() const override
diff --git a/launcher/pages/instance/OtherLogsPage.cpp b/launcher/pages/instance/OtherLogsPage.cpp
index 31cd44ed..6705c059 100644
--- a/launcher/pages/instance/OtherLogsPage.cpp
+++ b/launcher/pages/instance/OtherLogsPage.cpp
@@ -129,9 +129,9 @@ void OtherLogsPage::on_btnReload_clicked()
{
auto setPlainText = [&](const QString & text)
{
- QString fontFamily = LAUNCHER->settings()->get("ConsoleFont").toString();
+ QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
bool conversionOk = false;
- 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/instance/OtherLogsPage.h b/launcher/pages/instance/OtherLogsPage.h
index 25f127f6..c8323659 100644
--- a/launcher/pages/instance/OtherLogsPage.h
+++ b/launcher/pages/instance/OtherLogsPage.h
@@ -18,7 +18,7 @@
#include <QWidget>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
#include <pathmatcher/IPathMatcher.h>
namespace Ui
@@ -46,7 +46,7 @@ public:
}
QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("log");
+ return APPLICATION->getThemedIcon("log");
}
QString helpPage() const override
{
diff --git a/launcher/pages/instance/ScreenshotsPage.cpp b/launcher/pages/instance/ScreenshotsPage.cpp
index 172e2eb3..f24cf486 100644
--- a/launcher/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/pages/instance/ScreenshotsPage.cpp
@@ -15,7 +15,7 @@
#include <QKeyEvent>
#include <QMenu>
-#include <Launcher.h>
+#include <Application.h>
#include "dialogs/ProgressDialog.h"
#include "dialogs/CustomMessageBox.h"
@@ -104,7 +104,7 @@ public:
{
m_thumbnailingPool.setMaxThreadCount(4);
m_thumbnailCache = std::make_shared<SharedIconCache>();
- m_thumbnailCache->add("placeholder", LAUNCHER->getThemedIcon("screenshot-placeholder"));
+ m_thumbnailCache->add("placeholder", APPLICATION->getThemedIcon("screenshot-placeholder"));
connect(&watcher, SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
// FIXME: the watched file set is not updated when files are removed
}
diff --git a/launcher/pages/instance/ScreenshotsPage.h b/launcher/pages/instance/ScreenshotsPage.h
index 01f26642..84145b0e 100644
--- a/launcher/pages/instance/ScreenshotsPage.h
+++ b/launcher/pages/instance/ScreenshotsPage.h
@@ -18,7 +18,7 @@
#include <QMainWindow>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
class QFileSystemModel;
class QIdentityProxyModel;
@@ -53,7 +53,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("screenshots");
+ return APPLICATION->getThemedIcon("screenshots");
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/ServersPage.cpp b/launcher/pages/instance/ServersPage.cpp
index 6c55fdac..8116d2bf 100644
--- a/launcher/pages/instance/ServersPage.cpp
+++ b/launcher/pages/instance/ServersPage.cpp
@@ -324,7 +324,7 @@ public:
if(px.loadFromData(bytes))
return QIcon(px);
}
- return LAUNCHER->getThemedIcon("unknown_server");
+ return APPLICATION->getThemedIcon("unknown_server");
}
case Qt::DisplayRole:
return m_servers[row].m_name;
@@ -762,7 +762,7 @@ void ServersPage::on_actionMove_Down_triggered()
void ServersPage::on_actionJoin_triggered()
{
const auto &address = m_model->at(currentServer)->m_address;
- LAUNCHER->launch(m_inst, true, nullptr, std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(address)));
+ APPLICATION->launch(m_inst, true, nullptr, std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(address)));
}
#include "ServersPage.moc"
diff --git a/launcher/pages/instance/ServersPage.h b/launcher/pages/instance/ServersPage.h
index 63f3b9e3..1f678bce 100644
--- a/launcher/pages/instance/ServersPage.h
+++ b/launcher/pages/instance/ServersPage.h
@@ -19,7 +19,7 @@
#include <QString>
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
namespace Ui
{
@@ -47,7 +47,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("unknown_server");
+ return APPLICATION->getThemedIcon("unknown_server");
}
virtual QString id() const override
{
diff --git a/launcher/pages/instance/VersionPage.cpp b/launcher/pages/instance/VersionPage.cpp
index 103f0c7a..15d5d8d5 100644
--- a/launcher/pages/instance/VersionPage.cpp
+++ b/launcher/pages/instance/VersionPage.cpp
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-#include "Launcher.h"
+#include "Application.h"
#include <QMessageBox>
#include <QLabel>
@@ -70,14 +70,14 @@ public:
auto string = var.toString();
if(string == "warning")
{
- return LAUNCHER->getThemedIcon("status-yellow");
+ return APPLICATION->getThemedIcon("status-yellow");
}
else if(string == "error")
{
- return LAUNCHER->getThemedIcon("status-bad");
+ return APPLICATION->getThemedIcon("status-bad");
}
}
- return LAUNCHER->getThemedIcon("status-good");
+ return APPLICATION->getThemedIcon("status-good");
}
return var;
}
@@ -93,7 +93,7 @@ private:
QIcon VersionPage::icon() const
{
- return LAUNCHER->icons()->getIcon(m_inst->iconKey());
+ return APPLICATION->icons()->getIcon(m_inst->iconKey());
}
bool VersionPage::shouldDisplay() const
{
@@ -297,7 +297,7 @@ void VersionPage::on_actionInstall_mods_triggered()
void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
{
- auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods (*.zip *.jar)"), LAUNCHER->settings()->get("CentralModsDir").toString(), this->parentWidget());
+ auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods (*.zip *.jar)"), APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
if(!list.empty())
{
m_profile->installJarMods(list);
@@ -307,7 +307,7 @@ void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
void VersionPage::on_actionReplace_Minecraft_jar_triggered()
{
- auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement (*.jar)"), LAUNCHER->settings()->get("CentralModsDir").toString(), this->parentWidget());
+ auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement (*.jar)"), APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
if(!jarPath.isEmpty())
{
m_profile->installCustomJar(jarPath);
@@ -395,7 +395,7 @@ void VersionPage::on_actionChange_version_triggered()
void VersionPage::on_actionDownload_All_triggered()
{
- if (!LAUNCHER->accounts()->anyAccountIsValid())
+ if (!APPLICATION->accounts()->anyAccountIsValid())
{
CustomMessageBox::selectable(
this, tr("Error"),
@@ -420,7 +420,7 @@ void VersionPage::on_actionDownload_All_triggered()
void VersionPage::on_actionInstall_Forge_triggered()
{
- auto vlist = ENV.metadataIndex()->get("net.minecraftforge");
+ auto vlist = ENV->metadataIndex()->get("net.minecraftforge");
if(!vlist)
{
return;
@@ -449,7 +449,7 @@ void VersionPage::on_actionInstall_Forge_triggered()
void VersionPage::on_actionInstall_Fabric_triggered()
{
- auto vlist = ENV.metadataIndex()->get("net.fabricmc.fabric-loader");
+ auto vlist = ENV->metadataIndex()->get("net.fabricmc.fabric-loader");
if(!vlist)
{
return;
@@ -494,7 +494,7 @@ void VersionPage::on_actionAdd_Empty_triggered()
void VersionPage::on_actionInstall_LiteLoader_triggered()
{
- auto vlist = ENV.metadataIndex()->get("com.mumfrey.liteloader");
+ auto vlist = ENV->metadataIndex()->get("com.mumfrey.liteloader");
if(!vlist)
{
return;
@@ -614,7 +614,7 @@ void VersionPage::on_actionEdit_triggered()
qWarning() << "file" << filename << "can't be opened for editing, doesn't exist!";
return;
}
- LAUNCHER->openJsonEditor(filename);
+ APPLICATION->openJsonEditor(filename);
}
void VersionPage::on_actionRevert_triggered()
diff --git a/launcher/pages/instance/WorldListPage.cpp b/launcher/pages/instance/WorldListPage.cpp
index d25f23a8..1af38bb8 100644
--- a/launcher/pages/instance/WorldListPage.cpp
+++ b/launcher/pages/instance/WorldListPage.cpp
@@ -26,7 +26,7 @@
#include <QInputDialog>
#include <tools/MCEditTool.h>
-#include "Launcher.h"
+#include "Application.h"
#include <GuiUtil.h>
#include <QProcess>
#include <FileSystem.h>
@@ -48,7 +48,7 @@ public:
auto iconFile = worlds->data(sourceIndex, WorldList::IconFileRole).toString();
if(iconFile.isNull()) {
// NOTE: Minecraft uses the same placeholder for servers AND worlds
- return LAUNCHER->getThemedIcon("unknown_server");
+ return APPLICATION->getThemedIcon("unknown_server");
}
return QIcon(iconFile);
}
@@ -218,7 +218,7 @@ void WorldListPage::on_actionCopy_Seed_triggered()
return;
}
int64_t seed = m_worlds->data(index, WorldList::SeedRole).toLongLong();
- LAUNCHER->clipboard()->setText(QString::number(seed));
+ APPLICATION->clipboard()->setText(QString::number(seed));
}
void WorldListPage::on_actionMCEdit_triggered()
@@ -226,7 +226,7 @@ void WorldListPage::on_actionMCEdit_triggered()
if(m_mceditStarting)
return;
- auto mcedit = LAUNCHER->mcedit();
+ auto mcedit = APPLICATION->mcedit();
const QString mceditPath = mcedit->path();
diff --git a/launcher/pages/instance/WorldListPage.h b/launcher/pages/instance/WorldListPage.h
index b90d7ad1..7636d604 100644
--- a/launcher/pages/instance/WorldListPage.h
+++ b/launcher/pages/instance/WorldListPage.h
@@ -19,7 +19,7 @@
#include "minecraft/MinecraftInstance.h"
#include "pages/BasePage.h"
-#include <Launcher.h>
+#include <Application.h>
#include <LoggedProcess.h>
class WorldList;
@@ -46,7 +46,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("worlds");
+ return APPLICATION->getThemedIcon("worlds");
}
virtual QString id() const override
{
generated by cgit (git 2.46.0) at 2025-02-02 21:53:19 +0000