Browse Source

Add Settings entry to File menu

This automagically creates a (localized?) Preferences entry on OSX as well
Palana 11 years ago
parent
commit
b5276ea18f
3 changed files with 14 additions and 0 deletions
  1. 7 0
      obs/forms/OBSBasic.ui
  2. 6 0
      obs/window-basic-main.cpp
  3. 1 0
      obs/window-basic-main.hpp

+ 7 - 0
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>

+ 6 - 0
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)
 {

+ 1 - 0
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);