From 9242e072066561537b3bd38b8c9de2ce22c2a3f6 Mon Sep 17 00:00:00 2001
From: foudfou <foudil.newbie+git@gmail.com>
Date: Sun, 6 Nov 2011 23:53:04 +0100
Subject: [PATCH] * options: ability to choose fixed 'newmail' icon * fix
 actual color update after icon text color pick

---
 src/chrome/content/options.js       |  1 +
 src/chrome/content/options.xul      | 63 +++++++++++++++--------------
 src/chrome/locale/en-US/options.dtd |  2 +-
 src/modules/FiretrayMessaging.jsm   | 10 +++--
 4 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 7707b99..6055baa 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -106,6 +106,7 @@ firetray.UIOptions = {
   chooseMailIconFile: function() {
     var filepath = document.getElementById("custom_mail_icon_filename");
     this._chooseIconFile(filepath);
+    firetray.Messaging.updateUnreadMsgCount();
   },
 
   _chooseIconFile: function(iconFilename) {
diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 71c42ec..d020a0a 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -25,9 +25,9 @@
         <tab label="&input_options;" disabled="true" tooltiptext="&NOT_IMPLEMENTED_YET;"/>
         <tab label="&mail_options;" id="mail_tab" />
       </tabs>
-      <tabpanels>
+      <tabpanels flex="1">
 
-        <tabpanel id="general_tabpanel">
+        <tabpanel id="general_tabpanel" flex="1">
 
           <groupbox flex="1">
             <caption label="&windows_behaviour;" tooltiptext="&windows_behaviour.tooltip;" />
@@ -43,10 +43,10 @@
 
         </tabpanel>
 
-        <tabpanel id="input_tabpanel" />
+        <tabpanel id="input_tabpanel" flex="1" />
 
-        <tabpanel id="mail_tabpanel">
-          <vbox align="left" flex="1" >
+        <tabpanel id="mail_tabpanel" flex="1">
+          <vbox align="left" flex="1">
 
           <!-- <label value="&mail_notification;" class="header" /> -->
           <groupbox flex="1">
@@ -55,38 +55,41 @@
               <radio id="radio_mail_icon1" label="&mail_notification_disabled;"
                      accesskey="&mail_notification_disabled.accesskey;"
                      oncommand="firetray.UIOptions.updateNotificationSettings()" />
-              <radio id="radio_mail_icon2" label="&mail_notification_unread_count;"
-                     accesskey="&mail_notification_unread_count.accesskey;"
-                     oncommand="firetray.UIOptions.updateNotificationSettings()" />
+              <hbox>
+                <radio id="radio_mail_icon2" label="&mail_notification_unread_count;"
+                       accesskey="&mail_notification_unread_count.accesskey;"
+                       oncommand="firetray.UIOptions.updateNotificationSettings()" />
+                <hbox id="icon_text_color" align="center">
+                  <label value="&icon_text_color;" accesskey="&icon_text_color.accesskey;"/>
+                  <colorpicker id="btn_icon_text_color" type="button"
+                               preference="pref_string_icon_text_color"
+                               onchange="firetray.Messaging.updateUnreadMsgCount();"/>
+                </hbox>
+              </hbox>
               <radio id="radio_mail_icon3" label="&mail_notification_newmail_icon;"
                      accesskey="&mail_notification_newmail_icon.accesskey;"
                      oncommand="firetray.UIOptions.updateNotificationSettings()" />
-              <radio id="radio_mail_icon4" label="&mail_notification_custom_mail_icon;"
-                     accesskey="&mail_notification_custom_mail_icon.accesskey;"
-                     oncommand="firetray.UIOptions.updateNotificationSettings()" />
+              <hbox>
+                <radio id="radio_mail_icon4" label="&mail_notification_custom_mail_icon;"
+                       accesskey="&mail_notification_custom_mail_icon.accesskey;"
+                       oncommand="firetray.UIOptions.updateNotificationSettings()" />
+                <hbox id="custom_mail_icon" align="center" flex="1" >
+                  <textbox id="custom_mail_icon_filename" preference="pref_string_custom_mail_icon"
+                           onblur="firetray.Messaging.updateUnreadMsgCount();" flex="1" />
+                  <button id="custom_mail_icon_select" label="&choose;"
+                          accesskey="&choose.accesskey;"
+                          oncommand="firetray.UIOptions.chooseMailIconFile()" />
+                </hbox>
+              </hbox>
             </radiogroup>
           </groupbox>
 
-          <hbox id="icon_text_color" align="center">
-            <label value="&icon_text_color;" accesskey="&icon_text_color.accesskey;"/>
-            <colorpicker id="btn_icon_text_color" type="button"
-                         preference="pref_string_icon_text_color" />
-          </hbox>
-
-          <hbox id="custom_mail_icon" align="center" flex="1" >
-            <textbox id="custom_mail_icon_filename" preference="pref_string_custom_mail_icon"
-                     hidden="FALSE" flex="1" />
-            <button id="custom_mail_icon_select" label="&choose;"
-                    accesskey="&choose.accesskey;"
-                    oncommand="firetray.UIOptions.chooseMailIconFile()" />
-          </hbox>
-
           <groupbox flex="1">
             <caption label="&unread_count_account_exceptions;"
                      tooltiptext="&unread_count_account_exceptions.tooltip;" />
 
-            <tree id="ui_tree_mail_accounts" flex="1" rows="10" minwidth="300"
-                  seltype="single" editable="true"
+            <tree id="ui_tree_mail_accounts" flex="1" rows="10" minwidth="400"
+                  seltype="single" editable="true" hidecolumnpicker="false"
                   preference-editable="true"
                   preference="pref_string_mail_accounts"
                   onsynctopreference="return firetray.UIOptions.saveTreeAccountsOrServerTypes();">
@@ -94,17 +97,17 @@
                 <treecol id="account_or_server_type_name" editable="false" flex="2"
                          persist="width" primary="true" label="&account_or_server_type_name;"
                          tooltiptext="&account_or_server_type_name.tooltip;"/>
-                <splitter class="tree-splitter" resizeafter="grow"/>
+                <splitter class="tree-splitter" resizeafter="grow" />
                 <treecol id="account_or_server_type_excluded" type="checkbox" editable="true"
                          label="&account_or_server_type_excluded;" flex="1" persist="width"
                          tooltiptext="&account_or_server_type_excluded.tooltip;"/>
-                <splitter class="tree-splitter" resizeafter="grow"/>
+                <splitter class="tree-splitter" resizeafter="grow" />
                 <treecol id="account_or_server_type_order" editable="true"
                          persist="width" flex="1" hidden= "true"
                          label="&account_or_server_type_order;"
                          tooltiptext="&account_or_server_type_order.tooltip;"/>
               </treecols>
-              <treechildren id="ui_mail_accounts" flex="1" />
+              <treechildren id="ui_mail_accounts" flex="1"/>
             </tree>
 
           </groupbox>
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index c4d3941..a1c6b7f 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -24,7 +24,7 @@
 <!ENTITY mail_notification_newmail_icon.accesskey "N">
 <!ENTITY mail_notification_custom_mail_icon "display custom icon">
 <!ENTITY mail_notification_custom_mail_icon.accesskey "I">
-<!ENTITY icon_text_color "Icon text color">
+<!ENTITY icon_text_color "Text color">
 <!ENTITY icon_text_color.accesskey "T">
 <!ENTITY choose "Choose">
 <!ENTITY choose.accesskey "O">
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index a7e19e6..70c4ef3 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -116,13 +116,17 @@ firetray.Messaging = {
       let prefMailNotification = firetray.Utils.prefService.getIntPref("mail_notification");
       switch (prefMailNotification) {
 
-      case NOTIFICATION_NEWMAIL_ICON:
-        firetray.Handler.setImage(firetray.Handler.FILENAME_NEWMAIL);
-        break;
       case NOTIFICATION_UNREAD_MESSAGE_COUNT:
         let prefIconTextColor = firetray.Utils.prefService.getCharPref("icon_text_color");
         firetray.Handler.setText(this._unreadMsgCount.toString(), prefIconTextColor);
         break;
+      case NOTIFICATION_NEWMAIL_ICON:
+        firetray.Handler.setImage(firetray.Handler.FILENAME_NEWMAIL);
+        break;
+      case NOTIFICATION_CUSTOM_ICON:
+        let prefCustomIconPath = firetray.Utils.prefService.getCharPref("custom_mail_icon");
+        firetray.Handler.setImage(prefCustomIconPath);
+        break;
       default:
         ERROR("Unknown notification mode");
       }