aboutsummaryrefslogtreecommitdiff
path: root/gui/dialogs/SettingsDialog.h
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-12-30 06:04:32 -0800
committerSky <git@bunnies.cc>2013-12-30 06:04:32 -0800
commitd62e175cca3d1a9e16741623442f8bdd5c107c02 (patch)
tree9b82e5fd20529ac1ead260b2e7e7f60d54b476e6 /gui/dialogs/SettingsDialog.h
parent654f444f55de58f5cf0477e3b08b8f18e8d60831 (diff)
parent76438f6afe4b29b3436bc32ba18e7f4dbdfa636d (diff)
downloadPrismLauncher-d62e175cca3d1a9e16741623442f8bdd5c107c02.tar.gz
PrismLauncher-d62e175cca3d1a9e16741623442f8bdd5c107c02.tar.bz2
PrismLauncher-d62e175cca3d1a9e16741623442f8bdd5c107c02.zip
Merge pull request #28 from 02JanDal/feature_editor
Button for opening an editor for the custom.json file
Diffstat (limited to 'gui/dialogs/SettingsDialog.h')
-rw-r--r--gui/dialogs/SettingsDialog.h2
1 files changed, 2 insertions, 0 deletions
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();