Commit 5a6d682c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent 6ff86dc4
...@@ -303,7 +303,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -303,7 +303,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" ); char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" );
char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" ); char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" );
if( psz_dvddiscpath && psz_vcddiscpath && psz_cddadiscpath ) if( psz_dvddiscpath && psz_vcddiscpath && psz_cddadiscpath )
if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) && if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) &&
!strcmp( psz_dvddiscpath, psz_vcddiscpath ) ) !strcmp( psz_dvddiscpath, psz_vcddiscpath ) )
{ {
ui.DVDDevice->setText( qfu( psz_dvddiscpath ) ); ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
...@@ -420,6 +420,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -420,6 +420,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher ); CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates ); CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates );
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
skinBrowse ); skinBrowse );
#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) #if defined( WIN32 ) || defined( HAVE_DBUS_3 )
......
...@@ -29,14 +29,14 @@ ...@@ -29,14 +29,14 @@
<string>_("Native or Skins")</string> <string>_("Native or Skins")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="2" column="0" colspan="3" > <item row="3" column="0" colspan="3" >
<widget class="Line" name="line" > <widget class="Line" name="line" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2" > <item row="4" column="1" colspan="2" >
<widget class="QLabel" name="skinsLabel" > <widget class="QLabel" name="skinsLabel" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" > <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
...@@ -64,21 +64,21 @@ ...@@ -64,21 +64,21 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" > <item row="5" column="2" >
<widget class="QPushButton" name="skinBrowse" > <widget class="QPushButton" name="skinBrowse" >
<property name="text" > <property name="text" >
<string>_("Browse...")</string> <string>_("Browse...")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="5" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>_("Skin File")</string> <string>_("Skin File")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" > <item row="5" column="1" >
<widget class="QLineEdit" name="fileSkin" /> <widget class="QLineEdit" name="fileSkin" />
</item> </item>
<item row="0" column="1" colspan="2" > <item row="0" column="1" colspan="2" >
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="4" column="0" >
<widget class="QRadioButton" name="skins" > <widget class="QRadioButton" name="skins" >
<property name="text" > <property name="text" >
<string>_("Skins")</string> <string>_("Skins")</string>
...@@ -121,6 +121,13 @@ ...@@ -121,6 +121,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" >
<widget class="QCheckBox" name="embedVideo" >
<property name="text" >
<string>_("Integrate video in interface")</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment