X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=8143b28e9e292fec32d61a9fc79aa075261fccd4;hb=79579afe7f4dd0e87162828fe47a305d679d1bf7;hp=5a9536dc49e5a4ec58e44703e002dc342ce6731b;hpb=0b5c3c57ba372aaea61d3093a8df569f68f1f8de;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index 5a9536dc49..8143b28e9e 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -1,7 +1,7 @@ /***************************************************************************** - * main_inteface.cpp : Main interface + * dialogs_provider.cpp : Dialog Provider ***************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright (C) 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -22,30 +22,39 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include "qt4.hpp" #include "dialogs_provider.hpp" #include "main_interface.hpp" #include "menus.hpp" -#include +#include "input_manager.hpp" +#include "recents.hpp" +#include "util/qvlcapp.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" + +#include +#include +#include +#include DialogsProvider* DialogsProvider::instance = NULL; @@ -53,9 +62,9 @@ DialogsProvider* DialogsProvider::instance = NULL; DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : QObject( NULL ), p_intf( _p_intf ) { - fixed_timer = new QTimer( this ); - fixed_timer->start( 150 /* milliseconds */ ); + b_isDying = false; + /* Various signal mappers for the menus */ menusMapper = new QSignalMapper(); CONNECT( menusMapper, mapped(QObject *), this, menuAction( QObject *) ); @@ -69,21 +78,35 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : DialogsProvider::~DialogsProvider() { + msg_Dbg( p_intf, "Destroying the Dialog Provider" ); PlaylistDialog::killInstance(); MediaInfoDialog::killInstance(); - fixed_timer->stop(); + MessagesDialog::killInstance(); + ExtendedDialog::killInstance(); + BookmarksDialog::killInstance(); + HelpDialog::killInstance(); +#ifdef UPDATE_CHECK + UpdateDialog::killInstance(); +#endif + + delete menusMapper; + delete menusUpdateMapper; + delete SDMapper; } void DialogsProvider::quit() { - vlc_object_kill( p_intf ); + /* Stop the playlist */ + playlist_Stop( THEPL ); + b_isDying = true; + vlc_object_kill( p_intf->p_libvlc ); QApplication::closeAllWindows(); QApplication::quit(); } void DialogsProvider::customEvent( QEvent *event ) { - if( event->type() == DialogEvent_Type ) + if( event->type() == (int)DialogEvent_Type ) { DialogEvent *de = static_cast(event); switch( de->i_dialog ) @@ -91,6 +114,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: @@ -112,8 +137,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: @@ -126,8 +153,13 @@ void DialogsProvider::customEvent( QEvent *event ) QVLCMenu::MiscPopupMenu( p_intf ); break; case INTF_DIALOG_WIZARD: case INTF_DIALOG_STREAMWIZARD: + openAndStreamingDialogs(); break; +#ifdef UPDATE_CHECK case INTF_DIALOG_UPDATEVLC: + updateDialog(); break; +#endif case INTF_DIALOG_EXIT: + quit(); break; default: msg_Warn( p_intf, "unimplemented dialog" ); } @@ -162,20 +194,24 @@ void DialogsProvider::gotoTimeDialog() GotoTimeDialog::getInstance( p_intf )->toggleVisible(); } +#ifdef ENABLE_VLM void DialogsProvider::vlmDialog() { VLMDialog::getInstance( p_intf )->toggleVisible(); } +#endif void DialogsProvider::helpDialog() { HelpDialog::getInstance( p_intf )->toggleVisible(); } +#ifdef UPDATE_CHECK void DialogsProvider::updateDialog() { UpdateDialog::getInstance( p_intf )->toggleVisible(); } +#endif void DialogsProvider::aboutDialog() { @@ -194,8 +230,7 @@ void DialogsProvider::mediaCodecDialog() void DialogsProvider::bookmarksDialog() { - /* FIXME - Implement me */ - /* BookmarkDialog::getInstance( p_intf )->toggleVisible(); */ + BookmarksDialog::getInstance( p_intf )->toggleVisible(); } void DialogsProvider::podcastConfigureDialog() @@ -203,7 +238,69 @@ void DialogsProvider::podcastConfigureDialog() PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); } +/* Generic open file */ +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( toNativeSepNoSlash( 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( toNativeSepNoSlash( 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 ); +} /**************************************************************************** * All the open/add stuff * Open Dialog first - Simple Open then @@ -237,19 +334,19 @@ 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) - ->showTab( OPEN_FILE_TAB ); + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, + OPEN_AND_ENQUEUE )->showTab( OPEN_FILE_TAB ); } -/* Unimplemmented yet - Usefull ? */ void DialogsProvider::MLAppendDialog() { + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, + OPEN_AND_ENQUEUE, false, false ) + ->showTab( OPEN_FILE_TAB ); } /** * 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, @@ -273,9 +370,10 @@ QStringList DialogsProvider::showSimpleOpen( QString help, } ADD_FILTER_ALL( fileTypes ); 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, + help.isEmpty() ? qfu(I_OP_SEL_FILES ) : help, + path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path, fileTypes ); } @@ -290,13 +388,14 @@ void DialogsProvider::addFromSimple( bool pl, bool go) int i = 0; foreach( QString file, files ) { - const char * psz_utf8 = qtu( file ); - playlist_Add( THEPL, psz_utf8, NULL, + playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL, go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) | ( i ? PLAYLIST_PREPARSE : 0 ) ) : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), PLAYLIST_END, - pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE ); + pl ? true : false, false ); + RecentsMRL::getInstance( p_intf )->addRecent( + toNativeSeparators( file ) ); i++; } } @@ -324,18 +423,32 @@ void DialogsProvider::simpleMLAppendDialog() **/ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open directory") ); - if (!dir.isEmpty()) { - input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL, - 0, NULL, -1 ); + QString dir = QFileDialog::getExistingDirectory( NULL, qtr("Open Directory") ); + if (!dir.isEmpty() ) + { + QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) + ? "dvd://" : "directory://" + toNativeSeparators( dir ); + msg_Dbg( p_intf, "Directory opening: %s", qtu( dir ) ); + input_item_t *p_input = input_item_NewExt( THEPL, qtu( mrl ), + 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 ); + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); + if( !go ) + input_Read( THEPL, p_input, true ); + vlc_gc_decref( p_input ); } } +void DialogsProvider::PLOpenDir() +{ + openDirectory( p_intf, true, true ); +} + void DialogsProvider::PLAppendDir() { openDirectory( p_intf, true, false ); @@ -351,19 +464,19 @@ void DialogsProvider::MLAppendDir() ****************/ void DialogsProvider::openAPlaylist() { - QStringList files = showSimpleOpen( qtr( "Open playlist file" ), + QStringList files = showSimpleOpen( qtr( "Open playlist..." ), EXT_FILTER_PLAYLIST ); foreach( QString file, files ) { - playlist_Import( THEPL, qtu(file) ); + playlist_Import( THEPL, qtu( toNativeSeparators( file ) ) ); } } void DialogsProvider::saveAPlaylist() { QFileDialog *qfd = new QFileDialog( NULL, - qtr( "Choose a filename to save playlist" ), - qfu( p_intf->p_libvlc->psz_homedir ), + qtr( "Save playlist as..." ), + qfu( p_intf->p_sys->psz_filepath ), qtr( "XSPF playlist (*.xspf);; " ) + qtr( "M3U playlist (*.m3u);; Any (*.*) " ) ); qfd->setFileMode( QFileDialog::AnyFile ); @@ -395,26 +508,25 @@ void DialogsProvider::saveAPlaylist() file.append( ".m3u" ); } - playlist_Export( THEPL, qtu( file ), THEPL->p_local_category, - psz_module); + playlist_Export( THEPL, qtu( toNativeSeparators( file ) ), + THEPL->p_local_category, psz_module); } } delete qfd; } - /**************************************************************************** * Sout emulation ****************************************************************************/ -//FIXME !! -void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only ) +void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, + bool b_transcode_only ) { - SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf, - b_transcode_only ); + SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only ); + if( s->exec() == QDialog::Accepted ) { - msg_Err( p_intf, "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 ); @@ -422,49 +534,54 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only ) 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 ); + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); } - delete s; } -void DialogsProvider::openThenStreamingDialogs() +void DialogsProvider::openAndStreamingDialogs() { - 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() +void DialogsProvider::openAndTranscodingDialogs() { - 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 ); } -/* -void DialogsProvider::streamingDialog() + +void DialogsProvider::loadSubtitlesFile() { - OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true ); - if ( o->exec() == QDialog::Accepted ) + 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..." ), + EXT_FILTER_SUBTITLE, + path ); + free( path ); + QString qsFile; + foreach( qsFile, qsl ) { - SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf ); - if( s->exec() == QDialog::Accepted ) - { - msg_Err(p_intf, "mrl %s\n", qta(s->mrl)); - /* Just do it - int i_len = strlen( qtu(s->mrl) ) + 10; - char *psz_option = (char*)malloc(i_len); - snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl)); - - playlist_AddExt( THEPL, qtu( o->mrl ), "Streaming", - PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, - -1, &psz_option, 1, VLC_TRUE, VLC_FALSE ); - } - delete s; + if( !input_AddSubtitles( p_input, qtu( toNativeSeparators( qsFile ) ), + true ) ) + msg_Warn( p_intf, "unable to load subtitles from '%s'", + qtu( qsFile ) ); } - delete o; -}*/ +} /**************************************************************************** - * Menus / Interaction + * Menus ****************************************************************************/ void DialogsProvider::menuAction( QObject *data ) @@ -474,20 +591,34 @@ void DialogsProvider::menuAction( QObject *data ) void DialogsProvider::menuUpdateAction( QObject *data ) { - MenuFunc * f = qobject_cast(data); - f->doFunc( p_intf ); + MenuFunc *func = qobject_cast(data); + assert( func ); + func->doFunc( p_intf ); } void DialogsProvider::SDMenuAction( QString data ) { - char *psz_sd = strdup( qtu( data ) ); + char *psz_sd = qtu( data ); if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) ) playlist_ServicesDiscoveryAdd( THEPL, psz_sd ); else playlist_ServicesDiscoveryRemove( THEPL, psz_sd ); - free( psz_sd ); } +/** + * Play the MRL contained in the Recently played menu. + **/ +void DialogsProvider::playMRL( const QString &mrl ) +{ + playlist_Add( THEPL, qtu( mrl ) , NULL, + PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false ); + + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); +} + +/************************************* + * Interactions + *************************************/ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) { InteractionDialog *qdialog; @@ -502,16 +633,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; @@ -520,7 +664,3 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) } } -void DialogsProvider::switchToSkins() -{ - var_SetString( p_intf, "intf-switch", "skins2" ); -}