Qt: allow to select inexistent files from Prefs

[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 de1615a68a7dfb4dbcf59e49987bc839a28fa373..56c68f29027b6d0ae4a0c0483c8b8c1e5d783de9 100644 (file)
--- 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 ) );
@@ -517,7 +518,12 @@ 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] :
@@ -1252,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;
         }
@@ -1274,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 );