Backout bug 609245 / changeset 9ee393ca9926 due to Windows and Mac orange. CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 04 Aug 2011 10:42:11 +0100
changeset 8232 89947432225137e2cf07460e4055c573bf0fbc91
parent 8231 90c0fbac9a7e093b2807dd9c49660ceafc0dd657
child 8233 5ba3c4ec69922759882709ad4d05ac51813bf52a
push id6332
push userbugzilla@standard8.plus.com
push dateThu, 04 Aug 2011 09:42:25 +0000
treeherdercomm-central@899474322251 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs609245
Backout bug 609245 / changeset 9ee393ca9926 due to Windows and Mac orange. CLOSED TREE
mail/base/content/mail3PaneWindowCommands.js
mail/base/content/mailTabs.js
mail/base/content/mailWindowOverlay.js
mail/base/content/mailWindowOverlay.xul
mail/base/content/utilityOverlay.js
mail/base/content/widgetglue.js
mail/components/addrbook/content/abCommon.js
mail/components/addrbook/content/addressbook.xul
mail/components/compose/content/messengercompose.xul
mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
mail/locales/en-US/chrome/messenger/messenger.dtd
mail/test/mozmill/addrbook/test-address-book-panes.js
mail/test/mozmill/folder-display/test-folder-pane-visibility.js
mail/test/mozmill/shared-modules/test-address-book-helpers.js
--- a/mail/base/content/mail3PaneWindowCommands.js
+++ b/mail/base/content/mail3PaneWindowCommands.js
@@ -171,17 +171,16 @@ var DefaultController =
       case "button_goBack":
       case "cmd_goForward":
       case "cmd_goBack":
       case "cmd_goStartPage":
       case "cmd_undoCloseTab":
       case "cmd_viewClassicMailLayout":
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
-      case "cmd_toggleFolderPane":
       case "cmd_toggleMessagePane":
       case "cmd_viewAllMsgs":
       case "cmd_viewUnreadMsgs":
       case "cmd_viewThreadsWithUnread":
       case "cmd_viewWatchedThreadsWithUnread":
       case "cmd_viewIgnoredThreads":
       case "cmd_undo":
       case "cmd_redo":
@@ -481,17 +480,16 @@ var DefaultController =
       case "cmd_collapseAllThreads":
         return gFolderDisplay.view.showThreaded;
       case "cmd_nextFlaggedMsg":
       case "cmd_previousFlaggedMsg":
         return IsViewNavigationItemEnabled();
       case "cmd_viewClassicMailLayout":
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
-      case "cmd_toggleFolderPane":
       case "cmd_toggleMessagePane":
         // this is overridden per-mail tab
         return true;
       case "cmd_viewAllMsgs":
       case "cmd_viewIgnoredThreads":
         return gDBView;
       case "cmd_viewUnreadMsgs":
       case "cmd_viewThreadsWithUnread":
@@ -715,19 +713,16 @@ var DefaultController =
       case "cmd_undoCloseTab":
         document.getElementById("tabmail").undoCloseTab();
         break;
       case "cmd_viewClassicMailLayout":
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
         ChangeMailLayoutForCommand(command);
         break;
-      case "cmd_toggleFolderPane":
-        MsgToggleFolderPane();
-        break;
       case "cmd_toggleMessagePane":
         MsgToggleMessagePane();
         break;
       case "cmd_viewAllMsgs":
       case "cmd_viewThreadsWithUnread":
       case "cmd_viewWatchedThreadsWithUnread":
       case "cmd_viewUnreadMsgs":
       case "cmd_viewIgnoredThreads":
