Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 6 insertions, 9 deletions

diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index 508bcaa1..e5bc24d4 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +38,7 @@
 
 #include <QMainWindow>
 #include <QSystemTrayIcon>
+#include <QToolButton>
 
 #include "LaunchController.h"
 #include "launch/LaunchTask.h"
@@ -52,9 +54,10 @@ class InstanceWindow : public QMainWindow, public BasePageContainer {
 
    public:
     explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0);
-    virtual ~InstanceWindow();
+    virtual ~InstanceWindow() = default;
 
     bool selectPage(QString pageId) override;
+    BasePage* selectedPage() const override;
     void refreshContainer() override;
 
     QString instanceId();
@@ -69,11 +72,6 @@ class InstanceWindow : public QMainWindow, public BasePageContainer {
     void isClosing();
 
    private slots:
-    void on_closeButton_clicked();
-    void on_btnKillMinecraft_clicked();
-    void on_btnLaunchMinecraftOffline_clicked();
-    void on_btnLaunchMinecraftDemo_clicked();
-
     void instanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc);
     void runningStateChanged(bool running);
     void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
@@ -82,7 +80,7 @@ class InstanceWindow : public QMainWindow, public BasePageContainer {
     void closeEvent(QCloseEvent*) override;
 
    private:
-    void updateLaunchButtons();
+    void updateButtons();
 
    private:
     shared_qobject_ptr<LaunchTask> m_proc;
@@ -90,7 +88,6 @@ class InstanceWindow : public QMainWindow, public BasePageContainer {
     bool m_doNotSave = false;
     PageContainer* m_container = nullptr;
     QPushButton* m_closeButton = nullptr;
+    QToolButton* m_launchButton = nullptr;
     QPushButton* m_killButton = nullptr;
-    QPushButton* m_launchOfflineButton = nullptr;
-    QPushButton* m_launchDemoButton = nullptr;
 };