Qt: ExtensionsModel: do DI

[vlc] / modules / gui / qt4 / dialogs / preferences.cpp

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index d18118a849998fd5147a1705de5668960255d72e..ef482006aee086239f2f9f5ed0423389d2197ee5 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -42,6 +42,8 @@
 #include <QMessageBox>
 #include <QDialogButtonBox>
 #include <QStackedWidget>
+#include <QSplitter>
+#include <QShortcut>
 
 PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
             : QVLCDialog( parent, _p_intf )
@@ -62,28 +64,26 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
     advanced_tree_panel = new QWidget;
     advanced_tree_panel->setLayout( new QVBoxLayout );
 
-    advanced_main_panel = new QWidget;
-    advanced_main_panel->setLayout( new QHBoxLayout );
-
     /* Choice for types */
     types = new QGroupBox( qtr("Show settings") );
     types->setAlignment( Qt::AlignHCenter );
     QHBoxLayout *types_l = new QHBoxLayout;
     types_l->setSpacing( 3 ); types_l->setMargin( 3 );
-    small = new QRadioButton( qtr( "Simple" ), types );
-    small->setToolTip( qtr( "Switch to simple preferences view" ) );
-    types_l->addWidget( small );
+    simple = new QRadioButton( qtr( "Simple" ), types );
+    simple->setToolTip( qtr( "Switch to simple preferences view" ) );
+    types_l->addWidget( simple );
     all = new QRadioButton( qtr("All"), types ); types_l->addWidget( all );
     all->setToolTip( qtr( "Switch to full preferences view" ) );
     types->setLayout( types_l );
-    small->setChecked( true );
+    simple->setChecked( true );
 
     /* Tree and panel initialisations */
     advanced_tree = NULL;
     tree_filter = NULL;
+    current_filter = NULL;
     simple_tree = NULL;
     simple_panels_stack = new QStackedWidget;
-    advanced_panel = NULL;
+    advanced_panels_stack = new QStackedWidget;
 
     /* Buttons */
     QDialogButtonBox *buttonsBox = new QDialogButtonBox();
@@ -100,7 +100,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
     simple_split_widget = new QWidget();
     simple_split_widget->setLayout( new QHBoxLayout );
 
-    advanced_split_widget = new QWidget();
+    advanced_split_widget = new QSplitter();
     advanced_split_widget->setLayout( new QHBoxLayout );
 
     stack = new QStackedWidget();
@@ -112,7 +112,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
     simple_split_widget->layout()->setMargin( 0 );
 
     advanced_split_widget->layout()->addWidget( advanced_tree_panel );
-    advanced_split_widget->layout()->addWidget( advanced_main_panel );
+    advanced_split_widget->layout()->addWidget( advanced_panels_stack );
     advanced_split_widget->layout()->setMargin( 0 );
 
     /* Layout  */
@@ -136,13 +136,13 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
      || var_InheritBool( p_intf, "advanced" ) )
         setAdvanced();
     else
-        setSmall();
+        setSimple();
 
     BUTTONACT( save, save() );
     BUTTONACT( cancel, cancel() );
     BUTTONACT( reset, reset() );
 
-    BUTTONACT( small, setSmall() );
+    BUTTONACT( simple, setSimple() );
     BUTTONACT( all, setAdvanced() );
 
     resize( 780, sizeHint().height() );
@@ -159,6 +159,16 @@ void PrefsDialog::setAdvanced()
                 this, advancedTreeFilterChanged( const QString & ) );
 
         advanced_tree_panel->layout()->addWidget( tree_filter );
+
+        current_filter = new QCheckBox( qtr("Only show current") );
+        current_filter->setToolTip(
+                    qtr("Only show modules related to current playback") );
+        CONNECT( current_filter, stateChanged(int),
+                 this, onlyLoadedToggled() );
+        advanced_tree_panel->layout()->addWidget( current_filter );
+
+        QShortcut *search = new QShortcut( QKeySequence( QKeySequence::Find ), tree_filter );
+        CONNECT( search, activated(), tree_filter, setFocus() );
     }
 
     /* If don't have already and advanced TREE, then create it */
