X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=92df106f84e3754c7b809acc6f9325c2001e120a;hb=afd60281ee0c27bfc31cf3bc09aa24b4f7ad95fd;hp=c2b7bb2b0b926830f32f56879cd52a0455663b9f;hpb=61ea7a5cd41d4d9b1c6a5b3bb4640eb62e025988;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index c2b7bb2b0b..92df106f84 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 @@ -30,12 +30,13 @@ #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" @@ -56,6 +57,7 @@ DialogsProvider* DialogsProvider::instance = NULL; DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : QObject( NULL ), p_intf( _p_intf ) { + b_isDying = false; fixed_timer = new QTimer( this ); fixed_timer->start( 150 /* milliseconds */ ); @@ -79,14 +81,22 @@ DialogsProvider::~DialogsProvider() ExtendedDialog::killInstance(); BookmarksDialog::killInstance(); HelpDialog::killInstance(); +#ifdef UPDATE_CHECK UpdateDialog::killInstance(); +#endif fixed_timer->stop(); + 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(); } @@ -101,6 +111,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: @@ -237,6 +249,69 @@ void DialogsProvider::openDialog() { openDialog( OPEN_FILE_TAB ); } +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( 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( 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 ); +} + void DialogsProvider::openFileDialog() { openDialog( OPEN_FILE_TAB ); @@ -257,18 +332,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) + 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, @@ -315,7 +391,7 @@ 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++; } } @@ -343,19 +419,27 @@ void DialogsProvider::simpleMLAppendDialog() **/ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory( 0, qtr(I_OP_OPDIR) ); + QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") ); if (!dir.isEmpty()) { - input_item_t *p_input = input_ItemNewExt( THEPL, + input_item_t *p_input = input_item_NewExt( 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 ); + 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 ); @@ -434,7 +518,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, if( s->exec() == QDialog::Accepted ) { - msg_Err( p_intf, "Sout 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 ); @@ -442,20 +526,20 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, 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 ); } } void DialogsProvider::openThenStreamingDialogs() { - 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() { - 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 ); } /**************************************************************************** @@ -499,14 +583,27 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) qdialog = (InteractionDialog*)(p_dialog->p_private); 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; @@ -515,12 +612,29 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) } } -void DialogsProvider::switchToSkins() -{ - var_SetString( p_intf, "intf-switch", "skins2" ); -} - -void DialogsProvider::switchToWx() -{ - var_SetString( p_intf, "intf-switch", "wxwidgets" ); +void DialogsProvider::loadSubtitlesFile() +{ + 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 file" ), + EXT_FILTER_SUBTITLE, + path ); + free( path ); + QString qsFile; + foreach( qsFile, qsl ) + { + if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) ) + msg_Warn( p_intf, "unable to load subtitles from '%s'", + qtu( qsFile ) ); + } }