From b5276ea18ffacb102b896ad006a071a204bfe4e6 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Tue, 15 Apr 2014 14:19:59 +0200
Subject: [PATCH] Add Settings entry to File menu

This automagically creates a (localized?) Preferences entry on OSX as well
---
 obs/forms/OBSBasic.ui     | 7 +++++++
 obs/window-basic-main.cpp | 6 ++++++
 obs/window-basic-main.hpp | 1 +
 3 files changed, 14 insertions(+)

diff --git a/obs/forms/OBSBasic.ui b/obs/forms/OBSBasic.ui
index a1d3d9bb5..a0e995981 100644
--- a/obs/forms/OBSBasic.ui
+++ b/obs/forms/OBSBasic.ui
@@ -378,6 +378,8 @@
     <addaction name="action_Open"/>
     <addaction name="action_Save"/>
     <addaction name="separator"/>
+    <addaction name="action_Settings"/>
+    <addaction name="separator"/>
     <addaction name="actionE_xit"/>
    </widget>
    <addaction name="menu_File"/>
@@ -494,6 +496,11 @@
     <string>&amp;Save</string>
    </property>
   </action>
+  <action name="action_Settings">
+   <property name="text">
+    <string>Settings</string>
+   </property>
+  </action>
   <action name="actionE_xit">
    <property name="text">
     <string>E&amp;xit</string>
diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp
index 4ca1e4199..f994fd14e 100644
--- a/obs/window-basic-main.cpp
+++ b/obs/window-basic-main.cpp
@@ -575,6 +575,12 @@ void OBSBasic::on_action_Save_triggered()
 	/* TODO */
 }
 
+void OBSBasic::on_action_Settings_triggered()
+{
+	OBSBasicSettings settings(this);
+	settings.exec();
+}
+
 void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current,
 		QListWidgetItem *prev)
 {
diff --git a/obs/window-basic-main.hpp b/obs/window-basic-main.hpp
index a5fc82aa7..62106483b 100644
--- a/obs/window-basic-main.hpp
+++ b/obs/window-basic-main.hpp
@@ -115,6 +115,7 @@ private slots:
 	void on_action_New_triggered();
 	void on_action_Open_triggered();
 	void on_action_Save_triggered();
+	void on_action_Settings_triggered();
 	void on_scenes_currentItemChanged(QListWidgetItem *current,
 			QListWidgetItem *prev);
 	void on_scenes_customContextMenuRequested(const QPoint &pos);