add back folder pane columns for total msgs, unread msgs, and size, for TBird only, controlled by a pref, default to off, r/sr=mscott 221726

mail/app/profile/mailnews.js

@@ -352,7 +352,7 @@ pref("mail.server.default.delete_model", 1);
 pref("mail.server.default.fetch_by_chunks", true);
 pref("mail.server.default.mime_parts_on_demand", true);
 
-pref("mail.server.default.always_authenticate",false);
+pref("mail.server.default.always_authenticate",false);
 pref("mail.server.default.singleSignon", true);
 pref("mail.server.default.max_articles", 500);
 pref("mail.server.default.notify.on", true);
@@ -436,8 +436,8 @@ pref("mail.warn_on_send_accel_key", true);
 pref("mail.enable_autocomplete",true);
 pref("mailnews.html_domains","");
 pref("mailnews.plaintext_domains","");
-pref("mailnews.global_html_domains.version",1);
-
+pref("mailnews.global_html_domains.version",1);
+
 pref("mail.imap.use_status_for_biff", true);
 
 // Pref controlling the updates on the pre-configured accounts.
@@ -464,16 +464,18 @@ pref("mail.content_disposition_type", 0);
 
 pref("mailnews.show_send_progress", true); //Will show a progress dialog when saving or sending a message
 pref("mail.server.default.retainBy", 1);
-pref("mailnews.ui.junk.firstuse", true);
-
-// for manual upgrades of certain UI features.
-// 1 -> 2 is for the thread pane tree landing, to hide the
-// labels column, see msgMail3PaneWindow.js
-// 2 -> 3 is for the junk status column
-// 3 -> 4 is for the sender column
-// 4 -> 5 is for the attachment column
+pref("mailnews.ui.junk.firstuse", true);
+
+// for manual upgrades of certain UI features.
+// 1 -> 2 is for the thread pane tree landing, to hide the
+// labels column, see msgMail3PaneWindow.js
+// 2 -> 3 is for the junk status column
+// 3 -> 4 is for the sender column
+// 4 -> 5 is for the attachment column
 pref("mailnews.ui.threadpane.version", 1);
 
+pref("mail.showFolderPaneColumns", false); // setting to true will allow total/unread/size columns
+
 //If set to a number greater than 0, msg compose windows will be recycled in order to open them quickly
 pref("mail.compose.max_recycled_windows", 1); 
 

mail/base/content/messenger.xul

@@ -148,6 +148,8 @@
     
     <vbox id="folderPaneBox" minwidth="100" width="200" persist="collapsed width">
     
+      <label id="folderColumnLabel" hidden="true" value="&folderColumn.label;"/>
+
 	  <hbox id="folderPaneHeaderContainer">
       <sidebarheader id="folderPaneHeader" align="center" flex="1">
         <label id="folderpane-title" value="&folderPaneHeader.label;"/>
@@ -158,7 +160,6 @@
             context="folderPaneContext"
             disableKeyNavigation="true"
             datasources="rdf:null"
-            hidecolumnpicker="true"
             statedatasource="rdf:mailnewsfolders"
             flags="dont-build-content"
             ondraggesture="BeginDragFolderTree(event);"
@@ -213,7 +214,16 @@
               <binding subject="?member"
                        predicate="http://home.netscape.com/NC-rdf#ImapShared"
                        object="?imapShared" />
-            </bindings>
+              <binding subject="?member"
+                 predicate="http://home.netscape.com/NC-rdf#TotalUnreadMessages"
+                 object="?unreadCount" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#TotalMessages"
+                       object="?totalCount" />
+              <binding subject="?member"
+                     predicate="http://home.netscape.com/NC-rdf#FolderSize"
+                     object="?folderSize" />
+     </bindings>
 
             <action>
               <treechildren>
@@ -222,6 +232,11 @@
                     <treecell id="folderNameCell"
                               label="?folderTreeName"
                               properties="specialFolder-?specialFolder biffState-?biffState isServer-?isServer newMessages-?newMessages hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages isSecure-?isSecure serverType-?serverType redirectorType-?redirectorType noSelect-?noSelect imapShared-?imapShared"/>
+                    <treecell label="?unreadCount"
+                                  properties="hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages"/>
+                    <treecell label="?totalCount"
+                                  properties="hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages"/>
+                    <treecell label="?folderSize"/>
                   </treerow>
                 </treeitem>
               </treechildren>
@@ -239,6 +254,21 @@
                    sort="?folderTreeNameSort"
                    sortActive="true"
                    sortDirection="ascending"/>
+                  <splitter class="tree-splitter"/>
+          <treecol id="folderUnreadCol"
+                       persist="hidden width"
+                       flex="1"
+                       label="&unreadColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="folderTotalCol"
+                       persist="hidden width"
+                       flex="1"
+                       label="&totalColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="folderSizeCol"
+                       persist="hidden width"
+                       flex="1"
+                       label="&folderSizeColumn.label;"/>
         </treecols>
       </tree>
     </vbox>

mail/base/content/msgMail3PaneWindow.js

@@ -961,6 +961,36 @@ function OnFolderUnreadColAttrModified(event)
 
 function OnLoadFolderPane()
 {
+    var folderNameCol = document.getElementById("folderNameCol");
+    var showColumns = pref.getBoolPref("mail.showFolderPaneColumns");
+    var folderUnreadCol = document.getElementById("folderUnreadCol");
+    if (!showColumns)
+    {
+      var folderTotalCol = document.getElementById("folderTotalCol");
+      var folderSizeCol = document.getElementById("folderSizeCol");
+      folderUnreadCol.setAttribute("hidden", "true");
+      folderTotalCol.setAttribute("hidden", "true");
+      folderSizeCol.setAttribute("hidden", "true");
+    }
+    else
+    {
+      var folderColumnLabel = document.getElementById("folderColumnLabel");
+      folderNameCol.setAttribute("label", folderColumnLabel.value);
+    }
+    folderNameCol.setAttribute("hideheader", showColumns ? "false" : "true");
+    var folderPaneHeader = document.getElementById("folderPaneHeader");
+    folderPaneHeader.setAttribute("hidden", showColumns ? "true" : "false");
+    var folderTree = document.getElementById("folderTree");
+    folderTree.setAttribute("hidecolumnpicker", showColumns ? "false" : "true");
+    var hidden = folderUnreadCol.getAttribute("hidden");
+    if (hidden != "true")
+    {
+        var folderNameCell = document.getElementById("folderNameCell");
+        folderNameCell.setAttribute("label", "?folderTreeSimpleName");
+    }
+
+    folderUnreadCol.addEventListener("DOMAttrModified", OnFolderUnreadColAttrModified, false);
+
     //Add folderDataSource and accountManagerDataSource to folderPane
     accountManagerDataSource = accountManagerDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);
     folderDataSource = folderDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);

mail/base/locale/messenger.dtd

@@ -29,7 +29,6 @@
 <!ENTITY getAllNewMsgCmd.label "Get All New Messages">
 <!ENTITY getAllNewMsgCmd.key "t">
 <!ENTITY getNextNMsgCmd.label "Get Next 500 News Messages">
-
 <!ENTITY getNextNMsgCmd.accesskey "t">
 <!ENTITY sendUnsentCmd.label "Send Unsent Messages">
 <!ENTITY sendUnsentCmd.accesskey "d">
@@ -439,6 +438,10 @@
 
 <!-- Folder Pane -->
 <!ENTITY folderPaneHeader.label "Folders">
+<!ENTITY folderColumn.label "Name">
+<!ENTITY unreadColumn.label "Unread">
+<!ENTITY totalColumn.label "Total">
+<!ENTITY folderSizeColumn.label "Size">
 
 <!-- Folder Pane Context Menu -->
 <!ENTITY folderContextGetMessages.label "Get Messages for Account">

mail/base/skin/mailWindow1.css

@@ -182,6 +182,12 @@ treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
   list-style-image: none;
 }
 
+#folderUnreadCol,
+#folderTotalCol,
+#folderSizeCol {
+  text-align: right;
+}
+
 #folderNameCol [sortDirection="ascending"],
 #folderNameCol [sortDirection="descending"] {
   list-style-image: none;