bugzilla 43797 abolish the taskbar sr=hewitt, (s)r=hyatt

2001-05-09 04:40:33 +00:00 · 2001-05-09 04:40:33 +00:00 · 98ece361b5
--- a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@ -170,14 +170,15 @@ Rights Reserved.
        <!-- message view -->
        <browser id="messagepane" context="messagePaneContext" style="height: 0px" flex="1" name="messagepane" type="content-primary" src="about:blank" onclick="contentAreaClick(event);" ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"/>
      </box>  
-      <statusbar id="status-bar" class="mailwindow-statusbar">
-        <statusbarpanel id="unreadMessageCount" style="min-width: 5px"/>
-        <statusbarpanel id="totalMessageCount" style="min-width: 5px"/>
-      </statusbar>
+
    </box>

  </box>

-  <box id="taskbar" class="toolbox-bottom"/>
-
+	<statusbar id="status-bar" class="mailwindow-statusbar">
+		<statusbarpanel id="unreadMessageCount" hidden="true" style="min-width: 5px"/>
+		<statusbarpanel id="totalMessageCount" hidden="true" style="min-width: 5px"/>
+	</statusbar>
+	
+	
 </window>
--- a/mailnews/base/resources/content/mailTasksOverlay.xul
+++ b/mailnews/base/resources/content/mailTasksOverlay.xul
@ -58,7 +58,7 @@
  </commandset>
  

-  <box id="taskButtons">
+  <box id="component-bar">
    <button class="button-toolbar-4 taskbutton" id="mini-mail" oncommand="toMessengerWindow()" 
            position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
  </box>
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@ -1287,14 +1287,20 @@ Rights Reserved.
  </toolbar>
 </toolbox>

+
+
 <statusbar id="status-bar"> 
-  <box position="1" flex="1">
+  <box insertbefore="unreadMessageCount" flex="1">
+    <box id="component-bar" class="component-bar-box"/>
    <statusbarpanel id="offline-status" class="statusbarpanel-icononly"/> 
-    <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/> 
    <statusbarpanel id="statusText" label="&statusText.label;" crop="right" flex="1"/> 
+    <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" hidden="true" mode="normal" value="0" oncommand="dumpProgress()"/> 
+  </box>
+  <box insertafter="totalMessageCount">
+      <statusbarpanel id="security-button" class="statusbarpanel-icononly"/>
+	  <resizer class="window-diagonal"/>
  </box>
-  <statusbarpanel id="security-button" class="statusbarpanel-icononly"/>
 </statusbar> 
-<box id="taskbar" class="chromeclass-extrachrome toolbox-bottom"/>
+

 </overlay>
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@ -137,7 +137,6 @@ Rights Reserved.
  </toolbox>

  <box style="height:100px" flex="1">
-
    <box id="sidebar-box">
      <sidebarheader type="box" class="sidebarheader-main" label="&mail-sidebar-header.label;"/>
      <tree id="folderTree" flex="1000" context="folderPaneContext"  />
@ -168,14 +167,14 @@ Rights Reserved.
        <browser id="messagepane" context="messagePaneContext" style="height: 0px" flex="1" name="messagepane" type="content-primary" src="about:blank"/>
      </box>  
      </box>
+
+   </box>             
+
+  </box>
+
      <statusbar id="status-bar" class="mailwindow-statusbar">
        <statusbarpanel id="unreadMessageCount" style="min-width: 5px"/>
        <statusbarpanel id="totalMessageCount" style="min-width: 5px"/>
      </statusbar>
-                </box>
-
-  </box>
-
-  <box id="taskbar" class="toolbox-bottom"/>

 </window>
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@ -506,12 +506,15 @@
  </box>

  <statusbar id="status-bar">
-    <statusbarpanel id="offline-status" onclick="setTimeout('UpdateOfflineState()', 0)"/> 
-    <progressmeter id ="progressmeter" class="progressmeter-statusbar" mode="normal" value="0"/>
+    <box id="component-bar" class="component-bar-box"/>
+    <statusbarpanel id="offline-status" class="statusbarpanel-icononly" onclick="setTimeout('UpdateOfflineState()', 0)"/> 
    <statusbarpanel id="statusText" flex="1" label="&defaultStatusText.label;"/>
