Browse Source

Fix "Remove" shortcut (Del) to work for both scenes and sources

Palana 11 years ago
parent
commit
55d2af0e60
2 changed files with 17 additions and 4 deletions
  1. 15 0
      obs/forms/OBSBasic.ui
  2. 2 4
      obs/window-basic-main.cpp

+ 15 - 0
obs/forms/OBSBasic.ui

@@ -46,6 +46,10 @@
         <height>32</height>
        </size>
       </property>
+      <property name="focusPolicy">
+       <enum>Qt::ClickFocus</enum>
+      </property>
+      <addaction name="actionRemoveSource"/>
      </widget>
     </item>
     <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
@@ -165,6 +169,7 @@
                <property name="frameShadow">
                 <enum>QFrame::Plain</enum>
                </property>
+               <addaction name="actionRemoveScene"/>
               </widget>
              </item>
              <item>
@@ -270,6 +275,7 @@
                <property name="frameShape">
                 <enum>QFrame::NoFrame</enum>
                </property>
+               <addaction name="actionRemoveSource"/>
               </widget>
              </item>
              <item>
@@ -547,6 +553,12 @@
    <property name="text">
     <string>Remove</string>
    </property>
+   <property name="shortcut">
+    <string>Del</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
   </action>
   <action name="actionRemoveSource">
    <property name="icon">
@@ -559,6 +571,9 @@
    <property name="shortcut">
     <string>Del</string>
    </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
   </action>
   <action name="actionSceneProperties">
    <property name="enabled">

+ 2 - 4
obs/window-basic-main.cpp

@@ -119,10 +119,8 @@ OBSBasic::OBSBasic(QWidget *parent)
 		QKeySequence::keyBindings(QKeySequence::Delete);
 
 #ifdef __APPLE__
-	QList<QKeySequence> keys;
-	keys.append(QKeySequence::Delete);
-	keys.append(QKeySequence(Qt::Key_Backspace));
-	ui->actionRemoveSource->setShortcuts(keys);
+	ui->actionRemoveSource->setShortcuts(DeleteKeys);
+	ui->actionRemoveScene->setShortcuts(DeleteKeys);
 
 	ui->action_Settings->setMenuRole(QAction::PreferencesRole);
 	ui->actionE_xit->setMenuRole(QAction::QuitRole);