Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Converted Navigator to use globalOverlay for File and Edit menu.

Browse Source
This commit is contained in:
hangas%netscape.com 1999-09-14 22:03:38 +00:00
parent 9f88f309ff
commit 3d70c15c27
8 changed files with 111 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
suite/browser/hiddenWindow.xul
View File

@ -49,9 +49,26 @@ Contributor(s): ______________________________________. -->
<html:script language="javascript" src="chrome://navigator/content/navigator.js"/>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<keyset id="keyset">
<!-- Edit Menu -->
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
</keyset>
<broadcasterset id="broadcasterset">
<!-- Edit Menu -->
<broadcaster id="cmd_undo" oncommand="EditUndo()"/>
<broadcaster id="cmd_redo" oncommand="EditRedo()"/>
<broadcaster id="cmd_cut" oncommand="EditCut()"/>
<broadcaster id="cmd_copy" oncommand="EditCopy()"/>
<broadcaster id="cmd_paste" oncommand="EditPaste()"/>
<broadcaster id="cmd_delete" oncommand="Delete()"/>
<broadcaster id="cmd_selectAll" oncommand="SelectAll()"/>
</broadcasterset>
<!-- it's the whole navigator.xul menubar! hidden windows need to
have a menubar for situations where they're the only window remaining
@ -61,39 +78,39 @@ Contributor(s): ______________________________________. -->
-->
<menubar chromeclass="menubar">
<menu id="fileMenu"/>
<menu id="menu_File"/>
<menu accesskey="e" value="&editMenu.label;">
<menupopup>
<menuitem value="&undoCmd.label;" oncommand="BrowserReload();"/>
<menuitem value="&redoCmd.label;" oncommand="BrowserReload();"/>
<menuseparator />
<menuitem value="&cutCmd.label;" oncommand="BrowserReload();"/>
<menuitem value="&copyCmd.label;" oncommand="BrowserCopy();"/>
<menuitem value="&pasteCmd.label;" oncommand="BrowserReload();"/>
<menuitem value="&deleteCmd.label;" oncommand="BrowserReload();"/>
<menuseparator />
<menu value="&walletMenu.label;">
<menupopup>
<menuitem value="&walletSafeFillCmd.label;" oncommand="WalletSafeFillin();"/>
<menuitem value="&walletQuickFillCmd.label;" oncommand="WalletQuickFillin();"/>
<menuitem value="&walletRequestToCaptureCmd.label;" oncommand="WalletRequestToCapture();"/>
<menuseparator />
<menuitem value="&walletContentsCmd.label;" oncommand="WalletEditor();"/>
<menuitem value="&walletDisplaySignonsCmd.label;" oncommand="SignonViewer();"/>
<menuitem value="&walletDisplayCookiesCmd.label;" oncommand="CookieViewer();"/>
<menuseparator />
<menuitem value="&walletSamplesCmd.label;" oncommand="WalletSamples();"/>
<menuitem value="&walletChangePasswordCmd.label;" oncommand="WalletChangePassword();"/>
</menupopup>
</menu>
<menuseparator />
<menuitem value="&selectAllCmd.label;" oncommand="BrowserReload();"/>
<menuseparator />
<menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://pref/content/pref-appearance.xul')"/>
</menupopup>
</menu>
<menu id="menu_Edit">
<menupopup>
<menuitem id="menu_undo"/>
<menuitem id="menu_redo"/>
<menuseparator/>
<menuitem id="menu_cut"/>
<menuitem id="menu_copy"/>
<menuitem id="menu_paste"/>
<menuseparator/>
<menuitem id="menu_delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"/>
<menuseparator />
<menu value="&walletMenu.label;">
<menupopup>
<menuitem value="&walletSafeFillCmd.label;" oncommand="WalletSafeFillin();"/>
<menuitem value="&walletQuickFillCmd.label;" oncommand="WalletQuickFillin();"/>
<menuitem value="&walletRequestToCaptureCmd.label;" oncommand="WalletRequestToCapture();"/>
<menuseparator />
<menuitem value="&walletContentsCmd.label;" oncommand="WalletEditor();"/>
<menuitem value="&walletDisplaySignonsCmd.label;" oncommand="SignonViewer();"/>
<menuitem value="&walletDisplayCookiesCmd.label;" oncommand="CookieViewer();"/>
<menuseparator />
<menuitem value="&walletSamplesCmd.label;" oncommand="WalletSamples();"/>
<menuitem value="&walletChangePasswordCmd.label;" oncommand="WalletChangePassword();"/>
</menupopup>
</menu>
<menuseparator/>
<menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://pref/content/pref-appearance.xul')"/>
</menupopup>
</menu>
<menu accesskey="v" value="&viewMenu.label;">
<menupopup>

