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

Merge pull request #3405 from cg2121/media-label-spacing

Browse Source 
UI: Refine context bar
This commit is contained in:
Jim 2020-09-06 08:43:29 -07:00 committed by GitHub
commit de41bb8763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 496 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
UI/forms/OBSBasic.ui
View File

@ -206,18 +206,18 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
<height>30</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout9">
<property name="spacing">
<number>4</number>
<number>6</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
@ -266,16 +266,22 @@
</property>
<item>
<widget class="QLabel" name="contextSourceLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
<width>250</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>16</height>
<width>250</width>
<height>22</height>
</size>
</property>
<property name="text">
@ -298,6 +304,18 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Properties</string>
</property>
@ -318,6 +336,18 @@
</item>
<item>
<widget class="QPushButton" name="sourceFiltersButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Filters</string>
</property>
@ -349,11 +379,23 @@
<item>
<widget class="QWidget" name="emptySpace" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="spacing">
<number>0</number>
@ -929,7 +971,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>92</width>
<width>94</width>
<height>16</height>
</rect>
</property>

32
UI/forms/source-toolbar/browser-source-toolbar.ui
View File

@ -7,9 +7,27 @@
<x>0</x>
<y>0</y>
<width>628</width>
<height>38</height>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
@ -28,6 +46,18 @@
</property>
<item>
<widget class="QPushButton" name="refresh">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>RefreshBrowser</string>
</property>

46
UI/forms/source-toolbar/color-source-toolbar.ui
View File

@ -7,9 +7,27 @@
<x>0</x>
<y>0</y>
<width>565</width>
<height>37</height>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
@ -28,10 +46,22 @@
</property>
<item>
<widget class="QLabel" name="color">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
@ -44,6 +74,18 @@
</item>
<item>
<widget class="QPushButton" name="choose">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>Basic.PropertiesWindow.SelectColor</string>
</property>

58
UI/forms/source-toolbar/device-select-toolbar.ui
View File

@ -7,9 +7,27 @@
<x>0</x>
<y>0</y>
<width>665</width>
<height>43</height>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
@ -32,11 +50,23 @@
<item>
<widget class="QLabel" name="deviceLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string notr="true">Device</string>
</property>
@ -53,6 +83,18 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="currentText">
<string notr="true"/>
</property>
@ -63,6 +105,18 @@
</item>
<item>
<widget class="QPushButton" name="activateButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string notr="true">Activate</string>
</property>

72
UI/forms/source-toolbar/game-capture-toolbar.ui
View File

@ -7,9 +7,27 @@
<x>0</x>
<y>0</y>
<width>650</width>
<height>29</height>
<height>24</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
@ -29,11 +47,23 @@
<item>
<widget class="QLabel" name="modeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string notr="true">Mode</string>
</property>
@ -44,6 +74,18 @@
</item>
<item>
<widget class="QComboBox" name="mode">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="currentText">
<string notr="true"/>
</property>
@ -52,11 +94,23 @@
<item>
<widget class="QLabel" name="windowLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string notr="true">Window</string>
</property>
@ -73,6 +127,18 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="currentText">
<string notr="true"/>
</property>

56
UI/forms/source-toolbar/image-source-toolbar.ui
View File

@ -7,9 +7,27 @@
<x>0</x>
<y>0</y>
<width>580</width>
<height>41</height>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
@ -29,11 +47,23 @@
<item>
<widget class="QLabel" name="pathLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string notr="true">Image File</string>
</property>
@ -47,7 +77,13 @@
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
@ -61,11 +97,23 @@
<item>
<widget class="QPushButton" name="browse">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>Browse</string>
</property>

156
UI/forms/source-toolbar/media-controls.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>888</width>
<height>28</height>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
@ -19,7 +19,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="windowTitle">
@ -43,16 +49,22 @@
</property>
<item>
<widget class="QPushButton" name="playPauseButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
@ -97,16 +109,22 @@
</item>
<item>
<widget class="QPushButton" name="previousButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
@ -136,21 +154,21 @@
<item>
<widget class="QPushButton" name="stopButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
@ -180,21 +198,21 @@
<item>
<widget class="QPushButton" name="nextButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
@ -223,6 +241,18 @@
</item>
<item>
<widget class="MediaSlider" name="slider">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="accessibleName">
<string>ContextBar.MediaControls.BlindSeek</string>
</property>
@ -255,20 +285,106 @@
</item>
<item>
<widget class="QLabel" name="timerLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>--:--:--</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>4</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>/</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>4</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="ClickableLabel" name="durationLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>--:--:--</string>
</property>

59
UI/forms/source-toolbar/text-source-toolbar.ui
View File

@ -7,9 +7,27 @@
<x>0</x>
<y>0</y>
<width>726</width>
<height>49</height>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
@ -28,6 +46,18 @@
</property>
<item>
<widget class="QPushButton" name="selectFont">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>Basic.PropertiesWindow.SelectFont</string>
</property>
@ -35,6 +65,18 @@
</item>
<item>
<widget class="QPushButton" name="selectColor">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>Basic.PropertiesWindow.SelectColor</string>
</property>
@ -51,7 +93,20 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="text"/>
<widget class="QLineEdit" name="text">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>