* 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/vlm.hpp"
#include "dialogs/help.hpp"
#include "dialogs/gototime.hpp"
#include "dialogs/podcast_configuration.hpp"
-#include "dialogs/vlm.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();
}
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::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" );
}
GotoTimeDialog::getInstance( p_intf )->toggleVisible();
}
+#ifdef ENABLE_VLM
void DialogsProvider::vlmDialog()
{
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()
{
void DialogsProvider::bookmarksDialog()
{
- /* TODO - Implement me */
- /* BookmarkDialog::getInstance( p_intf )->toggleVisible(); */
+ BookmarksDialog::getInstance( p_intf )->toggleVisible();
}
void DialogsProvider::podcastConfigureDialog()
/* Unimplemmented yet - Usefull ? */
void DialogsProvider::MLAppendDialog()
-{
-}
+{}
/**
* Simple open
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 );
}
( i ? PLAYLIST_PREPARSE : 0 ) )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
PLAYLIST_END,
- pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE );
+ pl ? true : false, false );
i++;
}
}
**/
static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
{
- QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open directory") );
+ QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") );
if (!dir.isEmpty()) {
- input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
- 0, NULL, -1 );
+ 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, VLC_FALSE );
- input_Read( THEPL, p_input, VLC_FALSE );
+ PLAYLIST_END, pl, pl_Unlocked );
+ input_Read( THEPL, p_input, false );
+ vlc_gc_decref( p_input );
}
}
{
QFileDialog *qfd = new QFileDialog( NULL,
qtr( "Choose a filename to save playlist" ),
- qfu( p_intf->p_libvlc->psz_homedir ),
+ qfu( p_intf->p_sys->psz_filepath ),
qtr( "XSPF playlist (*.xspf);; " ) +
qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
qfd->setFileMode( QFileDialog::AnyFile );
* Sout emulation
****************************************************************************/
-//FIXME !!
-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", qta( s->getMrl() ) );
+ 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 );
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
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::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..." );
}