132027 - no menus work when download manager window has focus. patches by bryner and I. r=bryner/blake sr=ben/dveditz

build/mac/build_scripts/MozillaBuildList.pm

@@ -620,6 +620,7 @@ sub ProcessJarManifests()
     CreateJarFromManifest(":mozilla:xpfe:components:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:bookmarks:resources:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:download-manager:resources:jar.mn", $chrome_dir, \%jars);
+    CreateJarFromManifest(":mozilla:xpfe:components:download-manager:resources:mac:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:content:mac:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:unix:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:win:jar.mn", $chrome_dir, \%jars);

config/add-chrome.pl

@@ -40,7 +40,7 @@ $err = 0;
 if (open(FILE, "<$installedChromeFile")) {
     while (<FILE>) {
         chomp;
-        if ($_ =~ $line) {
+        if ($_ eq $line) {
             # line already appears in installed-chrome.txt file
             # just update the mod date
             close(FILE) or $err = 1; 

xpfe/components/download-manager/resources/Makefile.in

@@ -26,5 +26,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = mac
+endif
+
 include $(topsrcdir)/config/rules.mk
 

xpfe/components/download-manager/resources/downloadmanager.xul

@@ -63,7 +63,7 @@
   <data id="strings.unknownTime">&unknownTime;</data>
   <data id="strings.pausedMsg">&pausedMsg;</data>
 
-  <commands id="commands">
+  <commandset id="commands">
     <commandset id="commandUpdate_Downloads"
                 commandupdater="true"
                 events="focus,tree-select"
@@ -89,7 +89,9 @@
     <command id="cmd_close" oncommand="close()"/>
     <command id="cmd_quit"/>
 
-  </commands>
+  </commandset>
+  
+  <broadcasterset id="navBroadcasters"/>
 
   <keyset id="tasksKeys">
     <!-- File Menu -->
@@ -107,7 +109,7 @@
          command="cmd_properties" modifiers="accel"/>
   </keyset>
 
-  <toolbox>
+  <toolbox id="toolbox">
     <toolbar id="download-toolbar" tbalign="stretch" class="chromeclass-toolbar" persist="collapsed">
       <toolbarbutton label="&cmd.properties.label;" accesskey="&cmd.properties.accesskey;"
                      command="cmd_properties"/>

xpfe/components/download-manager/resources/mac/.cvsignore

@@ -0,0 +1 @@
+Makefile

xpfe/components/download-manager/resources/mac/Makefile.in

@@ -0,0 +1,45 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+DEPTH    = ../../../../..
+topsrcdir  = @top_srcdir@
+srcdir   = @srcdir@
+VPATH    = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+

xpfe/components/download-manager/resources/mac/contents.rdf

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:download-manager"/>
+  </RDF:Seq>
+ 
+  <RDF:Description about="urn:mozilla:package:download-manager"
+                   chrome:displayName="Mac-specific dl mgr files"
+                   chrome:author="mozilla.org"
+                   chrome:name="dlmgr"
+                   chrome:localeVersion="1.0.0"
+                   chrome:skinVersion="1.0">
+  </RDF:Description>
+ 
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
+    <RDF:li>chrome://global/content/hiddenWindow.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>

xpfe/components/download-manager/resources/mac/jar.mn

@@ -0,0 +1,3 @@
+comm.jar:
+   content/communicator/downloadmanager/contents.rdf (contents.rdf)
+   

xpfe/global/resources/content/hiddenWindow.xul

@@ -59,25 +59,29 @@ Contributor(s): ______________________________________. -->
   <stringbundleset id="stringbundleset"/>
 
   <!-- keys are appended from the overlay -->
-  <keyset id="tasksKeys"/>
-  <keyset id="navKeys">
-    <key id="showHideSidebar"/>
+  <keyset id="tasksKeys">
+    <keyset id="navKeys">
+      <key id="showHideSidebar"/>
+    </keyset>
   </keyset>
-  
+
   <!-- commands are appended from the overlay -->
-  <commandset id="tasksCommands"/>
-  <commandset id="globalEditMenuItems"/>
-  <commandset id="selectEditMenuItems"/>
-  <commandset id="undoEditMenuItems"/>
-  <commandset id="clipboardEditMenuItems"/>
-  <commandset id="commands"/>
-  
+  <commandset id="commands">
+    <commandset id="tasksCommands"/>
+    <commandset id="globalEditMenuItems"/>
+    <commandset id="selectEditMenuItems"/>
+    <commandset id="undoEditMenuItems"/>
+    <commandset id="clipboardEditMenuItems"/>
+  </commandset>
+
   <broadcasterset id="navBroadcasters"/>
 
   <!-- it's the whole navigator.xul menubar! hidden windows need to
        have a menubar for situations where they're the only window remaining
        on a platform that wants to leave the app running, like the Mac.
   -->
-  <menubar id="main-menubar"/>
+  <toolbox id="toolbox">
+    <menubar id="main-menubar" position="1"/>
+  </toolbox>
 
 </window>