From: Rafaël Carré <funman@videolan.org>
Date: Sat, 8 Sep 2007 01:32:33 +0000 (+0000)
Subject: Shows qt4 notification only if the player isn't visible
X-Git-Tag: 0.9.0-test0~5793
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a0659acba4853bf19af81476e0de984d3896bb6b;p=vlc

Shows qt4 notification only if the player isn't visible
---

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 0dd678cb5a..6c5a0be020 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -792,7 +792,7 @@ void MainInterface::updateSystrayTooltipName( QString name )
     else
     {
         sysTray->setToolTip( name );
-        if( notificationEnabled )
+        if( notificationEnabled && ( isHidden() || isMinimized() ) )
         {
             sysTray->showMessage( qtr( "VLC media player" ), name,
                     QSystemTrayIcon::NoIcon, 4000 );
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index a1c8591970..5048f74835 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -71,10 +71,10 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define FILEDIALOG_PATH_TEXT N_("Path to use in file dialog")
 #define FILEDIALOG_PATH_LONGTEXT N_("Path to use in file dialog")
 
-#define NOTIFICATION_TEXT N_("Show notification popup on track change")
+#define NOTIFICATION_TEXT N_("Show notification popup on track change if VLC is not visible")
 #define NOTIFICATION_LONGTEXT N_( \
     "Show a notification popup with the artist and track name when " \
-    "the current playlist item changes." )
+    "the current playlist item changes, when VLC is minimized or hidden." )
 
 #define ADVANCED_OPTIONS_TEXT N_("Advanced options")
 #define ADVANCED_OPTIONS_LONGTEXT N_("Activate by default all the" \