Qt4 - Copyright update and CRs

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

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index b7b1918baa14cc2f00580f8a5eb604b5e2bba572..e6212a0ab4c3bb5f1f3bb17c3dbd9d45f0aa1cb1 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,7 +19,8 @@
  *
  * 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_
@@ -68,6 +70,14 @@
     string += _("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
 
 class QEvent;
 class QSignalMapper;
@@ -132,13 +142,13 @@ public slots:
     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( QString mrl = "");
+    void streamingDialog( QString mrl = "", bool b_stream = true );
     void openThenStreamingDialogs();
+    void openThenTranscodingDialogs();
     void openPlaylist();
     void savePlaylist();
     void PLAppendDir();