0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00

UI: Make advanced settings pane a bit more compact

Packs related controls together and makes a bit more room for more
advanced settings.
This commit is contained in:
jp9000 2017-01-08 15:26:33 -08:00
parent e181db7845
commit 96f6fa9473

View File

@ -3255,8 +3255,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>818</width>
<height>697</height>
</rect>
</property>
<layout class="QFormLayout" name="hotkeyLayout">
@ -3302,8 +3302,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>593</width>
<height>709</height>
<width>820</width>
<height>699</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@ -3356,6 +3356,46 @@
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="rendererLabel">
<property name="text">
<string>Basic.Settings.Video.Renderer</string>
</property>
<property name="buddy">
<cstring>renderer</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="renderer">
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="adapterLabel">
<property name="text">
<string>Basic.Settings.Video.Adapter</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>adapter</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="adapter">
<property name="enabled">
<bool>false</bool>
</property>
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_30">
<property name="minimumSize">
@ -3399,18 +3439,84 @@
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>Basic.Settings.Advanced.Video.ColorRange</string>
</property>
<property name="buddy">
<cstring>colorRange</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="colorRange"/>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="disableOSXVSync">
<property name="text">
<string>DisableOSXVSync</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="resetOSXVSync">
<property name="text">
<string>ResetOSXVSyncOnExit</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_20">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QComboBox" name="colorSpace">
<item>
<property name="text">
<string notr="true">709</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">601</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_34">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Basic.Settings.Advanced.Video.ColorRange</string>
</property>
<property name="buddy">
<cstring>colorRange</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="colorRange"/>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_33">
@ -3422,74 +3528,6 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="colorSpace">
<item>
<property name="text">
<string notr="true">709</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">601</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="rendererLabel">
<property name="text">
<string>Basic.Settings.Video.Renderer</string>
</property>
<property name="buddy">
<cstring>renderer</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="renderer">
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="adapterLabel">
<property name="text">
<string>Basic.Settings.Video.Adapter</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>adapter</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="adapter">
<property name="enabled">
<bool>false</bool>
</property>
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="disableOSXVSync">
<property name="text">
<string>DisableOSXVSync</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QCheckBox" name="resetOSXVSync">
<property name="text">
<string>ResetOSXVSyncOnExit</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -3507,6 +3545,9 @@
<property name="text">
<string>Basic.Settings.Output.Adv.Recording.Filename</string>
</property>
<property name="buddy">
<cstring>filenameFormatting</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -3541,6 +3582,9 @@
<property name="text">
<string>Basic.Settings.Output.ReplayBuffer.Suffix</string>
</property>
<property name="buddy">
<cstring>simpleRBSuffix</cstring>
</property>
</widget>
</item>
<item>
@ -3553,6 +3597,9 @@
<property name="text">
<string>Basic.Settings.Output.ReplayBuffer.Prefix</string>
</property>
<property name="buddy">
<cstring>simpleRBPrefix</cstring>
</property>
</widget>
</item>
</layout>
@ -3662,16 +3709,6 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Basic.Settings.Output.RetryDelay</string>
</property>
<property name="buddy">
<cstring>reconnectRetryDelay</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="reconnectEnable">
<property name="text">
@ -3683,29 +3720,61 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="reconnectRetryDelay">
<property name="maximum">
<number>30</number>
<layout class="QHBoxLayout" name="horizontalLayout_19">
<property name="leftMargin">
<number>0</number>
</property>
</widget>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QSpinBox" name="reconnectRetryDelay">
<property name="maximum">
<number>30</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_22">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Basic.Settings.Output.MaxRetries</string>
</property>
<property name="buddy">
<cstring>reconnectMaxRetries</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="reconnectMaxRetries">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_22">
<item row="1" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Basic.Settings.Output.MaxRetries</string>
<string>Basic.Settings.Output.RetryDelay</string>
</property>
<property name="buddy">
<cstring>reconnectMaxRetries</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="reconnectMaxRetries">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
<cstring>reconnectRetryDelay</cstring>
</property>
</widget>
</item>
@ -3729,6 +3798,9 @@
<property name="text">
<string>Basic.Settings.Advanced.Network.BindToIP</string>
</property>
<property name="buddy">
<cstring>bindToIP</cstring>
</property>
</widget>
</item>
</layout>
@ -3784,8 +3856,135 @@
</widget>
<tabstops>
<tabstop>listWidget</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>language</tabstop>
<tabstop>theme</tabstop>
<tabstop>warnBeforeStreamStart</tabstop>
<tabstop>warnBeforeStreamStop</tabstop>
<tabstop>recordWhenStreaming</tabstop>
<tabstop>systemTrayEnabled</tabstop>
<tabstop>systemTrayWhenStarted</tabstop>
<tabstop>snappingEnabled</tabstop>
<tabstop>screenSnapping</tabstop>
<tabstop>centerSnapping</tabstop>
<tabstop>sourceSnapping</tabstop>
<tabstop>snapDistance</tabstop>
<tabstop>hideProjectorCursor</tabstop>
<tabstop>keepRecordStreamStops</tabstop>
<tabstop>projectorAlwaysOnTop</tabstop>
<tabstop>streamType</tabstop>
<tabstop>outputMode</tabstop>
<tabstop>simpleOutputVBitrate</tabstop>
<tabstop>simpleOutputABitrate</tabstop>
<tabstop>simpleOutAdvanced</tabstop>
<tabstop>simpleOutPreset</tabstop>
<tabstop>simpleOutCustom</tabstop>
<tabstop>simpleOutEnforce</tabstop>
<tabstop>simpleOutStrEncoder</tabstop>
<tabstop>simpleOutputPath</tabstop>
<tabstop>simpleOutputBrowse</tabstop>
<tabstop>simpleNoSpace</tabstop>
<tabstop>simpleOutRecQuality</tabstop>
<tabstop>simpleOutRecFormat</tabstop>
<tabstop>simpleOutRecEncoder</tabstop>
<tabstop>simpleOutMuxCustom</tabstop>
<tabstop>simpleReplayBuf</tabstop>
<tabstop>simpleRBSecMax</tabstop>
<tabstop>simpleRBMegsMax</tabstop>
<tabstop>advOutTabs</tabstop>
<tabstop>advOutTrack1</tabstop>
<tabstop>advOutTrack2</tabstop>
<tabstop>advOutTrack3</tabstop>
<tabstop>advOutTrack4</tabstop>
<tabstop>advOutTrack5</tabstop>
<tabstop>advOutTrack6</tabstop>
<tabstop>advOutEncoder</tabstop>
<tabstop>advOutApplyService</tabstop>
<tabstop>advOutUseRescale</tabstop>
<tabstop>advOutRescale</tabstop>
<tabstop>advOutRecType</tabstop>
<tabstop>advOutRecPath</tabstop>
<tabstop>advOutRecPathBrowse</tabstop>
<tabstop>advOutNoSpace</tabstop>
<tabstop>advOutRecFormat</tabstop>
<tabstop>advOutRecTrack1</tabstop>
<tabstop>advOutRecTrack2</tabstop>
<tabstop>advOutRecTrack3</tabstop>
<tabstop>advOutRecTrack4</tabstop>
<tabstop>advOutRecTrack5</tabstop>
<tabstop>advOutRecTrack6</tabstop>
<tabstop>advOutRecEncoder</tabstop>
<tabstop>advOutRecUseRescale</tabstop>
<tabstop>advOutRecRescale</tabstop>
<tabstop>advOutMuxCustom</tabstop>
<tabstop>advOutFFRecPath</tabstop>
<tabstop>advOutFFPathBrowse</tabstop>
<tabstop>advOutFFURL</tabstop>
<tabstop>advOutFFFormat</tabstop>
<tabstop>advOutFFVBitrate</tabstop>
<tabstop>advOutFFUseRescale</tabstop>
<tabstop>advOutFFRescale</tabstop>
<tabstop>advOutFFVEncoder</tabstop>
<tabstop>advOutFFVCfg</tabstop>
<tabstop>advOutFFABitrate</tabstop>
<tabstop>advOutFFTrack1</tabstop>
<tabstop>advOutFFTrack2</tabstop>
<tabstop>advOutFFTrack3</tabstop>
<tabstop>advOutFFTrack4</tabstop>
<tabstop>advOutFFTrack5</tabstop>
<tabstop>advOutFFTrack6</tabstop>
<tabstop>advOutFFAEncoder</tabstop>
<tabstop>advOutFFACfg</tabstop>
<tabstop>advOutFFType</tabstop>
<tabstop>advOutFFMCfg</tabstop>
<tabstop>advOutFFNoSpace</tabstop>
<tabstop>advOutTrack1Bitrate</tabstop>
<tabstop>advOutTrack1Name</tabstop>
<tabstop>advOutTrack2Bitrate</tabstop>
<tabstop>advOutTrack2Name</tabstop>
<tabstop>advOutTrack3Bitrate</tabstop>
<tabstop>advOutTrack3Name</tabstop>
<tabstop>advOutTrack4Bitrate</tabstop>
<tabstop>advOutTrack4Name</tabstop>
<tabstop>advOutTrack5Bitrate</tabstop>
<tabstop>advOutTrack5Name</tabstop>
<tabstop>advOutTrack6Bitrate</tabstop>
<tabstop>advOutTrack6Name</tabstop>
<tabstop>sampleRate</tabstop>
<tabstop>channelSetup</tabstop>
<tabstop>desktopAudioDevice1</tabstop>
<tabstop>desktopAudioDevice2</tabstop>
<tabstop>auxAudioDevice1</tabstop>
<tabstop>auxAudioDevice2</tabstop>
<tabstop>auxAudioDevice3</tabstop>
<tabstop>audioSourceScrollArea</tabstop>
<tabstop>baseResolution</tabstop>
<tabstop>outputResolution</tabstop>
<tabstop>downscaleFilter</tabstop>
<tabstop>fpsType</tabstop>
<tabstop>fpsCommon</tabstop>
<tabstop>fpsInteger</tabstop>
<tabstop>fpsNumerator</tabstop>
<tabstop>fpsDenominator</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>processPriority</tabstop>
<tabstop>renderer</tabstop>
<tabstop>adapter</tabstop>
<tabstop>colorFormat</tabstop>
<tabstop>colorSpace</tabstop>
<tabstop>colorRange</tabstop>
<tabstop>disableOSXVSync</tabstop>
<tabstop>resetOSXVSync</tabstop>
<tabstop>filenameFormatting</tabstop>
<tabstop>overwriteIfExists</tabstop>
<tabstop>simpleRBPrefix</tabstop>
<tabstop>simpleRBSuffix</tabstop>
<tabstop>streamDelayEnable</tabstop>
<tabstop>streamDelaySec</tabstop>
<tabstop>streamDelayPreserve</tabstop>
<tabstop>reconnectEnable</tabstop>
<tabstop>reconnectRetryDelay</tabstop>
<tabstop>reconnectMaxRetries</tabstop>
<tabstop>bindToIP</tabstop>
</tabstops>
<resources>
<include location="obs.qrc"/>
@ -4031,70 +4230,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>reconnectEnable</sender>
<signal>toggled(bool)</signal>
<receiver>label_17</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>724</x>
<y>541</y>
</hint>
<hint type="destinationlabel">
<x>332</x>
<y>567</y>
</hint>
</hints>
</connection>
<connection>
<sender>reconnectEnable</sender>
<signal>toggled(bool)</signal>
<receiver>reconnectRetryDelay</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>724</x>
<y>541</y>
</hint>
<hint type="destinationlabel">
<x>724</x>
<y>567</y>
</hint>
</hints>
</connection>
<connection>
<sender>reconnectEnable</sender>
<signal>toggled(bool)</signal>
<receiver>label_22</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>724</x>
<y>541</y>
</hint>
<hint type="destinationlabel">
<x>332</x>
<y>593</y>
</hint>
</hints>
</connection>
<connection>
<sender>reconnectEnable</sender>
<signal>toggled(bool)</signal>
<receiver>reconnectMaxRetries</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>724</x>
<y>541</y>
</hint>
<hint type="destinationlabel">
<x>724</x>
<y>593</y>
</hint>
</hints>
</connection>
<connection>
<sender>snappingEnabled</sender>
<signal>toggled(bool)</signal>