X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=815603999a423d7409b11ed91d8a72fb55e745e7;hb=05d736eac9cb11e55fca0552ff4150cb48004ed8;hp=a3d458891cb97f94172850a27c410aa337babdba;hpb=78adab773a52bd7e9a69a90ff7a2a8ee01e3ede3;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index a3d458891c..815603999a 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,6 +52,9 @@ #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 @@ -76,6 +79,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,7 +94,7 @@ DialogsProvider::~DialogsProvider() #ifdef UPDATE_CHECK UpdateDialog::killInstance(); #endif - ToolbarEditDialog::killInstance(); + PluginDialog::killInstance(); delete menusMapper; delete menusUpdateMapper; @@ -178,12 +183,20 @@ void DialogsProvider::prefsDialog() void DialogsProvider::extendedDialog() { - ExtendedDialog::getInstance( p_intf )->toggleVisible(); + 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() @@ -222,7 +235,7 @@ void DialogsProvider::aboutDialog() void DialogsProvider::mediaInfoDialog() { - MediaInfoDialog::getInstance( p_intf )->toggleVisible(); + MediaInfoDialog::getInstance( p_intf )->showTab( 0 ); } void DialogsProvider::mediaCodecDialog() @@ -242,13 +255,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,14 +289,14 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) else extensions.replace( i, 1, "(" ); } - extensions.replace(QString(";*"), QString(" *")); + extensions.replace( ";*", " *" ); 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 ); + p_intf->p_sys->filepath, extensions ); if( !file.isEmpty() ) { p_arg->i_results = 1; @@ -290,13 +309,17 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) else /* non-save mode */ { QStringList files = QFileDialog::getOpenFileNames( NULL, - p_arg->psz_title, qfu( p_intf->p_sys->psz_filepath ), + p_arg->psz_title, p_intf->p_sys->filepath, extensions ); p_arg->i_results = files.count(); p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); 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 +368,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 +405,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() ? qfu( p_intf->p_sys->psz_filepath ) : path, + path.isEmpty() ? p_intf->p_sys->filepath : path, fileTypes ); + + if( !files.isEmpty() ) savedirpathFromFile( files.last() ); + + return files; } /** @@ -399,15 +426,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) ) ); + 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 +463,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 +477,7 @@ void DialogsProvider::openUrlDialog() RecentsMRL::getInstance( p_intf )->addRecent( url ); } } + delete oud; } /* Directory */ @@ -461,12 +488,13 @@ 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("Open Directory"), p_intf->p_sys->filepath ); if (!dir.isEmpty() ) { - QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ? - "dvd://" : "directory://" + toNativeSeparators( dir ); + QString mrl = (dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ? + "dvd://" : "directory://") + + toNativeSeparators( dir ); input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL ); /* FIXME: playlist_AddInput() can fail */ @@ -475,7 +503,7 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) PLAYLIST_END, pl, pl_Unlocked ); RecentsMRL::getInstance( p_intf )->addRecent( mrl ); if( !go ) - input_Read( THEPL, p_input, true ); + input_Read( THEPL, p_input ); vlc_gc_decref( p_input ); } } @@ -510,58 +538,38 @@ void DialogsProvider::openAPlaylist() void DialogsProvider::saveAPlaylist() { - QFileDialog *qfd = new QFileDialog( NULL, - qtr( "Save playlist as..." ), - qfu( p_intf->p_sys->psz_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 +577,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 +589,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 +601,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 +611,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 +627,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 +639,6 @@ void DialogsProvider::streamingDialog( QWidget *parent, RecentsMRL::getInstance( p_intf )->addRecent( mrl ); } - free( psz_soutoption ); } void DialogsProvider::openAndStreamingDialogs() @@ -663,7 +669,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 +697,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 +712,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) ); + playlist_Add( THEPL, psz_uri, NULL, PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false ); + free( psz_uri ); RecentsMRL::getInstance( p_intf )->addRecent( mrl ); }