Merge branch 'codecleanup' of git://repo.or.cz/vlc/pdherbemont

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

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 5d7b426a3683d0afd6ba5a41f92dd6476fa67ace..41b7551aa83c1d4b75f594db58e4ed87d0d526f5 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -45,7 +45,7 @@
 #include <QScrollArea>
 #include <QUrl>
 
-#define I_DEVICE_TOOLTIP "Select the device or the VIDEO_TS directory"
+#define I_DEVICE_TOOLTIP N_("Select the device or the VIDEO_TS directory")
 
 /**************************************************************************
  * Open Files and subtitles                                               *
@@ -86,6 +86,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
     /* Add a tooltip */
     dialogBox->setToolTip( qtr( "Select one or multiple files" ) );
+    dialogBox->setMinimumHeight( 250 );
 
     // But hide the two OK/Cancel buttons. Enable them for debug.
     QDialogButtonBox *fileDialogAcceptBox =
@@ -1189,5 +1190,7 @@ void CaptureOpenPanel::advancedDialog()
         msg_Dbg( p_intf, "%s", qtu( advMRL ) );
     }
     delete adv;
+    module_PutConfig( p_config );
+    module_Put( p_module );
 }