vlc | branch: master | Roland Bewick <[email protected]> | Wed May 22 01:08:32 2019 +0700| [a6e246ffadee36c4d7a5e53432febedef7cb64b7] | committer: Thomas Guillem
qt: add secondary sub margin/alignment preferences Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6e246ffadee36c4d7a5e53432febedef7cb64b7 --- modules/gui/qt/components/simple_preferences.cpp | 3 + modules/gui/qt/ui/sprefs_subtitles.ui | 91 ++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp index 914b92f07d..6f427ef2d3 100644 --- a/modules/gui/qt/components/simple_preferences.cpp +++ b/modules/gui/qt/components/simple_preferences.cpp @@ -870,6 +870,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets["shadowCB"] = ui.shadowCheck; optionWidgets["backgroundCB"] = ui.backgroundCheck; + CONFIG_GENERIC( "secondary-sub-alignment", IntegerList, + ui.secondarySubsAlignmentLabel, secondarySubsAlignment ); + CONFIG_GENERIC_NO_BOOL( "secondary-sub-margin", Integer, ui.secondarySubsPosLabel, secondarySubsPosition ); END_SPREFS_CAT; case SPrefsHotkeys: diff --git a/modules/gui/qt/ui/sprefs_subtitles.ui b/modules/gui/qt/ui/sprefs_subtitles.ui index b9e851dc9d..d630a60660 100644 --- a/modules/gui/qt/ui/sprefs_subtitles.ui +++ b/modules/gui/qt/ui/sprefs_subtitles.ui @@ -313,6 +313,97 @@ </layout> </widget> </item> + <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Dual Subtitles</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QWidget" name="secondarySpuZone" native="true"> + <layout class="QGridLayout"> + <item row="0" column="1"> + <widget class="QComboBox" name="secondarySubsAlignment"/> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="secondarySubsAlignmentLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Align</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="buddy"> + <cstring>secondarySubsAlignment</cstring> + </property> + </widget> + </item> + <item row="0" 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>50</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="3"> + <widget class="QLabel" name="secondarySubsPosLabel"> + <property name="text"> + <string>Offset</string> + </property> + <property name="buddy"> + <cstring>secondarySubsPosition</cstring> + </property> + </widget> + </item> + <item row="0" column="4"> + <widget class="QSpinBox" name="secondarySubsPosition"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="suffix"> + <string> px</string> + </property> + <property name="minimum"> + <number>-1024</number> + </property> + <property name="maximum"> + <number>1024</number> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> </item> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
