[Pkg-mozext-commits] [firetray] 72/399: options: remove static tree for mail_account_types_exclude

[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 d8ef0882cc43fa2a5214480a31221157eab4d7c8
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Oct 29 22:42:21 2011 +0200

    options: remove static tree for mail_account_types_exclude
---
 src/chrome/content/options.js  |   32 +-----------------------------
 src/chrome/content/options.xul |   42 +++++++++++++---------------------------
 2 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 7ab6d70..5b24432 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -20,11 +20,8 @@ firetray.UIOptions = {
   onLoad: function() {
     if(firetray.Handler.inMailApp) {
       Cu.import("resource://firetray/FiretrayMessaging.jsm");
-      this.insertMailAccountsExcluded(this.accountBoxId);
-      this.populateMailAccountTypes();
-
       this.populateTreeServerTypes();
-
+      this.insertMailAccountsExcluded(this.accountBoxId);
     } else {
       this.hideElement("mail_tab");
     }
@@ -54,33 +51,6 @@ firetray.UIOptions = {
     targetNode.hidden = true;
   },
 
-  populateMailAccountTypes: function() {
-    let targetTree = document.getElementById("ui_mail_account_types");
-    let serverTypes = firetray.Utils.getObjPref('server_types');
-
-    for (t in serverTypes) {
-      let accType = serverTypes[t];
-
-      let item = document.createElement('treeitem');
-      let row = document.createElement('treerow');
-      item.appendChild(row);
-
-      let cell = document.createElement('treecell');
-      cell.setAttribute('label',t);
-      row.appendChild(cell);
-
-      cell = document.createElement('treecell');
-      cell.setAttribute('value',accType.excluded);
-      row.appendChild(cell);
-
-      cell = document.createElement('treecell');
-      cell.setAttribute('label',accType.order);
-      row.appendChild(cell);
-
-      targetTree.appendChild(item);
-    }
-  },
-
   insertMailAccountsExcluded: function(parentId) {
     // the DOM parent where we do appendChild
     let targetNode = document.getElementById(parentId);
diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 63d7ac4..132489d 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -21,7 +21,7 @@
     <tabbox>
       <tabs>
         <tab label="&general_options;"/>
-        <tab label="&input_options;"/>
+        <!-- <tab label="&input_options;"/> -->
         <tab label="&mail_options;" id="mail_tab" />
       </tabs>
       <tabpanels>
@@ -36,12 +36,14 @@
 
         </tabpanel>
 
-        <tabpanel id="input_tabpanel">
-        </tabpanel>
+        <!-- <tabpanel id="input_tabpanel"> -->
+        <!-- </tabpanel> -->
 
         <tabpanel id="mail_tabpanel">
 
-          <vbox align="center" >
+          <vbox>
+
+            <!-- <label value="To edit a item doubleclick on it" /> -->
             <tree id="ui_tree_server_types" height="200" width="500" flex="1"
                   seltype="single" editable="true"
                   preference-editable="true"
@@ -57,37 +59,19 @@
               </treecols>
               <treechildren id="ui_server_types" />
             </tree>
-            <separator class="thin" />
-            <label value="To edit a item doubleclick on it" />
-          </vbox>
 
-          <separator class="thin" />
-
-          <groupbox id="ui_mail_account_types_exclude">
-            <caption label="&mail_account_types_exclude;" tooltiptext="HI" />
-
-            <tree rows="6" flex="1" editable="true" hidecolumnpicker="false">
-              <treecols>
-                <treecol id="col_active" label="Account" flex="1" tooltiptext="HI"/>
-                <treecol id="col_active" label="Excluded" type="checkbox" flex="1"
-                         editable="true" />
-                <treecol id="col_name" label="Order" editable="true" flex="1"
-                         hidden= "true" />
-              </treecols>
+            <separator class="thin" />
 
-              <treechildren id="ui_mail_account_types" />
-            </tree>
-          </groupbox>
+            <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>
 
-          <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>
+          </vbox>
           
         </tabpanel>
         
-        
       </tabpanels>
     </tabbox>
 

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