summaryrefslogtreecommitdiffstats
path: root/gui/pages/InstanceSettingsPage.h
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-07-12 23:02:52 +0200
committerPetr Mrázek <peterix@gmail.com>2014-07-12 23:31:06 +0200
commit4c0dc51110603cbe0e98228c703e26402094a3cc (patch)
treeb056d601ba2494e046752e5c94e3049182293515 /gui/pages/InstanceSettingsPage.h
parent5c4384235989b16d6931cc0cfa26dd192af68b96 (diff)
downloadMultiMC-4c0dc51110603cbe0e98228c703e26402094a3cc.tar
MultiMC-4c0dc51110603cbe0e98228c703e26402094a3cc.tar.gz
MultiMC-4c0dc51110603cbe0e98228c703e26402094a3cc.tar.lz
MultiMC-4c0dc51110603cbe0e98228c703e26402094a3cc.tar.xz
MultiMC-4c0dc51110603cbe0e98228c703e26402094a3cc.zip
Finish of the OtherLogs page, and (re)format page related files
Diffstat (limited to 'gui/pages/InstanceSettingsPage.h')
-rw-r--r--gui/pages/InstanceSettingsPage.h28
1 files changed, 21 insertions, 7 deletions
diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h
index 7052040c..988862cf 100644
--- a/gui/pages/InstanceSettingsPage.h
+++ b/gui/pages/InstanceSettingsPage.h
@@ -14,11 +14,12 @@
*/
#pragma once
+
#include <QWidget>
-#include <logic/OneSixInstance.h>
-#include <logic/net/NetJob.h>
-#include <logic/java/JavaChecker.h>
+#include "logic/OneSixInstance.h"
+#include "logic/net/NetJob.h"
+#include "logic/java/JavaChecker.h"
#include "BasePage.h"
class JavaChecker;
@@ -34,11 +35,23 @@ class InstanceSettingsPage : public QWidget, public BasePage
public:
explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0);
virtual ~InstanceSettingsPage();
- virtual QString displayName() const override;
- virtual QIcon icon() const override;
- virtual QString id() const override;
+ virtual QString displayName() const override
+ {
+ return tr("Settings");
+ }
+ virtual QIcon icon() const override
+ {
+ return QIcon::fromTheme("settings");
+ }
+ virtual QString id() const override
+ {
+ return "settings";
+ }
virtual bool apply();
- virtual QString helpPage() const override { return "Instance-settings"; }
+ virtual QString helpPage() const override
+ {
+ return "Instance-settings";
+ }
virtual bool shouldDisplay() const;
private slots:
void on_javaDetectBtn_clicked();
@@ -51,6 +64,7 @@ private slots:
void applySettings();
void loadSettings();
+
private:
Ui::InstanceSettingsPage *ui;
BaseInstance *m_instance;