Commit 631f0bf4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - SPrefs: save the interface value... Doesn't seem to work, so please review.

parent af967f85
...@@ -247,7 +247,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -247,7 +247,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
volNormalizer ); volNormalizer );
CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label, CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
lastfm_user_edit ); lastfm_user_edit );
CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label, CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label,
...@@ -323,9 +322,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -323,9 +322,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
} }
if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" )) if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
{ {
ui.skins->setChecked( true ); ui.skins->setChecked( true );
} }
//FIXME interface choice skinInterfaceButton = ui.skins;
qtInterfaceButton = ui.qt4;
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
...@@ -400,6 +400,7 @@ void SPrefsPanel::apply() ...@@ -400,6 +400,7 @@ void SPrefsPanel::apply()
ConfigControl *c = qobject_cast<ConfigControl *>(*i); ConfigControl *c = qobject_cast<ConfigControl *>(*i);
c->doApply( p_intf ); c->doApply( p_intf );
} }
/* Devices */ /* Devices */
//FIXME is it qta or qtu ???? //FIXME is it qta or qtu ????
char *psz_devicepath = qtu( inputDevice->text() ); char *psz_devicepath = qtu( inputDevice->text() );
...@@ -409,6 +410,12 @@ void SPrefsPanel::apply() ...@@ -409,6 +410,12 @@ void SPrefsPanel::apply()
config_PutPsz( p_intf, "vcd", psz_devicepath ); config_PutPsz( p_intf, "vcd", psz_devicepath );
config_PutPsz( p_intf, "cd-audio", psz_devicepath ); config_PutPsz( p_intf, "cd-audio", psz_devicepath );
} }
/* Interfaces */
if( skinInterfaceButton->isChecked() )
config_PutPsz( p_intf, "intf", "skins2" );
if( qtInterfaceButton->isChecked() )
config_PutPsz( p_intf, "intf", "qt4" );
} }
void SPrefsPanel::clean() void SPrefsPanel::clean()
......
...@@ -42,6 +42,7 @@ enum { ...@@ -42,6 +42,7 @@ enum {
class ConfigControl; class ConfigControl;
class QComboBox; class QComboBox;
class QLineEdit; class QLineEdit;
class QRadioButton;
class SPrefsCatList : public QWidget class SPrefsCatList : public QWidget
{ {
...@@ -75,6 +76,8 @@ private: ...@@ -75,6 +76,8 @@ private:
QWidget *file_options; QWidget *file_options;
QComboBox *audioOutput; QComboBox *audioOutput;
QLineEdit *inputDevice; QLineEdit *inputDevice;
QRadioButton *skinInterfaceButton;
QRadioButton *qtInterfaceButton;
/* Display only the options for the selected audio output */ /* Display only the options for the selected audio output */
private slots: private slots:
......
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