jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add ability to disable hotkeys when not in focus

Browse Source
This commit is contained in:
Jonathan Baecker
2019-07-22 01:20:12 -07:00
committed by jp9000
parent 985772d915
commit 19464e6552
5 changed files with 89 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
UI/forms/OBSBasicSettings.ui
View File

@@ -151,8 +151,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>806</width>
<height>1225</height>
<width>803</width>
<height>954</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
@@ -1173,8 +1173,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>813</width>
<height>761</height>
<width>601</width>
<height>631</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -3621,8 +3621,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>767</width>
<height>582</height>
<width>555</width>
<height>469</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_50">
@@ -4436,9 +4436,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>806</width>
<height>933</height>
<y>-114</y>
<width>803</width>
<height>761</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -5136,17 +5136,23 @@
<string>Basic.Settings.Hotkeys</string>
</property>
<layout class="QFormLayout" name="formLayout_33">
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="topMargin">
<number>2</number>
</property>
<item row="0" column="1">
<widget class="QCheckBox" name="disableFocusHotkeys">
<item row="0" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus</string>
<string>Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior</string>
</property>
</widget>
</item>
<item row="0" column="0">
<item row="0" column="1">
<widget class="QComboBox" name="hotkeyFocusType"/>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -5154,7 +5160,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>170</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
@@ -5399,7 +5405,6 @@
<tabstop>enableNewSocketLoop</tabstop>
<tabstop>enableLowLatencyMode</tabstop>
<tabstop>browserHWAccel</tabstop>
<tabstop>disableFocusHotkeys</tabstop>
</tabstops>
<resources>
<include location="obs.qrc"/>