--- a/mail/base/content/mailTabs.js
+++ b/mail/base/content/mailTabs.js
@@ -742,32 +742,30 @@ let mailTabType = {
 
   // nsIController implementation
 
   supportsCommand: function mailTabType_supportsCommand(aCommand, aTab) {
     switch (aCommand) {
       case "cmd_viewClassicMailLayout":
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
-      case "cmd_toggleFolderPane":
       case "cmd_toggleMessagePane":
         return true;
 
       default:
         return DefaultController.supportsCommand(aCommand);
     }
   },
 
   // We only depend on what's illegal
   isCommandEnabled: function mailTabType_isCommandEnabled(aCommand, aTab) {
     switch (aCommand) {
       case "cmd_viewClassicMailLayout":
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
-      case "cmd_toggleFolderPane":
       case "cmd_toggleMessagePane":
         // If the thread pane is illegal, these are all disabled
         if (!aTab.mode.legalPanes.thread)
           return false;
         // else fall through
 
       default:
         return DefaultController.isCommandEnabled(aCommand);
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -179,38 +179,36 @@ function InitGoMessagesMenu()
  * This is called every time the view menu popup is displayed.  It is
  *  responsible for updating the menu items' state to reflect reality.
  */
 function view_init()
 {
   var isFeed = gFolderDisplay.selectedMessageIsFeed;
 
   let accountCentralDisplayed = gFolderDisplay.isAccountCentralDisplayed;
-  let messagePaneMenuItem = document.getElementById("menu_showMessage");
+  var messagePaneMenuItem = document.getElementById("menu_showMessage");
   if (!messagePaneMenuItem.hidden) { // Hidden in the standalone msg window.
     messagePaneMenuItem.setAttribute("checked",
       accountCentralDisplayed ? false : gMessageDisplay.visible);
     messagePaneMenuItem.disabled = accountCentralDisplayed;
   }
 
-  let folderPaneMenuItem = document.getElementById("menu_showFolderPane");
-  if (!folderPaneMenuItem.hidden) { // Hidden in the standalone msg window.
-    folderPaneMenuItem.setAttribute("checked", gFolderDisplay.folderPaneVisible);
-  }
-
   // Disable some menus if account manager is showing
   document.getElementById("viewSortMenu").disabled = accountCentralDisplayed;
   document.getElementById("viewMessageViewMenu").disabled = accountCentralDisplayed;
   document.getElementById("viewMessagesMenu").disabled = accountCentralDisplayed;
 
   // Hide the views menu item if the user doesn't have the views toolbar button
   // visible.
   var viewsToolbarButton = document.getElementById("mailviews-container");
   document.getElementById('viewMessageViewMenu').hidden = !viewsToolbarButton;
 
+  // ... and also the separator.
+  document.getElementById("viewMenuAfterTaskbarSeparator").hidden = !viewsToolbarButton;
+
   // Initialize the Message Body menuitem
   document.getElementById('viewBodyMenu').hidden = isFeed;
 
   // Initialize the Show Feed Summary menu
   var viewFeedSummary = document.getElementById('viewFeedSummary');
   var winType = document.documentElement.getAttribute('windowtype');
   if (winType != "mail:3pane")
     viewFeedSummary.hidden = !gShowFeedSummary;
@@ -503,44 +501,16 @@ function InitViewBodyMenu()
   if (isFeed) {
     AllowHTML_menuitem.hidden = !gShowFeedSummary;
     Sanitized_menuitem.hidden = !gShowFeedSummary;
     AsPlaintext_menuitem.hidden = !gShowFeedSummary;
     document.getElementById("viewFeedSummarySeparator").hidden = !gShowFeedSummary;
   }
 }
 
-/**
- * Expand or collapse the folder pane.
- */
-function MsgToggleFolderPane()
-{
-  // Bail without doing anything if we are not a folder tab.
-  let currentTabInfo = document.getElementById("tabmail").currentTabInfo;
-  if (currentTabInfo.mode.name != "folder")
-    return;
-
-  togglePaneSplitter("folderpane_splitter");
-}
-
-/**
- * Expand or collapse the message preview pane.
- */
-function MsgToggleMessagePane()
-{
-  // Bail without doing anything if we are not a folder tab.
-  let currentTabInfo = document.getElementById("tabmail").currentTabInfo;
-  if (currentTabInfo.mode.name != "folder")
-    return;
-
-  togglePaneSplitter("threadpane-splitter");
-  ChangeMessagePaneVisibility(IsMessagePaneCollapsed());
-  SetFocusThreadPaneIfNotOnMessagePane();
-}
-
 function SetMenuItemLabel(menuItemId, customLabel)
 {
   var menuItem = document.getElementById(menuItemId);
   if (menuItem)
     menuItem.setAttribute('label', customLabel);
 }
 
 function RemoveAllMessageTags()
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -149,17 +149,16 @@
    <command id="cmd_viewPageSource" oncommand="goDoCommand('cmd_viewPageSource')" disabled="true"/>
    <command id="cmd_setFolderCharset" oncommand="goDoCommand('cmd_setFolderCharset')" />
 
    <command id="cmd_expandAllThreads" oncommand="goDoCommand('cmd_expandAllThreads')" disabled="true"/>
    <command id="cmd_collapseAllThreads" oncommand="goDoCommand('cmd_collapseAllThreads')" disabled="true"/>
    <command id="cmd_viewClassicMailLayout" oncommand="goDoCommand('cmd_viewClassicMailLayout')" disabled="true"/>
    <command id="cmd_viewWideMailLayout" oncommand="goDoCommand('cmd_viewWideMailLayout')" disabled="true"/>
    <command id="cmd_viewVerticalMailLayout" oncommand="goDoCommand('cmd_viewVerticalMailLayout')" disabled="true"/>
-   <command id="cmd_toggleFolderPane" oncommand="goDoCommand('cmd_toggleFolderPane')" disabled="true"/>
    <command id="cmd_toggleMessagePane" oncommand="goDoCommand('cmd_toggleMessagePane')" disabled="true"/>
    <command id="cmd_viewAllMsgs" oncommand="goDoCommand('cmd_viewAllMsgs')" disabled="true"/>
    <command id="cmd_viewUnreadMsgs" oncommand="goDoCommand('cmd_viewUnreadMsgs')" disabled="true"/>
    <command id="cmd_viewThreadsWithUnread" oncommand="goDoCommand('cmd_viewThreadsWithUnread')" disabled="true"/>
    <command id="cmd_viewWatchedThreadsWithUnread" oncommand="goDoCommand('cmd_viewWatchedThreadsWithUnread')" disabled="true"/>
    <command id="cmd_viewIgnoredThreads" oncommand="goDoCommand('cmd_viewIgnoredThreads')" disabled="true"/>
    <commandset id="viewZoomCommands"
                commandupdater="true"
@@ -1131,35 +1130,34 @@
       </menupopup>
     </menu>
 
     <!-- View -->
     <menu id="menu_View">
       <menupopup id="menu_View_Popup" onpopupshowing="view_init();">
         <menu id="menu_Toolbars" onpopupshowing="onViewToolbarsPopupShowing(event, 'mail-toolbox');">
           <menupopup id="view_toolbars_popup">
-            <menuitem id="menu_showTaskbar" type="checkbox"/>
             <menuseparator id="viewMenuBeforeCustomizeMailToolbarsSeparator"/>
             <menuitem id="customizeMailToolbars"
                       command="cmd_CustomizeMailToolbar"
                       label="&customizeToolbar.label;"
                       accesskey="&customizeToolbar.accesskey;"/>
           </menupopup>
         </menu>
+        <menuitem id="menu_showTaskbar" type="checkbox"/>
+        <menuseparator id="viewMenuAfterTaskbarSeparator"/>
         <menu id="menu_MessagePaneLayout" label="&messagePaneLayoutStyle.label;" accesskey="&messagePaneLayoutStyle.accesskey;">
           <menupopup id="view_layout_popup" onpopupshowing="InitViewLayoutStyleMenu(event)">
             <menuitem id="messagePaneClassic" type="radio" label="&messagePaneClassic.label;" name="viewlayoutgroup"
                       accesskey="&messagePaneClassic.accesskey;" command="cmd_viewClassicMailLayout"/>
             <menuitem id="messagePaneWide" type="radio" label="&messagePaneWide.label;" name="viewlayoutgroup"
                       accesskey="&messagePaneWide.accesskey;" command="cmd_viewWideMailLayout"/>
             <menuitem id="messagePaneVertical" type="radio" label="&messagePaneVertical.label;" name="viewlayoutgroup"
                       accesskey="&messagePaneVertical.accesskey;" command="cmd_viewVerticalMailLayout"/>
             <menuseparator id="viewMenuAfterPaneVerticalSeparator"/>
-            <menuitem id="menu_showFolderPane" type="checkbox" label="&showFolderPaneCmd.label;"
-                      accesskey="&showFolderPaneCmd.accesskey;" command="cmd_toggleFolderPane"/>
             <menuitem id="menu_showMessage" type="checkbox" label="&showMessageCmd.label;" key="key_toggleMessagePane"
                       accesskey="&showMessageCmd.accesskey;" command="cmd_toggleMessagePane"/>
           </menupopup>
         </menu>
         <menu id="menu_FolderViews" label="&folderView.label;" accesskey="&folderView.accesskey;">
           <menupopup id="menu_FolderViewsPopup"
                      onpopupshowing="InitViewFolderViewsMenu(event)">
             <menuitem id="menu_allFolders" value="all"
--- a/mail/base/content/utilityOverlay.js
+++ b/mail/base/content/utilityOverlay.js
@@ -193,32 +193,16 @@ function goToggleToolbar( id, elementID 
     toolbar.setAttribute("hidden", !isHidden);
     if ( element )
       element.setAttribute("checked", isHidden)
     document.persist(id, 'hidden');
     document.persist(elementID, 'checked');
   }
 }
 
-/**
- * Toggle a splitter to show or hide some piece of UI (e.g. the message preview
- * pane).
- *
- * @param splitterId the splliter that should be toggled
- */
-function togglePaneSplitter(splitterId)
-{
-  var splitter = document.getElementById(splitterId);
-  var state = splitter.getAttribute("state");
-  if (state == "collapsed")
-    splitter.setAttribute("state", "open");
-  else
-    splitter.setAttribute("state", "collapsed")
-}
-
 // openUILink handles clicks on UI elements that cause URLs to load.
 // Firefox and SeaMonkey have a function with the same name,
 // so extensions can use this everywhere to open links.
 // We currently only react to left click in Thunderbird.
 function openUILink(url, event)
 {
   if (!event.button)
     messenger.launchExternalURL(url);
--- a/mail/base/content/widgetglue.js
+++ b/mail/base/content/widgetglue.js
@@ -44,16 +44,32 @@
  * and then calls a function/command in commandglue
  */
 
 Components.utils.import("resource:///modules/MailUtils.js");
 
 //The eventual goal is for this file to go away and its contents to be brought into
 //mailWindowOverlay.js.  This is currently being done.
 
+function MsgToggleMessagePane()
+{
+  // Bail without doing anything if we are not a folder tab.
+  let currentTabInfo = document.getElementById("tabmail").currentTabInfo;
+  if (currentTabInfo.mode.name != "folder")
+    return;
+  var splitter = document.getElementById("threadpane-splitter");
+  var state = splitter.getAttribute("state");
+  if (state == "collapsed")
+    splitter.setAttribute("state", "open");
+  else
+    splitter.setAttribute("state", "collapsed")
+  ChangeMessagePaneVisibility(IsMessagePaneCollapsed());
+  SetFocusThreadPaneIfNotOnMessagePane();
+}
+
 // Given a URI we would like to return corresponding message folder here.
 // An additonal input param which specifies whether or not to check folder
 // attributes (like if there exists a parent or is it a server) is also passed
 // to this routine. Qualifying against those checks would return an existing
 // folder. Callers who don't want to check those attributes will specify the
 // same and then this routine will simply return a msgfolder. This scenario
 // applies to a new imap account creation where special folders are created
 // on demand and hence needs to prior check of existence.
--- a/mail/components/addrbook/content/abCommon.js
+++ b/mail/components/addrbook/content/abCommon.js
@@ -373,30 +373,40 @@ function AbNewMessage()
         composeFields.to = GetSelectedAddresses();
 
       params.composeFields = composeFields;
       msgComposeService.OpenComposeWindowWithParams(null, params);
     }
   }
 }
 
