Qt4 - Prefs; cleaning, disabling unused code, general comments, class renaming, in...

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index ed4b4f16c96572e88a8f76bd732a6fcb104e0d10..c2d7d47319f21b6206366c63230c3fc7f17028f0 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -324,10 +324,10 @@ void PrefsTree::doAll( bool doclean )
 /*********************************************************************
  * The Panel
  *********************************************************************/
-PrefsPanel::PrefsPanel( QWidget *_parent ) : QWidget( _parent )
+AdvPrefsPanel::AdvPrefsPanel( QWidget *_parent ) : QWidget( _parent )
 {}
 
-PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
+AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                         PrefsItemData * data ) :
                         QWidget( _parent ), p_intf( _p_intf )
 {
@@ -490,7 +490,7 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     setLayout( global_layout );
 }
 
-void PrefsPanel::apply()
+void AdvPrefsPanel::apply()
 {
     QList<ConfigControl *>::Iterator i;
     for( i = controls.begin() ; i != controls.end() ; i++ )
@@ -499,5 +499,5 @@ void PrefsPanel::apply()
         c->doApply( p_intf );
     }
 }
-void PrefsPanel::clean()
+void AdvPrefsPanel::clean()
 {}

diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index 4a7ea71e48227d91729103e66ed66347fac7f742..5c7cd89515711c7ddf671dddc7189790902214f6 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -37,7 +37,7 @@ enum
     TYPE_MODULE
 };
 
-class PrefsPanel;
+class AdvPrefsPanel;
 class QLabel;
 class QVBoxLayout;
 
@@ -47,7 +47,7 @@ public:
     PrefsItemData()
     { panel = NULL; i_object_id = 0; i_subcat_id = -1; psz_name = NULL; };
     virtual ~PrefsItemData() { free( psz_name ); };
-    PrefsPanel *panel;
+    AdvPrefsPanel *panel;
     int i_object_id;
     int i_subcat_id;
     int i_type;
@@ -76,13 +76,13 @@ private:
 
 class ConfigControl;
 
-class PrefsPanel : public QWidget
+class AdvPrefsPanel : public QWidget
 {
     Q_OBJECT
 public:
-    PrefsPanel( intf_thread_t *, QWidget *, PrefsItemData * );
-    PrefsPanel( QWidget *);
-    virtual ~PrefsPanel() {};
+    AdvPrefsPanel( intf_thread_t *, QWidget *, PrefsItemData * );
+    AdvPrefsPanel( QWidget *);
+    virtual ~AdvPrefsPanel() {};
     void apply();
     void clean();
 private:

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 7910fa8167f5482435c60e237cd268251565043e..99832bc7d63bfe682403bb4f5baddb73acbb584e 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -103,23 +103,19 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL;
 
     if( config_GetInt( p_intf, "qt-advanced-pref") == 1 )
-    {
-        setAll();
-    }
+        SetAdvanced();
     else
-    {
         setSmall();
-    }
 
     BUTTONACT( save, save() );
     BUTTONACT( cancel, cancel() );
     BUTTONACT( reset, reset() );
-    BUTTONACT( small, setSmall() );
-    BUTTONACT( all, setAll() );
 
+    BUTTONACT( small, setSmall() );
+    BUTTONACT( all, SetAdvanced() );
 }
 
-void PrefsDialog::setAll()
+void PrefsDialog::SetAdvanced()
 {
     /* We already have a simple TREE, and we just want to hide it */
     if( simple_tree )
@@ -136,7 +132,7 @@ void PrefsDialog::setAll()
         /* and connections */
          CONNECT( advanced_tree,
                   currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem *),
-                  this, changePanel( QTreeWidgetItem * ) );
+                  this, changeAdvPanel( QTreeWidgetItem * ) );
     }
     /* Add the Advanced tree to the tree_panel, even if it is already inside,
        since it can't hurt. And show it. */
@@ -151,7 +147,7 @@ void PrefsDialog::setAll()
     }
     /* If no advanced Panel exist, create one, attach it and show it*/
     if( !advanced_panel )
-         advanced_panel = new PrefsPanel( main_panel );
+         advanced_panel = new AdvPrefsPanel( main_panel );
     main_panel_l->addWidget( advanced_panel );
     all->setChecked( true );
     advanced_panel->show();
