UI: Fix buttons in settings dialog

- The buttons in the accessibility settings were a fixed height, so
they would be rendered in a undesirable way with the Yami theme.

- Also fixes clear button sizing issues in hotkeys sections
master
cg2121 2022-08-04 18:58:09 -05:00 committed by Jim
parent d71878cd35
commit f1f405b170
1 changed files with 690 additions and 929 deletions

View File

@ -160,8 +160,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>803</width>
<height>1226</height>
<width>806</width>
<height>1344</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
@ -1488,8 +1488,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>794</width>
<height>621</height>
<width>780</width>
<height>642</height>
</rect>
</property>
<property name="sizePolicy">
@ -2073,8 +2073,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>790</width>
<height>586</height>
<width>493</width>
<height>165</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
@ -2420,8 +2420,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>790</width>
<height>556</height>
<width>620</width>
<height>391</height>
</rect>
</property>
<property name="sizePolicy">
@ -3081,8 +3081,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>593</width>
<height>471</height>
<width>713</width>
<height>493</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
@ -3591,8 +3591,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>790</width>
<height>576</height>
<width>272</width>
<height>552</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
@ -4654,8 +4654,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>561</width>
<height>526</height>
<width>820</width>
<height>640</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_50">
@ -5500,38 +5500,51 @@
</item>
<item row="0" column="4">
<widget class="QPushButton" name="hotkeyFilterReset">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="baseSize">
<size>
<width>24</width>
<height>24</height>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Clear</string>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/res/images/revert.svg</normaloff>:/res/images/revert.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="themeID" stdset="0">
<string>revertIcon</string>
</property>
<property name="fixedSize" stdset="0">
<size>
<width>24</width>
<height>24</height>
</size>
<property name="toolButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
@ -5547,8 +5560,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>800</width>
<height>626</height>
</rect>
</property>
<layout class="QFormLayout" name="hotkeyFormLayout">
@ -5595,7 +5608,7 @@
<x>0</x>
<y>0</y>
<width>820</width>
<height>677</height>
<height>680</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_42">
@ -5672,38 +5685,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.SelectRed</string>
</property>
<property name="buddy">
<cstring>colorSelect1</cstring>
<cstring>choose1</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="colorSelect1">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_1">
<property name="leftMargin">
<number>0</number>
@ -5728,13 +5714,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -5750,13 +5736,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -5772,13 +5758,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="colorSelectLabel_2">
@ -5786,38 +5771,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.SelectGreen</string>
</property>
<property name="buddy">
<cstring>colorSelect2</cstring>
<cstring>choose2</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="colorSelect2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_2">
<property name="leftMargin">
<number>0</number>
@ -5842,13 +5800,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -5864,13 +5822,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -5886,13 +5844,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="colorSelectLabel_3">
@ -5900,38 +5857,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.SelectBlue</string>
</property>
<property name="buddy">
<cstring>colorSelect3</cstring>
<cstring>choose3</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QWidget" name="colorSelect3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_3">
<property name="leftMargin">
<number>0</number>
@ -5956,13 +5886,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -5978,13 +5908,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6000,13 +5930,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="colorSelectLabel_4">
@ -6014,38 +5943,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.MixerGreen</string>
</property>
<property name="buddy">
<cstring>colorSelect4</cstring>
<cstring>choose4</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QWidget" name="colorSelect4">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_4">
<property name="leftMargin">
<number>0</number>
@ -6070,13 +5972,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6092,13 +5994,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6114,13 +6016,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="colorSelectLabel_5">
@ -6128,38 +6029,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.MixerYellow</string>
</property>
<property name="buddy">
<cstring>colorSelect5</cstring>
<cstring>choose5</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QWidget" name="colorSelect5">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_5">
<property name="leftMargin">
<number>0</number>
@ -6184,13 +6058,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6206,13 +6080,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6228,13 +6102,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="colorSelectLabel_6">
@ -6242,38 +6115,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.MixerRed</string>
</property>
<property name="buddy">
<cstring>colorSelect6</cstring>
<cstring>choose6</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QWidget" name="colorSelect6">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_6">
<property name="leftMargin">
<number>0</number>
@ -6298,13 +6144,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6320,13 +6166,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6342,13 +6188,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="colorSelectLabel_7">
@ -6356,38 +6201,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive</string>
</property>
<property name="buddy">
<cstring>colorSelect7</cstring>
<cstring>choose7</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QWidget" name="colorSelect7">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_7">
<property name="leftMargin">
<number>0</number>
@ -6412,13 +6230,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6434,13 +6252,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6456,13 +6274,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="colorSelectLabel_8">
@ -6470,38 +6287,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive</string>
</property>
<property name="buddy">
<cstring>colorSelect8</cstring>
<cstring>choose8</cstring>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QWidget" name="colorSelect8">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_8">
<property name="leftMargin">
<number>0</number>
@ -6526,13 +6316,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6548,13 +6338,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6570,13 +6360,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="colorSelectLabel_9">
@ -6584,38 +6373,11 @@
<string>Basic.Settings.Accessibility.ColorOverrides.MixerRedActive</string>
</property>
<property name="buddy">
<cstring>colorSelect9</cstring>
<cstring>choose9</cstring>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QWidget" name="colorSelect9">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>565</width>
<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>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="colorSelectLayout_9">
<property name="leftMargin">
<number>0</number>
@ -6640,13 +6402,13 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6662,13 +6424,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -6684,13 +6446,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -6749,8 +6510,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>713</width>
<height>923</height>
<width>826</width>
<height>1018</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">