No need to have overlay twice in the preferences

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

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index d32ca26059af176c075d39906f3f10a4f035e7b8..be195ce8d5f696dfd0b9510583d5f6be94fac3b8 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,56 +19,71 @@
  *
  * 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"
-
 #include <assert.h>
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 
-#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
+#include "dialogs/interaction.hpp"
+
+#include <QObject>
+#include <QTimer>
+#include <QApplication>
 
 #define ADD_FILTER_MEDIA( string )   \
-    string += _("Media Files");      \
+    string += qtr("Media Files");      \
     string += " ( ";                 \
     string += EXTENSIONS_MEDIA;      \
     string += ");;";
 #define ADD_FILTER_VIDEO( string )   \
-    string += _("Video Files");      \
+    string += qtr("Video Files");      \
     string += " ( ";                 \
     string += EXTENSIONS_VIDEO;      \
     string += ");;";
 #define ADD_FILTER_AUDIO( string )   \
-    string += _("Audio Files");      \
+    string += qtr("Audio Files");      \
     string += " ( ";                 \
     string += EXTENSIONS_AUDIO;      \
     string += ");;";
 #define ADD_FILTER_PLAYLIST( string )\
-    string += _("Playlist Files");   \
+    string += qtr("Playlist Files");   \
     string += " ( ";                 \
     string += EXTENSIONS_PLAYLIST;   \
     string += ");;";
 #define ADD_FILTER_SUBTITLE( string )\
-    string += _("Subtitles Files");   \
+    string += qtr("Subtitles Files");   \
     string += " ( ";                 \
     string += EXTENSIONS_SUBTITLE;   \
     string += ");;";
 #define ADD_FILTER_ALL( string )     \
-    string += _("All Files");        \
+    string += qtr("All Files");        \
     string += " (*.*)";
 
+#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
+
+enum {
+    OPEN_FILE_TAB,
+    OPEN_DISC_TAB,
+    OPEN_NETWORK_TAB,
+    OPEN_CAPTURE_TAB,
+    OPEN_TAB_MAX
+};
+
+enum {
+    OPEN_AND_PLAY,
+    OPEN_AND_STREAM,
+    OPEN_AND_SAVE,
+    OPEN_AND_ENQUEUE
+};
 
 class QEvent;
 class QSignalMapper;
@@ -114,6 +130,11 @@ 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();
@@ -121,31 +142,39 @@ public slots:
     void prefsDialog();
     void extendedDialog();
     void messagesDialog();
+    void vlmDialog();
+    void helpDialog();
+    void updateDialog();
+    void aboutDialog();
+    void gotoTimeDialog();
+
+    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 quit();
+
+    void streamingDialog( QString mrl = "", bool b_stream = true );
+    void openThenStreamingDialogs();
+    void openThenTranscodingDialogs();
+
+    void openPlaylist();
+    void savePlaylist();
+
+    void podcastConfigureDialog();
+
     void switchToSkins();
-    void helpDialog();
-    void aboutDialog();
+    void quit();
 };
 
 #endif