X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.hpp;h=279f83bdcdebd0db7282ec79f0eaa86c40a7e204;hb=17f0388b7e0d5bd26b2a159ccf6356ee9b1f288a;hp=770a64e4cd98487fee5073767ee5aee106190ee6;hpb=45264e5f06bd52506b2effda0d45f2b295410838;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp index 770a64e4cd..279f83bdcd 100644 --- a/modules/gui/qt4/dialogs_provider.hpp +++ b/modules/gui/qt4/dialogs_provider.hpp @@ -1,10 +1,11 @@ /***************************************************************************** * dialogs_provider.hpp : Dialogs provider **************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright (C) 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac + * Jean-Baptiste Kempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,64 +19,67 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ -#ifndef _DIALOGS_PROVIDER_H_ -#define _DIALOGS_PROVIDER_H_ +#ifndef QVLC_DIALOGS_PROVIDER_H_ +#define QVLC_DIALOGS_PROVIDER_H_ -#include -#include -#include - -#include "dialogs/interaction.hpp" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include -#include - -#define EXT_FILTER_MEDIA 0x01 -#define EXT_FILTER_VIDEO 0x02 -#define EXT_FILTER_AUDIO 0x04 -#define EXT_FILTER_PLAYLIST 0x08 -#define EXT_FILTER_SUBTITLE 0x10 - -#define ADD_FILTER_MEDIA( string ) \ - string += _("Media Files"); \ - string += " ( "; \ - string += EXTENSIONS_MEDIA; \ + +#include "qt4.hpp" + +#include "dialogs/open.hpp" +#include +#include + +#define ADD_FILTER_MEDIA( string ) \ + string += qtr( "Media Files" ); \ + string += " ( "; \ + string += EXTENSIONS_MEDIA; \ string += ");;"; -#define ADD_FILTER_VIDEO( string ) \ - string += _("Video Files"); \ - string += " ( "; \ - string += EXTENSIONS_VIDEO; \ +#define ADD_FILTER_VIDEO( string ) \ + string += qtr( "Video Files" ); \ + string += " ( "; \ + string += EXTENSIONS_VIDEO; \ string += ");;"; -#define ADD_FILTER_AUDIO( string ) \ - string += _("Audio Files"); \ - string += " ( "; \ - string += EXTENSIONS_AUDIO; \ +#define ADD_FILTER_AUDIO( string ) \ + string += qtr( "Audio Files" ); \ + string += " ( "; \ + string += EXTENSIONS_AUDIO; \ string += ");;"; -#define ADD_FILTER_PLAYLIST( string )\ - string += _("Playlist Files"); \ - string += " ( "; \ - string += EXTENSIONS_PLAYLIST; \ +#define ADD_FILTER_PLAYLIST( string ) \ + string += qtr( "Playlist Files" ); \ + string += " ( "; \ + string += EXTENSIONS_PLAYLIST; \ string += ");;"; -#define ADD_FILTER_SUBTITLE( string )\ - string += _("Subtitles Files"); \ - string += " ( "; \ - string += EXTENSIONS_SUBTITLE; \ +#define ADD_FILTER_SUBTITLE( string ) \ + string += qtr( "Subtitles Files" );\ + string += " ( "; \ + string += EXTENSIONS_SUBTITLE; \ string += ");;"; -#define ADD_FILTER_ALL( string ) \ - string += _("All Files"); \ - string += " (*.*)"; +#define ADD_FILTER_ALL( string ) \ + string += qtr( "All Files" ); \ + string += " (*)"; -#define OPEN_FILE_TAB 0x0 -#define OPEN_DISC_TAB 0x1 -#define OPEN_NETWORK_TAB 0x2 -#define OPEN_CAPTURE_TAB 0x3 +enum { + EXT_FILTER_MEDIA = 0x01, + EXT_FILTER_VIDEO = 0x02, + EXT_FILTER_AUDIO = 0x04, + EXT_FILTER_PLAYLIST = 0x08, + EXT_FILTER_SUBTITLE = 0x10, +}; -#define OPEN_AND_PLAY 0x0 -#define OPEN_AND_STREAM 0x1 -#define OPEN_AND_SAVE 0x2 +enum { + DialogEvent_Type = QEvent::User + DialogEventType + 1, + //PLUndockEvent_Type = QEvent::User + DialogEventType + 2; + //PLDockEvent_Type = QEvent::User + DialogEventType + 3; + SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4, +}; class QEvent; class QSignalMapper; @@ -83,7 +87,9 @@ class QVLCMenu; class DialogsProvider : public QObject { - Q_OBJECT; + Q_OBJECT + friend class QVLCMenu; + public: static DialogsProvider *getInstance() { @@ -98,64 +104,117 @@ public: } static void killInstance() { - if( instance ) delete instance; - instance=NULL; + delete instance; + instance = NULL; + } + static bool isAlive() + { + return ( instance != NULL ); } - virtual ~DialogsProvider(); - QTimer *fixed_timer; - QStringList showSimpleOpen( QString help = QString(), + QStringList showSimpleOpen( const QString& help = QString(), int filters = EXT_FILTER_MEDIA | EXT_FILTER_VIDEO | EXT_FILTER_AUDIO | EXT_FILTER_PLAYLIST, - QString path = QString() ); + const QString& path = QString() ); + bool isDying() { return b_isDying; } protected: - friend class QVLCMenu; QSignalMapper *menusMapper; QSignalMapper *menusUpdateMapper; QSignalMapper *SDMapper; void customEvent( QEvent *); + private: DialogsProvider( intf_thread_t *); - intf_thread_t *p_intf; + virtual ~DialogsProvider(); static DialogsProvider *instance; + + intf_thread_t *p_intf; + QWidget* root; + bool b_isDying; + + void openDialog( int ); void addFromSimple( bool, bool ); public slots: + void playMRL( const QString & ); + void playlistDialog(); void bookmarksDialog(); void mediaInfoDialog(); void mediaCodecDialog(); void prefsDialog(); void extendedDialog(); + void synchroDialog(); void messagesDialog(); +#ifdef ENABLE_VLM + void vlmDialog(); +#endif + void helpDialog(); +#ifdef UPDATE_CHECK + void updateDialog(); +#endif + void aboutDialog(); + void gotoTimeDialog(); + void podcastConfigureDialog(); + void toolbarDialog(); + void pluginDialog(); + void epgDialog(); + + void openFileGenericDialog( intf_dialog_args_t * ); + + void simpleOpenDialog(); void simplePLAppendDialog(); void simpleMLAppendDialog(); - void simpleOpenDialog(); + void openDialog(); - void openDialog(int ); + void openDiscDialog(); void openFileDialog(); + void openUrlDialog(); void openNetDialog(); void openCaptureDialog(); - void openDiscDialog(); - void PLAppendDialog(); - void MLAppendDialog(); - void doInteraction( intf_dialog_args_t * ); - void menuAction( QObject *); - void menuUpdateAction( QObject *); - void SDMenuAction( QString ); - void streamingDialog( QString mrl = "", bool b_stream = true ); - void openThenStreamingDialogs(); - void openThenTranscodingDialogs(); - void openPlaylist(); - void savePlaylist(); + + void PLAppendDialog( int tab = OPEN_FILE_TAB ); + void MLAppendDialog( int tab = OPEN_FILE_TAB ); + + void PLOpenDir(); void PLAppendDir(); void MLAppendDir(); + + void streamingDialog( QWidget *parent, const QString& mrl, bool b_stream = true, + QStringList options = QStringList("") ); + void openAndStreamingDialogs(); + void openAndTranscodingDialogs(); + + void openAPlaylist(); + void saveAPlaylist(); + + void loadSubtitlesFile(); + void quit(); - void switchToSkins(); - void gotoTimeDialog(); - void helpDialog(); - void aboutDialog(); +private slots: + void menuAction( QObject *); + void menuUpdateAction( QObject * ); + void SDMenuAction( const QString& ); +signals: + void toolBarConfUpdated(); }; +class DialogEvent : public QEvent +{ +public: + DialogEvent( int _i_dialog, int _i_arg, intf_dialog_args_t *_p_arg ) : + QEvent( (QEvent::Type)(DialogEvent_Type) ) + { + i_dialog = _i_dialog; + i_arg = _i_arg; + p_arg = _p_arg; + } + virtual ~DialogEvent() { } + + int i_arg, i_dialog; + intf_dialog_args_t *p_arg; +}; + + #endif