Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 186789 - Ctrl+Shift Shortcuts in Mozilla conflict with ISO 14755 Input methods (shift+ctrl keys don't work) [mark all read]

Browse Source 
r=neil.parkwaycc.co.uk@myrealbox.com, sr=alecf@flett.org (for XPFE changes), src=mscott@mozilla.org (for MailNews changes)
This commit is contained in:
pkw%us.ibm.com 2004-06-10 01:42:00 +00:00
parent e10531d5f6
commit d1a98c592e
19 changed files with 82 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailnews/base/Makefile.in
View File

@ -43,15 +43,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = msgbase
DIRS = public src util search ispdata
DIRS = public src util search ispdata resources
ifndef MOZ_STATIC_MAIL_BUILD
DIRS += build
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
DIRS += resources/content/mac
endif
include $(topsrcdir)/config/rules.mk

8
mailnews/base/resources/content/Makefile.in
View File

@ -42,7 +42,15 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
DIRS = win
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
DIRS = mac
else
DIRS = unix
endif
endif
include $(topsrcdir)/config/rules.mk

2
mailnews/base/resources/content/mac/jar.mn
View File

@ -1,2 +1,2 @@
messenger.jar:
+ content/messenger/platformMailnewsOverlay.xul
content/messenger/platformMailnewsOverlay.xul

1
mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
View File

@ -39,7 +39,6 @@
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/platformMailnewsOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
<?xul-overlay href="chrome://messenger/content/folderPane.xul"?>
<?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>

1
mailnews/base/resources/content/mailWindowOverlay.xul
View File

@ -43,6 +43,7 @@
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailWindowExtrasOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/platformMailnewsOverlay.xul"?>
<!DOCTYPE overlay [
<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >

1
mailnews/base/resources/content/messageWindow.xul
View File

@ -40,7 +40,6 @@
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/platformMailnewsOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>

1
mailnews/base/resources/content/messenger.xul
View File

@ -39,7 +39,6 @@
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/platformMailnewsOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
<?xul-overlay href="chrome://messenger/content/folderPane.xul"?>
<?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>

2
mailnews/base/resources/content/unix/jar.mn Normal file
View File

@ -0,0 +1,2 @@
messenger.jar:
content/messenger/platformMailnewsOverlay.xul

5
mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
View File

@ -7,5 +7,8 @@
<!-- Delete Key -->
<key id="cmd_shiftDelete" keycode="VK_DELETE" xulkey="false" modifiers="shift"/>
</overlay>
<!-- Select Thread -->
<key id="key_selectThread" modifiers="alt,shift"/>
</overlay>

47
mailnews/base/resources/content/win/Makefile.in Normal file
View File

@ -0,0 +1,47 @@
#
# ***** 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
# IBM Corporation.
# Portions created by the Initial Developer are Copyright (C) 2004
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of 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

2
mailnews/base/resources/content/win/jar.mn Normal file
View File

@ -0,0 +1,2 @@
messenger.jar:
content/messenger/platformMailnewsOverlay.xul

4
mailnews/base/resources/locale/en-US/messenger.dtd
View File

@ -285,7 +285,7 @@
<!ENTITY searchMailCmd.label "Search Messages...">
<!ENTITY searchMailCmd.accesskey "M">
<!ENTITY searchMailCmd.key "f">
<!ENTITY searchMailCmd.key "s">
<!-- Go Menu -->
@ -411,7 +411,7 @@
<!ENTITY markReadByDateCmd.key "c">
<!ENTITY markAllReadCmd.label "All Read">
<!ENTITY markAllReadCmd.accesskey "A">
<!ENTITY markAllReadCmd.key "c">
<!ENTITY markAllReadCmd.key "m">
<!ENTITY markFlaggedCmd.label "Flag">
<!ENTITY markFlaggedCmd.accesskey "F">
<!ENTITY markAsJunkCmd.label "As Junk">

1
mailnews/jar.mn
View File

@ -136,7 +136,6 @@ messenger.jar:
content/messenger/mailMessengerComposeOverlay.xul (base/resources/content/mailMessengerComposeOverlay.xul)
content/messenger/mailOverlay.xul (base/resources/content/mailOverlay.xul)
content/messenger/mailWidgets.xml (base/resources/content/mailWidgets.xml)
content/messenger/platformMailnewsOverlay.xul (base/resources/content/win/platformMailnewsOverlay.xul)
content/messenger/junkMail.xul (base/resources/content/junkMail.xul)
content/messenger/junkMail.js (base/resources/content/junkMail.js)
content/messenger/junkMailInfo.xul (base/resources/content/junkMailInfo.xul)

3
xpfe/browser/resources/content/mac/platformNavigationBindings.xul
View File

@ -14,6 +14,9 @@
<key key="." oncommand="BrowserStop();" modifiers="accel"/>
<key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="meta"/>
<key id="key_newTabWithTarget" keycode="VK_INSERT" modifiers="shift" command="cmd_newTabWithTarget"/>
<!-- Support Accel+Shift for Add Bookmark -->
<key id="addBookmarkKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmark" modifiers="accel,shift"/>
</keyset>
</overlay>

3
xpfe/browser/resources/content/navigatorOverlay.xul
View File

@ -107,8 +107,7 @@
<!-- Go Menu -->
<!-- Bookmarks Menu -->
<key id="addBookmarkKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmark" modifiers="accel"/>
<key id="addBookmarkAsKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel,shift"/>
<key id="addBookmarkAsKb" key="&addCurPageAsCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel"/>
<key id="manBookmarkKb" key="&manBookmarksCmd.commandkey;" command="Browser:ManageBookmark" modifiers="accel"/>
<!-- Tools Menu -->

5
xpfe/browser/resources/content/win/platformNavigationBindings.xul
View File

@ -26,7 +26,10 @@
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
<key id="key_newTabWithTarget" keycode="VK_INSERT" command="cmd_newTabWithTarget"/>
<key id="key_newTabWithTarget" keycode="VK_INSERT" modifiers="shift" command="cmd_newTabWithTarget"/>
</keyset>
<!-- Support Accel+Shift for Add Bookmark -->
<key id="addBookmarkKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmark" modifiers="accel,shift"/>
</keyset>
<menuitem id="menuitem_fullScreen" hidden="false"/>
</overlay>

2
xpfe/browser/resources/locale/en-US/mac/platformNavigationBindings.dtd
View File

@ -4,4 +4,6 @@
<!ENTITY goBackCmd.commandKey "[">
<!ENTITY goForwardCmd.commandKey "]">
<!ENTITY addCurPageCmd.commandkey "d">

4
xpfe/browser/resources/locale/en-US/navigator.dtd
View File

@ -123,7 +123,7 @@
<!ENTITY searchInternetCmd.label "Search the Web">
<!ENTITY searchInternetCmd.accesskey "S">
<!ENTITY searchInternet.commandKey "f">
<!ENTITY searchInternet.commandKey "s">
<!ENTITY goMenu.label "Go">
<!ENTITY goMenu.accesskey "g">
@ -134,9 +134,9 @@
<!ENTITY bookmarksMenu.accesskey "B">
<!ENTITY addCurPageCmd.label "Bookmark This Page">
<!ENTITY addCurPageCmd.accesskey "B">
<!ENTITY addCurPageCmd.commandkey "d">
<!ENTITY addCurPageAsCmd.label "File Bookmark...">
<!ENTITY addCurPageAsCmd.accesskey "F">
<!ENTITY addCurPageAsCmd.commandkey "d">
<!ENTITY addCurTabsAsCmd.label "Bookmark This Group of Tabs...">
<!ENTITY addCurTabsAsCmd.accesskey "G">
<!ENTITY manBookmarksCmd.label "Manage Bookmarks...">

2
xpfe/browser/resources/locale/en-US/win/platformNavigationBindings.dtd
View File

@ -2,4 +2,6 @@
<!ENTITY goBackCmd.keyCode "VK_LEFT">
<!ENTITY goForwardCmd.keyCode "VK_RIGHT">
<!ENTITY addCurPageCmd.commandkey "d">