* 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_common.h>
#include "qt4.hpp"
#include "dialogs_provider.hpp"
#include "main_interface.hpp"
#include "menus.hpp"
#include <vlc_intf_strings.h>
+#include "input_manager.hpp"
/* The dialogs */
#include "dialogs/playlist.hpp"
+#include "dialogs/bookmarks.hpp"
#include "dialogs/preferences.hpp"
#include "dialogs/mediainfo.hpp"
#include "dialogs/messages.hpp"
#include "dialogs/extended.hpp"
+#include "dialogs/vlm.hpp"
#include "dialogs/sout.hpp"
#include "dialogs/open.hpp"
#include "dialogs/help.hpp"
#include "dialogs/gototime.hpp"
+#include "dialogs/podcast_configuration.hpp"
DialogsProvider* DialogsProvider::instance = NULL;
DialogsProvider::~DialogsProvider()
{
+ msg_Dbg( p_intf, "Destroying the Dialog Provider" );
PlaylistDialog::killInstance();
MediaInfoDialog::killInstance();
+ MessagesDialog::killInstance();
+ ExtendedDialog::killInstance();
+ BookmarksDialog::killInstance();
+ HelpDialog::killInstance();
+#ifdef UPDATE_CHECK
+ UpdateDialog::killInstance();
+#endif
+
+ fixed_timer->stop();
}
void DialogsProvider::quit()
{
- vlc_object_kill( p_intf );
+ vlc_object_kill( p_intf->p_libvlc );
+ QApplication::closeAllWindows();
QApplication::quit();
}
DialogEvent *de = static_cast<DialogEvent*>(event);
switch( de->i_dialog )
{
- case INTF_DIALOG_FILE_SIMPLE:
- case INTF_DIALOG_FILE:
- openDialog(); break;
- case INTF_DIALOG_DISC:
- openDiscDialog(); break;
- case INTF_DIALOG_NET:
- openNetDialog(); break;
- case INTF_DIALOG_SAT:
- case INTF_DIALOG_CAPTURE:
- openCaptureDialog(); break;
- case INTF_DIALOG_PLAYLIST:
- playlistDialog(); break;
- case INTF_DIALOG_MESSAGES:
- messagesDialog(); break;
- case INTF_DIALOG_FILEINFO:
- mediaInfoDialog(); break;
- case INTF_DIALOG_PREFS:
- prefsDialog(); break;
- case INTF_DIALOG_BOOKMARKS:
- bookmarksDialog(); break;
- case INTF_DIALOG_EXTENDED:
- extendedDialog(); break;
- /* We might want to make it better with custom functions */
- case INTF_DIALOG_POPUPMENU:
- QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break;
- case INTF_DIALOG_AUDIOPOPUPMENU:
- QVLCMenu::AudioPopupMenu( p_intf ); break;
- case INTF_DIALOG_VIDEOPOPUPMENU:
- QVLCMenu::VideoPopupMenu( p_intf ); break;
- case INTF_DIALOG_MISCPOPUPMENU:
- QVLCMenu::MiscPopupMenu( p_intf ); break;
- case INTF_DIALOG_INTERACTION:
- doInteraction( de->p_arg ); break;
- case INTF_DIALOG_VLM:
- vlmDialog(); break;
- case INTF_DIALOG_WIZARD:
- case INTF_DIALOG_UPDATEVLC:
- case INTF_DIALOG_EXIT:
- default:
- msg_Warn( p_intf, "unimplemented dialog\n" );
+ case INTF_DIALOG_FILE_SIMPLE:
+ case INTF_DIALOG_FILE:
+ openDialog(); break;
+ case INTF_DIALOG_DISC:
+ openDiscDialog(); break;
+ case INTF_DIALOG_NET:
+ openNetDialog(); break;
+ case INTF_DIALOG_SAT:
+ case INTF_DIALOG_CAPTURE:
+ openCaptureDialog(); break;
+ case INTF_DIALOG_DIRECTORY:
+ PLAppendDir(); break;
+ case INTF_DIALOG_PLAYLIST:
+ playlistDialog(); break;
+ case INTF_DIALOG_MESSAGES:
+ messagesDialog(); break;
+ case INTF_DIALOG_FILEINFO:
+ mediaInfoDialog(); break;
+ case INTF_DIALOG_PREFS:
+ prefsDialog(); break;
+ case INTF_DIALOG_BOOKMARKS:
+ bookmarksDialog(); break;
+ case INTF_DIALOG_EXTENDED:
+ extendedDialog(); break;
+#ifdef ENABLE_VLM
+ 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:
+ QVLCMenu::AudioPopupMenu( p_intf ); break;
+ case INTF_DIALOG_VIDEOPOPUPMENU:
+ QVLCMenu::VideoPopupMenu( p_intf ); break;
+ case INTF_DIALOG_MISCPOPUPMENU:
+ QVLCMenu::MiscPopupMenu( p_intf ); break;
+ case INTF_DIALOG_WIZARD:
+ case INTF_DIALOG_STREAMWIZARD:
+ openThenStreamingDialogs(); break;
+#ifdef UPDATE_CHECK
+ case INTF_DIALOG_UPDATEVLC:
+ updateDialog(); break;
+#endif
+ case INTF_DIALOG_EXIT:
+ quit(); break;
+ default:
+ msg_Warn( p_intf, "unimplemented dialog" );
}
}
}
{
PrefsDialog::getInstance( p_intf )->toggleVisible();
}
+
void DialogsProvider::extendedDialog()
{
ExtendedDialog::getInstance( p_intf )->toggleVisible();
GotoTimeDialog::getInstance( p_intf )->toggleVisible();
}
+#ifdef ENABLE_VLM
void DialogsProvider::vlmDialog()
{
- /* FIXME */
- /* VLMDialog::getInstance( p_intf )->toggleVisible(); */
+ VLMDialog::getInstance( p_intf )->toggleVisible();
}
+#endif
void DialogsProvider::helpDialog()
{
HelpDialog::getInstance( p_intf )->toggleVisible();
}
+#ifdef UPDATE_CHECK
+void DialogsProvider::updateDialog()
+{
+ UpdateDialog::getInstance( p_intf )->toggleVisible();
+}
+#endif
+
void DialogsProvider::aboutDialog()
{
AboutDialog::getInstance( p_intf )->toggleVisible();
void DialogsProvider::mediaCodecDialog()
{
- MediaInfoDialog::getInstance( p_intf )->showTab( 1 );
+ MediaInfoDialog::getInstance( p_intf )->showTab( 2 );
}
void DialogsProvider::bookmarksDialog()
{
- /* FIXME */
- /* BookmarkDialog::getInstance( p_intf )->toggleVisible(); */
+ BookmarksDialog::getInstance( p_intf )->toggleVisible();
}
+void DialogsProvider::podcastConfigureDialog()
+{
+ PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
+}
+
+
/****************************************************************************
* 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 );
{
openDialog( OPEN_CAPTURE_TAB );
}
-void DialogsProvider::openDialog( int i_tab )
-{
- OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
-}
+/* Same as the open one, but force the enqueue */
void DialogsProvider::PLAppendDialog()
{
-
- OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, ENQUEUE )
- ->showTab(0);
-}
-void DialogsProvider::MLAppendDialog()
-{
+ OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_ENQUEUE)
+ ->showTab( OPEN_FILE_TAB );
}
-/**** Simple open ****/
-QStringList DialogsProvider::showSimpleOpen( QString help, int filters,
+/* Unimplemmented yet - Usefull ? */
+void DialogsProvider::MLAppendDialog()
+{}
+
+/**
+ * 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,
QString path )
{
QString fileTypes = "";
fileTypes.replace(QString(";*"), QString(" *"));
return QFileDialog::getOpenFileNames( NULL,
help.isNull() ? qfu(I_OP_SEL_FILES ) : help,
- path.isNull() ? qfu( p_intf->p_libvlc->psz_homedir ) : path,
+ path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path,
fileTypes );
}
+/**
+ * Open a file,
+ * pl helps you to choose from playlist or media library,
+ * go to start or enqueue
+ **/
void DialogsProvider::addFromSimple( bool pl, bool go)
{
QStringList files = DialogsProvider::showSimpleOpen();
( i ? PLAYLIST_PREPARSE : 0 ) )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
PLAYLIST_END,
- pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE );
+ pl ? true : false, false );
i++;
}
}
+void DialogsProvider::simpleOpenDialog()
+{
+ addFromSimple( true, true ); /* Playlist and Go */
+}
+
void DialogsProvider::simplePLAppendDialog()
{
addFromSimple( true, false );
addFromSimple( false, false );
}
-void DialogsProvider::simpleOpenDialog()
+/* Directory */
+/**
+ * Open a directory,
+ * pl helps you to choose from playlist or media library,
+ * go to start or enqueue
+ **/
+static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
{
- addFromSimple( true, true );
+ QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") );
+ if (!dir.isEmpty()) {
+ input_item_t *p_input = input_ItemNewExt( 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, pl_Unlocked );
+ input_Read( THEPL, p_input, false );
+ vlc_gc_decref( p_input );
+ }
+}
+
+void DialogsProvider::PLAppendDir()
+{
+ openDirectory( p_intf, true, false );
+}
+
+void DialogsProvider::MLAppendDir()
+{
+ openDirectory( p_intf, false , false );
}
/****************
* Playlist *
****************/
-void DialogsProvider::openPlaylist()
+void DialogsProvider::openAPlaylist()
{
QStringList files = showSimpleOpen( qtr( "Open playlist file" ),
EXT_FILTER_PLAYLIST );
}
}
-void DialogsProvider::savePlaylist()
+void DialogsProvider::saveAPlaylist()
{
QFileDialog *qfd = new QFileDialog( NULL,
- qtr("Choose a filename to save playlist"),
- qfu( p_intf->p_libvlc->psz_homedir ),
- qtr("XSPF playlist (*.xspf);; ") +
- qtr("M3U playlist (*.m3u);; Any (*.*) ") );
+ qtr( "Choose a filename to save playlist" ),
+ qfu( p_intf->p_sys->psz_filepath ),
+ qtr( "XSPF playlist (*.xspf);; " ) +
+ qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
qfd->setFileMode( QFileDialog::AnyFile );
qfd->setAcceptMode( QFileDialog::AcceptSave );
qfd->setConfirmOverwrite( true );
{
if( qfd->selectedFiles().count() > 0 )
{
- char *psz_module, *psz_m3u = "export-m3u",
- *psz_xspf = "export-xspf";
+ static const char psz_xspf[] = "export-xspf",
+ psz_m3u[] = "export-m3u";
+ 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" ) && !file.contains( ".m3u" ) ) )
{
psz_module = psz_xspf;
if( !file.contains( ".xsp" ) )
file.append( ".m3u" );
}
- playlist_Export( THEPL, qtu(file), THEPL->p_local_category,
+ playlist_Export( THEPL, qtu( file ), THEPL->p_local_category,
psz_module);
}
}
delete qfd;
}
-static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
-{
- QString dir = QFileDialog::getExistingDirectory ( 0,
- _("Open directory") );
- input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
- 0, NULL, -1 );
- playlist_AddInput( THEPL, p_input,
- go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
- PLAYLIST_END, pl, VLC_FALSE );
- input_Read( THEPL, p_input, VLC_FALSE );
-}
-
-void DialogsProvider::PLAppendDir()
-{
- openDirectory( p_intf, true, false );
-}
-
-void DialogsProvider::MLAppendDir()
-{
- openDirectory( p_intf, false , false );
-}
-
/****************************************************************************
* Sout emulation
****************************************************************************/
-void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
+void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
+ bool b_transcode_only )
{
- SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf,
- b_transcode_only );
+ SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only );
+
if( s->exec() == QDialog::Accepted )
{
- msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
+ msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) );
/* Just do it */
- int i_len = strlen( qtu(s->mrl) ) + 10;
- char *psz_option = (char*)malloc(i_len);
- snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl));
+ 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, VLC_TRUE, VLC_FALSE );
+ -1, &psz_option, 1, true, pl_Unlocked );
}
- delete s;
}
void DialogsProvider::openThenStreamingDialogs()
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_SAVE )
->showTab( 0 );
}
-/*
-void DialogsProvider::streamingDialog()
-{
- OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true );
- if ( o->exec() == QDialog::Accepted )
- {
- SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf );
- if( s->exec() == QDialog::Accepted )
- {
- msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
- /* Just do it
- int i_len = strlen( qtu(s->mrl) ) + 10;
- char *psz_option = (char*)malloc(i_len);
- snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl));
-
- playlist_AddExt( THEPL, qtu( o->mrl ), "Streaming",
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
- -1, &psz_option, 1, VLC_TRUE, VLC_FALSE );
- }
- delete s;
- }
- delete o;
-}*/
-
-
/****************************************************************************
* Menus / Interaction
playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
else
playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
-
free( psz_sd );
}
-
void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
{
InteractionDialog *qdialog;
break;
case INTERACT_UPDATE:
qdialog = (InteractionDialog*)(p_dialog->p_private);
- if( qdialog)
+ 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:
qdialog = (InteractionDialog*)(p_dialog->p_private);
}
}
-void DialogsProvider::hideMenus()
-{
- /* TODO */
-}
-
-void DialogsProvider::switchToSkins()
+void DialogsProvider::loadSubtitlesFile()
{
- var_SetString( p_intf, "intf-switch", "skins2" );
+ input_thread_t *p_input = THEMIM->getInput();
+ if( !p_input )
+ return;
+ QString qsFile = QFileDialog::getOpenFileName(
+ NULL,
+ qtr( "Choose subtitles file" ),
+ "",
+ qtr( "Subtitles files (*.cdg *.idx *.srt *.sub *.utf);;"
+ "All files (*)" ) );
+ if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) )
+ msg_Warn( p_intf, "unable to load subtitles file..." );
}
projects / vlc / blobdiff