From 22327bbe71b271a126521db737101ae07ba26f8d Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 6 Jul 2023 18:04:44 +0100
Subject: Combine launch buttons in Instance window, persist profiler

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/InstanceWindow.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'launcher/ui/InstanceWindow.h')

diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index 554c4c74..64d9a45e 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  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"
@@ -53,7 +55,7 @@ class InstanceWindow : public QMainWindow, public BasePageContainer
 
 public:
     explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0);
-    virtual ~InstanceWindow();
+    virtual ~InstanceWindow() = default;
 
     bool selectPage(QString pageId) override;
     void refreshContainer() override;
@@ -71,11 +73,6 @@ signals:
 
 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);
@@ -84,7 +81,7 @@ protected:
     void closeEvent(QCloseEvent *) override;
 
 private:
-    void updateLaunchButtons();
+    void updateButtons();
 
 private:
     shared_qobject_ptr<LaunchTask> m_proc;
@@ -92,7 +89,6 @@ private:
     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;
 };
-- 
cgit 


From ffd8ed550f05e1336afc6ddc424b6733256ecf02 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 17 Aug 2023 10:16:52 +0100
Subject: Reformat

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp     | 15 +++++----------
 launcher/Application.h       |  2 +-
 launcher/ui/InstanceWindow.h |  2 +-
 launcher/ui/MainWindow.cpp   |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'launcher/ui/InstanceWindow.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index c1bf7e5e..4da7629c 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1104,18 +1104,13 @@ bool Application::launch(InstancePtr instance,
                          MinecraftServerTargetPtr serverToJoin,
                          MinecraftAccountPtr accountToUse)
 {
-    if(m_updateRunning)
-    {
+    if (m_updateRunning) {
         qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed.";
-    }
-    else if(instance->canLaunch())
-    {
-        auto & extras = m_instanceExtras[instance->id()];
+    } else if (instance->canLaunch()) {
+        auto& extras = m_instanceExtras[instance->id()];
         auto window = extras.window;
-        if(window)
-        {
-            if(!window->saveAll())
-            {
+        if (window) {
+            if (!window->saveAll()) {
                 return false;
             }
         }
diff --git a/launcher/Application.h b/launcher/Application.h
index a09f46b5..8a85fd95 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -187,7 +187,7 @@ class Application : public QApplication {
     void clickedOnDock();
 #endif
 
-public slots:
+   public slots:
     bool launch(InstancePtr instance,
                 bool online = true,
                 bool demo = false,
diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index a8a7559f..e5bc24d4 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -52,7 +52,7 @@ class PageContainer;
 class InstanceWindow : public QMainWindow, public BasePageContainer {
     Q_OBJECT
 
-public:
+   public:
     explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0);
     virtual ~InstanceWindow() = default;
 
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 48feea09..36a6e379 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -551,7 +551,7 @@ void MainWindow::updateMainToolBar()
 
 void MainWindow::updateLaunchButton()
 {
-    QMenu *launchMenu = ui->actionLaunchInstance->menu();
+    QMenu* launchMenu = ui->actionLaunchInstance->menu();
     if (launchMenu)
         launchMenu->clear();
     else
-- 
cgit