X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=6260c81a9c5048a4190a50ace0bd474eb9e038b7;hb=9896506ee513bcd89afcd1bc48bc238fa5ef1cf2;hp=8d4dbf68fa6463bec3bda4603a3a8e9d92cd2029;hpb=a2c859a5e74882e46a2ce702262e6d69194e4e68;p=vlc

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 8d4dbf68fa..6260c81a9c 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -39,6 +39,7 @@
 #include "util/qt_dirs.hpp"
 #include <vlc_keys.h>
 #include <vlc_intf_strings.h>
+#include <vlc_modules.h>
 
 #include <QString>
 #include <QVariant>
@@ -340,7 +341,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
 
 void FileConfigControl::updateField()
 {
-    QString file = QFileDialog::getOpenFileName( NULL,
+    QString file = QFileDialog::getSaveFileName( NULL,
                   qtr( "Select File" ), QVLCUserDir( VLC_HOME_DIR ) );
     if( file.isNull() ) return;
     text->setText( toNativeSeparators( file ) );
@@ -449,7 +450,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
         for( int i = 0; i < p_item->i_action; i++ )
         {
             QPushButton *button =
-                new QPushButton( qfu( p_item->ppsz_action_text[i] ));
+                new QPushButton( qtr( p_item->ppsz_action_text[i] ));
             CONNECT( button, clicked(), signalMapper, map() );
             signalMapper->setMapping( button, i );
             l->addWidget( button, line, LAST_COLUMN - p_item->i_action + i,
@@ -516,9 +517,16 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca
 
     for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
+        if( !p_module_config->ppsz_list[i_index] )
+        {
+              combo->addItem( "", QVariant(""));
+              if( !p_item->value.psz )
+                 combo->setCurrentIndex( combo->count() - 1 );
+              continue;
+        }
         combo->addItem( qfu((p_module_config->ppsz_list_text &&
                             p_module_config->ppsz_list_text[i_index])?
-                            p_module_config->ppsz_list_text[i_index] :
+                            _(p_module_config->ppsz_list_text[i_index]) :
                             p_module_config->ppsz_list[i_index] ),
                    QVariant( qfu(p_module_config->ppsz_list[i_index] )) );
         if( p_item->value.psz && !strcmp( p_module_config->value.psz,
@@ -558,7 +566,7 @@ void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
 
         for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
         {
-            combo->addItem( qfu( p_config->ppsz_list_text[i_index] ),
+            combo->addItem( qtr(p_config->ppsz_list_text[i_index]),
                     QVariant( p_config->pi_list[i_index] ) );
             if( p_config->value.i == p_config->pi_list[i_index] )
             {
@@ -1250,14 +1258,14 @@ void KeySelectorControl::finish()
                 - QString text in column 0
                 - QString name in data of column 0
                 - KeyValue in String in column 1
-                - KeyValue in int in column 1
+                - KeyValue in int64_t in column 1
              */
             QTreeWidgetItem *treeItem = new QTreeWidgetItem();
             treeItem->setText( 0, qtr( p_item->psz_text ) );
             treeItem->setData( 0, Qt::UserRole,
                                QVariant( qfu( p_item->psz_name ) ) );
             treeItem->setText( 1, VLCKeyToString( p_item->value.i ) );
-            treeItem->setData( 1, Qt::UserRole, QVariant( p_item->value.i ) );
+            treeItem->setData( 1, Qt::UserRole, QVariant( qlonglong( p_item->value.i ) ) );
             table->addTopLevelItem( treeItem );
             continue;
         }
@@ -1272,7 +1280,7 @@ void KeySelectorControl::finish()
             {
                 list[0]->setText( 2, VLCKeyToString( p_item->value.i ) );
                 list[0]->setData( 2, Qt::UserRole,
-                                  QVariant( p_item->value.i ) );
+                                  QVariant( qlonglong( p_item->value.i ) ) );
             }
             if( list.count() >= 2 )
                 msg_Dbg( p_this, "This is probably wrong, %s", p_item->psz_text );