4
xpfe/global/resources/content/globalOverlay.xul
View File

@ -11,13 +11,13 @@
<html:script language="JavaScript" src="chrome://global/content/globalOverlay.js"/>
<!-- File Menu -->
<menu id="menu_File" value="&fileMenu.label;"/>
<menu id="menu_File" value="&fileMenu.label;" accesskey="&fileMenu.accesskey;"/>
<!-- Page Setup menu item -->
<menuitem id="menu_pageSetup" value="&pageSetupCmd.label;" oncommand="goPageSetup()"/>
<!-- Edit Menu -->
<menu id="menu_Edit" value="&editMenu.label;"/>
<menu id="menu_Edit" value="&editMenu.label;" accesskey="&editMenu.accesskey;"/>
<menuitem id="menu_undo" value="&undoCmd.label;" key="key_undo" observes="cmd_undo"/>
<menuitem id="menu_cut" value="&cutCmd.label;" key="key_cut" observes="cmd_cut"/>
<menuitem id="menu_copy" value="&copyCmd.label;" key="key_copy" observes="cmd_copy"/>

83
xpfe/global/resources/content/hiddenWindow.xul
View File

@ -49,9 +49,26 @@ Contributor(s): ______________________________________. -->
<html:script language="javascript" src="chrome://navigator/content/navigator.js"/>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<keyset id="keyset">
<!-- Edit Menu -->
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
</keyset>
<broadcasterset id="broadcasterset">
<!-- Edit Menu -->
<broadcaster id="cmd_undo" oncommand="EditUndo()"/>
<broadcaster id="cmd_redo" oncommand="EditRedo()"/>
<broadcaster id="cmd_cut" oncommand="EditCut()"/>
<broadcaster id="cmd_copy" oncommand="EditCopy()"/>
<broadcaster id="cmd_paste" oncommand="EditPaste()"/>
<broadcaster id="cmd_delete" oncommand="Delete()"/>
<broadcaster id="cmd_selectAll" oncommand="SelectAll()"/>
</broadcasterset>
<!-- it's the whole navigator.xul menubar! hidden windows need to
have a menubar for situations where they're the only window remaining
@ -61,39 +78,39 @@ Contributor(s): ______________________________________. -->
-->
<menubar chromeclass="menubar">
<menu id="fileMenu"/>
<menu id="menu_File"/>
<menu accesskey="e" value="&editMenu.label;">
<menupopup>
<menuitem value="&undoCmd.label;" oncommand="BrowserReload();"/>
<menuitem value="&redoCmd.label;" oncommand="BrowserReload();"/>
<menuseparator />
<menuitem value="&cutCmd.label;" oncommand="BrowserReload();"/>
<menuitem value="&copyCmd.label;" oncommand="BrowserCopy();"/>
<menuitem value="&pasteCmd.label;" oncommand="BrowserReload();"/>
<menuitem value="&deleteCmd.label;" oncommand="BrowserReload();"/>
<menuseparator />
<menu value="&walletMenu.label;">
<menupopup>
<menuitem value="&walletSafeFillCmd.label;" oncommand="WalletSafeFillin();"/>
<menuitem value="&walletQuickFillCmd.label;" oncommand="WalletQuickFillin();"/>
<menuitem value="&walletRequestToCaptureCmd.label;" oncommand="WalletRequestToCapture();"/>
<menuseparator />
<menuitem value="&walletContentsCmd.label;" oncommand="WalletEditor();"/>
<menuitem value="&walletDisplaySignonsCmd.label;" oncommand="SignonViewer();"/>
<menuitem value="&walletDisplayCookiesCmd.label;" oncommand="CookieViewer();"/>
<menuseparator />
<menuitem value="&walletSamplesCmd.label;" oncommand="WalletSamples();"/>
<menuitem value="&walletChangePasswordCmd.label;" oncommand="WalletChangePassword();"/>
</menupopup>
</menu>
<menuseparator />
<menuitem value="&selectAllCmd.label;" oncommand="BrowserReload();"/>
<menuseparator />
<menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://pref/content/pref-appearance.xul')"/>
</menupopup>
</menu>
<menu id="menu_Edit">
<menupopup>
<menuitem id="menu_undo"/>
<menuitem id="menu_redo"/>
<menuseparator/>
<menuitem id="menu_cut"/>
<menuitem id="menu_copy"/>
<menuitem id="menu_paste"/>
<menuseparator/>
<menuitem id="menu_delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"/>
<menuseparator />
<menu value="&walletMenu.label;">
<menupopup>
<menuitem value="&walletSafeFillCmd.label;" oncommand="WalletSafeFillin();"/>
<menuitem value="&walletQuickFillCmd.label;" oncommand="WalletQuickFillin();"/>
<menuitem value="&walletRequestToCaptureCmd.label;" oncommand="WalletRequestToCapture();"/>
<menuseparator />
<menuitem value="&walletContentsCmd.label;" oncommand="WalletEditor();"/>
<menuitem value="&walletDisplaySignonsCmd.label;" oncommand="SignonViewer();"/>
<menuitem value="&walletDisplayCookiesCmd.label;" oncommand="CookieViewer();"/>
<menuseparator />
<menuitem value="&walletSamplesCmd.label;" oncommand="WalletSamples();"/>
<menuitem value="&walletChangePasswordCmd.label;" oncommand="WalletChangePassword();"/>
</menupopup>
</menu>
<menuseparator/>
<menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://pref/content/pref-appearance.xul')"/>
</menupopup>
</menu>
<menu accesskey="v" value="&viewMenu.label;">
<menupopup>

