opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Clean up Settings form markup

Browse Source 
This continues work from #5133 to correct UI file markup and save correctly in Qt Creator

Defining alignment as an attribute in the <item> tag seems to be old behaviour that current versions of Qt Creator do not respect and will clobber these entries on save.

The correct approach is to have alignment as a property element in the widget.

As well, QWidgets that contain property definitions as well as a layout child item do not properly show up in the Qt Creator hierarchy.

These properties are still invisibly applied but the QWidgets are not shown in Qt Creator and will get removed from the file after saving.
This commit is contained in:
Warchamp7
2021-08-17 01:41:57 -04:00
parent e13e46839f
commit 59ed4131a8
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/forms/OBSBasicSettings.ui
+26 -26
View File
@@ -168,8 +168,8 @@
<property name="bottomMargin">
<number>9</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget_2">
<item>
<widget class="QFrame" name="widget_2">
<layout class="QVBoxLayout" name="verticalLayout_20">
<item>
<widget class="QGroupBox" name="groupBox_15">
@@ -799,7 +799,7 @@
<number>0</number>
</property>
<item>
<widget class="QWidget" name="widget_5">
<widget class="QFrame" name="widget_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@@ -824,7 +824,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QWidget" name="serviceWidget">
<widget class="QFrame" name="serviceWidget">
<layout class="QHBoxLayout" name="serviceWidgetLayout" stretch="0,0">
<property name="leftMargin">
<number>0</number>
@@ -1052,7 +1052,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="streamKeyWidget">
<widget class="QFrame" name="streamKeyWidget">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="leftMargin">
<number>0</number>
@@ -1196,7 +1196,7 @@
</widget>
</item>
<item row="10" column="1">
<widget class="QWidget" name="authPwWidget">
<widget class="QFrame" name="authPwWidget">
<layout class="QHBoxLayout" name="horizontalLayout_25">
<property name="leftMargin">
<number>0</number>
@@ -1365,8 +1365,8 @@
<property name="bottomMargin">
<number>9</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget">
<item>
<widget class="QFrame" name="widget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -1882,8 +1882,8 @@
</property>
</spacer>
</item>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="simpleOutputContainer">
<item>
<widget class="QFrame" name="simpleOutputContainer">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
@@ -1941,8 +1941,8 @@
<property name="bottomMargin">
<number>9</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget_4">
<item>
<widget class="QFrame" name="widget_4">
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="spacing">
<number>0</number>
@@ -1960,7 +1960,7 @@
<number>0</number>
</property>
<item>
<widget class="QWidget" name="advOutTopContainer">
<widget class="QFrame" name="advOutTopContainer">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@@ -1991,7 +1991,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="widget_8">
<widget class="QFrame" name="widget_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -2124,7 +2124,7 @@
<number>9</number>
</property>
<item>
<widget class="QWidget" name="advOutRecTypeContainer">
<widget class="QFrame" name="advOutRecTypeContainer">
<layout class="QFormLayout" name="formLayout_9">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
@@ -2194,7 +2194,7 @@
<number>0</number>
</property>
<item>
<widget class="QWidget" name="advOutRecTopContainer">
<widget class="QFrame" name="advOutRecTopContainer">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@@ -2348,7 +2348,7 @@
</widget>
</item>
<item row="5" column="1">
<widget class="QWidget" name="advOutRecRescaleContainer">
<widget class="QFrame" name="advOutRecRescaleContainer">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin">
<number>0</number>
@@ -2518,8 +2518,8 @@
</layout>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget_7">
<item>
<widget class="QFrame" name="widget_7">
<layout class="QVBoxLayout" name="verticalLayout_15">
<property name="leftMargin">
<number>0</number>
@@ -2873,7 +2873,7 @@
</widget>
</item>
<item row="13" column="1">
<widget class="QWidget" name="widget_10">
<widget class="QFrame" name="widget_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -3010,8 +3010,8 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget_3">
<item>
<widget class="QFrame" name="widget_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -3874,8 +3874,8 @@
<property name="bottomMargin">
<number>9</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget_50">
<item>
<widget class="QFrame" name="widget_50">
<layout class="QVBoxLayout" name="verticalLayout_51">
<item>
<widget class="QGroupBox" name="audioGeneralGroupBox">
@@ -4731,7 +4731,7 @@
<number>9</number>
</property>
<item>
<widget class="QWidget" name="widget_11">
<widget class="QFrame" name="widget_11">
<layout class="QVBoxLayout" name="verticalLayout_24">
<item>
<widget class="QGroupBox" name="advancedGeneralGroupBox">
@@ -5124,7 +5124,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="widget_12">
<widget class="QFrame" name="widget_12">
<property name="enabled">
<bool>true</bool>
</property>