[pkg-wpa-devel] r1258 - in /wpasupplicant/trunk/debian: changelog patches/18_improve_first_tray_message.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Thu Sep 25 19:23:39 2008
New Revision: 1258

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1258
Log:
Add 18_improve_first_tray_message.patch to make less noise when
sending the application to the system tray.

Added:
    wpasupplicant/trunk/debian/patches/18_improve_first_tray_message.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1258&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Sep 25 19:23:39 2008
@@ -4,8 +4,10 @@
     handling of wpa_gui-qt4, so that event history and scan results windows
     may be launched independently from the main status window via the system
     tray icon.
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 26 Sep 2008 03:16:28 +1000
+  * Add 18_improve_first_tray_message.patch to make less noise when
+    sending the application to the system tray.
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 26 Sep 2008 05:05:32 +1000
 
 wpasupplicant (0.6.4-3) experimental; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/18_improve_first_tray_message.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/18_improve_first_tray_message.patch?rev=1258&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/18_improve_first_tray_message.patch (added)
+++ wpasupplicant/trunk/debian/patches/18_improve_first_tray_message.patch Thu Sep 25 19:23:39 2008
@@ -1,0 +1,51 @@
+Don't bother showing a status message when returning to the system tray,
+but still show a one time tray message to indicate to the user that the
+program is still running in the tray if they triggered the window manager
+close button.
+
+Signed-off-by: Kel Modderman <kel at otaku42.de>
+---
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -1156,6 +1156,7 @@
+ 	/* use close() here instead of hide() and allow the
+ 	 * custom closeEvent handler take care of children */
+ 	case QSystemTrayIcon::Trigger:
++		ackTrayIcon = true;
+ 		if (isVisible())
+ 			close();
+ 		else
+@@ -1241,21 +1242,24 @@
+ 
+ 	if (tray_icon && tray_icon->isVisible()) {
+ 		/* give user a visual hint that the tray icon exists */
+-		if (QSystemTrayIcon::supportsMessages()) {
++		if (!ackTrayIcon && QSystemTrayIcon::supportsMessages()) {
+ 			hide();
+-			QTimer::singleShot(1 * 1000, this,
+-					   SLOT(showTrayStatus()));
++			showTrayMessage(QSystemTrayIcon::Information, 3,
++					qAppName() + " will keep running in "
++					"the system tray.");
+ 		} else if (!ackTrayIcon) {
+ 			QMessageBox::information(this, qAppName() + " systray",
+ 						 "The program will keep "
+-						 "running in the system tray."
+-						 " To terminate the program, "
+-						 "choose <b>Quit</b> in the "
+-						 "context menu of the system "
+-						 "tray icon.");
+-			ackTrayIcon = true;
++						 "running in the system "
++						 "tray.");
+ 			hide();
+ 		}
++
++		if (ackTrayIcon)
++			hide();
++		else
++			ackTrayIcon = true;
++
+ 		event->ignore();
+ 		return;
+ 	}

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1258&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Sep 25 19:23:39 2008
@@ -14,4 +14,5 @@
 15_tray_status_state.patch
 16_wpa_gui_icon_touchup.patch
 17_handle_last_window_closed.patch
+18_improve_first_tray_message.patch
 20_wpa_gui_menu_exec_path.patch