Disable update checking per default, re-enable with --enable-update-check

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

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index a0f5e085f31d7391e318229525e7340fdf42770c..2d3533bd14d53ad18257b9a08971867292a22a25 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -35,53 +35,56 @@
 #include <QTimer>
 #include <QApplication>
 
-#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 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 {
+    EXT_FILTER_MEDIA     =  0x01,
+    EXT_FILTER_VIDEO     =  0x02,
+    EXT_FILTER_AUDIO     =  0x04,
+    EXT_FILTER_PLAYLIST  =  0x08,
+    EXT_FILTER_SUBTITLE  =  0x10,
+};
 
 enum {
     OPEN_FILE_TAB,
     OPEN_DISC_TAB,
     OPEN_NETWORK_TAB,
-    OPEN_CAPTURE_TAB
+    OPEN_CAPTURE_TAB,
+    OPEN_TAB_MAX
 };
 
 enum {
     OPEN_AND_PLAY,
     OPEN_AND_STREAM,
     OPEN_AND_SAVE,
-    ENQUEUE
+    OPEN_AND_ENQUEUE
 };
 
 class QEvent;
@@ -131,7 +134,7 @@ private:
 public slots:
     void doInteraction( intf_dialog_args_t * );
     void menuAction( QObject *);
-    void menuUpdateAction( QObject *);
+    void menuUpdateAction( QObject * );
     void SDMenuAction( QString );
 
     void playlistDialog();
@@ -143,8 +146,12 @@ public slots:
     void messagesDialog();
     void vlmDialog();
     void helpDialog();
+#ifdef UPDATE_CHECK
+    void updateDialog();
+#endif
     void aboutDialog();
     void gotoTimeDialog();
+    void podcastConfigureDialog();
 
     void simpleOpenDialog();
     void simplePLAppendDialog();
@@ -166,10 +173,8 @@ public slots:
     void openThenStreamingDialogs();
     void openThenTranscodingDialogs();
 
-    void openPlaylist();
-    void savePlaylist();
-
-    void podcastConfigureDialog();
+    void openAPlaylist();
+    void saveAPlaylist();
 
     void switchToSkins();
     void quit();