Commit b25d8309 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 win32 native open dialog.

parent e04cc4a8
......@@ -370,8 +370,8 @@ QStringList DialogsProvider::showSimpleOpen( QString help,
fileTypes.replace(QString(";*"), QString(" *"));
return QFileDialog::getOpenFileNames( NULL,
help.isNull() ? qfu(I_OP_SEL_FILES ) : help,
path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path,
help.isEmpty() ? qfu(I_OP_SEL_FILES ) : help,
path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path,
fileTypes );
}
......
......@@ -297,7 +297,11 @@ QMenu *QVLCMenu::FileMenu()
QMenu *menu = new QMenu();
addDPStaticEntry( menu, qtr( "&Open File..." ), "",
":/file-asym", SLOT( openFileDialog() ), "Ctrl+O" );
#ifdef WIN32
":/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( "Advanced Open File..." ), "",
#endif
":/file-asym", SLOT( openFileDialog() ), "" );
addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ), "",
......
......@@ -427,8 +427,8 @@ static void *Init( vlc_object_t *obj )
/* Retrieve last known path used in file browsing */
char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" );
p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path
: config_GetHomeDir();
p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? config_GetHomeDir()
: psz_path;
/* Launch */
app->exec();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment