From 96f6fa9473d2d5f2b74b7a36d25e92e6265b5cc8 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 8 Jan 2017 15:26:33 -0800 Subject: [PATCH] UI: Make advanced settings pane a bit more compact Packs related controls together and makes a bit more room for more advanced settings. --- UI/forms/OBSBasicSettings.ui | 487 ++++++++++++++++++++++------------- 1 file changed, 311 insertions(+), 176 deletions(-) diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index ccef5a52c..801bdcae5 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -3255,8 +3255,8 @@ 0 0 - 98 - 28 + 818 + 697 @@ -3302,8 +3302,8 @@ 0 0 - 593 - 709 + 820 + 699 @@ -3356,6 +3356,46 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Basic.Settings.Video.Renderer + + + renderer + + + + + + + + + + + + + + Basic.Settings.Video.Adapter + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + adapter + + + + + + + false + + + + + + @@ -3399,18 +3439,84 @@ - - - - Basic.Settings.Advanced.Video.ColorRange - - - colorRange - - - - + + + 0 + + + 0 + + + 0 + + + 0 + + + + + DisableOSXVSync + + + + + + + ResetOSXVSyncOnExit + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 709 + + + + + 601 + + + + + + + + + 0 + 0 + + + + Basic.Settings.Advanced.Video.ColorRange + + + colorRange + + + + + + + @@ -3422,74 +3528,6 @@ - - - - - 709 - - - - - 601 - - - - - - - - Basic.Settings.Video.Renderer - - - renderer - - - - - - - - - - - - - - Basic.Settings.Video.Adapter - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - adapter - - - - - - - false - - - - - - - - - - DisableOSXVSync - - - - - - - ResetOSXVSyncOnExit - - - @@ -3507,6 +3545,9 @@ Basic.Settings.Output.Adv.Recording.Filename + + filenameFormatting + @@ -3541,6 +3582,9 @@ Basic.Settings.Output.ReplayBuffer.Suffix + + simpleRBSuffix + @@ -3553,6 +3597,9 @@ Basic.Settings.Output.ReplayBuffer.Prefix + + simpleRBPrefix + @@ -3662,16 +3709,6 @@ QFormLayout::AllNonFixedFieldsGrow - - - - Basic.Settings.Output.RetryDelay - - - reconnectRetryDelay - - - @@ -3683,29 +3720,61 @@ - - - 30 + + + 0 - + + 0 + + + 0 + + + 0 + + + + + 30 + + + + + + + + 0 + 0 + + + + Basic.Settings.Output.MaxRetries + + + reconnectMaxRetries + + + + + + + 1 + + + 10000 + + + + - - + + - Basic.Settings.Output.MaxRetries + Basic.Settings.Output.RetryDelay - reconnectMaxRetries - - - - - - - 1 - - - 10000 + reconnectRetryDelay @@ -3729,6 +3798,9 @@ Basic.Settings.Advanced.Network.BindToIP + + bindToIP + @@ -3784,8 +3856,135 @@ listWidget - buttonBox language + theme + warnBeforeStreamStart + warnBeforeStreamStop + recordWhenStreaming + systemTrayEnabled + systemTrayWhenStarted + snappingEnabled + screenSnapping + centerSnapping + sourceSnapping + snapDistance + hideProjectorCursor + keepRecordStreamStops + projectorAlwaysOnTop + streamType + outputMode + simpleOutputVBitrate + simpleOutputABitrate + simpleOutAdvanced + simpleOutPreset + simpleOutCustom + simpleOutEnforce + simpleOutStrEncoder + simpleOutputPath + simpleOutputBrowse + simpleNoSpace + simpleOutRecQuality + simpleOutRecFormat + simpleOutRecEncoder + simpleOutMuxCustom + simpleReplayBuf + simpleRBSecMax + simpleRBMegsMax + advOutTabs + advOutTrack1 + advOutTrack2 + advOutTrack3 + advOutTrack4 + advOutTrack5 + advOutTrack6 + advOutEncoder + advOutApplyService + advOutUseRescale + advOutRescale + advOutRecType + advOutRecPath + advOutRecPathBrowse + advOutNoSpace + advOutRecFormat + advOutRecTrack1 + advOutRecTrack2 + advOutRecTrack3 + advOutRecTrack4 + advOutRecTrack5 + advOutRecTrack6 + advOutRecEncoder + advOutRecUseRescale + advOutRecRescale + advOutMuxCustom + advOutFFRecPath + advOutFFPathBrowse + advOutFFURL + advOutFFFormat + advOutFFVBitrate + advOutFFUseRescale + advOutFFRescale + advOutFFVEncoder + advOutFFVCfg + advOutFFABitrate + advOutFFTrack1 + advOutFFTrack2 + advOutFFTrack3 + advOutFFTrack4 + advOutFFTrack5 + advOutFFTrack6 + advOutFFAEncoder + advOutFFACfg + advOutFFType + advOutFFMCfg + advOutFFNoSpace + advOutTrack1Bitrate + advOutTrack1Name + advOutTrack2Bitrate + advOutTrack2Name + advOutTrack3Bitrate + advOutTrack3Name + advOutTrack4Bitrate + advOutTrack4Name + advOutTrack5Bitrate + advOutTrack5Name + advOutTrack6Bitrate + advOutTrack6Name + sampleRate + channelSetup + desktopAudioDevice1 + desktopAudioDevice2 + auxAudioDevice1 + auxAudioDevice2 + auxAudioDevice3 + audioSourceScrollArea + baseResolution + outputResolution + downscaleFilter + fpsType + fpsCommon + fpsInteger + fpsNumerator + fpsDenominator + scrollArea + processPriority + renderer + adapter + colorFormat + colorSpace + colorRange + disableOSXVSync + resetOSXVSync + filenameFormatting + overwriteIfExists + simpleRBPrefix + simpleRBSuffix + streamDelayEnable + streamDelaySec + streamDelayPreserve + reconnectEnable + reconnectRetryDelay + reconnectMaxRetries + bindToIP @@ -4031,70 +4230,6 @@ - - reconnectEnable - toggled(bool) - label_17 - setEnabled(bool) - - - 724 - 541 - - - 332 - 567 - - - - - reconnectEnable - toggled(bool) - reconnectRetryDelay - setEnabled(bool) - - - 724 - 541 - - - 724 - 567 - - - - - reconnectEnable - toggled(bool) - label_22 - setEnabled(bool) - - - 724 - 541 - - - 332 - 593 - - - - - reconnectEnable - toggled(bool) - reconnectMaxRetries - setEnabled(bool) - - - 724 - 541 - - - 724 - 593 - - - snappingEnabled toggled(bool)