2
xpfe/global/resources/content/unix/platformGlobalOverlay.xul
View File

@ -9,7 +9,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- close -->
<menuitem id="menu_close" value="&closeCmd.label;" key="key_close" observes="cmd_close"/>
<menuitem id="menu_close" value="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" observes="cmd_close"/>
<key id="key_close" command="true" key="&closeCmd.key;" observes="cmd_close"/>
<!-- quit -->

2
xpfe/global/resources/content/win/platformGlobalOverlay.xul
View File

@ -9,7 +9,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- close -->
<menuitem id="menu_close" value="&closeCmd.label;" key="key_close" observes="cmd_close"/>
<menuitem id="menu_close" value="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" observes="cmd_close"/>
<key id="key_close" command="true" key="&closeCmd.key;" observes="cmd_close"/>
<!-- quit -->

3
xpfe/global/resources/locale/globalOverlay.dtd
View File

@ -1,9 +1,12 @@
<!-- extracted from globalOverlay.xul -->
<!ENTITY fileMenu.label "File">
<!ENTITY fileMenu.accesskey "f">
<!ENTITY pageSetupCmd.label ".Page Setup...">
<!ENTITY editMenu.label "Edit">
<!ENTITY editMenu.accesskey "e">
<!ENTITY undoCmd.label "Undo">
<!ENTITY undoCmd.key "Z">
<!ENTITY cutCmd.label "Cut">

2
xpfe/global/resources/locale/unix/platformGlobalOverlay.dtd
View File

@ -2,6 +2,8 @@
<!ENTITY closeCmd.label "Close">
<!ENTITY closeCmd.key "W">
<!ENTITY closeCmd.accesskey "c">
<!ENTITY quitApplicationCmd.label "Exit">
<!ENTITY quitApplicationCmd.key "Q">

2
xpfe/global/resources/locale/win/platformGlobalOverlay.dtd
View File

@ -2,6 +2,8 @@
<!ENTITY closeCmd.label "Close">
<!ENTITY closeCmd.key "W">
<!ENTITY closeCmd.accesskey "c">
<!ENTITY quitApplicationCmd.label "Exit">
<!ENTITY quitApplicationCmd.key "Q">