[Pkg-mozext-commits] [firetray] 29/84: add icon tooltip

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit 17889beac6ff1f2f6b83ca4ef47fc26ac0ff2908
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Feb 17 22:54:41 2014 +0100

    add icon tooltip
---
 src/modules/winnt/FiretrayStatusIcon.jsm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index 6138e19..0b4e284 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -249,9 +249,12 @@ firetray.StatusIcon = {
     this.destroyProxyWindow();
   },
 
-  setImageFromIcon: function(hicon) {
+  setIcon: function(iconinfo) {
     let nid = firetray.StatusIcon.notifyIconData;
-    nid.hIcon = hicon;
+    if (iconinfo.hicon)
+      nid.hIcon = iconinfo.hicon;
+    if (iconinfo.tip)
+      nid.szTip = iconinfo.tip;
     rv = shell32.Shell_NotifyIconW(shell32.NIM_MODIFY, nid.address());
     log.debug("Shell_NotifyIcon MODIFY="+rv+" winLastError="+ctypes.winLastError);
   },
@@ -342,20 +345,24 @@ firetray.StatusIcon = {
 
 firetray.Handler.setIconImageDefault = function() {
   log.debug("setIconImageDefault");
-  firetray.StatusIcon.setImageFromIcon(firetray.StatusIcon.icons.get('app'));
+  firetray.StatusIcon.setIcon({hicon:firetray.StatusIcon.icons.get('app')});
 };
 
 firetray.Handler.setIconImageNewMail = function() {
   log.debug("setIconImageDefault");
-  firetray.StatusIcon.setImageFromIcon(firetray.StatusIcon.icons.get('mail-unread'));
+  firetray.StatusIcon.setIcon({hicon:firetray.StatusIcon.icons.get('mail-unread')});
 };
 
 // firetray.Handler.setIconImageFromFile = firetray.StatusIcon.setIconImageFromFile;
 
 firetray.Handler.setIconTooltip = function(toolTipStr) {
+  log.debug("setIconTooltip");
+  firetray.StatusIcon.setIcon({tip:toolTipStr});
 };
 
 firetray.Handler.setIconTooltipDefault = function() {
+  log.debug("setIconTooltipDefault");
+  firetray.StatusIcon.setIcon({tip:this.appName});
 };
 
 firetray.Handler.setIconText = function(text, color) {
@@ -364,7 +371,7 @@ firetray.Handler.setIconText = function(text, color) {
   log.debug("setIconText icon="+hicon);
   if (hicon.isNull())
     log.error("Could not create hicon");
-  firetray.StatusIcon.setImageFromIcon(hicon);
+  firetray.StatusIcon.setIcon({hicon:hicon});
 };
 
 firetray.Handler.setIconVisibility = function(visible) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git