# include "config.h"
#endif
-#include <vlc_common.h>
#include <vlc_intf_strings.h>
#include "qt4.hpp"
#include "dialogs_provider.hpp"
-#include "main_interface.hpp"
+#include "input_manager.hpp" /* Load Subtitles */
#include "menus.hpp"
-#include "input_manager.hpp"
#include "recents.hpp"
-#include "util/qvlcapp.hpp"
+#include "util/qt_dirs.hpp"
/* The dialogs */
#include "dialogs/playlist.hpp"
#include "dialogs/extended.hpp"
#include "dialogs/vlm.hpp"
#include "dialogs/sout.hpp"
+#include "dialogs/convert.hpp"
#include "dialogs/open.hpp"
+#include "dialogs/openurl.hpp"
#include "dialogs/help.hpp"
#include "dialogs/gototime.hpp"
#include "dialogs/podcast_configuration.hpp"
+#include "dialogs/toolbar.hpp"
+#include "dialogs/plugins.hpp"
#include <QEvent>
#include <QApplication>
DialogsProvider::~DialogsProvider()
{
- msg_Dbg( p_intf, "Destroying the Dialog Provider" );
PlaylistDialog::killInstance();
MediaInfoDialog::killInstance();
MessagesDialog::killInstance();
#ifdef UPDATE_CHECK
UpdateDialog::killInstance();
#endif
+ ToolbarEditDialog::killInstance();
delete menusMapper;
delete menusUpdateMapper;
void DialogsProvider::quit()
{
- /* Stop the playlist */
- playlist_Stop( THEPL );
b_isDying = true;
- vlc_object_kill( p_intf->p_libvlc );
- QApplication::closeAllWindows();
- QApplication::quit();
+ libvlc_Quit( p_intf->p_libvlc );
}
void DialogsProvider::customEvent( QEvent *event )
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:
void DialogsProvider::prefsDialog()
{
- PrefsDialog::getInstance( p_intf )->toggleVisible();
+ PrefsDialog *p = new PrefsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
+ p->toggleVisible();
}
void DialogsProvider::extendedDialog()
ExtendedDialog::getInstance( p_intf )->toggleVisible();
}
+void DialogsProvider::synchroDialog()
+{
+ ExtendedDialog::getInstance( p_intf )->showTab( 2 );
+}
+
void DialogsProvider::messagesDialog()
{
MessagesDialog::getInstance( p_intf )->toggleVisible();
PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
}
+void DialogsProvider::toolbarDialog()
+{
+ ToolbarEditDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::pluginDialog()
+{
+ PluginDialog *diag = new PluginDialog( p_intf );
+ diag->show();
+}
+
/* Generic open file */
void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
{
p_arg->i_results = files.count();
p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) );
i = 0;
- foreach( QString file, files )
+ foreach( const QString &file, files )
p_arg->psz_results[i++] = strdup( qtu( toNativeSepNoSlash( file ) ) );
}
fileTypes.replace(QString(";*"), QString(" *"));
return QFileDialog::getOpenFileNames( NULL,
- help.isEmpty() ? qfu(I_OP_SEL_FILES ) : help,
+ help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help,
path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path,
fileTypes );
}
{
QStringList files = DialogsProvider::showSimpleOpen();
int i = 0;
- foreach( QString file, files )
+ foreach( const QString &file, files )
{
playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL,
go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) |
addFromSimple( false, false );
}
+/* Url & Clipboard */
+/**
+ * Open a MRL.
+ * If the clipboard contains URLs, the first is automatically 'preselected'.
+ **/
+void DialogsProvider::openUrlDialog()
+{
+ OpenUrlDialog *oud = OpenUrlDialog::getInstance( p_intf->p_sys->p_mi,
+ p_intf );
+ if( oud->exec() == QDialog::Accepted )
+ {
+ QString url = oud->url();
+ if( !url.isEmpty() )
+ {
+ playlist_Add( THEPL, qtu( url ),
+ NULL, !oud->shouldEnqueue() ?
+ ( PLAYLIST_APPEND | PLAYLIST_GO )
+ : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
+ PLAYLIST_END, true, false );
+ RecentsMRL::getInstance( p_intf )->addRecent( url );
+ }
+ }
+}
+
/* Directory */
/**
* Open a directory,
if (!dir.isEmpty() )
{
- QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive )
- ? "dvd://" : "directory://" + toNativeSeparators( dir );
- msg_Dbg( p_intf, "Directory opening: %s", qtu( dir ) );
- input_item_t *p_input = input_item_NewExt( THEPL, qtu( mrl ),
- NULL, 0, NULL, -1 );
+ 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 */
playlist_AddInput( THEPL, p_input,
{
QStringList files = showSimpleOpen( qtr( "Open playlist..." ),
EXT_FILTER_PLAYLIST );
- foreach( QString file, files )
+ foreach( const QString &file, files )
{
playlist_Import( THEPL, qtu( toNativeSeparators( file ) ) );
}
qtr( "Save playlist as..." ),
qfu( p_intf->p_sys->psz_filepath ),
qtr( "XSPF playlist (*.xspf);; " ) +
- qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
+ qtr( "M3U playlist (*.m3u);; " ) +
+ qtr( "HTML playlist (*.html)" ) );
qfd->setFileMode( QFileDialog::AnyFile );
qfd->setAcceptMode( QFileDialog::AcceptSave );
qfd->setConfirmOverwrite( true );
if( qfd->selectedFiles().count() > 0 )
{
static const char psz_xspf[] = "export-xspf",
- psz_m3u[] = "export-m3u";
+ psz_m3u[] = "export-m3u",
+ psz_html[] = "export-html";
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" ) )
{
psz_module = psz_xspf;
if( !file.contains( ".xsp" ) )
file.append( ".xspf" );
}
- else
+ 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;
+ }
playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
THEPL->p_local_category, psz_module);
* Sout emulation
****************************************************************************/
-void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
- bool b_transcode_only )
+void DialogsProvider::streamingDialog( QWidget *parent,
+ QString mrl,
+ bool b_transcode_only,
+ QStringList options )
{
- SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only );
+ char *psz_soutoption;
- if( s->exec() == QDialog::Accepted )
+ /* Stream */
+ if( !b_transcode_only )
{
- 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 );
- 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, true, pl_Unlocked );
+ SoutDialog *s = new SoutDialog( parent, p_intf, mrl );
+ if( s->exec() == QDialog::Accepted )
+ {
+ psz_soutoption = strdup( qtu( s->getMrl() ) );
+ delete s;
+ }
+ else
+ {
+ delete s; return;
+ }
+ } else {
+ /* Convert */
+ ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl );
+ if( s->exec() == QDialog::Accepted )
+ {
+ psz_soutoption = strdup( qtu( s->getMrl() ) );
+ delete s;
+ }
+ else
+ {
+ delete s; return;
+ }
+ }
+
+ /* Get SoutMRL */
+ if( !EMPTY_STR( psz_soutoption ) )
+ {
+ /* Create Input */
+ input_item_t *p_input;
+ p_input = input_item_New( p_intf, qtu( mrl ), _("Streaming") );
+
+ /* Add normal Options */
+ for( int j = 0; j < options.size(); j++ )
+ {
+ QString qs = colon_unescape( options[j] );
+ if( !qs.isEmpty() )
+ {
+ input_item_AddOption( p_input, qtu( qs ),
+ VLC_INPUT_OPTION_TRUSTED );
+ }
+ }
+
+ /* 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,
+ PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, true, pl_Unlocked );
+ vlc_gc_decref( p_input );
+
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
}
+ free( psz_soutoption );
}
void DialogsProvider::openAndStreamingDialogs()
EXT_FILTER_SUBTITLE,
path );
free( path );
- QString qsFile;
- foreach( qsFile, qsl )
+ foreach( const QString &qsFile, qsl )
{
- if( !input_AddSubtitles( p_input, qtu( toNativeSeparators( qsFile ) ),
+ if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ),
true ) )
msg_Warn( p_intf, "unable to load subtitles from '%s'",
qtu( qsFile ) );
void DialogsProvider::menuAction( QObject *data )
{
- QVLCMenu::DoAction( p_intf, data );
+ QVLCMenu::DoAction( data );
}
void DialogsProvider::menuUpdateAction( QObject *data )
void DialogsProvider::SDMenuAction( QString data )
{
- char *psz_sd = qtu( data );
+ char *psz_sd = strdup( qtu( data ) );
if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
else
playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+ free( psz_sd );
}
/**
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
}
-
-/*************************************
- * Interactions
- *************************************/
-void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
-{
- InteractionDialog *qdialog;
- interaction_dialog_t *p_dialog = p_arg->p_dialog;
- switch( p_dialog->i_action )
- {
- case INTERACT_NEW:
- qdialog = new InteractionDialog( p_intf, p_dialog );
- p_dialog->p_private = (void*)qdialog;
- if( !(p_dialog->i_status == ANSWERED_DIALOG) )
- qdialog->show();
- break;
- case INTERACT_UPDATE:
- 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;
- p_dialog->i_status = DESTROYED_DIALOG;
- break;
- }
-}
-
projects / vlc / blobdiff