diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-06-30 02:02:57 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-06-30 02:02:57 +0200 |
commit | 421a46e3d3036ea0dea4889125ee58309d0ed21e (patch) | |
tree | b3665ec5c94c991c7dba5436580ffd4047395aa8 /gui/pages/InstanceSettingsPage.cpp | |
parent | 5179aed3a066dfc9885a75d36a0e64c48aa448f7 (diff) | |
download | MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar.gz MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar.lz MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.tar.xz MultiMC-421a46e3d3036ea0dea4889125ee58309d0ed21e.zip |
Redo the console window. Log is now a page. Console window has relevant pages.
Dirty fix for screenshot thumbnail generation. Needs more QTimer.
Diffstat (limited to 'gui/pages/InstanceSettingsPage.cpp')
-rw-r--r-- | gui/pages/InstanceSettingsPage.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gui/pages/InstanceSettingsPage.cpp b/gui/pages/InstanceSettingsPage.cpp index b4a6405f..6e2ce238 100644 --- a/gui/pages/InstanceSettingsPage.cpp +++ b/gui/pages/InstanceSettingsPage.cpp @@ -23,13 +23,19 @@ QString InstanceSettingsPage::id() return "settings"; } -InstanceSettingsPage::InstanceSettingsPage(SettingsObject *s, QWidget *parent) - : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_settings(s) +InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent) + : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst) { + m_settings = &(inst->settings()); ui->setupUi(this); loadSettings(); } +bool InstanceSettingsPage::shouldDisplay() +{ + return !m_instance->isRunning(); +} + InstanceSettingsPage::~InstanceSettingsPage() { delete ui; |