X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=758ebec6ad212421743a869f129b9daca5101fd2;hb=84091c6692d4e22e6082ecf692c4df6e9e292b2f;hp=9a6cc3b49e635a20518dc963e8994cf8a6bb6ae3;hpb=e4bbf1c43df3c160b45b8b8d65261d4708f2e147;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index 9a6cc3b49e..758ebec6ad 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -21,24 +21,31 @@ * 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 "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/help.hpp" @@ -66,13 +73,24 @@ 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(); } void DialogsProvider::quit() { - vlc_object_kill( p_intf ); + vlc_object_kill( p_intf->p_libvlc ); + QApplication::closeAllWindows(); QApplication::quit(); } @@ -83,46 +101,55 @@ void DialogsProvider::customEvent( QEvent *event ) DialogEvent *de = static_cast(event); switch( de->i_dialog ) { - case INTF_DIALOG_FILE_SIMPLE: - case INTF_DIALOG_FILE: - openDialog(); break; - case INTF_DIALOG_DISC: - openDiscDialog(); break; - case INTF_DIALOG_NET: - openNetDialog(); break; - case INTF_DIALOG_SAT: - case INTF_DIALOG_CAPTURE: - openCaptureDialog(); break; - case INTF_DIALOG_PLAYLIST: - playlistDialog(); break; - case INTF_DIALOG_MESSAGES: - messagesDialog(); break; - case INTF_DIALOG_FILEINFO: - mediaInfoDialog(); break; - case INTF_DIALOG_PREFS: - prefsDialog(); break; - case INTF_DIALOG_BOOKMARKS: - bookmarksDialog(); break; - case INTF_DIALOG_EXTENDED: - extendedDialog(); break; - /* We might want to make it better with custom functions */ - case INTF_DIALOG_POPUPMENU: - QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; - case INTF_DIALOG_AUDIOPOPUPMENU: - QVLCMenu::AudioPopupMenu( p_intf ); break; - case INTF_DIALOG_VIDEOPOPUPMENU: - QVLCMenu::VideoPopupMenu( p_intf ); break; - case INTF_DIALOG_MISCPOPUPMENU: - QVLCMenu::MiscPopupMenu( p_intf ); break; - case INTF_DIALOG_INTERACTION: - doInteraction( de->p_arg ); break; - case INTF_DIALOG_VLM: - vlmDialog(); break; - case INTF_DIALOG_WIZARD: - case INTF_DIALOG_UPDATEVLC: - case INTF_DIALOG_EXIT: - default: - msg_Warn( p_intf, "unimplemented dialog\n" ); + case INTF_DIALOG_FILE_SIMPLE: + case INTF_DIALOG_FILE: + openDialog(); break; + case INTF_DIALOG_DISC: + openDiscDialog(); break; + case INTF_DIALOG_NET: + openNetDialog(); break; + case INTF_DIALOG_SAT: + case INTF_DIALOG_CAPTURE: + openCaptureDialog(); break; + case INTF_DIALOG_DIRECTORY: + PLAppendDir(); break; + case INTF_DIALOG_PLAYLIST: + playlistDialog(); break; + case INTF_DIALOG_MESSAGES: + messagesDialog(); break; + case INTF_DIALOG_FILEINFO: + mediaInfoDialog(); break; + case INTF_DIALOG_PREFS: + prefsDialog(); break; + case INTF_DIALOG_BOOKMARKS: + 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: + QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; + case INTF_DIALOG_AUDIOPOPUPMENU: + QVLCMenu::AudioPopupMenu( p_intf ); break; + case INTF_DIALOG_VIDEOPOPUPMENU: + QVLCMenu::VideoPopupMenu( p_intf ); break; + case INTF_DIALOG_MISCPOPUPMENU: + QVLCMenu::MiscPopupMenu( p_intf ); break; + case INTF_DIALOG_WIZARD: + case INTF_DIALOG_STREAMWIZARD: + openThenStreamingDialogs(); break; +#ifdef UPDATE_CHECK + case INTF_DIALOG_UPDATEVLC: + updateDialog(); break; +#endif + case INTF_DIALOG_EXIT: + quit(); break; + default: + msg_Warn( p_intf, "unimplemented dialog" ); } } } @@ -139,6 +166,7 @@ void DialogsProvider::prefsDialog() { PrefsDialog::getInstance( p_intf )->toggleVisible(); } + void DialogsProvider::extendedDialog() { ExtendedDialog::getInstance( p_intf )->toggleVisible(); @@ -154,17 +182,25 @@ void DialogsProvider::gotoTimeDialog() GotoTimeDialog::getInstance( p_intf )->toggleVisible(); } +#ifdef ENABLE_VLM void DialogsProvider::vlmDialog() { - /* FIXME - Implement me */ - /* VLMDialog::getInstance( p_intf )->toggleVisible(); */ + 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() { AboutDialog::getInstance( p_intf )->toggleVisible(); @@ -182,10 +218,15 @@ void DialogsProvider::mediaCodecDialog() void DialogsProvider::bookmarksDialog() { - /* FIXME - Implement me */ - /* BookmarkDialog::getInstance( p_intf )->toggleVisible(); */ + BookmarksDialog::getInstance( p_intf )->toggleVisible(); +} + +void DialogsProvider::podcastConfigureDialog() +{ + PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); } + /**************************************************************************** * All the open/add stuff * Open Dialog first - Simple Open then @@ -219,13 +260,13 @@ 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, ENQUEUE)->showTab(0); + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_ENQUEUE) + ->showTab( OPEN_FILE_TAB ); } /* Unimplemmented yet - Usefull ? */ void DialogsProvider::MLAppendDialog() -{ -} +{} /** * Simple open @@ -256,10 +297,15 @@ 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 ); } +/** + * Open a file, + * pl helps you to choose from playlist or media library, + * go to start or enqueue + **/ void DialogsProvider::addFromSimple( bool pl, bool go) { QStringList files = DialogsProvider::showSimpleOpen(); @@ -272,11 +318,16 @@ 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++; } } +void DialogsProvider::simpleOpenDialog() +{ + addFromSimple( true, true ); /* Playlist and Go */ +} + void DialogsProvider::simplePLAppendDialog() { addFromSimple( true, false ); @@ -287,40 +338,33 @@ void DialogsProvider::simpleMLAppendDialog() addFromSimple( false, false ); } -void DialogsProvider::simpleOpenDialog() -{ - addFromSimple( true, true ); -} - /* Directory */ - /** * Open a directory, * pl helps you to choose from playlist or media library, * go to start or enqueue **/ -static void openDirectory( intf_thread_t* p_intf, bool pl, bool go ) +static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory ( 0, qtr("Open directory") ); + 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 ); + input_item_t *p_input = input_ItemNewExt( 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 ); + /* Why this ? + * input_Read( THEPL, p_input, false ); */ + vlc_gc_decref( p_input ); } } -void DialogsProvider::openDirDialog() -{ - openDirectory( p_intf, true, true ); -} - void DialogsProvider::PLAppendDir() { - openDirectory( p_intf, true, false ); + openDirectory( p_intf, true, true ); } void DialogsProvider::MLAppendDir() @@ -331,7 +375,7 @@ void DialogsProvider::MLAppendDir() /**************** * Playlist * ****************/ -void DialogsProvider::openPlaylist() +void DialogsProvider::openAPlaylist() { QStringList files = showSimpleOpen( qtr( "Open playlist file" ), EXT_FILTER_PLAYLIST ); @@ -341,13 +385,13 @@ void DialogsProvider::openPlaylist() } } -void DialogsProvider::savePlaylist() +void DialogsProvider::saveAPlaylist() { QFileDialog *qfd = new QFileDialog( NULL, - qtr("Choose a filename to save playlist"), - qfu( p_intf->p_libvlc->psz_homedir ), - qtr("XSPF playlist (*.xspf);; ") + - qtr("M3U playlist (*.m3u);; Any (*.*) ") ); + qtr( "Choose a filename to save playlist" ), + qfu( p_intf->p_sys->psz_filepath ), + qtr( "XSPF playlist (*.xspf);; " ) + + qtr( "M3U playlist (*.m3u);; Any (*.*) " ) ); qfd->setFileMode( QFileDialog::AnyFile ); qfd->setAcceptMode( QFileDialog::AcceptSave ); qfd->setConfirmOverwrite( true ); @@ -357,14 +401,14 @@ void DialogsProvider::savePlaylist() if( qfd->selectedFiles().count() > 0 ) { static const char psz_xspf[] = "export-xspf", - psz_m3u[] = "esport-m3u"; + psz_m3u[] = "export-m3u"; const char *psz_module; QString file = qfd->selectedFiles().first(); QString filter = qfd->selectedFilter(); - if( file.contains(".xsp") || - ( filter.contains(".xspf") && !file.contains(".m3u") ) ) + if( file.contains( ".xsp" ) || + ( filter.contains( ".xspf" ) && !file.contains( ".m3u" ) ) ) { psz_module = psz_xspf; if( !file.contains( ".xsp" ) ) @@ -377,7 +421,7 @@ void DialogsProvider::savePlaylist() file.append( ".m3u" ); } - playlist_Export( THEPL, qtu(file), THEPL->p_local_category, + playlist_Export( THEPL, qtu( file ), THEPL->p_local_category, psz_module); } } @@ -389,24 +433,23 @@ void DialogsProvider::savePlaylist() * 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\n", qta(s->mrl)); + msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) ); /* 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)); + int i_len = strlen( qtu( s->getMrl() ) ) + 10; + char *psz_option = (char*)malloc( i_len ); + snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) ); 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 ); } - delete s; } void DialogsProvider::openThenStreamingDialogs() @@ -420,31 +463,6 @@ void DialogsProvider::openThenTranscodingDialogs() OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_SAVE ) ->showTab( 0 ); } -/* -void DialogsProvider::streamingDialog() -{ - OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true ); - if ( o->exec() == QDialog::Accepted ) - { - 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; - } - delete o; -}*/ - - /**************************************************************************** * Menus / Interaction @@ -485,8 +503,19 @@ 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: qdialog = (InteractionDialog*)(p_dialog->p_private); @@ -503,13 +532,17 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) } } -void DialogsProvider::podcastConfigureDialog() -{ - PodcastConfigurationDialog c( p_intf ); - c.exec(); -} - -void DialogsProvider::switchToSkins() +void DialogsProvider::loadSubtitlesFile() { - var_SetString( p_intf, "intf-switch", "skins2" ); + input_thread_t *p_input = THEMIM->getInput(); + if( !p_input ) + return; + QString qsFile = QFileDialog::getOpenFileName( + NULL, + qtr( "Choose subtitles file" ), + "", + qtr( "Subtitles files (*.cdg *.idx *.srt *.sub *.utf);;" + "All files (*)" ) ); + if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) ) + msg_Warn( p_intf, "unable to load subtitles file..." ); }