X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=2bb90cb899571140f04bd9a2a9550b16aae83425;hb=d11fd0d1e5433a5299fbf0f0150178178ebd3f83;hp=d52c12850bc2d9b3fc5cd53101913986c1ee7682;hpb=f9ff5b64b419eccc3d746aa93ff22d49eef4c3bd;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index d52c12850b..2bb90cb899 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -21,33 +21,36 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include #include -#include +#include #include "qt4.hpp" #include "dialogs_provider.hpp" #include "main_interface.hpp" #include "menus.hpp" #include +#include "input_manager.hpp" /* The dialogs */ #include "dialogs/playlist.hpp" +#include "dialogs/bookmarks.hpp" #include "dialogs/preferences.hpp" #include "dialogs/mediainfo.hpp" #include "dialogs/messages.hpp" #include "dialogs/extended.hpp" +#include "dialogs/vlm.hpp" #include "dialogs/sout.hpp" #include "dialogs/open.hpp" -#include "dialogs/vlm.hpp" #include "dialogs/help.hpp" #include "dialogs/gototime.hpp" #include "dialogs/podcast_configuration.hpp" -#include "dialogs/vlm.hpp" - DialogsProvider* DialogsProvider::instance = NULL; @@ -70,14 +73,26 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : DialogsProvider::~DialogsProvider() { + msg_Dbg( p_intf, "Destroying the Dialog Provider" ); PlaylistDialog::killInstance(); MediaInfoDialog::killInstance(); + MessagesDialog::killInstance(); + ExtendedDialog::killInstance(); + BookmarksDialog::killInstance(); + HelpDialog::killInstance(); +#ifdef UPDATE_CHECK + UpdateDialog::killInstance(); +#endif + fixed_timer->stop(); + delete menusMapper; + delete menusUpdateMapper; + delete SDMapper; } void DialogsProvider::quit() { - vlc_object_kill( p_intf ); + vlc_object_kill( p_intf->p_libvlc ); QApplication::closeAllWindows(); QApplication::quit(); } @@ -92,6 +107,8 @@ void DialogsProvider::customEvent( QEvent *event ) case INTF_DIALOG_FILE_SIMPLE: case INTF_DIALOG_FILE: openDialog(); break; + case INTF_DIALOG_FILE_GENERIC: + openFileGenericDialog( de->p_arg ); break; case INTF_DIALOG_DISC: openDiscDialog(); break; case INTF_DIALOG_NET: @@ -113,8 +130,10 @@ void DialogsProvider::customEvent( QEvent *event ) bookmarksDialog(); break; case INTF_DIALOG_EXTENDED: extendedDialog(); break; +#ifdef ENABLE_VLM case INTF_DIALOG_VLM: vlmDialog(); break; +#endif case INTF_DIALOG_INTERACTION: doInteraction( de->p_arg ); break; case INTF_DIALOG_POPUPMENU: @@ -168,10 +187,12 @@ void DialogsProvider::gotoTimeDialog() GotoTimeDialog::getInstance( p_intf )->toggleVisible(); } +#ifdef ENABLE_VLM void DialogsProvider::vlmDialog() { VLMDialog::getInstance( p_intf )->toggleVisible(); } +#endif void DialogsProvider::helpDialog() { @@ -202,8 +223,7 @@ void DialogsProvider::mediaCodecDialog() void DialogsProvider::bookmarksDialog() { - /* TODO - Implement me */ - /* BookmarkDialog::getInstance( p_intf )->toggleVisible(); */ + BookmarksDialog::getInstance( p_intf )->toggleVisible(); } void DialogsProvider::podcastConfigureDialog() @@ -225,6 +245,69 @@ void DialogsProvider::openDialog() { openDialog( OPEN_FILE_TAB ); } +void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) +{ + if( p_arg == NULL ) + { + msg_Warn( p_intf, "openFileGenericDialog() called with NULL arg" ); + return; + } + + /* Replace the extensions to a Qt format */ + int i = 0; + QString extensions = qfu( p_arg->psz_extensions ); + while ( ( i = extensions.indexOf( "|", i ) ) != -1 ) + { + if( ( extensions.count( "|" ) % 2 ) == 0 ) + extensions.replace( i, 1, ");;" ); + else + extensions.replace( i, 1, "(" ); + } + extensions.replace(QString(";*"), QString(" *")); + extensions.append( ")" ); + + /* Save */ + if( p_arg->b_save ) + { + QString file = QFileDialog::getSaveFileName( NULL, p_arg->psz_title, + qfu( p_intf->p_sys->psz_filepath ), extensions ); + if( !file.isEmpty() ) + { + p_arg->i_results = 1; + p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); + p_arg->psz_results[0] = strdup( qtu( file ) ); + } + else + p_arg->i_results = 0; + } + else /* non-save mode */ + { + QStringList files = QFileDialog::getOpenFileNames( NULL, + p_arg->psz_title, qfu( p_intf->p_sys->psz_filepath ), + extensions ); + p_arg->i_results = files.count(); + p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); + i = 0; + foreach( QString file, files ) + p_arg->psz_results[i++] = strdup( qtu( file ) ); + } + + /* Callback */ + if( p_arg->pf_callback ) + p_arg->pf_callback( p_arg ); + + /* Clean afterwards */ + if( p_arg->psz_results ) + { + for( i = 0; i < p_arg->i_results; i++ ) + free( p_arg->psz_results[i] ); + free( p_arg->psz_results ); + } + free( p_arg->psz_title ); + free( p_arg->psz_extensions ); + free( p_arg ); +} + void DialogsProvider::openFileDialog() { openDialog( OPEN_FILE_TAB ); @@ -245,7 +328,7 @@ void DialogsProvider::openCaptureDialog() /* Same as the open one, but force the enqueue */ void DialogsProvider::PLAppendDialog() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_ENQUEUE) + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_ENQUEUE) ->showTab( OPEN_FILE_TAB ); } @@ -255,8 +338,6 @@ void DialogsProvider::MLAppendDialog() /** * Simple open - * Not used anymore. Let the code until we are sure we don't want it - * Two opens make it confusing for the user. ***/ QStringList DialogsProvider::showSimpleOpen( QString help, int filters, @@ -282,7 +363,7 @@ 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_libvlc->psz_homedir ) : path, + path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path, fileTypes ); } @@ -303,7 +384,7 @@ void DialogsProvider::addFromSimple( bool pl, bool go) ( i ? PLAYLIST_PREPARSE : 0 ) ) : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), PLAYLIST_END, - pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE ); + pl ? true : false, false ); i++; } } @@ -331,16 +412,18 @@ void DialogsProvider::simpleMLAppendDialog() **/ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory( 0, qtr(I_OP_OPDIR) ); + QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") ); if (!dir.isEmpty()) { - input_item_t *p_input = input_ItemNewExt( THEPL, + input_item_t *p_input = input_item_NewExt( THEPL, qtu( "directory://" + dir ), NULL, 0, NULL, -1 ); + /* FIXME: playlist_AddInput() can fail */ playlist_AddInput( THEPL, p_input, go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, - PLAYLIST_END, pl, VLC_FALSE ); - input_Read( THEPL, p_input, VLC_FALSE ); + PLAYLIST_END, pl, pl_Unlocked ); + input_Read( THEPL, p_input, false ); + vlc_gc_decref( p_input ); } } @@ -371,7 +454,7 @@ void DialogsProvider::saveAPlaylist() { QFileDialog *qfd = new QFileDialog( NULL, qtr( "Choose a filename to save playlist" ), - qfu( p_intf->p_libvlc->psz_homedir ), + qfu( p_intf->p_sys->psz_filepath ), qtr( "XSPF playlist (*.xspf);; " ) + qtr( "M3U playlist (*.m3u);; Any (*.*) " ) ); qfd->setFileMode( QFileDialog::AnyFile ); @@ -422,7 +505,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, if( s->exec() == QDialog::Accepted ) { - msg_Err( p_intf, "Sout mrl %s", qta( s->getMrl() ) ); + msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) ); /* Just do it */ int i_len = strlen( qtu( s->getMrl() ) ) + 10; char *psz_option = (char*)malloc( i_len ); @@ -430,23 +513,22 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, playlist_AddExt( THEPL, qtu( mrl ), "Streaming", PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, - -1, &psz_option, 1, VLC_TRUE, VLC_FALSE ); + -1, &psz_option, 1, true, pl_Unlocked ); } } void DialogsProvider::openThenStreamingDialogs() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_STREAM ) - ->showTab( 0 ); + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_STREAM ) + ->showTab( OPEN_FILE_TAB ); } void DialogsProvider::openThenTranscodingDialogs() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_SAVE ) - ->showTab( 0 ); + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, false, OPEN_AND_SAVE ) + ->showTab( OPEN_FILE_TAB ); } - /**************************************************************************** * Menus / Interaction ****************************************************************************/ @@ -486,16 +568,29 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) break; case INTERACT_UPDATE: qdialog = (InteractionDialog*)(p_dialog->p_private); - if( qdialog) + if( qdialog ) qdialog->update(); + else + { + /* The INTERACT_NEW message was forgotten + so we must create the dialog and update it*/ + qdialog = new InteractionDialog( p_intf, p_dialog ); + p_dialog->p_private = (void*)qdialog; + if( !(p_dialog->i_status == ANSWERED_DIALOG) ) + qdialog->show(); + if( qdialog ) + qdialog->update(); + } break; case INTERACT_HIDE: + msg_Dbg( p_intf, "Hide the Interaction Dialog" ); qdialog = (InteractionDialog*)(p_dialog->p_private); if( qdialog ) qdialog->hide(); p_dialog->i_status = HIDDEN_DIALOG; break; case INTERACT_DESTROY: + msg_Dbg( p_intf, "Destroy the Interaction Dialog" ); qdialog = (InteractionDialog*)(p_dialog->p_private); if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) delete qdialog; @@ -504,7 +599,29 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) } } -void DialogsProvider::switchToSkins() -{ - var_SetString( p_intf, "intf-switch", "skins2" ); +void DialogsProvider::loadSubtitlesFile() +{ + input_thread_t *p_input = THEMIM->getInput(); + if( !p_input ) + return; + input_item_t *p_item = input_GetItem( p_input ); + if( !p_item ) + return; + char *path = input_item_GetURI( p_item ); + if( !path ) + path = strdup( "" ); + char *sep = strrchr( path, DIR_SEP_CHAR ); + if( sep ) + *sep = '\0'; + QStringList qsl = showSimpleOpen( qtr( "Open subtitles file" ), + EXT_FILTER_SUBTITLE, + path ); + free( path ); + QString qsFile; + foreach( qsFile, qsl ) + { + if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) ) + msg_Warn( p_intf, "unable to load subtitles from '%s'", + qtu( qsFile ) ); + } }