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

UI: Improve/refactor autoconfig/settings service UI

Browse Source 
Makes it so that services can have custom handling on a per-service
basis.  The bottom part of the service pane is now a stacked widget
which can now be customized for different types of services
(particularly OAuth services).
This commit is contained in:
jp9000
2019-02-06 19:19:17 -08:00
parent dcf48e8ffc
commit 24bcfacea5
9 changed files with 864 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

374
UI/forms/OBSBasicSettings.ui
View File

@@ -145,8 +145,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>804</width>
<height>1072</height>
<width>801</width>
<height>836</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
@@ -686,91 +686,192 @@
<number>0</number>
</property>
<item>
<widget class="QWidget" name="streamContainer" native="true">
<widget class="QWidget" name="widget_5" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="leftMargin">
<number>0</number>
<layout class="QFormLayout" name="topStreamLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="topMargin">
<number>0</number>
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="widget_5" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="2" column="0">
<widget class="QLabel" name="serviceLabel">
<property name="text">
<string>Basic.AutoConfig.StreamPage.Service</string>
</property>
<property name="buddy">
<cstring>service</cstring>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<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="QWidget" name="widget_6" native="true">
<layout class="QFormLayout" name="formLayout_8">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_21">
<property name="minimumSize">
<size>
<width>170</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Basic.Settings.Stream.StreamType</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>streamType</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="streamType"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="service">
<property name="maxVisibleItems">
<number>20</number>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>170</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="streamStackWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="streamKeyPage">
<layout class="QFormLayout" name="streamkeyPageLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="serverLabel">
<property name="text">
<string>Basic.AutoConfig.StreamPage.Server</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QStackedWidget" name="serverStackedWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="servicePage">
<layout class="QHBoxLayout" name="horizontalLayout_21">
<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="server"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="customPage">
<layout class="QHBoxLayout" name="horizontalLayout_22">
<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="QLineEdit" name="customServer"/>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="streamKeyLabel">
<property name="text">
<string>Basic.AutoConfig.StreamPage.StreamKey</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>key</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="streamKeyWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<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="QLineEdit" name="key">
<property name="inputMask">
<string notr="true"/>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="show">
<property name="text">
<string>Show</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>170</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="outputPage">
@@ -797,8 +898,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>813</width>
<height>770</height>
<width>818</width>
<height>697</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -3913,7 +4014,7 @@
<x>0</x>
<y>0</y>
<width>594</width>
<height>807</height>
<height>833</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -4751,7 +4852,6 @@
</widget>
<tabstops>
<tabstop>listWidget</tabstop>
<tabstop>streamType</tabstop>
<tabstop>outputMode</tabstop>
<tabstop>simpleOutputVBitrate</tabstop>
<tabstop>simpleOutputABitrate</tabstop>
@@ -4939,8 +5039,8 @@
<y>16</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>39</y>
<x>401</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -4951,12 +5051,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -4967,12 +5067,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -4983,12 +5083,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -4999,12 +5099,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -5015,12 +5115,12 @@
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
<x>232</x>
<y>41</y>
<x>260</x>
<y>73</y>
</hint>
<hint type="destinationlabel">
<x>241</x>
<y>30</y>
<x>242</x>
<y>85</y>
</hint>
</hints>
</connection>
@@ -5031,12 +5131,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>259</x>
<y>60</y>
<x>260</x>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>228</x>
<y>50</y>
<x>229</x>
<y>85</y>
</hint>
</hints>
</connection>
@@ -5047,12 +5147,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>259</x>
<y>39</y>
<x>260</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>228</x>
<y>29</y>
<x>229</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -5063,12 +5163,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>168</x>
<y>56</y>
<x>260</x>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>228</x>
<y>50</y>
<x>229</x>
<y>85</y>
</hint>
</hints>
</connection>
@@ -5079,12 +5179,12 @@
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
<x>250</x>
<y>50</y>
<x>260</x>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>52</y>
<x>260</x>
<y>85</y>
</hint>
</hints>
</connection>
@@ -5095,12 +5195,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>39</y>
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
@@ -5111,11 +5211,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>579</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>602</y>
</hint>
</hints>
@@ -5127,11 +5227,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>579</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>625</y>
</hint>
</hints>
@@ -5159,7 +5259,7 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
@@ -5175,11 +5275,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>366</y>
</hint>
</hints>
@@ -5191,11 +5291,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>389</y>
</hint>
</hints>
@@ -5207,11 +5307,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>412</y>
</hint>
</hints>
@@ -5223,11 +5323,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>435</y>
</hint>
</hints>
@@ -5239,11 +5339,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>222</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>245</y>
</hint>
</hints>
@@ -5255,11 +5355,11 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>950</x>
<x>933</x>
<y>268</y>
</hint>
<hint type="destinationlabel">
<x>950</x>
<x>933</x>
<y>291</y>
</hint>
</hints>