From 2e65e07029fcc69ba9772f1ea1ad33b65692698e Mon Sep 17 00:00:00 2001
From: foudfou <foudil.newbie+git@gmail.com>
Date: Tue, 13 Mar 2012 16:10:23 +0100
Subject: [PATCH] add ui preference functionality for new-mail themed icon

NOTES:
* we need to find out why for ex. ["glade", "mail-message-new"] gives
  "mail-message-new" where "glade" is expected (first in the list).
* we need to handle defaults better (avoid things like
  newMailIconNames.push("mail-unread")).
* be consistent in preference UI when disabling (or not) the filename inputs
  along with their related radio button.
---
 src/chrome/content/options.js                 |  50 ++++++++++++------
 src/chrome/content/options.xul                |  22 ++++----
 src/chrome/locale/en-US/options.dtd           |   2 +-
 .../gnome/22x22/actions/mail-message-new.png  |   1 -
 .../icons/gnome/22x22/status/mail-unread.png  |   1 +
 src/chrome/skin/mail-message-new.png          | Bin 1146 -> 0 bytes
 src/chrome/skin/mail-unread.png               | Bin 0 -> 1100 bytes
 src/defaults/preferences/prefs.js             |   3 +-
 src/modules/FiretrayHandler.jsm               |   2 +
 src/modules/linux/FiretrayStatusIcon.jsm      |   6 ++-
 10 files changed, 57 insertions(+), 30 deletions(-)
 delete mode 120000 src/chrome/skin/linux/icons/gnome/22x22/actions/mail-message-new.png
 create mode 120000 src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png
 delete mode 100644 src/chrome/skin/mail-message-new.png
 create mode 100644 src/chrome/skin/mail-unread.png

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 06c2511..8ba26a2 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -30,7 +30,8 @@ var firetrayUIOptions = {
     this.updateWindowAndIconOptions();
     this.updateScrollOptions();
     this.initAppIconType();
-    this.initIconNames();
+    this.initAppIconNames();
+    this.initNewMailIconNames();
   },
 
   onQuit: function(e) {
@@ -60,8 +61,9 @@ var firetrayUIOptions = {
 
   disableGroup: function(group, disableval) {
     try {
-      for (let i=0, len=group.childNodes.length; i<len ; ++i)
-        group.childNodes[i].disabled = disableval;
+      let children = group.childNodes;
+      for (let i=0, len=children.length; i<len ; ++i)
+        children[i].disabled = disableval;
     } catch(e) {}
   },
 
@@ -85,33 +87,49 @@ var firetrayUIOptions = {
       FIRETRAY_APPLICATION_ICON_TYPE_CUSTOM;
     document.getElementById("ui_app_icon_type").selectedIndex =
       firetray.Utils.prefService.getIntPref("app_icon_type");
-   },
+  },
 
-  initIconNames: function() {
-    let appIconNames = firetray.Utils.getArrayPref(firetray.StatusIcon.prefAppIconNames);
+  initAppIconNames: function() {
+    this.initIconNames(firetray.StatusIcon.prefAppIconNames,
+      "app_icon_type_themed_name", firetray.Handler.appNameOriginal.toLowerCase());
+  },
+  initNewMailIconNames: function() {
+    this.initIconNames("new_mail_icon_names",
+      "radio_mail_notification_newmail_icon_name", "mail-unread");
+  },
+
+  initIconNames: function(prefIconNames, uiIconNameId, defaultIconName) {
+    let appIconNames = firetray.Utils.getArrayPref(prefIconNames);
     LOG("appIconNames="+appIconNames);
     let len = appIconNames.length;
     if (len>2)
       throw new RangeError("Too many icon names");
     for (let i=0; i<len; ++i) {
-      let textbox = document.getElementById("app_icon_type_themed_name"+(i+1));
+      let textbox = document.getElementById(uiIconNameId+(i+1));
       textbox.value = appIconNames[i];
     }
-    let textbox = document.getElementById("app_icon_type_themed_name3");
-    textbox.value = firetray.Handler.appNameOriginal.toLowerCase();
+    let textbox = document.getElementById(uiIconNameId+3);
+    textbox.value = defaultIconName;
   },
 
-  updateIconNames: function(textbox) {
-    let appIconNames = [];
+  updateAppIconNames: function(textbox) {
+    this.updateIconNames(firetray.StatusIcon.prefAppIconNames, "app_icon_type_themed_name");
+  },
+  updateNewMailIconNames: function(textbox) {
+    this.updateIconNames("new_mail_icon_names", "radio_mail_notification_newmail_icon_name");
+  },
+
+  updateIconNames: function(prefIconNames, uiIconNameId) {
+    let iconNames = [];
     for (let i=1; i<3; ++i) {
-      let tb = document.getElementById("app_icon_type_themed_name"+i);
-      let val = tb.value.trim();
+      let textbox = document.getElementById(uiIconNameId+i);
+      let val = textbox.value.trim();
       LOG("val="+val);
       if (val)
-        appIconNames.push(val);
+        iconNames.push(val);
     }
-    LOG("appIconNames="+appIconNames);
-    firetray.Utils.setArrayPref(firetray.StatusIcon.prefAppIconNames, appIconNames);
+    LOG("iconNames="+iconNames);
+    firetray.Utils.setArrayPref(prefIconNames, iconNames);
   },
 
   initMailControls: function() {
diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 60f4272..da14b1c 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -82,11 +82,11 @@
                   <radio id="ui_app_icon_type_themed" label="&app_icon_themed.label;"
                          accesskey="&app_icon_themed.accesskey;" tooltiptext="&app_icon_themed.tooltip;" />
                   <textbox id="app_icon_type_themed_name1" size="12" placeholder="&app_icon_themed_name;"
-                           onchange="firetrayUIOptions.updateIconNames(this);" flex="1" />
+                           onchange="firetrayUIOptions.updateAppIconNames(this);" flex="1" />
                   <textbox id="app_icon_type_themed_name2" size="12" placeholder="&app_icon_themed_name;"
-                           onchange="firetrayUIOptions.updateIconNames(this);" flex="1" />
+                           onchange="firetrayUIOptions.updateAppIconNames(this);" flex="1" />
                   <textbox id="app_icon_type_themed_name3" size="12" placeholder="&app_icon_themed_name;"
-                           onchange="firetrayUIOptions.updateIconNames(this);" flex="1"
+                           onchange="firetrayUIOptions.updateAppIconNames(this);" flex="1"
                            disabled="true"/>
                 </hbox>
                 <hbox>
@@ -167,16 +167,18 @@
                        accesskey="&mail_notification_newmail_icon.accesskey;"
                        oncommand="firetrayUIOptions.updateNotificationSettings()"
                        observes="broadcaster-notification-disabled" />
-                <!-- TODO -->
                 <textbox id="radio_mail_notification_newmail_icon_name1" size="12"
-                         placeholder="&app_icon_themed_name;" onchange="" flex="1"
-                         observes="broadcaster-notification-disabled" />
+                         placeholder="&app_icon_themed_name;" flex="1"
+                         observes="broadcaster-notification-disabled"
+                         onchange="firetrayUIOptions.updateNewMailIconNames(this);" />
                 <textbox id="radio_mail_notification_newmail_icon_name2" size="12"
-                         placeholder="&app_icon_themed_name;" onchange="" flex="1"
-                         observes="broadcaster-notification-disabled" />
+                         placeholder="&app_icon_themed_name;" flex="1"
+                         observes="broadcaster-notification-disabled"
+                         onchange="firetrayUIOptions.updateNewMailIconNames(this);" />
                 <textbox id="radio_mail_notification_newmail_icon_name3" size="12"
-                         placeholder="&app_icon_themed_name;" onchange="" flex="1"
-                         observes="broadcaster-notification-disabled" />
+                         placeholder="&app_icon_themed_name;" flex="1"
+                         onchange="firetrayUIOptions.updateNewMailIconNames(this);"
+                         disabled="true"/>
               </hbox>
               <hbox>
                 <radio id="ui_radio_mail_notification_custom_mail_icon" label="&mail_notification_custom_mail_icon.label;"
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index 5e5d905..b66c15d 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -23,7 +23,7 @@
 
 <!ENTITY bool_show_icon_on_hide.label "Show tray icon only if a window is hidden">
 <!ENTITY bool_show_icon_on_hide.accesskey "w">
-<!ENTITY app_icon_type "Application icon">
+<!ENTITY app_icon_type "Application icon type">
 <!ENTITY app_icon_themed.label "Default themed">
 <!ENTITY app_icon_themed.accesskey "D">
 <!ENTITY app_icon_themed_name "icon-name">
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/actions/mail-message-new.png b/src/chrome/skin/linux/icons/gnome/22x22/actions/mail-message-new.png
deleted file mode 120000
index e40a113..0000000
--- a/src/chrome/skin/linux/icons/gnome/22x22/actions/mail-message-new.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mail-message-new.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png b/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png
new file mode 120000
index 0000000..0e4ffc3
--- /dev/null
+++ b/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png
@@ -0,0 +1 @@
+../../../../../mail-unread.png
\ No newline at end of file
diff --git a/src/chrome/skin/mail-message-new.png b/src/chrome/skin/mail-message-new.png
deleted file mode 100644
index 2d9caca8310c9a293058f3a7b6de9cc7bde87b3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1026dYSaeirbZlh+PjGZ;V_|F{L~?0%Wj<%R3;+NF*hxe|R5*>D
zmCJ8cRTPK6eO|q7X)jP7Ew5-ADo|Q0CA@>EiOSHqi9{SRG5iA>Mph96iD9DAn1DJl
zgn<uK)S!(>2qB6DF(#F0f!^ER=eg&(_i}LCa(i1J_)C5{gSFSUcGlWiM~MjkPe-i!
z_hqwCRQ((H=&_N*z^ld>7ocZZE!x^Ye!6$<ABpJdfP&E$Z}}-!oc-}XfsY?QvRG96
z2ZMtTKeli0<1MyrBhe@(yhu>KEUukbcE|H1h2zF`JI*S*<Fviv%ts4?KR^H3L8as<
zu%x-r(nWu=dg(QmcaDMB(Dn>=$FroB_eqK;iDmuOcCUEY=|1xf03tH$bLT&~og_&j
z%`%ZBg;yjR-!Jj_en}<{ikRATED-<qN2Pdkm6U$%naKa#x?M!>fk#G0vgf}1SQ}%c
zQYp`|U%n}|TYE$Ym*&;HSG*)q@jaQk-f>$*umDDmjSPFO&JD}5ETt5#>*BgDrBaE>
z$w~amI9OTI%7=hnU?LifPgFTWq8I-L)WNQ8ojZ8og>I!30FLA0I4<4YJ*-)?mab*1
z@!Ez+YZnM}FU@622zm<t_KOgW@x_$`n*bbuG)cQUJF@`9NsQ-u0OWEx(lo_FXt%Q1
zmVl{(&VvFZMI;3AK}xiA>>^iimdt`@^u)fW`2Ny&^luy_(~=>Z%}z(UP*Fc|<Y6ld
z(YHvdUlCV7#ar|=Zrc`=YQu;_6xWe+z{VJMZrj7?#S3g$zln0WLYk%k*lHD>?vvP4
zCkQ6r!tqw(dR;_QZ{knnQL3G6?+M`4d~lM+*tWy&9eWwQc!Ayr*W)_g%u7b`9B%sn
zHe>a^20lwx_7R)4l)^rgvu>6(2duRrO+&=>*u7&f-;REbHijgL8&0*+-r7g2<1;ig
zOf7Du=+~cYqncWw5i!)l8cDfCOD4l${}7o>rs0g>`&F+0a*exFi%3m^81v6yZ8Tzp
zAn>_6ahGkwJBj0nVzEFyubyn%4%@fx;_{Ur$S%&}y6!x%HRr}!6NCY!Qjwv-VZt!L
z_p8%M_Y$>EDHJBzx@9|I5D>=^+UUOrM{z_H1#Ea|Gqu1c2m?@cqydZwMhw~*w9(}9
z6Abh}g4WG*Xlg~OQyy5?OMWUx9EX_M1!ZP;iZP~PaTyAwJRAEq^V5y1bHPd}@AWrc
zyHh9@y4Up7pUbkP%eh|-Y#1V!pTM@AJ4z|f0Vr3hhu(Sj?UQMmbl*3zLALGODOSse
zV0zIjr7XY&>?T_cZj@=TZgL_bX2D;Rs;{{jplUGGXF22Pna+p&1xF!U+aYiWRR910
M07*qoM6N<$f)_*?N&o-=

diff --git a/src/chrome/skin/mail-unread.png b/src/chrome/skin/mail-unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..b877d3ac2f79889df215a2c5fd12f28caf3697e3
GIT binary patch
literal 1100
zcmV-S1he~zP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11IbB5K~y-6rIpK%6jc<)f9F<pS6BBikA4h~fu1LiahQw>7*<9Q
zLSUgW#>BYNHEuL<=fbT!7rN4ge}NJSVh|x=W7Lfaw2aPx5(Wi&rl#qc?yl*oy2r&l
z7zi*Czum3+?yv6s?m4$aRoO^Eu(LCp^}4N<UR5m^l^l=)A}iVuajIe1oX+Q`>Z@~P
zBk<zlL@(HaF*1lvc7T>dOs7gACpy<qwRMmx#<?k?mwo^8O#pYJm8R2~g0T##+HnyE
zK)1I3s=NZ=^^aZ>v<C8zCbmaJGWGi2MrY@h;0fUUsg>;ys<nxTtpgL`jmd*O&$JN9
z5LD#FO#hx+pf?5attyT~1NL7Kt-O)8h4x7mJuV{o`{2Z}rtMi1<`)0HR9=1BwfiR=
z_XPl~ou_v7{*-Lrff>R5Q3*eg<o2uYUA<8}dGY6wfkw+Zt0vzMDHZ2AHvTEP`D=Re
zCom@c*!@NANfxF?3A0Co(x&)JS4EFs{AIZR?RVaFI&vMX9;QuhW9?<EEz`L68d8X!
zbQ~;9jgl_E$y6okE_TizG9r?1G}Uz-mn)SkhzP2RRg1L|s>{Ik(uX{*f|BGn0E}3Y
z#2SH4v-;BWJW9nP=YKelF$Qo^6|6O6`ro2)?PJu=KN5UzatyCLj+iuwHGqlNz#>AS
zP-J*$h;L4x!gYPbWPvP7$Fj$4dVChr4QwKcQix4OYhYDHMA*D#3&X=ZIeq3FDYqA6
zil`P=KAu9gMNkofieQuKI`S4oN;Dc-3~uy59mh$8F^27ZeME7@neTq(#IfzD-Xpc+
zeS(Srkm(->B5ISp%Q5z!#HxoYeazg7fH}JcR#oCS2EcJ0^7(FNgA(6gxXzKoBe-q~
zZ}=lr?=n00C$6h_+xFr(-6Tl|R<|PF^VAn+fpsmdC~*>lLaWteetwQ4FCAs()(l^r
z`j%3$itjJtItk_SKDxVd+__uD&lEAvW@7s+IWrENdk~B&NgNZlm#E*XF)_Z6Fbv6M
zeU85TIuHXjgaDB_TCId_+m11Pt%~QDNx3;#SB~qVfN&`!3`6$p8l%~2(r$+!vf@ag
z6j3dLf&#U=vU}Ha{4sqMn=G-u${)%&VrXE5>g*lb(Gse<Y*s~AXo{{ZOi@+p3pI9)
zjPm<*<$(rrRW-<EiQ^=8%i9NuqBdP!J!{GHP_yYHMoaCG-6LZ(n+>u)v8o2HsGL1?
z;QG)PpMNsY4AtR($oC{Ud~o`PsGNPmwfWzrs)4ASHFN3DHvBa`t<1)jr_;Y=@YaB<
S!d>nF0000<MNUMnLSTX|u?Il_

literal 0
HcmV?d00001

diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index 67e6907..17e2bff 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -14,10 +14,11 @@ pref("extensions.firetray.start_hidden", false);
 pref("extensions.firetray.show_activates", false);
 
 pref("extensions.firetray.app_icon_type", 0);
-pref("extensions.firetray.app_browser_icon_names", '[]');
+pref("extensions.firetray.app_browser_icon_names", '["web-browser", "internet-web-browser"]');
 pref("extensions.firetray.app_mail_icon_names", '["indicator-messages", "applications-email-panel"]');
 pref("extensions.firetray.app_default_icon_names", '[]');
 pref("extensions.firetray.app_icon_filename", "");
+pref("extensions.firetray.new_mail_icon_names", '["indicator-messages-new", "mail-message-new"]');
 pref("extensions.firetray.show_icon_on_hide", false);
 pref("extensions.firetray.scroll_hides", true);
 pref("extensions.firetray.scroll_mode", "down_hides");
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 42b633f..7812ed0 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -367,6 +367,8 @@ firetray.PrefListener = new PrefListener(
     case 'show_icon_on_hide':
       firetray.Handler.showHideIcon();
       break;
+    case 'new_mail_icon_names':
+      firetray.StatusIcon.loadThemedIcons();
     case 'message_count_type':
       firetray.Messaging.updateMsgCount();
       break;
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index fd601a4..78e135e 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -70,8 +70,11 @@ firetray.StatusIcon = {
 
   loadThemedIcons: function() {
     if (firetray.Handler.inMailApp) {
+      let newMailIconNames = firetray.Utils.getArrayPref("new_mail_icon_names");
+      newMailIconNames.push("mail-unread"); // SMELL
+      this.themedIconNewMail = this.initThemedIcon(newMailIconNames);
+
       this.prefAppIconNames = "app_mail_icon_names";
-      this.themedIconNewMail = this.initThemedIcon(["indicator-messages-new", "mail-message-new"]); // TODO
     } else if (firetray.Handler.inBrowserApp) {
       this.prefAppIconNames = "app_browser_icon_names";
     } else {
@@ -84,6 +87,7 @@ firetray.StatusIcon = {
 
   initThemedIcon: function(names) {
     if (!isArray(names)) throw new TypeError();
+    LOG("themedIconNames="+names);
     let namesLen = names.length;
     LOG("themedIconNamesLen="+namesLen);
     let themedIconNames = ctypes.char.ptr.array(namesLen)();