X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=b636742bc805577918cbca5873bb29d71e1de549;hb=28825619153e9637a9d80146ee7d525b1ec920a5;hp=a71fd9a8dc83cbedf74cf3d9932868d27b133f5b;hpb=85ff1461a28b5ec29f881aaaa960a242750704fb;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index a71fd9a8dc..b636742bc8 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -1,10 +1,11 @@ /***************************************************************************** * main_inteface.cpp : Main interface - **************************************************************************** - * Copyright (C) 2006 the VideoLAN team + ***************************************************************************** + * Copyright (C) 2006-2007 the VideoLAN team * $Id$ * * Authors: Clément Stenac + * Jean-Baptiste Kempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,13 +19,18 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + * 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" @@ -33,18 +39,22 @@ /* The dialogs */ #include "dialogs/playlist.hpp" -#include "dialogs/prefs_dialog.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" +#include "dialogs/gototime.hpp" +#include "dialogs/podcast_configuration.hpp" DialogsProvider* DialogsProvider::instance = NULL; DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : - QObject( NULL ), p_intf( _p_intf ) + QObject( NULL ), p_intf( _p_intf ) { fixed_timer = new QTimer( this ); fixed_timer->start( 150 /* milliseconds */ ); @@ -64,11 +74,13 @@ DialogsProvider::~DialogsProvider() { PlaylistDialog::killInstance(); MediaInfoDialog::killInstance(); + fixed_timer->stop(); } void DialogsProvider::quit() { - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); + QApplication::closeAllWindows(); QApplication::quit(); } @@ -79,35 +91,55 @@ void DialogsProvider::customEvent( QEvent *event ) DialogEvent *de = static_cast(event); switch( de->i_dialog ) { - case INTF_DIALOG_FILE: - openDialog(); break; - case INTF_DIALOG_DISC: - openDiscDialog(); break; - case INTF_DIALOG_NET: - openNetDialog(); break; - case INTF_DIALOG_CAPTURE: - openDialog(); break; - case INTF_DIALOG_PLAYLIST: - playlistDialog(); break; - case INTF_DIALOG_MESSAGES: - messagesDialog(); break; - case INTF_DIALOG_PREFS: - prefsDialog(); break; - case INTF_DIALOG_POPUPMENU: - case INTF_DIALOG_AUDIOPOPUPMENU: - case INTF_DIALOG_VIDEOPOPUPMENU: - case INTF_DIALOG_MISCPOPUPMENU: - popupMenu( de->i_dialog ); break; - case INTF_DIALOG_FILEINFO: - mediaInfoDialog(); break; - case INTF_DIALOG_INTERACTION: - doInteraction( de->p_arg ); break; - case INTF_DIALOG_VLM: - case INTF_DIALOG_BOOKMARKS: - bookmarksDialog(); break; - case INTF_DIALOG_WIZARD: - 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" ); } } } @@ -124,6 +156,7 @@ void DialogsProvider::prefsDialog() { PrefsDialog::getInstance( p_intf )->toggleVisible(); } + void DialogsProvider::extendedDialog() { ExtendedDialog::getInstance( p_intf )->toggleVisible(); @@ -134,11 +167,30 @@ void DialogsProvider::messagesDialog() MessagesDialog::getInstance( p_intf )->toggleVisible(); } +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() { AboutDialog::getInstance( p_intf )->toggleVisible(); @@ -149,84 +201,101 @@ void DialogsProvider::mediaInfoDialog() MediaInfoDialog::getInstance( p_intf )->toggleVisible(); } +void DialogsProvider::mediaCodecDialog() +{ + MediaInfoDialog::getInstance( p_intf )->showTab( 2 ); +} + void DialogsProvider::bookmarksDialog() { + BookmarksDialog::getInstance( p_intf )->toggleVisible(); } +void DialogsProvider::podcastConfigureDialog() +{ + PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); +} + + /**************************************************************************** * All the open/add stuff + * Open Dialog first - Simple Open then ****************************************************************************/ +void DialogsProvider::openDialog( int i_tab ) +{ + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab ); +} void DialogsProvider::openDialog() { - openDialog( 0 ); + openDialog( OPEN_FILE_TAB ); } void DialogsProvider::openFileDialog() { - openDialog( 0 ); + openDialog( OPEN_FILE_TAB ); } void DialogsProvider::openDiscDialog() { - openDialog( 1 ); + openDialog( OPEN_DISC_TAB ); } void DialogsProvider::openNetDialog() { - openDialog( 2 ); + openDialog( OPEN_NETWORK_TAB ); } -void DialogsProvider::openDialog( int i_tab ) +void DialogsProvider::openCaptureDialog() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab ); + openDialog( OPEN_CAPTURE_TAB ); } +/* Same as the open one, but force the enqueue */ void DialogsProvider::PLAppendDialog() { -} -void DialogsProvider::MLAppendDialog() -{ + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_ENQUEUE) + ->showTab( OPEN_FILE_TAB ); } - -/**** Simple open ****/ - -QStringList DialogsProvider::showSimpleOpen(QString help, bool all, - bool audio, bool video, - bool subs, bool pls) -{ - QString fileTypes; - if( all ) { - fileTypes = _("Media Files"); - fileTypes += " ( "; - fileTypes += EXTENSIONS_MEDIA; - fileTypes += ");;"; +/* Unimplemmented yet - Usefull ? */ +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, + QString path ) +{ + QString fileTypes = ""; + if( filters & EXT_FILTER_MEDIA ) { + ADD_FILTER_MEDIA( fileTypes ); + } + if( filters & EXT_FILTER_VIDEO ) { + ADD_FILTER_VIDEO( fileTypes ); } - if( video ) { - fileTypes += _("Video Files"); - fileTypes += " ( "; - fileTypes += EXTENSIONS_VIDEO; - fileTypes += ");;"; + if( filters & EXT_FILTER_AUDIO ) { + ADD_FILTER_AUDIO( fileTypes ); } - if( audio ) { - fileTypes += _("Sound Files"); - fileTypes += " ( "; - fileTypes += EXTENSIONS_AUDIO; - fileTypes += ");;"; + if( filters & EXT_FILTER_PLAYLIST ) { + ADD_FILTER_PLAYLIST( fileTypes ); } - if( pls ) { - fileTypes += _("PlayList Files"); - fileTypes += " ( "; - fileTypes += EXTENSIONS_PLAYLIST; - fileTypes += ");;"; + if( filters & EXT_FILTER_SUBTITLE ) { + ADD_FILTER_SUBTITLE( fileTypes ); } - fileTypes += _("All Files"); - fileTypes += " (*.*)"; + ADD_FILTER_ALL( fileTypes ); fileTypes.replace(QString(";*"), QString(" *")); return QFileDialog::getOpenFileNames( NULL, - help.isNull() ? - qfu(I_OP_SEL_FILES ) : help, - p_intf->p_libvlc->psz_homedir, - fileTypes ); + help.isNull() ? qfu(I_OP_SEL_FILES ) : help, + 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(); @@ -244,6 +313,11 @@ void DialogsProvider::addFromSimple( bool pl, bool go) } } +void DialogsProvider::simpleOpenDialog() +{ + addFromSimple( true, true ); /* Playlist and Go */ +} + void DialogsProvider::simplePLAppendDialog() { addFromSimple( true, false ); @@ -254,28 +328,57 @@ void DialogsProvider::simpleMLAppendDialog() addFromSimple( false, false ); } -void DialogsProvider::simpleOpenDialog() +/* 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 ) { - addFromSimple( true, true ); + QString dir = QFileDialog::getExistingDirectory( 0, qtr(I_OP_OPDIR) ); + if (!dir.isEmpty()) { + input_item_t *p_input = input_ItemNewExt( THEPL, + qtu( "directory://" + dir ), NULL, + 0, NULL, -1 ); + + playlist_AddInput( THEPL, p_input, + go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, + PLAYLIST_END, pl, VLC_FALSE ); + input_Read( THEPL, p_input, VLC_FALSE ); + } } -void DialogsProvider::openPlaylist() +void DialogsProvider::PLAppendDir() +{ + openDirectory( p_intf, true, false ); +} + +void DialogsProvider::MLAppendDir() +{ + openDirectory( p_intf, false , false ); +} + +/**************** + * Playlist * + ****************/ +void DialogsProvider::openAPlaylist() { - QStringList files = showSimpleOpen( qtr( "Open playlist file" ), false, - false, false, false ); + QStringList files = showSimpleOpen( qtr( "Open playlist file" ), + EXT_FILTER_PLAYLIST ); foreach( QString file, files ) { playlist_Import( THEPL, qtu(file) ); } } -void DialogsProvider::savePlaylist() +void DialogsProvider::saveAPlaylist() { QFileDialog *qfd = new QFileDialog( NULL, - qtr("Choose a filename to save playlist"), - p_intf->p_libvlc->psz_homedir, - qfu("XSPF playlist (*.xspf);; ") + - qfu("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 ); @@ -284,14 +387,15 @@ void DialogsProvider::savePlaylist() { if( qfd->selectedFiles().count() > 0 ) { - char *psz_module, *psz_m3u = "export-m3u", - *psz_xspf = "export-xspf"; + static const char psz_xspf[] = "export-xspf", + 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" ) ) @@ -304,61 +408,47 @@ 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); } } delete qfd; } -static void openDirectory( intf_thread_t* p_intf, bool pl, bool go ) -{ - QString dir = QFileDialog::getExistingDirectory ( 0, - _("Open directory") ); - input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL, - 0, NULL, -1 ); - playlist_AddInput( THEPL, p_input, - go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, - PLAYLIST_END, pl, VLC_FALSE ); - input_Read( THEPL, p_input, VLC_FALSE ); -} - -void DialogsProvider::PLAppendDir() -{ - openDirectory( p_intf, true, false ); -} - -void DialogsProvider::MLAppendDir() -{ - openDirectory( p_intf, false , false ); -} - /**************************************************************************** * Sout emulation ****************************************************************************/ -void DialogsProvider::streamingDialog() +void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, + bool b_transcode_only ) { - OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true ); - if ( o->exec() == QDialog::Accepted ) + SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only ); + + if( s->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; + msg_Err( 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 ); + 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 ); } - delete o; +} + +void DialogsProvider::openThenStreamingDialogs() +{ + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_STREAM ) + ->showTab( 0 ); +} + +void DialogsProvider::openThenTranscodingDialogs() +{ + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_SAVE ) + ->showTab( 0 ); } /**************************************************************************** @@ -383,11 +473,9 @@ void DialogsProvider::SDMenuAction( QString data ) playlist_ServicesDiscoveryAdd( THEPL, psz_sd ); else playlist_ServicesDiscoveryRemove( THEPL, psz_sd ); - free( psz_sd ); } - void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) { InteractionDialog *qdialog; @@ -402,7 +490,7 @@ 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(); break; case INTERACT_HIDE: @@ -425,6 +513,7 @@ void DialogsProvider::switchToSkins() var_SetString( p_intf, "intf-switch", "skins2" ); } -void DialogsProvider::popupMenu( int i_dialog ) +void DialogsProvider::switchToWx() { + var_SetString( p_intf, "intf-switch", "wxwidgets" ); }