@@ -193,6 +189,7 @@ void PrefsDialog::setSmall()
     current_simple_panel->show();
 }
 
+/* Switching from on simple panel to another */
 void PrefsDialog::changeSimplePanel( int number )
 {
     if( current_simple_panel  )
@@ -210,7 +207,8 @@ void PrefsDialog::changeSimplePanel( int number )
     current_simple_panel->show();
 }
 
-void PrefsDialog::changePanel( QTreeWidgetItem *item )
+/* Changing from one Advanced Panel to another */
+void PrefsDialog::changeAdvPanel( QTreeWidgetItem *item )
 {
     PrefsItemData *data = item->data( 0, Qt::UserRole ).value<PrefsItemData*>();
 
@@ -220,16 +218,18 @@ void PrefsDialog::changePanel( QTreeWidgetItem *item )
         advanced_panel->hide();
     }
     if( !data->panel )
-        data->panel = new PrefsPanel( p_intf, main_panel , data );
+        data->panel = new AdvPrefsPanel( p_intf, main_panel , data );
 
     advanced_panel = data->panel;
     main_panel_l->addWidget( advanced_panel );
     advanced_panel->show();
 }
 
+#if 0 
+/*Called from extended settings, is not used anymore, but could be useful one day*/
 void PrefsDialog::showModulePrefs( char *psz_module )
 {
-    setAll();
+    SetAdvanced();
     all->setChecked( true );
     for( int i_cat_index = 0 ; i_cat_index < advanced_tree->topLevelItemCount();
          i_cat_index++ )
@@ -257,14 +257,10 @@ void PrefsDialog::showModulePrefs( char *psz_module )
     }
     show();
 }
+#endif
 
+/* Actual apply and save for the preferences */
 void PrefsDialog::save()
-{
-    apply();
-    hide();
-}
-
-void PrefsDialog::apply()
 {
     if( small->isChecked() && simple_tree )
     {
@@ -289,8 +285,11 @@ void PrefsDialog::apply()
         delete current_simple_panel;
         current_simple_panel  = NULL;
     }
+    
+    hide();
 }
 
+/* Clean the preferences, dunno if it does something really */
 void PrefsDialog::cancel()
 {
     if( small->isChecked() && simple_tree )
@@ -306,6 +305,7 @@ void PrefsDialog::cancel()
     hide();
 }
 
+/* Reset all the preferences, when you click the button */
 void PrefsDialog::reset()
 {
     int ret = QMessageBox::question(this, qtr("Reset Preferences"),

diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp
index f5475329209f4080f30069fb1c1c54eef07dc61f..dac2e94fd72ec99e515244d0c745de32bb6890cb 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.hpp
+++ b/modules/gui/qt4/dialogs/preferences.hpp
@@ -29,7 +29,7 @@
 
 class PrefsTree;
 class SPrefsCatList;
-class PrefsPanel;
+class AdvPrefsPanel;
 class SPrefsPanel;
 class QTreeWidgetItem;
 class QTreeWidget;
@@ -54,14 +54,17 @@ public:
         return instance;
     }
     virtual ~PrefsDialog() {};
-
+#if 0
+    /*Called from extended settings, is not used anymore, but could be useful one day*/
     void showModulePrefs( char* );
+#endif
 private:
     PrefsDialog( intf_thread_t * );
 
     QWidget *main_panel;
     QHBoxLayout *main_panel_l;
-    PrefsPanel *advanced_panel;
+
+    AdvPrefsPanel *advanced_panel;
     SPrefsPanel *current_simple_panel;
     SPrefsPanel *simple_panels[SPrefsMax];
 
@@ -76,16 +79,18 @@ private:
     QGridLayout *main_layout;
 
     static PrefsDialog *instance;
+
 private slots:
-     void changePanel( QTreeWidgetItem * );
-     void changeSimplePanel( int );
-     void setAll();
-     void setSmall();
-     void save();
-     void apply();
-     void cancel();
-     void reset();
-     void close(){ save(); };
+    void SetAdvanced();
+    void setSmall();
+
+    void changeAdvPanel( QTreeWidgetItem * );
+    void changeSimplePanel( int );
+
+    void save();
+    void cancel();
+    void reset();
+    void close(){ save(); }; /* Needed for any generic CloseEvent*/
 };
 
 #endif