NOISSUE debranding for real, initial work
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
This commit is contained in:
parent
6a4130c914
commit
441ab7eedc
112 changed files with 944 additions and 663 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue