From 82c87aa06f793b9f38e6cb42d284f00695f4bac5 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 20 Dec 2013 14:47:26 +0100 Subject: Initial FTB support. Allows "tracking" of FTB instances. --- gui/dialogs/SettingsDialog.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gui/dialogs/SettingsDialog.h') diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index 0cb8fa38..36fc4797 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -45,6 +45,10 @@ protected: private slots: + void on_ftbLauncherBrowseBtn_clicked(); + + void on_ftbBrowseBtn_clicked(); + void on_instDirBrowseBtn_clicked(); void on_modsDirBrowseBtn_clicked(); -- cgit v1.2.3 From 3380bc75633c63e8569b76981ac29528c58943ce Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sun, 29 Dec 2013 17:51:16 +0100 Subject: Launch an editor for the custom.json file. Also allow overriding of the system default editor --- gui/dialogs/SettingsDialog.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gui/dialogs/SettingsDialog.h') diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index 36fc4797..01357c91 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -55,6 +55,8 @@ slots: void on_lwjglDirBrowseBtn_clicked(); + void on_jsonEditorBrowseBtn_clicked(); + void on_maximizedCheckBox_clicked(bool checked); void on_buttonBox_accepted(); -- cgit v1.2.3 From 952b63f68de93e8acf7aab81373661dae8d5098b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 31 Dec 2013 01:24:28 +0100 Subject: Refactor icon lists heavily * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM. --- gui/dialogs/SettingsDialog.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gui/dialogs/SettingsDialog.h') diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index 01357c91..bcf57a80 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -55,8 +55,11 @@ slots: void on_lwjglDirBrowseBtn_clicked(); + void on_jsonEditorBrowseBtn_clicked(); + void on_iconsDirBrowseBtn_clicked(); + void on_maximizedCheckBox_clicked(bool checked); void on_buttonBox_accepted(); -- cgit v1.2.3 From eb4e7d3f6771d5c5fb6d70557c8013f745e72ca4 Mon Sep 17 00:00:00 2001 From: Sky Date: Thu, 2 Jan 2014 02:20:34 +0000 Subject: Save/restore settings dialog (and instance specific settings) window geometry --- gui/dialogs/SettingsDialog.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gui/dialogs/SettingsDialog.h') diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index bcf57a80..11fdb696 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -41,7 +41,8 @@ public: void loadSettings(SettingsObject *s); protected: - virtual void showEvent(QShowEvent *); + virtual void showEvent(QShowEvent *ev); + virtual void closeEvent(QCloseEvent *ev); private slots: @@ -64,6 +65,8 @@ slots: void on_buttonBox_accepted(); + void on_buttonBox_rejected(); + void on_javaDetectBtn_clicked(); void on_javaTestBtn_clicked(); -- cgit v1.2.3