Qt4 - SysTrayIcon: change the previous commit after some remarks on IRC and fix the...

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 5252d9b41d497d2ee08a36704c5319ffd640e5ee..d1a7f2ceec27b4218f63103477cb05cdc29326fa 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -22,13 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QMenu>
-#include <QMenuBar>
-#include <QAction>
-#include <QActionGroup>
-#include <QSignalMapper>
-#include <QSystemTrayIcon>
-
 #ifndef WIN32
 #   include <signal.h>
 #endif
@@ -40,6 +33,13 @@
 #include "dialogs_provider.hpp"
 #include "input_manager.hpp"
 
+#include <QMenu>
+#include <QMenuBar>
+#include <QAction>
+#include <QActionGroup>
+#include <QSignalMapper>
+#include <QSystemTrayIcon>
+
 enum
 {
     ITEM_NORMAL,
@@ -597,24 +597,20 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf,
     POPUP_BOILERPLATE;
     QMenu *sysMenu = mi->getSysTrayMenu();
     sysMenu->clear();
-    DP_SADD( sysMenu, qtr("&About VLC media player" ), "", "",
-            aboutDialog(), "" );
-    sysMenu->addSeparator();
-    POPUP_PLAY_ENTRIES( sysMenu );
-    sysMenu->addSeparator();
-    DP_SADD( sysMenu, qtr("&Open" ), "", "", openFileDialog(), "" );
-    sysMenu->addSeparator();
-
-    if( !mi->isVisible() || b_force_visible )
+    if( mi->isVisible() || b_force_visible )
     {
-        sysMenu->addAction( qtr("Hide Interface"), mi,
+        sysMenu->addAction( qtr("Hide VLC media player"), mi,
                 SLOT( toggleUpdateSystrayMenu() ) );
     }
     else
     {
-        sysMenu->addAction( qtr("Show Interface"), mi,
+        sysMenu->addAction( qtr("Show VLC media player"), mi,
                 SLOT( toggleUpdateSystrayMenu() ) );
     }
+    sysMenu->addSeparator();
+    POPUP_PLAY_ENTRIES( sysMenu );
+    sysMenu->addSeparator();
+    DP_SADD( sysMenu, qtr("&Open Media" ), "", "", openFileDialog(), "" );
     DP_SADD( sysMenu, qtr("&Quit") , "", "", quit(), "" );
 
     mi->getSysTray()->setContextMenu( sysMenu );

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 666028b2bac0f17dcfd105464292ca910396154a..015c26d62482c77a7079d06407efbdb0f3eb47bc 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -26,12 +26,12 @@
 #include "qt4.hpp"
 #include <QObject>
 #include <vector>
-#include <QSystemTrayIcon>
 
 using namespace std;
 
 class QMenu;
 class QMenuBar;
+class QSystemTrayIcon;
 
 class MenuItemData : public QObject
 {