-/**
- * Set up items in the View > Layout menupopup.  This function is responsible
- * for updating the menu items' state to reflect reality.
- *
- * @param event the event that caused the View > Layout menupopup to be shown
- */
-function InitViewLayoutMenuPopup(event) {
-  let dirPaneMenuItem = document.getElementById("menu_showDirectoryPane");
-  dirPaneMenuItem.setAttribute("checked", document.getElementById(
-    "dirTree-splitter").getAttribute("state") != "collapsed");
-
-  let cardPaneMenuItem = document.getElementById("menu_showCardPane");
-  cardPaneMenuItem.setAttribute("checked", document.getElementById(
-    "results-splitter").getAttribute("state") != "collapsed");
+// XXX todo
+// could this be moved into utilityOverlay.js?
+function goToggleSplitter( id, elementID )
+{
+  var splitter = document.getElementById( id );
+  var element = document.getElementById( elementID );
+  if ( splitter )
+  {
+    var attribValue = splitter.getAttribute("state") ;
+    if ( attribValue == "collapsed" )
+    {
+      splitter.setAttribute("state", "open" );
+      if ( element )
+        element.setAttribute("checked","true")
+    }
+    else
+    {
+      splitter.setAttribute("state", "collapsed");
+      if ( element )
+        element.setAttribute("checked","false")
+    }
+    document.persist(id, 'state');
+    document.persist(elementID, 'checked');
+  }
 }
 
 // Generate a list of cards from the selected mailing list
 // and get a comma separated list of card addresses. If the
 // item selected in the directory pane is not a mailing list,
 // an empty string is returned.
 function GetSelectedAddressesFromDirTree()
 {
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -413,45 +413,34 @@
         </menu>
 
         <menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
             <menupopup id="menu_View_Popup">
                 <menu id="menu_Toolbars"
                       label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"
                       onpopupshowing="onViewToolbarsPopupShowing(event, 'ab-toolbox');">
                   <menupopup id="view_toolbars_popup">
-                    <menuitem id="menu_showTaskbar"
-                              label="&showTaskbarCmd.label;" accesskey="&showTaskbarCmd.accesskey;"
-                              oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"
-                              type="checkbox" checked="true"/>
                     <menuseparator id="viewMenuBeforeCustomizeABToolbarsSeparator"/>
                     <menuitem id="customizeABToolbars"
                               command="cmd_CustomizeABToolbar"
                               label="&customizeToolbar.label;"
                               accesskey="&customizeToolbar.accesskey;"/>
                   </menupopup>
                 </menu>
-                <menu id="menu_Layout"
-                      label="&layoutMenu.label;"
-                      accesskey="&layoutMenu.accesskey;">
-                  <menupopup id="view_layout_popup"
-                             onpopupshowing="InitViewLayoutMenuPopup(event);">
-                    <menuitem id="menu_showDirectoryPane"
-                              label="&showDirectoryPane.label;"
-                              accesskey="&showDirectoryPane.accesskey;"
-                              oncommand="togglePaneSplitter('dirTree-splitter');"
-                              checked="true" type="checkbox"/>
-                    <menuitem id="menu_showCardPane"
-                              label="&showContactPane2.label;"
-                              accesskey="&showContactPane2.accesskey;"
-                              oncommand="togglePaneSplitter('results-splitter');"
-                              checked="true" type="checkbox"/>
-                  </menupopup>
-                </menu>
-                <menuseparator id="viewMenuAfterLayoutSeparator"/>
+                <menuitem id="menu_showTaskbar"
+                          label="&showTaskbarCmd.label;" accesskey="&showTaskbarCmd.accesskey;"
+                          oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"
+                          type="checkbox" checked="true"/>
+                <menuseparator id="viewMenuAfterTaskbarSeparator"/>
+                <menuitem id="menu_showCardPane"
+                          label="&showContactPane.label;"
+                          accesskey="&showContactPane.accesskey;"
+                          oncommand="goToggleSplitter('results-splitter', 'menu_showCardPane')"
+                          checked="true" type="checkbox"/>
+                <menuseparator/>
                 <menu id="menu_ShowNameAs" label="&menu_ShowNameAs.label;" accesskey="&menu_ShowNameAs.accesskey;">
                     <menupopup id="menu_ShowNameAsPopup">
                         <menuitem type="radio" name="shownameas"
                                   id="firstLastCmd"
                                   label="&firstLastCmd.label;"
                                   accesskey="&firstLastCmd.accesskey;"
                                   oncommand="SetNameColumn('firstLastCmd')"/>
                         <menuitem type="radio" name="shownameas"
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -435,35 +435,35 @@
 
       <menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
         <menupopup id="menu_View_Popup">
           <menu id="menu_ToolbarsNew"
                 label="&viewToolbarsMenuNew.label;"
                 accesskey="&viewToolbarsMenuNew.accesskey;"
                 onpopupshowing="onViewToolbarsPopupShowing(event, 'compose-toolbox');">
             <menupopup id="view_toolbars_popup">
-              <menuitem id="menu_showFormatToolbar"
-                        type="checkbox"
-                        label="&showFormattingBarCmd.label;"
-                        accesskey="&showFormattingBarCmd.accesskey;"
-                        command="cmd_showFormatToolbar"
-                        checked="true"/>
-              <menuitem id="menu_showTaskbar"
-                        type="checkbox"
-                        label="&showTaskbarCmd.label;"
-                        accesskey="&showTaskbarCmd.accesskey;"
-                        oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"
-                        checked="true"/>
               <menuseparator id="viewMenuBeforeCustomizeComposeToolbarsSeparator"/>
               <menuitem id="customizeComposeToolbars"
                         label="&customizeToolbar.label;"
                         accesskey="&customizeToolbar.accesskey;"
                         command="cmd_CustomizeComposeToolbar"/>
             </menupopup>
           </menu>
+          <menuitem id="menu_showFormatToolbar"
+                    type="checkbox"
+                    label="&showFormattingBarCmd.label;"
+                    accesskey="&showFormattingBarCmd.accesskey;"
+                    command="cmd_showFormatToolbar"
+                    checked="true"/>
+          <menuitem id="menu_showTaskbar"
+                    type="checkbox"
+                    label="&showTaskbarCmd.label;"
+                    accesskey="&showTaskbarCmd.accesskey;"
+                    oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"
+                    checked="true"/>
           <menuitem id="menu_AddressSidebar"
                     label="&addressSidebar.label;" accesskey="&addressSidebar.accesskey;"
                     key="key_addressSidebar" observes="viewAddressPicker"/>
         </menupopup>
       </menu>
 
       <menu id="insertMenu" command="cmd_renderedHTMLEnabler"/>
 
--- a/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
@@ -80,22 +80,18 @@
 <!ENTITY viewToolbarsMenu.label                         "Toolbars">
 <!ENTITY viewToolbarsMenu.accesskey                     "T"> 
 <!ENTITY showAbToolbarCmd.label                         "Address Book Toolbar">
 <!ENTITY showAbToolbarCmd.accesskey                     "o">
 <!ENTITY showTaskbarCmd.label                           "Status Bar">
 <!ENTITY showTaskbarCmd.accesskey                       "S">
 <!ENTITY customizeToolbar.label                         "Customize…">
 <!ENTITY customizeToolbar.accesskey                     "C">
-<!ENTITY layoutMenu.label                               "Layout">
-<!ENTITY layoutMenu.accesskey                           "L">
-<!ENTITY showDirectoryPane.label                        "Directory Pane">
-<!ENTITY showDirectoryPane.accesskey                    "D">
-<!ENTITY showContactPane2.label                         "Contact Pane">
-<!ENTITY showContactPane2.accesskey                     "C">
+<!ENTITY showContactPane.label                          "Contact Summary Pane">
+<!ENTITY showContactPane.accesskey                      "C">
 <!ENTITY menu_ShowNameAs.label                          "Show Name As">
 <!ENTITY menu_ShowNameAs.accesskey                      "n"> 
 <!ENTITY firstLastCmd.label                             "First, Last">
 <!ENTITY firstLastCmd.accesskey                         "f"> 
 <!ENTITY lastFirstCmd.label                             "Last, First">
 <!ENTITY lastFirstCmd.accesskey                         "l">
 <!ENTITY displayNameCmd.label                           "Display Name">
 <!ENTITY displayNameCmd.accesskey                       "d">
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -127,18 +127,16 @@
 <!ENTITY messagePaneLayoutStyle.label "Layout">
 <!ENTITY messagePaneLayoutStyle.accesskey "L">
 <!ENTITY messagePaneClassic.label "Classic View">
 <!ENTITY messagePaneClassic.accesskey "C">
 <!ENTITY messagePaneWide.label "Wide View">
 <!ENTITY messagePaneWide.accesskey "W">
 <!ENTITY messagePaneVertical.label "Vertical View">
 <!ENTITY messagePaneVertical.accesskey "V">
-<!ENTITY showFolderPaneCmd.label "Folder Pane">
-<!ENTITY showFolderPaneCmd.accesskey "F">
 <!ENTITY showMessageCmd.label "Message Pane">
 <!ENTITY showMessageCmd.accesskey "M">
 
 <!ENTITY folderView.label "Folders">
 <!ENTITY folderView.accesskey "F">
 <!ENTITY unifiedFolders.label "Unified">
 <!ENTITY unifiedFolders.accesskey "n">
 <!ENTITY allFolders.label "All">
deleted file mode 100644
--- a/mail/test/mozmill/addrbook/test-address-book-panes.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Thunderbird Mail Client.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jim Porter <squibblyflabbetydoo@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Tests for the address book.
- */
-
-var MODULE_NAME = "test-address-book-panes";
-
-var RELATIVE_ROOT = "../shared-modules";
-var MODULE_REQUIRES = ["address-book-helpers"];
-
-function setupModule(module) {
-  let abh = collector.getModule("address-book-helpers");
-  abh.installInto(module);
-
-  // Open the address book main window
-  abController = open_address_book_window();
-}
-
-/**
- * Helper function to toggle a pane.
- *
- * @param splitterId the id of the splitter to toggle
- */
-function _help_toggle_pane(splitterId) {
-  abController.window.togglePaneSplitter(splitterId);
-}
-
-/**
- * Helper function to check consistency of a pane's state.
- *
- * @param paneId the id of the pane in question
- * @param menuitemId the id of the menuitem corresponding to the pane
- * @param visible true if the pane should be visible, false otherwise
- */
-function _help_assert_pane_visibility(paneId, menuitemId, visible) {
-  if (abController.e(paneId).collapsed == visible)
-    throw new Error(paneId+" pane should be " +
-                    (visible ? "visible" : "hidden"));
-
-  abController.window.InitViewLayoutMenuPopup();
-  if ((abController.e(menuitemId).getAttribute("checked") == "true") != visible)
-    throw new Error(menuitemId+" menuitem should be " +
-                    (visible ? "checked" : "unchecked"));
-
-}
-
-/**
- * Toggle the directory pane.
- */
-function toggle_directory_pane() {
-  _help_toggle_pane("dirTree-splitter");
-}
-
-/**
- * Toggle the contact pane.
- */
-function toggle_contact_pane() {
-  _help_toggle_pane("results-splitter");
-}
-
-/**
- * Check that the directory pane is visible or hidden.
- *
- * @param visible true if the pane should be visible, false otherwise
- */
-function assert_directory_pane_visibility(visible) {
-  _help_assert_pane_visibility("dirTreeBox", "menu_showDirectoryPane", visible);
-}
-
-/**
- * Check that the contact pane is visible or hidden.
- *
- * @param visible true if the pane should be visible, false otherwise
- */
-function assert_contact_pane_visibility(visible) {
-  _help_assert_pane_visibility("CardViewOuterBox", "menu_showCardPane",
-                               visible);
-}
-
-function test_hide_directory_pane() {
-  toggle_directory_pane();
-  assert_directory_pane_visibility(false);
-}
-
-function test_show_directory_pane() {
-  toggle_directory_pane();
-  assert_directory_pane_visibility(true);
-}
-
-function test_hide_contact_pane() {
-  toggle_contact_pane();
-  assert_contact_pane_visibility(false);
-}
-
-function test_show_contact_pane() {
-  toggle_contact_pane();
-  assert_contact_pane_visibility(true);
-}
-
-function test_persist_panes() {
-  toggle_directory_pane();
-  toggle_contact_pane();
-
-  close_address_book_window(abController);
-  abController = open_address_book_window();
-
-  assert_directory_pane_visibility(false);
-  assert_contact_pane_visibility(false);
-}
--- a/mail/test/mozmill/folder-display/test-folder-pane-visibility.js
+++ b/mail/test/mozmill/folder-display/test-folder-pane-visibility.js
@@ -69,23 +69,16 @@ function assert_folder_pane_visible() {
 
   // - folder pane should be visible
   if (mc.e("folderPaneBox").collapsed === true)
     throw new Error("folderPaneBox should not be collapsed!");
 
   // - the folder pane splitter should not be collapsed
   if (mc.e("folderpane_splitter").collapsed === true)
     throw new Error("folderpane_splitter should not be collapsed!");
-
-  // - the menu item should be checked
-  // force the view menu to update.
-  mc.window.view_init();
-  let paneMenuItem = mc.e("menu_showFolderPane");
-  if (paneMenuItem.getAttribute("checked") != "true")
-    throw new Error("The Folder Pane menu item should be checked.");
 }
 
 /**
  * When displaying a folder, assert that the folder pane is hidden and all the
  * menus, splitters, etc. are set up right.
  *
  * @param aFolderPaneIllegal Is the folder pane illegal to display at this time?
  *     This impacts whether the folder pane splitter should be visible.
@@ -94,32 +87,25 @@ function assert_folder_pane_hidden(aFold
   if (mc.folderDisplay.folderPaneVisible)
     throw new Error("The folder display thinks that the folder pane is " +
                     "visible, but it shouldn't!");
 
   // - folder pane shouldn't be visible
   if (mc.e("folderPaneBox").collapsed === false)
     throw new Error("folderPaneBox should be collapsed!");
 
-  // force the view menu to update.
-  mc.window.view_init();
-  let paneMenuItem = mc.e("menu_showFolderPane");
   // - the folder pane splitter should or should not be collapsed, depending on
   //   aFolderPaneIllegal
   if (aFolderPaneIllegal) {
     if (mc.e("folderpane_splitter").collapsed === false)
       throw new Error("folderpane_splitter should be collapsed!");
-    if (paneMenuItem.disabled)
-      throw new Error("The Folder Pane menu item should be disabled.");
   }
   else {
     if (mc.e("folderpane_splitter").collapsed === true)
       throw new Error("folderpane_splitter should not be collapsed!");
-    if (paneMenuItem.getAttribute("checked") == "true")
-      throw new Error("The Folder Pane menu item should not be checked.");
   }
 }
 
 function toggle_folder_pane() {
   // Since we don't have a shortcut to toggle the folder pane, we're going to
   // have to collapse it ourselves
   let folderPaneBox = mc.e("folderPaneBox");
   let currentState = folderPaneBox.collapsed;
--- a/mail/test/mozmill/shared-modules/test-address-book-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-address-book-helpers.js
@@ -47,35 +47,31 @@ const ABMDB_PREFIX = "moz-abmdbdirectory
 const ABLDAP_PREFIX = "moz-abldapdirectory://";
 
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/Services.jsm");
 
 var collectedAddresses;
 
 var abController;
-var windowHelper;
 
 function setupModule() {
-  windowHelper = collector.getModule("window-helpers");
-
   // Ensure all the directories are initialised.
   MailServices.ab.directories;
   collectedAddresses = MailServices.ab
                        .getDirectory("moz-abmdbdirectory://history.mab");
 }
 
 function installInto(module) {
   setupModule();
 
   // Now copy helper functions
   module.ensure_card_exists = ensure_card_exists;
   module.ensure_no_card_exists = ensure_no_card_exists;
   module.open_address_book_window = open_address_book_window;
-  module.close_address_book_window = close_address_book_window;
   module.create_mork_address_book = create_mork_address_book;
   module.create_ldap_address_book = create_ldap_address_book;
   module.create_contact = create_contact;
   module.create_mailing_list = create_mailing_list;
   module.get_mailing_list_from_address_book =
       get_mailing_list_from_address_book;
   module.load_contacts_into_address_book = load_contacts_into_address_book;
   module.load_contacts_into_mailing_list = load_contacts_into_mailing_list;
@@ -159,33 +155,20 @@ function get_cards_in_all_address_books_
 
 /**
  * Opens the address book interface
  * @returns a controller for the address book
  */
 function open_address_book_window()
 {
   abController = mozmill.getAddrbkController();
-  windowHelper.augment_controller(abController);
   return abController;
 }
 
 /**
- * Closes the address book interface
- * @param abc the controller for the address book window to close
- * @return the result from wait_for_window_close
- */
-function close_address_book_window(abc)
-{
-  windowHelper.plan_for_window_close(abc);
-  abc.window.close();
-  return windowHelper.wait_for_window_close(abc);
-}
-
-/**
  * Creates and returns a Mork-backed address book.
  * @param aName the name for the address book
  * @returns the nsIAbDirectory address book
  */
 function create_mork_address_book(aName)
 {
   let abPrefString = MailServices.ab.newAddressBook(aName, "", 2);
   let abURI = Services.prefs.getCharPref(abPrefString + ".filename");