@@ -175,10 +185,10 @@ void PrefsDialog::setAdvanced()
     }
 
     /* If no advanced Panel exist, create one, attach it and show it*/
-    if( !advanced_panel )
+    if( advanced_panels_stack->count() < 1 )
     {
-        advanced_panel = new AdvPrefsPanel( advanced_main_panel );
-        advanced_main_panel->layout()->addWidget( advanced_panel );
+        AdvPrefsPanel *insert = new AdvPrefsPanel( advanced_panels_stack );
+        advanced_panels_stack->insertWidget( 0, insert );
     }
 
     /* Select the first Item of the preferences. Maybe you want to select a specified
@@ -188,9 +198,10 @@ void PrefsDialog::setAdvanced()
 
     all->setChecked( true );
     stack->setCurrentIndex( ADVANCED );
+    setWindowTitle( qtr( "Advanced Preferences" ) );
 }
 
-void PrefsDialog::setSmall()
+void PrefsDialog::setSimple()
 {
     /* If no simple_tree, create one, connect it */
     if( !simple_tree )
@@ -200,15 +211,15 @@ void PrefsDialog::setSmall()
                   currentItemChanged( int ),
                   this,  changeSimplePanel( int ) );
         simple_tree_panel->layout()->addWidget( simple_tree );
-        simple_tree_panel->setMinimumSize( QSize( 150, 0 ) );
         simple_tree_panel->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
     }
 
     if( ! simple_panels[SPrefsDefaultCat] )
         changeSimplePanel( SPrefsDefaultCat );
 
-    small->setChecked( true );
+    simple->setChecked( true );
     stack->setCurrentIndex( SIMPLE );
+    setWindowTitle( qtr( "Simple Preferences" ) );
 }
 
 /* Switching from on simple panel to another */
@@ -229,17 +240,13 @@ void PrefsDialog::changeAdvPanel( QTreeWidgetItem *item )
     if( item == NULL ) return;
     PrefsItemData *data = item->data( 0, Qt::UserRole ).value<PrefsItemData*>();
 
-    if( advanced_panel )
-        if( advanced_panel->isVisible() ) advanced_panel->hide();
-
     if( !data->panel )
     {
-        data->panel = new AdvPrefsPanel( p_intf, advanced_main_panel, data );
-        advanced_main_panel->layout()->addWidget( data->panel );
+        data->panel = new AdvPrefsPanel( p_intf, advanced_panels_stack, data );
+        advanced_panels_stack->insertWidget( advanced_panels_stack->count(),
+                                             data->panel );
     }
-
-    advanced_panel = data->panel;
-    advanced_panel->show();
+    advanced_panels_stack->setCurrentWidget( data->panel );
 }
 
 #if 0
@@ -279,7 +286,7 @@ void PrefsDialog::showModulePrefs( char *psz_module )
 /* Actual apply and save for the preferences */
 void PrefsDialog::save()
 {
-    if( small->isChecked() && simple_tree->isVisible() )
+    if( simple->isChecked() && simple_tree->isVisible() )
     {
         msg_Dbg( p_intf, "Saving the simple preferences" );
         for( int i = 0 ; i< SPrefsMax; i++ ){
@@ -327,6 +334,10 @@ void PrefsDialog::reset()
         config_SaveConfigFile( p_intf );
         getSettings()->clear();
 
+#ifdef _WIN32
+        simple_panels[0]->cleanLang();
+#endif
+
         accept();
     }
 }
@@ -335,3 +346,8 @@ void PrefsDialog::advancedTreeFilterChanged( const QString & text )
 {
     advanced_tree->filter( text );
 }
+
+void PrefsDialog::onlyLoadedToggled()
+{
+    advanced_tree->setLoadedOnly( current_filter->isChecked() );
+}