* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <QEvent>
-#include <QApplication>
-#include <QSignalMapper>
-#include <QFileDialog>
+#include <vlc_intf_strings.h>
-#include <vlc_common.h>
#include "qt4.hpp"
#include "dialogs_provider.hpp"
-#include "main_interface.hpp"
+#include "input_manager.hpp" /* Load Subtitles */
#include "menus.hpp"
-#include <vlc_intf_strings.h>
-#include "input_manager.hpp"
+#include "recents.hpp"
+#include "util/qt_dirs.hpp"
/* The dialogs */
#include "dialogs/playlist.hpp"
#include "dialogs/vlm.hpp"
#include "dialogs/sout.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 "dialogs/interaction.hpp"
+
+#include <QEvent>
+#include <QApplication>
+#include <QSignalMapper>
+#include <QFileDialog>
+
DialogsProvider* DialogsProvider::instance = NULL;
QObject( NULL ), p_intf( _p_intf )
{
b_isDying = false;
- fixed_timer = new QTimer( this );
- fixed_timer->start( 150 /* milliseconds */ );
+ /* Various signal mappers for the menus */
menusMapper = new QSignalMapper();
CONNECT( menusMapper, mapped(QObject *), this, menuAction( QObject *) );
UpdateDialog::killInstance();
#endif
- fixed_timer->stop();
delete menusMapper;
delete menusUpdateMapper;
delete SDMapper;
void DialogsProvider::quit()
{
- /* Stop the playlist */
- playlist_Stop( THEPL );
b_isDying = true;
vlc_object_kill( p_intf->p_libvlc );
- QApplication::closeAllWindows();
- QApplication::quit();
}
void DialogsProvider::customEvent( QEvent *event )
{
- if( event->type() == DialogEvent_Type )
+ if( event->type() == (int)DialogEvent_Type )
{
DialogEvent *de = static_cast<DialogEvent*>(event);
switch( de->i_dialog )
QVLCMenu::MiscPopupMenu( p_intf ); break;
case INTF_DIALOG_WIZARD:
case INTF_DIALOG_STREAMWIZARD:
- openThenStreamingDialogs(); break;
+ openAndStreamingDialogs(); break;
#ifdef UPDATE_CHECK
case INTF_DIALOG_UPDATEVLC:
updateDialog(); break;
PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
}
-
-/****************************************************************************
- * All the open/add stuff
- * Open Dialog first - Simple Open then
- ****************************************************************************/
-
-void DialogsProvider::openDialog( int i_tab )
+void DialogsProvider::toolbarDialog()
{
- OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
+ ToolbarEditDialog::getInstance( p_intf )->toggleVisible();
}
-void DialogsProvider::openDialog()
+
+void DialogsProvider::pluginDialog()
{
- openDialog( OPEN_FILE_TAB );
+ PluginDialog *diag = new PluginDialog( p_intf );
+ diag->show();
}
+
+/* Generic open file */
void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
{
if( p_arg == NULL )
{
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 ) );
+ p_arg->psz_results[0] = strdup( qtu( toNativeSepNoSlash( file ) ) );
}
else
p_arg->i_results = 0;
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 ) );
+ p_arg->psz_results[i++] = strdup( qtu( toNativeSepNoSlash( file ) ) );
}
/* Callback */
free( p_arg->psz_extensions );
free( p_arg );
}
+/****************************************************************************
+ * 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( OPEN_FILE_TAB );
+}
void DialogsProvider::openFileDialog()
{
openDialog( OPEN_FILE_TAB );
/* Same as the open one, but force the enqueue */
void DialogsProvider::PLAppendDialog()
{
- OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_ENQUEUE)
- ->showTab( OPEN_FILE_TAB );
+ OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false,
+ OPEN_AND_ENQUEUE )->showTab( OPEN_FILE_TAB );
}
void DialogsProvider::MLAppendDialog()
}
ADD_FILTER_ALL( fileTypes );
fileTypes.replace(QString(";*"), QString(" *"));
+
return QFileDialog::getOpenFileNames( NULL,
- help.isNull() ? qfu(I_OP_SEL_FILES ) : help,
- path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path,
+ help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help,
+ path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path,
fileTypes );
}
int i = 0;
foreach( QString file, files )
{
- const char * psz_utf8 = qtu( file );
- playlist_Add( THEPL, psz_utf8, NULL,
+ playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL,
go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) |
( i ? PLAYLIST_PREPARSE : 0 ) )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
PLAYLIST_END,
pl ? true : false, false );
+ RecentsMRL::getInstance( p_intf )->addRecent(
+ toNativeSeparators( file ) );
i++;
}
}
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( toNativeSeparators( url ) ),
+ NULL, !oud->shouldEnqueue() ?
+ ( PLAYLIST_APPEND | PLAYLIST_GO )
+ : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
+ PLAYLIST_END, true, false );
+ RecentsMRL::getInstance( p_intf )->addRecent(
+ toNativeSeparators( url ) );
+ }
+ }
+}
+
/* Directory */
/**
* Open a directory,
**/
static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
{
- QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") );
- if (!dir.isEmpty()) {
- input_item_t *p_input = input_item_NewExt( THEPL,
- qtu( "directory://" + dir ), NULL,
- 0, NULL, -1 );
+ QString dir = QFileDialog::getExistingDirectory( NULL, qtr("Open Directory") );
+
+ 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 );
/* 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 );
EXT_FILTER_PLAYLIST );
foreach( QString file, files )
{
- playlist_Import( THEPL, qtu(file) );
+ 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);;" ) +
+ qtr( "Any (*.*) " ) );
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( file ), THEPL->p_local_category,
- psz_module);
+ playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
+ THEPL->p_local_category, psz_module);
}
}
delete qfd;
}
-
/****************************************************************************
* Sout emulation
****************************************************************************/
if( s->exec() == QDialog::Accepted )
{
- 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() ) );
+ const char *psz_option = qtu( s->getMrl() );
+ msg_Dbg( p_intf, "Sout mrl %s", psz_option );
playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
- -1, &psz_option, 1, true, pl_Unlocked );
+ -1, 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
+ RecentsMRL::getInstance( p_intf )->addRecent( mrl );
}
}
-void DialogsProvider::openThenStreamingDialogs()
+void DialogsProvider::openAndStreamingDialogs()
{
OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_STREAM )
->showTab( OPEN_FILE_TAB );
}
-void DialogsProvider::openThenTranscodingDialogs()
+void DialogsProvider::openAndTranscodingDialogs()
{
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, false, OPEN_AND_SAVE )
->showTab( OPEN_FILE_TAB );
}
+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..." ),
+ EXT_FILTER_SUBTITLE,
+ path );
+ free( path );
+ QString qsFile;
+ foreach( qsFile, qsl )
+ {
+ if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ),
+ true ) )
+ msg_Warn( p_intf, "unable to load subtitles from '%s'",
+ qtu( qsFile ) );
+ }
+}
+
+
/****************************************************************************
- * Menus / Interaction
+ * Menus
****************************************************************************/
void DialogsProvider::menuAction( QObject *data )
{
- QVLCMenu::DoAction( p_intf, data );
+ QVLCMenu::DoAction( data );
}
void DialogsProvider::menuUpdateAction( QObject *data )
{
- MenuFunc * f = qobject_cast<MenuFunc *>(data);
- f->doFunc( p_intf );
+ MenuFunc *func = qobject_cast<MenuFunc *>(data);
+ assert( func );
+ func->doFunc( p_intf );
}
void DialogsProvider::SDMenuAction( QString data )
{
- char *psz_sd = strdup( qtu( data ) );
+ const char *psz_sd = qtu( data );
if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
else
playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
- free( psz_sd );
}
+/**
+ * Play the MRL contained in the Recently played menu.
+ **/
+void DialogsProvider::playMRL( const QString &mrl )
+{
+ playlist_Add( THEPL, qtu( mrl ) , NULL,
+ PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false );
+
+ RecentsMRL::getInstance( p_intf )->addRecent( mrl );
+}
+
+/*************************************
+ * Interactions
+ *************************************/
void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
{
InteractionDialog *qdialog;
}
}
-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..." ),
- 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 ) );
- }
-}