[vlc-devel] commit: [Qt] Add the video-on-title in Simple Preferences. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 16 12:52:18 2008 +0200| [51d01bba9204cc9d9ab5b15105948055230ef75f] | committer: Jean-Baptiste Kempf 

[Qt] Add the video-on-title in Simple Preferences.

In the complete preferences it is not linked directly to OSD, so users don't find it. Linked to Closed #2207.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=51d01bba9204cc9d9ab5b15105948055230ef75f
---

 modules/gui/qt4/components/simple_preferences.cpp |    2 ++
 modules/gui/qt4/ui/sprefs_subtitles.ui            |   13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 3cfb8f4..ca1c776 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -515,6 +515,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
         START_SPREFS_CAT( Subtitles, qtr("Subtitles & On Screen Display Settings") );
             CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
+            CONFIG_GENERIC( "video-title-show", Bool, NULL, OSDTitleBox);
+
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
             CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index 7f8fab3..61761fb 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>434</width>
-    <height>410</height>
+    <height>441</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -27,11 +27,12 @@
         <property name="text" >
          <string>_("Enable OSD")</string>
         </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-        <property name="tristate" >
-         <bool>false</bool>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="OSDTitleBox" >
+        <property name="text" >
+         <string>_("Show media title on video")</string>
         </property>
        </widget>
       </item>