From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 29 Oct 2007 03:02:43 +0000 (+0000)
Subject: Qt4 - SPrefs: save the interface value... Doesn't seem to work, so please review.
X-Git-Tag: 0.9.0-test0~4757
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=631f0bf45e7aa86841bc7c510e28d7cb353e436a;p=vlc

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

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 210d249aaa..d768c8f438 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -247,7 +247,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                  volNormalizer );
         CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
 
-
         CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
                          lastfm_user_edit );
         CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label,
@@ -323,9 +322,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             }
             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_FILE( "skins2-last", File, NULL, fileSkin,
@@ -400,6 +400,7 @@ void SPrefsPanel::apply()
         ConfigControl *c = qobject_cast<ConfigControl *>(*i);
         c->doApply( p_intf );
     }
+    
     /* Devices */
     //FIXME is it qta or qtu ????
     char *psz_devicepath = qtu( inputDevice->text() );
@@ -409,6 +410,12 @@ void SPrefsPanel::apply()
         config_PutPsz( p_intf, "vcd", 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()
diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index affc333b3d..f00b380740 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -42,6 +42,7 @@ enum {
 class ConfigControl;
 class QComboBox;
 class QLineEdit;
+class QRadioButton;
 
 class SPrefsCatList : public QWidget
 {
@@ -75,6 +76,8 @@ private:
     QWidget *file_options;
     QComboBox *audioOutput;
     QLineEdit *inputDevice;
+    QRadioButton *skinInterfaceButton;
+    QRadioButton *qtInterfaceButton;
 
 /* Display only the options for the selected audio output */
 private slots: