Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 69e03130b8c7287ad5471828cb537abb44dacde8..8b7d4f1407c1a6a9650aac14986005ded1c7699c 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -5,6 +5,7 @@
  * $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
@@ -24,16 +25,28 @@
 #define _MENUS_H_
 
 #include "qt4.hpp"
+
 #include <QObject>
 #include <vector>
 
+/* Folder vs. Directory */
+#ifdef WIN32
+#define I_OPEN_FOLDER "Open &Folder..."
+#else
+#define I_OPEN_FOLDER "Open D&irectory..."
+#endif //WIN32
+
 using namespace std;
 
 class QMenu;
 class QMenuBar;
+class QSystemTrayIcon;
 
 class MenuItemData : public QObject
 {
+
+Q_OBJECT
+
 public:
     MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var )
     {
@@ -58,25 +71,31 @@ class QVLCMenu : public QObject
 {
     Q_OBJECT;
 public:
-    static void createMenuBar( MainInterface *mi, intf_thread_t *, bool, bool, bool );
+    static void createMenuBar( MainInterface *mi, intf_thread_t *,
+                               bool, bool );
 
     /* Menus */
     static QMenu *FileMenu();
     static QMenu *SDMenu( intf_thread_t * );
     static QMenu *PlaylistMenu( MainInterface *, intf_thread_t *);
-    static QMenu *ToolsMenu( intf_thread_t *, MainInterface *, bool, bool,
-                             bool with = true );
+    static QMenu *ToolsMenu( intf_thread_t *, MainInterface *, bool, bool with = true );
     static QMenu *NavigMenu( intf_thread_t * , QMenu * );
     static QMenu *VideoMenu( intf_thread_t * , QMenu * );
     static QMenu *AudioMenu( intf_thread_t * , QMenu * );
     static QMenu *InterfacesMenu( intf_thread_t *p_intf, QMenu * );
+    static QMenu *HelpMenu();
 
-    /* Popups */
+    /* Popups Menus */
     static void AudioPopupMenu( intf_thread_t * );
     static void VideoPopupMenu( intf_thread_t * );
     static void MiscPopupMenu( intf_thread_t * );
-    static void PopupMenu( intf_thread_t * );
+    static void PopupMenu( intf_thread_t *, bool );
 
+    /* Systray */
+    static void updateSystrayMenu( MainInterface *,intf_thread_t  *,
+                                   bool b_force_visible = false);
+
+    /* Actions */
     static void DoAction( intf_thread_t *, QObject * );
 private:
     /* Generic automenu methods */
@@ -88,11 +107,12 @@ private:
                                   int, int, vlc_value_t, int, bool c = false );
     static void CreateItem( QMenu *, const char *, vlc_object_t *, bool );
     static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
-
 };
 
 class MenuFunc : public QObject
 {
+Q_OBJECT
+
 public:
     MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; };
     void doFunc( intf_thread_t *p_intf)