Qt4 - SPrefs: add the option to embed the video in the interface In the Simple Prefer...

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 914f1ffc8b7da5bb4bc06a05faa698ad50f74bf6..5f849d056182124bfa5835bc0ca0b20c5698dfc4 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -303,7 +303,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" );
                 char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" );
                 if( psz_dvddiscpath && psz_vcddiscpath && psz_cddadiscpath )
-                               if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) &&
+                if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) &&
                     !strcmp( psz_dvddiscpath, psz_vcddiscpath ) )
                 {
                     ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
@@ -420,6 +420,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
             CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates );
             CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
+            CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo );
             CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
                     skinBrowse );
 #if defined( WIN32 ) || defined( HAVE_DBUS_3 )

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index dcfcec5ee783ace0e6224abb8d66378838a22ba9..fd1f3aa6af7926713664346ed4a88467e4b0265c 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -29,14 +29,14 @@
       <string>_("Native or Skins")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="2" column="0" colspan="3" >
+      <item row="3" column="0" colspan="3" >
        <widget class="Line" name="line" >
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2" >
+      <item row="4" column="1" colspan="2" >
        <widget class="QLabel" name="skinsLabel" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
@@ -64,21 +64,21 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
+      <item row="5" column="2" >
        <widget class="QPushButton" name="skinBrowse" >
         <property name="text" >
          <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
+      <item row="5" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
          <string>_("Skin File")</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
+      <item row="5" column="1" >
        <widget class="QLineEdit" name="fileSkin" />
       </item>
       <item row="0" column="1" colspan="2" >
@@ -107,7 +107,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
+      <item row="4" column="0" >
        <widget class="QRadioButton" name="skins" >
         <property name="text" >
          <string>_("Skins")</string>
@@ -121,6 +121,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="1" >
+       <widget class="QCheckBox" name="embedVideo" >
+        <property name="text" >
+         <string>_("Integrate video in interface")</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>