Merge remote-tracking branch 'upstream/master'

Conflicts:
	gui/mainwindow.cpp

1 files changed, 34 insertions, 0 deletions

diff --git a/gui/instancesettings.h b/gui/instancesettings.h
new file mode 100644
index 00000000..afbd0c16
--- /dev/null
+++ b/gui/instancesettings.h
@@ -0,0 +1,34 @@
+#ifndef INSTANCESETTINGS_H
+#define INSTANCESETTINGS_H
+
+#include <QDialog>
+#include "settingsobject.h"
+
+namespace Ui {
+class InstanceSettings;
+}
+
+class InstanceSettings : public QDialog
+{
+	Q_OBJECT
+    
+public:
+	explicit InstanceSettings(SettingsObject *s, QWidget *parent = 0);
+	~InstanceSettings();
+
+	void updateCheckboxStuff();
+
+	void applySettings();
+	void loadSettings();
+    
+private slots:
+	void on_customCommandsGroupBox_toggled(bool arg1);
+	void on_buttonBox_accepted();
+	void on_buttonBox_rejected();
+
+private:
+	Ui::InstanceSettings *ui;
+	SettingsObject * m_obj;
+};
+
+#endif // INSTANCESETTINGS_H