[vlc-devel] [PATCH 2/9] Qt: spref, put subtitle shadow and background options on their own line
Hugo Beauzée-Luyssen
hugo at beauzee.fr
Tue Dec 19 13:33:01 CET 2017
On Tue, Dec 19, 2017, at 11:56 AM, Pierre Lamot wrote:
> ---
> modules/gui/qt/ui/sprefs_subtitles.ui | 133 +++++++++++++++++-----------------
> 1 file changed, 66 insertions(+), 67 deletions(-)
>
> diff --git a/modules/gui/qt/ui/sprefs_subtitles.ui b/modules/gui/qt/ui/
> sprefs_subtitles.ui
> index b9e851dc9d..747369002b 100644
> --- a/modules/gui/qt/ui/sprefs_subtitles.ui
> +++ b/modules/gui/qt/ui/sprefs_subtitles.ui
> @@ -8,7 +8,7 @@
> <x>0</x>
> <y>0</y>
> <width>741</width>
> - <height>416</height>
> + <height>468</height>
> </rect>
> </property>
> <property name="windowTitle">
> @@ -145,21 +145,24 @@
> <string>Subtitle effects</string>
> </property>
> <layout class="QGridLayout" name="gridLayout_2">
> - <item row="0" column="0">
> - <widget class="QLabel" name="fontLabel">
> - <property name="minimumSize">
> - <size>
> - <width>250</width>
> - <height>0</height>
> - </size>
> + <item row="1" column="2">
> + <spacer name="horizontalSpacer">
> + <property name="orientation">
> + <enum>Qt::Horizontal</enum>
> </property>
> - <property name="text">
> - <string>Font</string>
> + <property name="sizeType">
> + <enum>QSizePolicy::Preferred</enum>
> </property>
> - <property name="buddy">
> - <cstring>font</cstring>
> + <property name="sizeHint" stdset="0">
> + <size>
> + <width>10</width>
> + <height>20</height>
> + </size>
> </property>
> - </widget>
> + </spacer>
> + </item>
> + <item row="2" column="4">
> + <widget class="QPushButton" name="outlineColor"/>
> </item>
> <item row="1" column="0">
> <widget class="QLabel" name="fontSizeLabel">
> @@ -170,15 +173,15 @@
> </size>
> </property>
> <property name="text">
> - <string>Font size</string>
> + <string>Font si&ze</string>
I guess that answers my question from the previous patch, it seems like QtCreator tried a bit too hard to be helpful :)
> </property>
> <property name="buddy">
> <cstring>fontSize</cstring>
> </property>
> </widget>
> </item>
> - <item row="1" column="1">
> - <widget class="QComboBox" name="fontSize">
> + <item row="2" column="1">
> + <widget class="QComboBox" name="effect">
> <property name="sizePolicy">
> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
> <horstretch>0</horstretch>
> @@ -187,21 +190,8 @@
> </property>
> </widget>
> </item>
> - <item row="1" column="2">
> - <spacer name="horizontalSpacer">
> - <property name="orientation">
> - <enum>Qt::Horizontal</enum>
> - </property>
> - <property name="sizeType">
> - <enum>QSizePolicy::Preferred</enum>
> - </property>
> - <property name="sizeHint" stdset="0">
> - <size>
> - <width>10</width>
> - <height>20</height>
> - </size>
> - </property>
> - </spacer>
> + <item row="1" column="4">
> + <widget class="QPushButton" name="fontColor"/>
> </item>
> <item row="1" column="3">
> <widget class="QLabel" name="fontColorLabel">
> @@ -213,11 +203,18 @@
> </property>
> </widget>
> </item>
> - <item row="1" column="4">
> - <widget class="QPushButton" name="fontColor"/>
> + <item row="2" column="3">
> + <widget class="QLabel" name="outlineColorLabel">
> + <property name="text">
> + <string>Outline color</string>
> + </property>
> + <property name="buddy">
> + <cstring>outlineColor</cstring>
> + </property>
> + </widget>
> </item>
> - <item row="2" column="0">
> - <widget class="QLabel" name="fontEffectLabel">
> + <item row="0" column="0">
> + <widget class="QLabel" name="fontLabel">
> <property name="minimumSize">
> <size>
> <width>250</width>
> @@ -225,45 +222,41 @@
> </size>
> </property>
> <property name="text">
> - <string>Outline thickness</string>
> + <string>Font</string>
> </property>
> <property name="buddy">
> - <cstring>effect</cstring>
> + <cstring>font</cstring>
> </property>
> </widget>
> </item>
> - <item row="2" column="1">
> - <widget class="QComboBox" name="effect">
> - <property name="sizePolicy">
> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
> - <horstretch>0</horstretch>
> - <verstretch>0</verstretch>
> - </sizepolicy>
> + <item row="5" column="0">
> + <widget class="QLabel" name="subsPosLabel">
> + <property name="minimumSize">
> + <size>
> + <width>250</width>
> + <height>0</height>
> + </size>
> </property>
> - </widget>
> - </item>
> - <item row="2" column="3">
> - <widget class="QLabel" name="outlineColorLabel">
> <property name="text">
> - <string>Outline color</string>
> + <string>Force subtitle position</string>
> </property>
> <property name="buddy">
> - <cstring>outlineColor</cstring>
> + <cstring>subsPosition</cstring>
> </property>
> </widget>
> </item>
> - <item row="2" column="4">
> - <widget class="QPushButton" name="outlineColor"/>
> - </item>
> - <item row="3" column="0">
> - <widget class="QCheckBox" name="shadowCheck">
> - <property name="text">
> - <string>Add a shadow</string>
> + <item row="1" column="1">
> + <widget class="QComboBox" name="fontSize">
> + <property name="sizePolicy">
> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
> + <horstretch>0</horstretch>
> + <verstretch>0</verstretch>
> + </sizepolicy>
> </property>
> </widget>
> </item>
> - <item row="4" column="0">
> - <widget class="QLabel" name="subsPosLabel">
> + <item row="2" column="0">
> + <widget class="QLabel" name="fontEffectLabel">
> <property name="minimumSize">
> <size>
> <width>250</width>
> @@ -271,14 +264,17 @@
> </size>
> </property>
> <property name="text">
> - <string>Force subtitle position</string>
> + <string>O&utline thickness</string>
> </property>
> <property name="buddy">
> - <cstring>subsPosition</cstring>
> + <cstring>effect</cstring>
> </property>
> </widget>
> </item>
> - <item row="4" column="1">
> + <item row="0" column="1" colspan="4">
> + <widget class="QFontComboBox" name="font"/>
> + </item>
> + <item row="5" column="1">
> <widget class="QSpinBox" name="subsPosition">
> <property name="maximumSize">
> <size>
> @@ -300,16 +296,20 @@
> </property>
> </widget>
> </item>
> - <item row="0" column="1" colspan="4">
> - <widget class="QFontComboBox" name="font"/>
> - </item>
> - <item row="3" column="1">
> + <item row="3" column="0">
> <widget class="QCheckBox" name="backgroundCheck">
> <property name="text">
> <string>Add a background</string>
> </property>
> </widget>
> </item>
> + <item row="4" column="0">
> + <widget class="QCheckBox" name="shadowCheck">
> + <property name="text">
> + <string>Add a shadow</string>
> + </property>
> + </widget>
> + </item>
> </layout>
> </widget>
> </item>
> @@ -342,7 +342,6 @@
> <tabstop>fontColor</tabstop>
> <tabstop>effect</tabstop>
> <tabstop>outlineColor</tabstop>
> - <tabstop>shadowCheck</tabstop>
> <tabstop>subsPosition</tabstop>
> </tabstops>
> <resources/>
> --
> 2.14.1
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
--
Hugo Beauzée-Luyssen
hugo at beauzee.fr
More information about the vlc-devel
mailing list