X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=5198bdd4c6b9837a143d65f3c16885cd6c5348b3;hb=794142d331d9a04420fd7e010fb63d13ac43cfb3;hp=ed1af0b8aa8b83455b890f997dc18bb3c22cf05e;hpb=6511df53b2ea6320b5cf36a539ea6cffa99dffb9;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index ed1af0b8aa..5198bdd4c6 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * dialogs_provider.cpp : Dialog Provider ***************************************************************************** - * Copyright (C) 2006-2008 the VideoLAN team + * Copyright (C) 2006-2009 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -52,12 +52,17 @@ #include "dialogs/podcast_configuration.hpp" #include "dialogs/toolbar.hpp" #include "dialogs/plugins.hpp" +#include "dialogs/external.hpp" +#include "dialogs/epg.hpp" +#include "dialogs/errors.hpp" #include #include #include #include +#define I_OP_DIR_WINTITLE I_DIR_OR_FOLDER( N_("Open Directory"), \ + N_("Open Folder") ) DialogsProvider* DialogsProvider::instance = NULL; @@ -76,6 +81,8 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : SDMapper = new QSignalMapper(); CONNECT( SDMapper, mapped (QString), this, SDMenuAction( QString ) ); + + new DialogHandler (p_intf, this ); } DialogsProvider::~DialogsProvider() @@ -89,11 +96,16 @@ DialogsProvider::~DialogsProvider() #ifdef UPDATE_CHECK UpdateDialog::killInstance(); #endif - ToolbarEditDialog::killInstance(); + PluginDialog::killInstance(); delete menusMapper; delete menusUpdateMapper; delete SDMapper; + + QVLCMenu::PopupMenu( p_intf, false ); + QVLCMenu::AudioPopupMenu( p_intf, false ); + QVLCMenu::VideoPopupMenu( p_intf, false ); + QVLCMenu::MiscPopupMenu( p_intf, false ); } void DialogsProvider::quit() @@ -142,11 +154,11 @@ void DialogsProvider::customEvent( QEvent *event ) case INTF_DIALOG_POPUPMENU: QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_AUDIOPOPUPMENU: - QVLCMenu::AudioPopupMenu( p_intf ); break; + QVLCMenu::AudioPopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_VIDEOPOPUPMENU: - QVLCMenu::VideoPopupMenu( p_intf ); break; + QVLCMenu::VideoPopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_MISCPOPUPMENU: - QVLCMenu::MiscPopupMenu( p_intf ); break; + QVLCMenu::MiscPopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_WIZARD: case INTF_DIALOG_STREAMWIZARD: openAndStreamingDialogs(); break; @@ -178,12 +190,20 @@ void DialogsProvider::prefsDialog() void DialogsProvider::extendedDialog() { - ExtendedDialog::getInstance( p_intf )->showTab( 0 ); + if( !ExtendedDialog::getInstance( p_intf )->isVisible() || /* Hidden */ + ExtendedDialog::getInstance( p_intf )->currentTab() != 0 ) /* wrong tab */ + ExtendedDialog::getInstance( p_intf )->showTab( 0 ); + else + ExtendedDialog::getInstance( p_intf )->hide(); } void DialogsProvider::synchroDialog() { - ExtendedDialog::getInstance( p_intf )->showTab( 2 ); + if( !ExtendedDialog::getInstance( p_intf )->isVisible() || /* Hidden */ + ExtendedDialog::getInstance( p_intf )->currentTab() != 2 ) /* wrong tab */ + ExtendedDialog::getInstance( p_intf )->showTab( 2 ); + else + ExtendedDialog::getInstance( p_intf )->hide(); } void DialogsProvider::messagesDialog() @@ -242,13 +262,19 @@ void DialogsProvider::podcastConfigureDialog() void DialogsProvider::toolbarDialog() { - ToolbarEditDialog::getInstance( p_intf )->toggleVisible(); + ToolbarEditDialog *toolbarEditor = new ToolbarEditDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf ); + if( toolbarEditor->exec() == QDialog::Accepted ) + emit toolBarConfUpdated(); } void DialogsProvider::pluginDialog() { - PluginDialog *diag = new PluginDialog( p_intf ); - diag->show(); + PluginDialog::getInstance( p_intf )->toggleVisible(); +} + +void DialogsProvider::epgDialog() +{ + EpgDialog::getInstance( p_intf )->toggleVisible(); } /* Generic open file */ @@ -270,7 +296,7 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) else extensions.replace( i, 1, "(" ); } - extensions.replace(QString(";*"), QString(" *")); + extensions.replace( ";*", " *" ); extensions.append( ")" ); /* Save */ @@ -297,6 +323,10 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) i = 0; foreach( const QString &file, files ) p_arg->psz_results[i++] = strdup( qtu( toNativeSepNoSlash( file ) ) ); + if(i == 0) + p_intf->p_sys->filepath = QString::fromAscii(""); + else + p_intf->p_sys->filepath = qfu( p_arg->psz_results[i-1] ); } /* Callback */ @@ -345,25 +375,25 @@ void DialogsProvider::openCaptureDialog() } /* Same as the open one, but force the enqueue */ -void DialogsProvider::PLAppendDialog() +void DialogsProvider::PLAppendDialog( int tab ) { OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, - OPEN_AND_ENQUEUE )->showTab( OPEN_FILE_TAB ); + OPEN_AND_ENQUEUE )->showTab( tab ); } -void DialogsProvider::MLAppendDialog() +void DialogsProvider::MLAppendDialog( int tab ) { OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_ENQUEUE, false, false ) - ->showTab( OPEN_FILE_TAB ); + ->showTab( tab ); } /** * Simple open ***/ -QStringList DialogsProvider::showSimpleOpen( QString help, +QStringList DialogsProvider::showSimpleOpen( const QString& help, int filters, - QString path ) + const QString& path ) { QString fileTypes = ""; if( filters & EXT_FILTER_MEDIA ) { @@ -382,12 +412,16 @@ QStringList DialogsProvider::showSimpleOpen( QString help, ADD_FILTER_SUBTITLE( fileTypes ); } ADD_FILTER_ALL( fileTypes ); - fileTypes.replace(QString(";*"), QString(" *")); + fileTypes.replace( ";*", " *"); - return QFileDialog::getOpenFileNames( NULL, + QStringList files = QFileDialog::getOpenFileNames( NULL, help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help, path.isEmpty() ? p_intf->p_sys->filepath : path, fileTypes ); + + if( !files.isEmpty() ) savedirpathFromFile( files.last() ); + + return files; } /** @@ -399,15 +433,15 @@ void DialogsProvider::addFromSimple( bool pl, bool go) { QStringList files = DialogsProvider::showSimpleOpen(); int i = 0; - files.sort(); + files.sort(); foreach( const QString &file, files ) { - playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL, - go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) | - ( i ? PLAYLIST_PREPARSE : 0 ) ) + char* psz_uri = make_URI( qtu( toNativeSeparators(file) ), NULL ); + playlist_Add( THEPL, psz_uri, NULL, + go ? ( PLAYLIST_APPEND | ( i ? PLAYLIST_PREPARSE : PLAYLIST_GO ) ) : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), - PLAYLIST_END, - pl ? true : false, false ); + PLAYLIST_END, pl, pl_Unlocked ); + free( psz_uri ); RecentsMRL::getInstance( p_intf )->addRecent( toNativeSeparators( file ) ); i++; @@ -436,8 +470,7 @@ void DialogsProvider::simpleMLAppendDialog() **/ void DialogsProvider::openUrlDialog() { - OpenUrlDialog *oud = OpenUrlDialog::getInstance( p_intf->p_sys->p_mi, - p_intf ); + OpenUrlDialog *oud = new OpenUrlDialog( p_intf ); if( oud->exec() == QDialog::Accepted ) { QString url = oud->url(); @@ -451,6 +484,7 @@ void DialogsProvider::openUrlDialog() RecentsMRL::getInstance( p_intf )->addRecent( url ); } } + delete oud; } /* Directory */ @@ -461,23 +495,33 @@ void DialogsProvider::openUrlDialog() **/ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory( NULL, qtr("Open Directory") ); + QString dir = QFileDialog::getExistingDirectory( NULL, qtr( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath ); - if (!dir.isEmpty() ) - { - QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ? - "dvd://" : "directory://" + toNativeSeparators( dir ); - input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL ); + if( dir.isEmpty() ) + return; - /* FIXME: playlist_AddInput() can fail */ - playlist_AddInput( THEPL, p_input, - go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, + const char *scheme = "directory"; + if( dir.endsWith( "/VIDEO_TS", Qt::CaseInsensitive ) ) + scheme = "dvd"; + + char *uri = make_URI( qtu( toNativeSeparators( dir ) ), scheme ); + if( unlikely(uri == NULL) ) + return; + + RecentsMRL::getInstance( p_intf )->addRecent( qfu(uri) ); + + input_item_t *p_input = input_item_New( THEPL, uri, NULL ); + free( uri ); + if( unlikely( p_input == NULL ) ) + return; + + /* FIXME: playlist_AddInput() can fail */ + playlist_AddInput( THEPL, p_input, + go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, PLAYLIST_END, pl, pl_Unlocked ); - RecentsMRL::getInstance( p_intf )->addRecent( mrl ); - if( !go ) - input_Read( THEPL, p_input, true ); - vlc_gc_decref( p_input ); - } + if( !go ) + input_Read( THEPL, p_input ); + vlc_gc_decref( p_input ); } void DialogsProvider::PLOpenDir() @@ -510,58 +554,38 @@ void DialogsProvider::openAPlaylist() void DialogsProvider::saveAPlaylist() { - QFileDialog *qfd = new QFileDialog( NULL, - qtr( "Save playlist as..." ), - p_intf->p_sys->filepath, - qtr( "XSPF playlist (*.xspf);; " ) + - qtr( "M3U playlist (*.m3u);; " ) + - qtr( "HTML playlist (*.html)" ) ); - qfd->setFileMode( QFileDialog::AnyFile ); - qfd->setAcceptMode( QFileDialog::AcceptSave ); - qfd->setConfirmOverwrite( true ); - - if( qfd->exec() == QDialog::Accepted ) + static const struct { - if( qfd->selectedFiles().count() > 0 ) - { - static const char psz_xspf[] = "export-xspf", - psz_m3u[] = "export-m3u", - psz_html[] = "export-html"; - const char *psz_module; - - QString file = qfd->selectedFiles().first(); - QString filter = qfd->selectedFilter(); + char filter[24]; + char module[12]; + } types[] = { + { N_("XSPF playlist (*.xspf)"), "export-xspf", }, + { N_("M3U8 playlist (*.m3u)"), "export-m3u8", }, + { N_("M3U playlist (*.m3u)"), "export-m3u", }, + { N_("HTML playlist (*.html)"), "export-html", }, + }; + QString filters, selected; + + for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++ ) + { + if( !filters.isEmpty() ) + filters += ";;"; + filters += qfu( vlc_gettext( types[i].filter ) ); + } - if( file.contains( ".xsp" ) || filter.contains( "XSPF" ) ) - { - psz_module = psz_xspf; - if( !file.contains( ".xsp" ) ) - file.append( ".xspf" ); - } - else if( file.contains( ".m3u" ) || filter.contains( "M3U" ) ) - { - psz_module = psz_m3u; - if( !file.contains( ".m3u" ) ) - file.append( ".m3u" ); - } - else if( file.contains(".html" ) || filter.contains( "HTML" ) ) - { - psz_module = psz_html; - if( !file.contains( "html" ) ) - file.append( ".html" ); - } - else - { - msg_Err( p_intf, "Impossible to recognise the file type" ); - delete qfd; - return; - } + QString file = QFileDialog::getSaveFileName( NULL, + qtr( "Save playlist as..." ), + p_intf->p_sys->filepath, filters, &selected ); + if( file.isEmpty() ) + return; + for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++) + if( selected == qfu( vlc_gettext( types[i].filter ) ) ) + { playlist_Export( THEPL, qtu( toNativeSeparators( file ) ), - THEPL->p_local_category, psz_module); + THEPL->p_playing, types[i].module ); + break; } - } - delete qfd; } /**************************************************************************** @@ -569,11 +593,11 @@ void DialogsProvider::saveAPlaylist() ****************************************************************************/ void DialogsProvider::streamingDialog( QWidget *parent, - QString mrl, + const QString& mrl, bool b_transcode_only, QStringList options ) { - char *psz_soutoption; + QString soutoption; /* Stream */ if( !b_transcode_only ) @@ -581,7 +605,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, SoutDialog *s = new SoutDialog( parent, p_intf, mrl ); if( s->exec() == QDialog::Accepted ) { - psz_soutoption = strdup( qtu( s->getMrl() ) ); + soutoption = s->getMrl(); delete s; } else @@ -593,7 +617,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl ); if( s->exec() == QDialog::Accepted ) { - psz_soutoption = strdup( qtu( s->getMrl() ) ); + soutoption = s->getMrl(); delete s; } else @@ -603,8 +627,10 @@ void DialogsProvider::streamingDialog( QWidget *parent, } /* Get SoutMRL */ - if( !EMPTY_STR( psz_soutoption ) ) + if( !soutoption.isEmpty() ) { + options += soutoption.split( " :"); + /* Create Input */ input_item_t *p_input; p_input = input_item_New( p_intf, qtu( mrl ), _("Streaming") ); @@ -617,13 +643,10 @@ void DialogsProvider::streamingDialog( QWidget *parent, { input_item_AddOption( p_input, qtu( qs ), VLC_INPUT_OPTION_TRUSTED ); + msg_Dbg( p_intf, "Adding option: %s", qtu( qs ) ); } } - /* Add SoutMRL */ - msg_Dbg( p_intf, "Streaming MRL is: %s", psz_soutoption ); - input_item_AddOption( p_input, psz_soutoption, VLC_INPUT_OPTION_TRUSTED ); - /* Switch between enqueuing and starting the item */ /* FIXME: playlist_AddInput() can fail */ playlist_AddInput( THEPL, p_input, @@ -632,7 +655,6 @@ void DialogsProvider::streamingDialog( QWidget *parent, RecentsMRL::getInstance( p_intf )->addRecent( mrl ); } - free( psz_soutoption ); } void DialogsProvider::openAndStreamingDialogs() @@ -663,7 +685,7 @@ void DialogsProvider::loadSubtitlesFile() QStringList qsl = showSimpleOpen( qtr( "Open subtitles..." ), EXT_FILTER_SUBTITLE, - path ); + qfu( path ) ); free( path ); foreach( const QString &qsFile, qsl ) { @@ -691,7 +713,7 @@ void DialogsProvider::menuUpdateAction( QObject *data ) func->doFunc( p_intf ); } -void DialogsProvider::SDMenuAction( QString data ) +void DialogsProvider::SDMenuAction( const QString& data ) { char *psz_sd = strdup( qtu( data ) ); if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) ) @@ -706,8 +728,10 @@ void DialogsProvider::SDMenuAction( QString data ) **/ void DialogsProvider::playMRL( const QString &mrl ) { - playlist_Add( THEPL, qtu( mrl ) , NULL, + char* psz_uri = make_URI( qtu(mrl), NULL ); + playlist_Add( THEPL, psz_uri, NULL, PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false ); + free( psz_uri ); RecentsMRL::getInstance( p_intf )->addRecent( mrl ); }