QT4: fix warning on already assigned hotkey

[vlc] / modules / gui / qt4 / qt4.cpp

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 0a1d32513d6bd8dc4a40744f33cb8f72a412aff3..5048f7483513857411c6660a87a03475d19b80c1 100644 (file)
--- 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" \
@@ -83,7 +83,7 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define OPACITY_TEXT N_("Windows opacity between 0.1 and 1.")
 #define OPACITY_LONGTEXT N_("Sets the windows opacity between 0.1 and 1 " \
                             "for main interface, playlist and extended panel." \
-                            "This options does only work with Windows and " \
+                            "This options only works with Windows and " \
                             "X11 with composite extensions.")
 
 #define SHOWFLAGS_TEXT N_("Define what columns to show in playlist window")
@@ -209,17 +209,16 @@ static void Init( intf_thread_t *p_intf )
     int argc = 1;
 
     Q_INIT_RESOURCE( vlc );
+#ifndef WIN32
+    /* KLUDGE:
+     * disables icon theme use because that makes cleanlook style bug
+     * see commits 21610 21622 21654 for reference */
+    QApplication::setDesktopSettingsAware(false);
+#endif
     QApplication *app = new QApplication( argc, argv , true );
     app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
     p_intf->p_sys->p_app = app;
 
-#ifndef WIN32
-    /* kludge:
-     * forces plastique style as cleanlooks bugs on gnome */
-    QPlastiqueStyle *plastique = new QPlastiqueStyle;
-    app->setStyle( plastique );
-#endif
-
     // Initialize timers
     DialogsProvider::getInstance( p_intf );