summaryrefslogtreecommitdiffstats
path: root/gui/pages/InstanceSettingsPage.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-06-30 02:02:57 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-30 02:02:57 +0200
commit421a46e3d3036ea0dea4889125ee58309d0ed21e (patch)
treeb3665ec5c94c991c7dba5436580ffd4047395aa8 /gui/pages/InstanceSettingsPage.h
parent5179aed3a066dfc9885a75d36a0e64c48aa448f7 (diff)
downloadMultiMC-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.h')
-rw-r--r--gui/pages/InstanceSettingsPage.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h
index db37d8d8..2447168f 100644
--- a/gui/pages/InstanceSettingsPage.h
+++ b/gui/pages/InstanceSettingsPage.h
@@ -32,15 +32,14 @@ class InstanceSettingsPage : public QWidget, public BasePage
Q_OBJECT
public:
- explicit InstanceSettingsPage(SettingsObject *s, QWidget *parent = 0);
+ explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0);
virtual ~InstanceSettingsPage();
virtual QString displayName() override;
virtual QIcon icon() override;
virtual QString id() override;
virtual bool apply();
- virtual QString helpPage() override { return "Instance-settings"; };
-private:
- void updateCheckboxStuff();
+ virtual QString helpPage() override { return "Instance-settings"; }
+ virtual bool shouldDisplay();
private slots:
void on_javaDetectBtn_clicked();
@@ -54,6 +53,7 @@ private slots:
void loadSettings();
private:
Ui::InstanceSettingsPage *ui;
+ BaseInstance *m_instance;
SettingsObject *m_settings;
std::shared_ptr<JavaChecker> checker;
};