X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.hpp;h=314e3ac07d2d8d101c6f723b757cbfcf53363ed3;hb=676a627a1ff186119ec05f690e34645a3e003431;hp=9ed6f46e0ca1a9e18d58d2432f3048ce4862e4bc;hpb=4936cc77f11ebbdd370957c80be9532903bb2ef0;p=vlc

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 9ed6f46e0c..314e3ac07d 100644
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -25,60 +25,58 @@
 #ifndef _DIALOGS_PROVIDER_H_
 #define _DIALOGS_PROVIDER_H_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <assert.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
+#include "qt4.hpp"
 #include "dialogs/interaction.hpp"
+#include "dialogs/open.hpp"
 
 #include <QObject>
 #include <QTimer>
 #include <QApplication>
 
-#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 += qtr("Media Files");      \
-    string += " ( ";                 \
-    string += EXTENSIONS_MEDIA;      \
+#define ADD_FILTER_MEDIA( string )     \
+    string += qtr( "Media Files" );    \
+    string += " ( ";                   \
+    string += EXTENSIONS_MEDIA;        \
     string += ");;";
-#define ADD_FILTER_VIDEO( string )   \
-    string += qtr("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 += qtr("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 += qtr("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 += qtr("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 += qtr("All Files");        \
+#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
-
-#define OPEN_AND_PLAY           0x0
-#define OPEN_AND_STREAM         0x1
-#define OPEN_AND_SAVE           0x2
-#define ENQUEUE                 0x4
+enum {
+    EXT_FILTER_MEDIA     =  0x01,
+    EXT_FILTER_VIDEO     =  0x02,
+    EXT_FILTER_AUDIO     =  0x04,
+    EXT_FILTER_PLAYLIST  =  0x08,
+    EXT_FILTER_SUBTITLE  =  0x10,
+};
 
 class QEvent;
 class QSignalMapper;
@@ -87,6 +85,8 @@ class QVLCMenu;
 class DialogsProvider : public QObject
 {
     Q_OBJECT;
+    friend class QVLCMenu;
+
 public:
     static DialogsProvider *getInstance()
     {
@@ -102,7 +102,7 @@ public:
     static void killInstance()
     {
         if( instance ) delete instance;
-        instance=NULL;
+        instance = NULL;
     }
     virtual ~DialogsProvider();
     QTimer *fixed_timer;
@@ -113,11 +113,11 @@ public:
                                 EXT_FILTER_PLAYLIST,
                                 QString path = QString() );
 protected:
-    friend class QVLCMenu;
     QSignalMapper *menusMapper;
     QSignalMapper *menusUpdateMapper;
     QSignalMapper *SDMapper;
     void customEvent( QEvent *);
+
 private:
     DialogsProvider( intf_thread_t *);
     intf_thread_t *p_intf;
@@ -127,7 +127,7 @@ private:
 public slots:
     void doInteraction( intf_dialog_args_t * );
     void menuAction( QObject *);
-    void menuUpdateAction( QObject *);
+    void menuUpdateAction( QObject * );
     void SDMenuAction( QString );
 
     void playlistDialog();
@@ -137,10 +137,16 @@ public slots:
     void prefsDialog();
     void extendedDialog();
     void messagesDialog();
+#ifdef ENABLE_VLM
     void vlmDialog();
+#endif
     void helpDialog();
+#ifdef UPDATE_CHECK
+    void updateDialog();
+#endif
     void aboutDialog();
     void gotoTimeDialog();
+    void podcastConfigureDialog();
 
     void simpleOpenDialog();
     void simplePLAppendDialog();
@@ -148,26 +154,27 @@ public slots:
 
     void openDialog();
     void openDialog( int );
+    void openFileGenericDialog( intf_dialog_args_t * );
     void openDiscDialog();
     void openFileDialog();
     void openNetDialog();
     void openCaptureDialog();
-    void openDirDialog();
 
     void PLAppendDialog();
     void MLAppendDialog();
     void PLAppendDir();
     void MLAppendDir();
 
-    void streamingDialog( QString mrl = "", bool b_stream = true );
+    void streamingDialog( QWidget *parent, QString mrl = "",
+            bool b_stream = true );
     void openThenStreamingDialogs();
     void openThenTranscodingDialogs();
 
-    void openPlaylist();
-    void savePlaylist();
+    void openAPlaylist();
+    void saveAPlaylist();
+
+    void loadSubtitlesFile();
 
-    void hideMenus();
-    void switchToSkins();
     void quit();
 };