External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-14 04:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE debranding for real, initial work

Browse Source 
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
This commit is contained in:
Petr Mrázek
2021-10-13 01:59:25 +02:00
parent 6a4130c914
commit 441ab7eedc
112 changed files with 944 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/InstanceWindow.cpp
View File

@@ -14,7 +14,7 @@
*/
#include "InstanceWindow.h"
#include "MultiMC.h"
#include "Launcher.h"
#include <QScrollBar>
#include <QMessageBox>
@@ -35,7 +35,7 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget *parent)
{
setAttribute(Qt::WA_DeleteOnClose);
auto icon = MMC->icons()->getIcon(m_instance->iconKey());
auto icon = LAUNCHER->icons()->getIcon(m_instance->iconKey());
QString windowTitle = tr("Console window for ") + m_instance->name();
// Set window properties
@@ -87,9 +87,9 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget *parent)
// restore window state
{
auto base64State = MMC->settings()->get("ConsoleWindowState").toByteArray();
auto base64State = LAUNCHER->settings()->get("ConsoleWindowState").toByteArray();
restoreState(QByteArray::fromBase64(base64State));
auto base64Geometry = MMC->settings()->get("ConsoleWindowGeometry").toByteArray();
auto base64Geometry = LAUNCHER->settings()->get("ConsoleWindowGeometry").toByteArray();
restoreGeometry(QByteArray::fromBase64(base64Geometry));
}
@@ -148,7 +148,7 @@ void InstanceWindow::updateLaunchButtons()
void InstanceWindow::on_btnLaunchMinecraftOffline_clicked()
{
MMC->launch(m_instance, false, nullptr);
LAUNCHER->launch(m_instance, false, nullptr);
}
void InstanceWindow::on_InstanceLaunchTask_changed(shared_qobject_ptr<LaunchTask> proc)
@@ -183,8 +183,8 @@ void InstanceWindow::closeEvent(QCloseEvent *event)
return;
}
MMC->settings()->set("ConsoleWindowState", saveState().toBase64());
MMC->settings()->set("ConsoleWindowGeometry", saveGeometry().toBase64());
LAUNCHER->settings()->set("ConsoleWindowState", saveState().toBase64());
LAUNCHER->settings()->set("ConsoleWindowGeometry", saveGeometry().toBase64());
emit isClosing();
event->accept();
}
@@ -198,11 +198,11 @@ void InstanceWindow::on_btnKillMinecraft_clicked()
{
if(m_instance->isRunning())
{
MMC->kill(m_instance);
LAUNCHER->kill(m_instance);
}
else
{
MMC->launch(m_instance, true, nullptr);
LAUNCHER->launch(m_instance, true, nullptr);
}
}