[vlc-devel] commit: Preferences: Modify the reset button according to the HIG. remove some warnings. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 12 23:36:44 2008 -0700| [e6ee64216f4e13a52ca651ebd2054e6fb9ab2dfd]

Preferences: Modify the reset button according to the HIG. remove some warnings.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e6ee64216f4e13a52ca651ebd2054e6fb9ab2dfd
---

 modules/gui/qt4/components/simple_preferences.cpp |    4 ----
 modules/gui/qt4/dialogs/preferences.cpp           |   15 ++++++++++++---
 modules/gui/qt4/dialogs/preferences.hpp           |    2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 7f4ed42..5fd5440 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -425,7 +425,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             char *psz_intf = config_GetPsz( p_intf, "intf" );
             if( psz_intf )
             {
-                msg_Dbg( p_intf, "Interface in config file: %s", psz_intf );
                 if( strstr( psz_intf, "skin" ) )
                     ui.skins->setChecked( true );
                 else if( strstr( psz_intf, "qt" ) )
@@ -533,8 +532,6 @@ void SPrefsPanel::updateAudioVolume( int volume )
 /* Function called from the main Preferences dialog on each SPrefs Panel */
 void SPrefsPanel::apply()
 {
-    msg_Dbg( p_intf, "Trying to save the %i simple panel", number );
-
     /* Generic save for ever panel */
     QList<ConfigControl *>::Iterator i;
     for( i = controls.begin() ; i != controls.end() ; i++ )
@@ -582,7 +579,6 @@ void SPrefsPanel::apply()
         int i_comboValue = cachingCombo->itemData( cachingCombo->currentIndex() ).toInt();
         if( i_comboValue )
         {
-            msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue );
             CaC( "udp-caching" );
             if (module_Exists (p_intf, "dvdread" ))
                 CaC( "dvdread-caching" );
diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 7abb5a6..3e32d2d 100644
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -82,7 +82,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
 
     buttonsBox->addButton( save, QDialogButtonBox::AcceptRole );
     buttonsBox->addButton( cancel, QDialogButtonBox::RejectRole );
-    buttonsBox->addButton( reset, QDialogButtonBox::ActionRole );
+    buttonsBox->addButton( reset, QDialogButtonBox::ResetRole );
 
     /* Layout  */
     main_layout->addWidget( tree_panel, 0, 0, 3, 1 );
@@ -283,6 +283,14 @@ void PrefsDialog::save()
     /* Save to file */
     config_SaveConfigFile( p_intf, NULL );
 
+    destroyPanels();
+
+    hide();
+}
+
+void PrefsDialog::destroyPanels()
+{
+    msg_Dbg( p_intf, "Destroying the Panels" );
     /* Delete the other panel in order to force its reload after clicking
        on apply. In fact, if we don't do that, the preferences from the other
        panels won't be accurate, so we would have to recreate the whole dialog,
@@ -307,10 +315,9 @@ void PrefsDialog::save()
         }
         current_simple_panel  = NULL;
     }
-
-    hide();
 }
 
+
 /* Clean the preferences, dunno if it does something really */
 void PrefsDialog::cancel()
 {
@@ -342,5 +349,7 @@ void PrefsDialog::reset()
     {
         config_ResetAll( p_intf );
         config_SaveConfigFile( p_intf, NULL );
+        /* FIXME reset the panels */
+        destroyPanels();
     }
 }
diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp
index 757bac5..5125bfa 100644
--- a/modules/gui/qt4/dialogs/preferences.hpp
+++ b/modules/gui/qt4/dialogs/preferences.hpp
@@ -61,6 +61,8 @@ private:
     PrefsDialog( QWidget *, intf_thread_t * );
     QGridLayout *main_layout;
 
+    void destroyPanels();
+
     QWidget *main_panel;
     QHBoxLayout *main_panel_l;