[Pkg-mozext-commits] [firetray] 73/399: options' UI light rework

[David Prévot]

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

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 6607b641a66761a85b7d3c6d2835955ad7163240
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Oct 29 23:35:35 2011 +0200

    options' UI light rework
---
 src/chrome/content/options.xul      |   52 +++++++++++++++++++----------------
 src/chrome/locale/en-US/options.dtd |   13 +++++++--
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 132489d..cc94dab 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -20,55 +20,61 @@
 
     <tabbox>
       <tabs>
-        <tab label="&general_options;"/>
+        <!-- <tab label="&general_options;"/> -->
         <!-- <tab label="&input_options;"/> -->
         <tab label="&mail_options;" id="mail_tab" />
       </tabs>
       <tabpanels>
 
-        <tabpanel id="general_tabpanel">          
+        <!-- <tabpanel id="general_tabpanel">           -->
 
-          <groupbox>
-            <checkbox id="ui_close_hides" preference="pref_bool_close_hides"
-                      label="&bool_close_hides.label;"
-                      accesskey="&bool_close_hides.accesskey;"/>
-          </groupbox>
+        <!--   <groupbox> -->
+        <!--     <checkbox id="ui_close_hides" preference="pref_bool_close_hides" -->
+        <!--               label="&bool_close_hides.label;" -->
+        <!--               accesskey="&bool_close_hides.accesskey;"/> -->
+        <!--   </groupbox> -->
 
-        </tabpanel>
+        <!-- </tabpanel> -->
 
         <!-- <tabpanel id="input_tabpanel"> -->
         <!-- </tabpanel> -->
 
         <tabpanel id="mail_tabpanel">
 
-          <vbox>
+          <groupbox>
+            <caption label="&unread_count_account_exceptions;" />
 
-            <!-- <label value="To edit a item doubleclick on it" /> -->
-            <tree id="ui_tree_server_types" height="200" width="500" flex="1"
+            <label value="&mail_account_types_exclude;" />
+            <tree id="ui_tree_server_types" flex="1" rows="6"
                   seltype="single" editable="true"
                   preference-editable="true"
                   preference="pref_string_server_types"
                   onsynctopreference="return firetray.UIOptions.saveTreeServerTypes();">
               <treecols>
                 <treecol id="server_type_excluded" type="checkbox" editable="true"
-                         label="Excluded" primary="true" width="40" flex="1" />
-                <treecol id="server_type_name" label="Type" editable="false" flex="1"
-                         primary="true" tooltiptext="FIXME"/>
-                <treecol id="server_type_order" label="Order" editable="true"
-                         flex="1" hidden= "true" />
+                         label="&server_type_excluded;" primary="true" flex="1" persist="width"
+                         tooltiptext="&server_type_excluded_tooltip;"/>
+                <splitter class="tree-splitter" resizeafter="grow"/>
+                <treecol id="server_type_name" editable="false" flex="1"
+                         persist="width" primary="true" label="&server_type_name;"
+                         tooltiptext="&server_type_name_tooltip;"/>
+                <splitter class="tree-splitter" resizeafter="grow"/>
+                <treecol id="server_type_order" editable="true"
+                         persist="width"
+                         flex="1" hidden= "true" label="&server_type_order;"
+                         tooltiptext="&server_type_name_tooltip;"/>
               </treecols>
-              <treechildren id="ui_server_types" />
+              <treechildren id="ui_server_types" flex="1" />
             </tree>
 
             <separator class="thin" />
 
-            <groupbox id="ui_accounts_box"> <!-- firetray.UIOptions.accountBoxId -->
-              <caption label="&mail_accounts_exclude;"/>
-              <!-- accounts are dynamically added here with insert_accounts_name()
-                   functions, called at the bottom of this file -->
-            </groupbox>
+            <label value="&mail_accounts_exclude;"/>
+            <vbox id="ui_accounts_box" />  <!-- firetray.UIOptions.accountBoxId -->
+            <!-- accounts are dynamically added here with insert_accounts_name()
+                 functions, called at the bottom of this file -->
 
-          </vbox>
+          </groupbox>
           
         </tabpanel>
         
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index b734b97..e0c2de1 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -8,5 +8,14 @@
 <!ENTITY bool_close_hides.label "Closing windows hides to tray">
 <!ENTITY bool_close_hides.accesskey "C">
 
-<!ENTITY mail_account_types_exclude "Account types to exclude">
-<!ENTITY mail_accounts_exclude "Mail accounts to exclude">
+<!ENTITY unread_count_account_exceptions "Exclude accounts from unread count">
+
+<!ENTITY mail_account_types_exclude "Account types to exclude:">
+<!ENTITY server_type_excluded "Excluded">
+<!ENTITY server_type_excluded_tooltip "FIXME">
+<!ENTITY server_type_name "Type">
+<!ENTITY server_type_name_tooltip "FIXME">
+<!ENTITY server_type_order "Order">
+<!ENTITY server_type_order_tooltip "FIXME">
+
+<!ENTITY mail_accounts_exclude "Mail accounts to exclude:">

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