Rework a bit the OpenDialog calls in order to fix the double-click issue when transco...

[vlc] / modules / gui / qt4 / dialogs_provider.hpp

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 6afbefff97cafefc4b9180bf956e292b7843ec16..97c19c6e5c39751eb151e048fa4a84a8ce9245fb 100644 (file)
--- 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-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * 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,45 +19,64 @@
  *
  * 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_
 
-#include <QObject>
-#include <QTimer>
-#include <QApplication>
-
-#include "dialogs/interaction.hpp"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <assert.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
-#define ADD_FILTER_MEDIA( string )   \
-    string += _("Media Files");      \
-    string += " ( ";                 \
-    string += EXTENSIONS_MEDIA;      \
+#include "qt4.hpp"
+#include "dialogs/interaction.hpp"
+#include "dialogs/open.hpp"
+
+#include <QObject>
+#include <QTimer>
+#include <QApplication>
+
+#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;        \
     string += ");;";
-#define ADD_FILTER_VIDEO( string )   \
-    string += _("Video Files");      \
-    string += " ( ";                 \
-    string += EXTENSIONS_VIDEO;      \
+#define ADD_FILTER_AUDIO( string )     \
+    string += qtr( "Audio Files" );    \
+    string += " ( ";                   \
+    string += EXTENSIONS_AUDIO;        \
     string += ");;";
-#define ADD_FILTER_AUDIO( string )   \
-    string += _("Audio Files");      \
-    string += " ( ";                 \
-    string += EXTENSIONS_AUDIO;      \
+#define ADD_FILTER_PLAYLIST( string )  \
+    string += qtr( "Playlist Files" ); \
+    string += " ( ";                   \
+    string += EXTENSIONS_PLAYLIST;     \
     string += ");;";
-#define ADD_FILTER_PLAYLIST( string )\
-    string += _("Playlist Files");   \
-    string += " ( ";                 \
-    string += EXTENSIONS_PLAYLIST;   \
+#define ADD_FILTER_SUBTITLE( string )  \
+    string += qtr( "Subtitles Files" );\
+    string += " ( ";                   \
+    string += EXTENSIONS_SUBTITLE;     \
     string += ");;";
-#define ADD_FILTER_ALL( string )     \
-    string += _("All Files");        \
+#define ADD_FILTER_ALL( string )       \
+    string += qtr( "All Files" );      \
     string += " (*.*)";
 
+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;
@@ -65,6 +85,8 @@ class QVLCMenu;
 class DialogsProvider : public QObject
 {
     Q_OBJECT;
+    friend class QVLCMenu;
+
 public:
     static DialogsProvider *getInstance()
     {
@@ -80,20 +102,22 @@ public:
     static void killInstance()
     {
         if( instance ) delete instance;
-        instance=NULL;
+        instance = NULL;
     }
     virtual ~DialogsProvider();
     QTimer *fixed_timer;
 
-    QStringList showSimpleOpen( QString help = QString(), bool all = true,
-                                bool video = true, bool audio = true,
-                                bool subs = true, bool pls = true );
+    QStringList showSimpleOpen( QString help = QString(),
+                                int filters = EXT_FILTER_MEDIA |
+                                EXT_FILTER_VIDEO | EXT_FILTER_AUDIO |
+                                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;
@@ -101,37 +125,56 @@ private:
     void addFromSimple( bool, bool );
 
 public slots:
+    void doInteraction( intf_dialog_args_t * );
+    void menuAction( QObject *);
+    void menuUpdateAction( QObject * );
+    void SDMenuAction( QString );
+
     void playlistDialog();
     void bookmarksDialog();
     void mediaInfoDialog();
+    void mediaCodecDialog();
     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();
     void simpleMLAppendDialog();
-    void simpleOpenDialog();
+
     void openDialog();
-    void openDialog(int );
+    void openDialog( int );
+    void openDiscDialog();
     void openFileDialog();
     void openNetDialog();
     void openCaptureDialog();
-    void openDiscDialog();
+
     void PLAppendDialog();
     void MLAppendDialog();
-    void popupMenu( int );
-    void doInteraction( intf_dialog_args_t * );
-    void menuAction( QObject *);
-    void menuUpdateAction( QObject *);
-    void SDMenuAction( QString );
-    void streamingDialog();
-    void openPlaylist();
-    void savePlaylist();
     void PLAppendDir();
     void MLAppendDir();
+
+    void streamingDialog( QWidget *parent, QString mrl = "",
+            bool b_stream = true );
+    void openThenStreamingDialogs();
+    void openThenTranscodingDialogs();
+
+    void openAPlaylist();
+    void saveAPlaylist();
+
+    void loadSubtitlesFile();
+
     void quit();
-    void switchToSkins();
-    void helpDialog();
-    void aboutDialog();
 };
 
 #endif