vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Sun Dec 19 21:29:37 2010 +0100| [f5b0dbb496963f2e52b6f5b27f75e5e1c8483a6c] | committer: Jean-Baptiste Kempf
Qt, sprefs: add configuration for OSD Title position > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5b0dbb496963f2e52b6f5b27f75e5e1c8483a6c --- modules/gui/qt4/components/simple_preferences.cpp | 3 +- modules/gui/qt4/ui/sprefs_subtitles.ui | 29 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 4b54999..f95ecda 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -639,7 +639,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, qtr("Subtitles & On Screen Display Settings") ); CONFIG_BOOL( "osd", OSDBox); CONFIG_BOOL( "video-title-show", OSDTitleBox); - + CONFIG_GENERIC( "video-title-position", IntegerList, + ui.OSDTitlePosLabel, OSDTitlePos ); CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel, encoding ); diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui index c5ccba5..b491d4b 100644 --- a/modules/gui/qt4/ui/sprefs_subtitles.ui +++ b/modules/gui/qt4/ui/sprefs_subtitles.ui @@ -23,21 +23,43 @@ <property name="title"> <string>On Screen Display</string> </property> - <layout class="QVBoxLayout"> - <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QCheckBox" name="OSDBox"> <property name="text"> <string>Enable On Screen Display (OSD)</string> </property> </widget> </item> - <item> + <item row="1" column="0"> <widget class="QCheckBox" name="OSDTitleBox"> <property name="text"> <string>Show media title on video start</string> </property> </widget> </item> + <item row="1" column="2"> + <widget class="QComboBox" name="OSDTitlePos"/> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="OSDTitlePosLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Position</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="buddy"> + <cstring>OSDTitlePos</cstring> + </property> + </widget> + </item> </layout> </widget> </item> @@ -247,6 +269,7 @@ <tabstops> <tabstop>OSDBox</tabstop> <tabstop>OSDTitleBox</tabstop> + <tabstop>OSDTitlePos</tabstop> <tabstop>preferredLanguage</tabstop> <tabstop>encoding</tabstop> <tabstop>font</tabstop> _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits