From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 20 Mar 2007 23:29:42 +0000 (+0000)
Subject: Qt4 - Pref: start to track functionnalities missing. Directory still segfaults..
X-Git-Tag: 0.9.0-test0~8086
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=381a5cb481e287f81290de6b3ff0fbaddb1af1bd;p=vlc

Qt4 - Pref: start to track functionnalities missing. Directory still segfaults..
---

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 9b4caa94e1..bdcf345e9d 100644
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -108,5 +108,5 @@ struct module_t
 VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, const char *, const char *, vlc_bool_t ) );
 #define module_Unneed(a,b) __module_Unneed(VLC_OBJECT(a),b)
 VLC_EXPORT( void, __module_Unneed, ( vlc_object_t *, module_t * ) );
-#define module_Exist(a,b) __module_Exists(VLC_OBJECT(a),b)
+#define module_Exists(a,b) __module_Exists(VLC_OBJECT(a),b)
 VLC_EXPORT( vlc_bool_t,  __module_Exists, ( vlc_object_t *, const char * ) );
diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 0466e561d9..41b6177a19 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -274,7 +274,7 @@ public:
     virtual void show() { text->show(); label->show(); browse->show(); }
     virtual void hide() { text->hide(); label->hide(); browse->hide(); }
 public slots:
-    void updateField();
+    virtual void updateField();
 protected:
     void finish();
 private:
@@ -296,7 +296,7 @@ public:
     virtual void show() { text->show(); label->show(); browse->show(); }
     virtual void hide() { text->hide(); label->hide(); browse->hide(); }
 public slots:
-    void updateField();
+    virtual void updateField();
 private:
     QLineEdit *text;
     QLabel *label;
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index d1a4420699..80635be0e3 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -123,8 +123,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     controls.append( control );                               \
                 }
 
-
-
 #define START_SPREFS_CAT( name , label )    \
         case SPrefs ## name:                \
         {                                   \
@@ -199,7 +197,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
          CONFIG_GENERIC_NO_BOOL( "volume" ,  IntegerRangeSlider, NULL, 
                  defaultVolume );
          CONFIG_GENERIC( "audio-language" , StringList , NULL, 
-                    preferredAudioLanguage );
+                    preferredAudioLanguage ); //FIXME
+
          CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
          CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, 
                     detectionDolby );
@@ -216,7 +215,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                  fileBrowseButton );
 
          CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
-//         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer 
+//         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
          CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, 
                  volNormalizer );
          CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
@@ -225,13 +224,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         /* Input and Codecs Panel Implementation */
         START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  );
           /* Disk Devices */
-/*          CONFIG_GENERIC( );*/
+/*          CONFIG_GENERIC( );*/ //FIXME
 
           CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
           CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
 
           /* Caching */
-/*          CONFIG_GENERIC( );*/
+/*          CONFIG_GENERIC( );*/ //FIXME
 
           CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
           CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
@@ -244,8 +243,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
         /* Interface Panel */
         START_SPREFS_CAT( Interface, "Interfaces settings" );
-
-            CONFIG_GENERIC( "language", StringList, NULL, language );
+            
+            CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME
 #if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
             ui.OneInterfaceBox->hide();
 #endif
@@ -270,8 +269,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
-            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
-
+            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );//FIXME
             CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, 
                     fontBrowse ); 
             CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
@@ -282,6 +280,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         END_SPREFS_CAT;
 
         START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
+        //FIMXE
         END_SPREFS_CAT;
         }