UI: Add hotkeys page in settings dialog

This commit is contained in:
Palana
2014-11-01 21:50:36 +01:00
parent 369d95dfc3
commit d28e80ae39
6 changed files with 406 additions and 1 deletions

View File

@@ -87,6 +87,15 @@
<normaloff>:/settings/images/settings/video-display-3.png</normaloff>:/settings/images/settings/video-display-3.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Basic.Settings.Hotkeys</string>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/settings/images/settings/preferences-desktop-keyboard-shortcuts.png</normaloff>:/settings/images/settings/preferences-desktop-keyboard-shortcuts.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Basic.Settings.Advanced</string>
@@ -2330,6 +2339,24 @@
</item>
</layout>
</widget>
<widget class="QScrollArea" name="hotkeyPage">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="hotkeyWidget">
<layout class="QFormLayout" name="hotkeyLayout">
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</layout>
</widget>
</widget>
<widget class="QWidget" name="advancedPage">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="leftMargin">

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -22,5 +22,6 @@
<file>images/settings/applications-system-2.png</file>
<file>images/settings/system-settings-3.png</file>
<file>images/settings/network-bluetooth.png</file>
<file>images/settings/preferences-desktop-keyboard-shortcuts.png</file>
</qresource>
</RCC>