From 46d6cb89ae58ee117959b3e69d8390eda8c0183b Mon Sep 17 00:00:00 2001
From: "german%netscape.com" <german%netscape.com>
Date: Fri, 20 Aug 1999 23:17:12 +0000
Subject: [PATCH] preparing for split of open menu into open file and open web
 page

---
 suite/browser/navigator.js                           | 7 +++++++
 suite/locales/en-US/chrome/browser/navigator.dtd     | 3 ++-
 xpfe/browser/resources/content/navigator.js          | 7 +++++++
 xpfe/browser/resources/locale/en-US/navigator.dtd    | 3 ++-
 xpfe/browser/resources/locale/en-US/openLocation.dtd | 4 ++--
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 1c2cda6458ab..b18af8dd5f59 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -547,6 +547,7 @@ function OpenSearch(tabName, searchStr)
   
   function BrowserOpenWindow()
   {
+    //opens a window where users can select a web location to open
     core = XPAppCoresManager.Find("toolkitCore");
     if ( !core ) {
         core = new ToolkitCore();
@@ -565,6 +566,12 @@ function OpenSearch(tabName, searchStr)
         dump("Error; can't create toolkitCore\n");
     }
   }
+  
+  function BrowserOpenFileWindow()
+  {
+    //opens an OS based file selector window
+    appCore.openWindow();
+  }
 
   function OpenFile(url) {
     // This is invoked from the browser app core.
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index 234143104cbd..ba0a37e13b49 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -11,7 +11,8 @@
 <!ENTITY newBlankPageCmd.label "Blank Window">
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromDraftCmd.label "Page using Draft">
-<!ENTITY openCmd.label "Open File or Location...">
+<!ENTITY openCmd.label "Open Web Location...">
+<!ENTITY openFileCmd.label "Open File...">
 <!ENTITY sendPageCmd.label "Send Page">
 <!ENTITY editPageCmd.label "Edit Page">
 <!ENTITY offlineMenu.label "Offline">
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 1c2cda6458ab..b18af8dd5f59 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -547,6 +547,7 @@ function OpenSearch(tabName, searchStr)
   
   function BrowserOpenWindow()
   {
+    //opens a window where users can select a web location to open
     core = XPAppCoresManager.Find("toolkitCore");
     if ( !core ) {
         core = new ToolkitCore();
@@ -565,6 +566,12 @@ function OpenSearch(tabName, searchStr)
         dump("Error; can't create toolkitCore\n");
     }
   }
+  
+  function BrowserOpenFileWindow()
+  {
+    //opens an OS based file selector window
+    appCore.openWindow();
+  }
 
   function OpenFile(url) {
     // This is invoked from the browser app core.
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 234143104cbd..ba0a37e13b49 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -11,7 +11,8 @@
 <!ENTITY newBlankPageCmd.label "Blank Window">
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromDraftCmd.label "Page using Draft">
-<!ENTITY openCmd.label "Open File or Location...">
+<!ENTITY openCmd.label "Open Web Location...">
+<!ENTITY openFileCmd.label "Open File...">
 <!ENTITY sendPageCmd.label "Send Page">
 <!ENTITY editPageCmd.label "Edit Page">
 <!ENTITY offlineMenu.label "Offline">
diff --git a/xpfe/browser/resources/locale/en-US/openLocation.dtd b/xpfe/browser/resources/locale/en-US/openLocation.dtd
index 215798926566..af1e2f20d150 100644
--- a/xpfe/browser/resources/locale/en-US/openLocation.dtd
+++ b/xpfe/browser/resources/locale/en-US/openLocation.dtd
@@ -1,8 +1,8 @@
 <!-- extracted from content/openLocation.xul -->
 
-<!ENTITY enter.label "Enter the World Wide Web location (URL) you would like to open or"> 
-<!ENTITY choose.label "use the Choose File... button to select a local file:"> 
+<!ENTITY enter.label "Enter the Web location (URL) you would like to open">  
 <!ENTITY chooseFile.label "Choose File...">
 <!ENTITY openWin.label "Open in new window">
 <!ENTITY ok.label "OK">
 <!ENTITY cancel.label "Cancel">
+<!ENTITY caption.label "Open Web Location">