From 5a6d682c85613c1ebca5161ceffa1a1d79274305 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 18 Jan 2008 06:46:50 +0000 Subject: [PATCH] Qt4 - SPrefs: add the option to embed the video in the interface In the Simple Preferences. --- .../gui/qt4/components/simple_preferences.cpp | 3 ++- modules/gui/qt4/ui/sprefs_interface.ui | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 914f1ffc8b..5f849d0561 100644 --- 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 dcfcec5ee7..fd1f3aa6af 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -29,14 +29,14 @@ _("Native or Skins") - + Qt::Horizontal - + @@ -64,21 +64,21 @@ - + _("Browse...") - + _("Skin File") - + @@ -107,7 +107,7 @@ - + _("Skins") @@ -121,6 +121,13 @@ + + + + _("Integrate video in interface") + + + -- 2.39.2