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

Fix console window (now not a QDialog)

Browse Source 
It now opens and coloses as expected, depending on user
preferences and the status of the various processes involved.
Console window geometry and state are remembered between runs.
This commit is contained in:
Petr Mrázek
2013-11-23 01:41:28 +01:00
parent 7f5eb5d61a
commit 4124faf474
9 changed files with 152 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/ConsoleWindow.h
View File

@ -15,7 +15,7 @@
#pragma once
#include <QDialog>
#include <QMainWindow>
#include "logic/MinecraftProcess.h"
namespace Ui
@ -23,7 +23,7 @@ namespace Ui
class ConsoleWindow;
}
class ConsoleWindow : public QDialog
class ConsoleWindow : public QMainWindow
{
Q_OBJECT
@ -38,6 +38,9 @@ public:
*/
void setMayClose(bool mayclose);
signals:
void isClosing();
public
slots:
/**
@ -67,13 +70,16 @@ slots:
void on_closeButton_clicked();
void on_btnKillMinecraft_clicked();
void onEnded(BaseInstance *instance, int code, QProcess::ExitStatus status);
void onLaunchFailed(BaseInstance *instance);
// FIXME: add handlers for the other MinecraftProcess signals (pre/post launch command
// failures)
protected:
void closeEvent(QCloseEvent *);
private:
Ui::ConsoleWindow *ui;
MinecraftProcess *proc;
bool m_mayclose;
Ui::ConsoleWindow *ui = nullptr;
MinecraftProcess *proc = nullptr;
bool m_mayclose = true;
};