+    <statusbarpanel id="statusbar-empty-spacer" flex="2" />
+
+    <progressmeter class="progressmeter-statusbar" mode="normal" value="0"/>
+    <resizer class="window-diagonal"/>
  </statusbar>

-  <box id="taskbar"/>

 </window>

--- a/themes/classic/communicator/mac/tasksOverlay.css
+++ b/themes/classic/communicator/mac/tasksOverlay.css
@ -72,3 +72,17 @@
 #taskbarGotoMenuBox{
 	display:none;	
 }   
+
+
+
+/* ::::: component bar ::::: */
+
+
+
+#component-bar {
+	margin-right: 20px;
+	
+
+} 
+
+
--- a/themes/classic/communicator/win/tasksOverlay.css
+++ b/themes/classic/communicator/win/tasksOverlay.css
@ -68,3 +68,13 @@
 #taskbarGotoMenuBox{
 	display:none;	
 }   
+
+
+/* ::::: component bar ::::: */
+
+
+
+#component-bar {
+	margin-right: 20px;
+	
+} 
--- a/themes/modern/communicator/tasksOverlay.css
+++ b/themes/modern/communicator/tasksOverlay.css
@ -95,3 +95,16 @@
  margin: 0px 0px 0px 3px;
  padding: 0px;
 }
+
+/* ::::: component bar ::::: */
+
+
+
+#component-bar {
+	margin-right: 20px;
+	
+
+} 
+
+
+
--- a/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/xpfe/communicator/resources/content/tasksOverlay.xul
@ -8,7 +8,7 @@
 %tasksDTD;
 ]>

-<?xul-overlay href="chrome://communicator/content/taskbarOverlay.xul"?>
+<!-- <?xul-overlay href="chrome://communicator/content/taskbarOverlay.xul"?>  -->

 <overlay id="tasksOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -70,7 +70,7 @@

        </menupopup>
      </menu>
-    
+ <!--   
  <box id="taskbar" class="toolbar-standard chromeclass-status" persist="collapsed" style="min-width: 1px;" 
       grippytooltip="aTooltip" grippytooltiptext="&taskBar.tooltip;">
    <box id="taskButtons">
@ -81,10 +81,33 @@
      <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
              tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
    </box>
+   
    <spring id="taskbar-middle-spacer" flex="10"/>
-    <box id="taskbarMenuBox"/>
-    <box id="taskbarGotoMenuBox" align="right"/>
-    <spring id="taskbar-right-spacer" flex="7"/>
-  </box>
    
+    <box id="taskbarMenuBox"/>
+    
+   
+   
+    <box id="taskbarGotoMenuBox" align="right"/>
+    
+    
+  
+    
+ 
+    <spring id="taskbar-right-spacer" flex="7"/>
+    
+  
+  </box>
+  -->
+  
+  <box id="component-bar" class="statusbarpanel-icononly" persist="collapsed">
+
+       <button class="button-toolbar-4 taskbutton" id="mini-nav" oncommand="toNavigator();" 
+              tooltip="aTooltip" tooltiptext="&taskNavigator.tooltip;"/>
+      <button class="button-toolbar-4 taskbutton" id="mini-comp" oncommand="toEditor();" 
+              tooltip="aTooltip" tooltiptext="&taskComposer.tooltip;"/>
+      <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
+              tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
+               
+   </box> 
 </overlay>
--- a/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
+++ b/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
@ -1,6 +1,6 @@
 <!-- extracted from tasksOverlay.xul -->
-<!ENTITY tasksMenu.label				"Tasks">
-<!ENTITY tasksMenu.accesskey                           "t"> 
+<!ENTITY tasksMenu.label				"Window">
+<!ENTITY tasksMenu.accesskey                           "w"> 
 <!-- LOCALIZATION NOTE (navigatorCmd.label): DONT_TRANSLATE -->  
 <!ENTITY navigatorCmd.label					"Navigator">  
 <!ENTITY navigatorCmd.accesskey             "n">