Implement basic panel change

Forgot this file

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 03eb65b4eacb3fbd2e41feb059d2d1eaa76ff113..0153c8d22cff831c078260ee4b4d29b1ce2c5f61 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -38,5 +38,8 @@
 #define I_POP_SORT N_("Sort")
 #define I_POP_ADD N_("Add node")
 
+/*************** Preferences *************/
 
+#define I_HIDDEN_ADV N_( "Some options are available but hidden. "\
+                         "Check \"Advanced options\" to see them." )
 #endif

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 620166ae74000040be8e4ec61f42511db8a775d3..fa659e0b540efca48a397e8b6b1489c528b66a72 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -116,7 +116,6 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
                 module_config_t *_p_item, QLabel *label, QComboBox *_combo,
                 bool bycat ) : VStringConfigControl( _p_this, _p_item )
 {
-    fprintf( stderr, "%p %p\n", _p_item, p_item );
     combo = _combo;
     finish( label, bycat );
 }

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index b048b8cbef2716aee0b50bc3c9c1b2ca5c646054..cb0bf57a9fc420861f38f9f6c4bf6c6f07c7ebb1 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -33,6 +33,7 @@
 #include <QFont>
 
 #include "pixmaps/audio.xpm"
+#include "pixmaps/video.xpm"
 #include "ui/sprefs_trivial.h"
 
 #define ITEM_HEIGHT 25
@@ -59,6 +60,10 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
 
     addItem( "Very trivial" );
     item(0)->setIcon( QIcon( QPixmap( audio_xpm ) ) );
+    item(0)->setData( Qt::UserRole, qVariantFromValue( 0 ) );
+    addItem( "Video" );
+    item(1)->setIcon( QIcon( QPixmap( video_xpm ) ) );
+    item(1)->setData( Qt::UserRole, qVariantFromValue( 1 ) );
 }
 
 void SPrefsCatList::ApplyAll()
@@ -87,10 +92,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     {
         Ui::SPrefsTrivial ui;
         ui.setupUi( this );
-        msg_Err( p_intf, "Intf there" );
         module_config_t *p_config = config_FindConfig( VLC_OBJECT(p_intf),
                                                         "memcpy" );
-        msg_Err( p_intf, "%p", p_config );
         ConfigControl *control = new ModuleConfigControl( VLC_OBJECT(p_intf),
                         p_config, ui.memcpyLabel, ui.memcpyCombo, false );
         controls.append( control );

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.cpp b/modules/gui/qt4/dialogs/prefs_dialog.cpp
index da620c37b279db2720c7f396a3ec4800fde37e5a..d5505c0a2e5b430f19fc44399d458ac2cc5d5cc8 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.cpp
+++ b/modules/gui/qt4/dialogs/prefs_dialog.cpp
@@ -74,7 +74,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      main_layout->setColumnStretch( 0, 1 );
      main_layout->setColumnStretch( 1,3 );
 
-     setAll();
+     setSmall();
 
      connect( adv_chk, SIGNAL( toggled(bool) ),
               this, SLOT( setAdvanced( bool ) ) );
@@ -117,6 +117,7 @@ void PrefsDialog::setAll()
          advanced_panel = new PrefsPanel( main_panel );
     main_panel_l->addWidget( advanced_panel );
     advanced_panel->show();
+    adv_chk->show();
 }
 
 void PrefsDialog::setSmall()
@@ -132,7 +133,6 @@ void PrefsDialog::setSmall()
          connect( simple_tree,
           SIGNAL( currentItemChanged( QListWidgetItem *, QListWidgetItem *) ),
           this, SLOT( changeSimplePanel( QListWidgetItem * ) ) );
- 
     }
     tree_panel_l->addWidget( simple_tree );
     simple_tree->show();
@@ -146,6 +146,7 @@ void PrefsDialog::setSmall()
         simple_panel = new SPrefsPanel( p_intf, main_panel, 0 );
     main_panel_l->addWidget( simple_panel );
     simple_panel->show();
+    adv_chk->hide();
 }
 
 PrefsDialog::~PrefsDialog()
@@ -154,6 +155,7 @@ PrefsDialog::~PrefsDialog()
 
 void PrefsDialog::changeSimplePanel( QListWidgetItem *item )
 {
+    int number = item->data( Qt::UserRole ).toInt();
     if( simple_panel )
     {
         main_panel_l->removeWidget( simple_panel );
@@ -161,7 +163,7 @@ void PrefsDialog::changeSimplePanel( QListWidgetItem *item )
         /* Don't do this once it works, you would loose all changes */
         delete simple_panel;
     }
-    simple_panel = new SPrefsPanel( p_intf, main_panel, 0 );
+    simple_panel = new SPrefsPanel( p_intf, main_panel, number );
     main_panel_l->addWidget( simple_panel );
     simple_panel->show();
 }