#include "dialogs/toolbar.hpp"
#include "dialogs/plugins.hpp"
#include "dialogs/external.hpp"
+#include "dialogs/epg.hpp"
+#include "dialogs/errors.hpp"
#include <QEvent>
#include <QApplication>
SDMapper = new QSignalMapper();
CONNECT( SDMapper, mapped (QString), this, SDMenuAction( QString ) );
- DialogHandler *dialogHandler = new DialogHandler (p_intf, this );
+ new DialogHandler (p_intf, this );
}
DialogsProvider::~DialogsProvider()
#ifdef UPDATE_CHECK
UpdateDialog::killInstance();
#endif
+ PluginDialog::killInstance();
delete menusMapper;
delete menusUpdateMapper;
PluginDialog::getInstance( p_intf )->toggleVisible();
}
+void DialogsProvider::epgDialog()
+{
+ EpgDialog::getInstance( p_intf )->toggleVisible();
+}
+
/* Generic open file */
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 ) ) );
- p_intf->p_sys->filepath = qfu( p_arg->psz_results[i] );
+ if(i == 0)
+ p_intf->p_sys->filepath = QString::fromAscii("");
+ else
+ p_intf->p_sys->filepath = qfu( p_arg->psz_results[i-1] );
}
/* Callback */
/**
* 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 ) {
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++;
**/
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();
RecentsMRL::getInstance( p_intf )->addRecent( url );
}
}
+ delete oud;
}
/* Directory */
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 );
}
}
void DialogsProvider::saveAPlaylist()
{
+ static const struct
+ {
+ 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 ) );
+ }
+
QString file = QFileDialog::getSaveFileName( NULL,
qtr( "Save playlist as..." ),
- p_intf->p_sys->filepath,
- qtr( "XSPF playlist (*.xspf);; " ) +
- qtr( "M3U playlist (*.m3u);; " ) +
- qtr( "HTML playlist (*.html)" ) );
+ p_intf->p_sys->filepath, filters, &selected );
+ if( file.isEmpty() )
+ return;
- if( !file.isEmpty() )
- {
- static const char psz_xspf[] = "export-xspf",
- psz_m3u[] = "export-m3u",
- psz_html[] = "export-html";
- const char *psz_module;
-
- if( file.contains( ".xsp" ) )
- psz_module = psz_xspf;
- else if( file.contains( ".m3u" ) )
- psz_module = psz_m3u;
- else if( file.contains(".html" ) )
- psz_module = psz_html;
- else
+ for( size_t i = 0; i < sizeof (types) / sizeof (types[0]); i++)
+ if( selected == qfu( vlc_gettext( types[i].filter ) ) )
{
- msg_Warn( p_intf, "Impossible to recognise the file type. "
- "Defaulting to XSPF" );
- psz_module = psz_xspf;
- file.append( ".xspf" );
+ playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
+ THEPL->p_playing, types[i].module );
+ break;
}
-
- playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
- THEPL->p_local_category, psz_module);
- }
}
/****************************************************************************
****************************************************************************/
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 )
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
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
}
/* Get SoutMRL */
- if( !EMPTY_STR( psz_soutoption ) )
+ if( !soutoption.isEmpty() )
{
- options += QString( psz_soutoption ).split( " :");
+ options += soutoption.split( " :");
/* Create Input */
input_item_t *p_input;
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
}
- free( psz_soutoption );
}
void DialogsProvider::openAndStreamingDialogs()
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 ) )
**/
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 );
}
projects / vlc / blobdiff