Qt: Fix simple preferences according to new ui modes

[vlc] / modules / gui / qt4 / components / preferences_widgets.cpp

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 2b6c99248f0f50caeda154daab9f3bbef5b176d5..90c8bc75ce7186015c1ac7b68bfcc7cb0166eb83 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -38,6 +38,7 @@
 #include "util/customwidgets.hpp"
 #include "util/qt_dirs.hpp"
 #include <vlc_keys.h>
+#include <vlc_intf_strings.h>
 
 #include <QString>
 #include <QVariant>
@@ -48,6 +49,7 @@
 #include <QTreeWidgetItem>
 #include <QSignalMapper>
 #include <QDialogButtonBox>
+#include <QKeyEvent>
 
 #define MINWIDTH_BOX 90
 #define LAST_COLUMN 10
@@ -98,9 +100,6 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
     case CONFIG_ITEM_MODULE_LIST_CAT:
         p_control = new ModuleListConfigControl( p_this, p_item, parent, true,
                                              l, line );
-        /* Special Hack for a bug in video-filter */
-        if( qobject_cast<ModuleListConfigControl *>( p_control )->groupBox == NULL )
-            return NULL;
         break;
     case CONFIG_ITEM_STRING:
         if( !p_item->i_list )
@@ -200,22 +199,40 @@ void ConfigControl::doApply( intf_thread_t *p_intf )
 /*******************************************************
  * Simple widgets
  *******************************************************/
-InterfacePreviewWidget::InterfacePreviewWidget
-        ( QWidget *parent ) : QLabel( parent, 0 )
+InterfacePreviewWidget::InterfacePreviewWidget ( QWidget *parent ) : QLabel( parent )
 {
     setGeometry( 0, 0, 128, 100 );
     setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
 }
 
-void InterfacePreviewWidget::setPreview( int comboid )
+void InterfacePreviewWidget::setNormalPreview( bool b_minimal )
 {
-    /* Need to move resources references as soon as qt4.cpp
-       local defines has been moved somewhere else
-    */
-    const char * pixmaps[] = { ":/prefsmenu/sample_classic",
-                               ":/prefsmenu/sample_complete",
-                               ":/prefsmenu/sample_minimal" };
-    setPixmap( QPixmap( pixmaps[ comboid ] ) );
+    setPreview( ( b_minimal )?MINIMAL:COMPLETE );
+}
+
+void InterfacePreviewWidget::setPreview( enum_style e_style )
+{
+    QString pixmapLocationString(":/prefsmenu/");
+
+    switch( e_style )
+    {
+    default:
+    case CLASSIC:
+        pixmapLocationString += "sample_classic";
+        break;
+    case COMPLETE:
+        pixmapLocationString += "sample_complete";
+        break;
+    case MINIMAL:
+        pixmapLocationString += "sample_minimal";
+        break;
+    case SKINS:
+        pixmapLocationString += "sample_skins";
+        break;
+    }
+
+    setPixmap( QPixmap( pixmapLocationString ) );
+    update();
 }
 
 
@@ -327,7 +344,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
 void FileConfigControl::updateField()
 {
     QString file = QFileDialog::getOpenFileName( NULL,
-                  qtr( "Select File" ), qfu( config_GetHomeDir() ) );
+                  qtr( "Select File" ), QVLCUserDir( VLC_HOME_DIR ) );
     if( file.isNull() ) return;
     text->setText( toNativeSeparators( file ) );
 }
@@ -359,9 +376,9 @@ DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this,
 void DirectoryConfigControl::updateField()
 {
     QString dir = QFileDialog::getExistingDirectory( NULL,
-                      qtr( "Select Directory" ),
+                      qtr( I_OP_SEL_DIR ),
                       text->text().isEmpty() ?
-                        qfu( config_GetHomeDir() ) : text->text(),
+                        QVLCUserDir( VLC_HOME_DIR ) : text->text(),
                   QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
 
     if( dir.isNull() ) return;
@@ -413,20 +430,6 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
     combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
 
     module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name );
-    if(p_module_config && p_module_config->pf_update_list)
-    {
-       vlc_value_t val;
-       val.psz_string = strdup(p_module_config->value.psz);
-
-       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
-
-       // assume in any case that dirty was set to true
-       // because lazy programmes will use the same callback for
-       // this, like the one behind the refresh push button?
-       p_module_config->b_dirty = false;
-
-       free( val.psz_string );
-    }
 
     finish( p_module_config, bycat );
     if( !l )
@@ -499,6 +502,21 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca
 
     if(!p_module_config) return;
 
+    if( p_module_config->pf_update_list )
+    {
+       vlc_value_t val;
+       val.psz_string = strdup(p_module_config->value.psz);
+
+       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
+
+       // assume in any case that dirty was set to true
+       // because lazy programmes will use the same callback for
+       // this, like the one behind the refresh push button?
+       p_module_config->b_dirty = false;
+
+       free( val.psz_string );
+    }
+
     for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
         combo->addItem( qfu((p_module_config->ppsz_list_text &&
@@ -913,19 +931,6 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
     combo->setMinimumWidth( MINWIDTH_BOX );
 
     module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name );
-    if(p_module_config && p_module_config->pf_update_list)
-    {
-       vlc_value_t val;
-       val.i_int = p_module_config->value.i;
-
-       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
-
-       // assume in any case that dirty was set to true
-       // because lazy programmes will use the same callback for
-       // this, like the one behind the refresh push button?
-       p_module_config->b_dirty = false;
-    }
-
 
     finish( p_module_config, bycat );
     if( !l )
@@ -977,6 +982,19 @@ void IntegerListConfigControl::finish(module_config_t *p_module_config, bool byc
 
     if(!p_module_config) return;
 
+    if( p_module_config->pf_update_list )
+    {
+       vlc_value_t val;
+       val.i_int = p_module_config->value.i;
+
+       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
+
+       // assume in any case that dirty was set to true
+       // because lazy programmes will use the same callback for
+       // this, like the one behind the refresh push button?
+       p_module_config->b_dirty = false;
+    }
+
     for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
         combo->addItem( qtr(p_module_config->ppsz_list_text[i_index] ),
@@ -1040,6 +1058,7 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
         l->addWidget( checkbox, line, 0 );
     }
 }
+
 BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
                                       module_config_t *_p_item,
                                       QLabel *_label,
@@ -1381,6 +1400,7 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
     table = _table;
     setWindowTitle( b_global ? qtr( "Global" ): ""
                     + qtr( "Hotkey for " ) + keyToChange );
+    setWindowRole( "vlc-key-input" );
 
     vLayout = new QVBoxLayout( this );
     selected = new QLabel( qtr( "Press the new keys for " ) + keyToChange );