CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into better-launch

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2023-08-16 20:46:16 +01:00
parent 57430fd189 c88088c91a
commit 3e2733d840
737 changed files with 20254 additions and 18943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
launcher/ui/InstanceWindow.h
View File

@ -49,15 +49,15 @@
class QPushButton;
class PageContainer;
class InstanceWindow : public QMainWindow, public BasePageContainer
{
class InstanceWindow : public QMainWindow, public BasePageContainer {
Q_OBJECT
public:
explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0);
explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0);
virtual ~InstanceWindow() = default;
bool selectPage(QString pageId) override;
BasePage* selectedPage() const override;
void refreshContainer() override;
QString instanceId();
@ -68,27 +68,26 @@ public:
// request closing the window (from a page)
bool requestClose() override;
signals:
signals:
void isClosing();
private
slots:
private slots:
void instanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc);
void runningStateChanged(bool running);
void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
protected:
void closeEvent(QCloseEvent *) override;
protected:
void closeEvent(QCloseEvent*) override;
private:
private:
void updateButtons();
private:
private:
shared_qobject_ptr<LaunchTask> m_proc;
InstancePtr m_instance;
bool m_doNotSave = false;
PageContainer *m_container = nullptr;
QPushButton *m_closeButton = nullptr;
QToolButton *m_launchButton = nullptr;
QPushButton *m_killButton = nullptr;
PageContainer* m_container = nullptr;
QPushButton* m_closeButton = nullptr;
QToolButton* m_launchButton = nullptr;
QPushButton* m_killButton = nullptr;
};