Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 13 insertions, 1 deletions

diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h
index 0cb8fa38..11fdb696 100644
--- a/gui/dialogs/SettingsDialog.h
+++ b/gui/dialogs/SettingsDialog.h
@@ -41,20 +41,32 @@ public:
 	void loadSettings(SettingsObject *s);
 
 protected:
-	virtual void showEvent(QShowEvent *);
+	virtual void showEvent(QShowEvent *ev);
+	virtual void closeEvent(QCloseEvent *ev);
 
 private
 slots:
+	void on_ftbLauncherBrowseBtn_clicked();
+
+	void on_ftbBrowseBtn_clicked();
+
 	void on_instDirBrowseBtn_clicked();
 
 	void on_modsDirBrowseBtn_clicked();
 
 	void on_lwjglDirBrowseBtn_clicked();
 
+
+	void on_jsonEditorBrowseBtn_clicked();
+
+	void on_iconsDirBrowseBtn_clicked();
+
 	void on_maximizedCheckBox_clicked(bool checked);
 
 	void on_buttonBox_accepted();
 
+	void on_buttonBox_rejected();
+
 	void on_javaDetectBtn_clicked();
 
 	void on_javaTestBtn_clicked();