#include "dialogs/podcast_configuration.hpp"
#include "dialogs/toolbar.hpp"
#include "dialogs/plugins.hpp"
+#include "dialogs/external.hpp"
#include <QEvent>
#include <QApplication>
SDMapper = new QSignalMapper();
CONNECT( SDMapper, mapped (QString), this, SDMenuAction( QString ) );
+
+ DialogHandler *dialogHandler = new DialogHandler (p_intf, this );
}
DialogsProvider::~DialogsProvider()
void DialogsProvider::extendedDialog()
{
- ExtendedDialog::getInstance( p_intf )->showTab( 0 );
+ 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()
void DialogsProvider::pluginDialog()
{
- PluginDialog *diag = new PluginDialog( p_intf );
- diag->show();
+ PluginDialog::getInstance( p_intf )->toggleVisible();
}
/* Generic open file */
else
extensions.replace( i, 1, "(" );
}
- extensions.replace(QString(";*"), QString(" *"));
+ extensions.replace( ";*", " *" );
extensions.append( ")" );
/* Save */
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] );
}
/* Callback */
}
/* 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 ) {
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() ? p_intf->p_sys->filepath : path,
fileTypes );
+
+ if( !files.isEmpty() ) savedirpathFromFile( files.last() );
+
+ return files;
}
/**
foreach( const QString &file, files )
{
playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL,
- go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) |
- ( i ? PLAYLIST_PREPARSE : 0 ) )
+ go ? ( PLAYLIST_APPEND | ( i ? PLAYLIST_PREPARSE : PLAYLIST_GO ) )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
- PLAYLIST_END,
- pl ? true : false, false );
+ PLAYLIST_END, pl, pl_Unlocked );
RecentsMRL::getInstance( p_intf )->addRecent(
toNativeSeparators( file ) );
i++;
**/
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 */
void DialogsProvider::saveAPlaylist()
{
- QFileDialog *qfd = new QFileDialog( NULL,
- qtr( "Save playlist as..." ),
- p_intf->p_sys->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 )
+ 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)" ) );
+
+ if( !file.isEmpty() )
{
- if( qfd->selectedFiles().count() > 0 )
+ 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
{
- 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();
-
- 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;
- }
-
- playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
- THEPL->p_local_category, psz_module);
+ 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_local_category, psz_module);
}
- delete qfd;
}
/****************************************************************************
****************************************************************************/
void DialogsProvider::streamingDialog( QWidget *parent,
- QString mrl,
+ const QString& mrl,
bool b_transcode_only,
QStringList options )
{
QStringList qsl = showSimpleOpen( qtr( "Open subtitles..." ),
EXT_FILTER_SUBTITLE,
- path );
+ qfu( path ) );
free( path );
foreach( const QString &qsFile, qsl )
{
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 ) )
projects / vlc / blobdiff