Bug 297236 - unable to dismiss about:config (Config Editor) window via keyboard, r=philor
authorŽiga Sancin <bisi@pikslar.com>
Fri, 12 Sep 2008 19:45:29 -0700
changeset 324 76558fa9afbd019c04e3f38924e527f1a941d649
parent 323 b63a39af19cdcd28199a11dbdd3980becd823127
child 325 51131d4c50ad879996799e05f0f1fac7a1601fde
push idunknown
push userunknown
push dateunknown
reviewersphilor
bugs297236
Bug 297236 - unable to dismiss about:config (Config Editor) window via keyboard, r=philor
mail/base/content/configEditorOverlay.xul
mail/base/jar.mn
mail/locales/en-US/chrome/messenger/configEditorOverlay.dtd
mail/locales/jar.mn
new file mode 100644
--- /dev/null
+++ b/mail/base/content/configEditorOverlay.xul
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+# ***** 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 Thunderbird Config Editor Overlay.
+#
+# The Initial Developer of the Original Code is
+# Žiga Sancin.
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Žiga Sancin <bisi@pikslar.com>
+#
+# 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 *****
+
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/configEditorOverlay.dtd">
+
+<overlay id="configEditorOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <window id="config">
+    <keyset id="configEditorOverlayKeys">
+      <key key="&closeCmd.key;" modifiers="accel" oncommand="window.close();"/>
+      <key keycode="VK_ESCAPE" xulkey="false" oncommand="window.close();"/>
+    </keyset>
+  </window>
+</overlay>
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -1,13 +1,14 @@
 messenger.jar:
 % content messagebody %content/messagebody/ contentaccessible=yes
 % content messenger %content/messenger/ xpcnativewrappers=yes
 % override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
 % overlay chrome://global/content/viewSource.xul chrome://messenger/content/viewSourceOverlay.xul
+% overlay chrome://global/content/config.xul chrome://messenger/content/configEditorOverlay.xul
 *   content/messenger/mailWindow.js                 (content/mailWindow.js)
 *   content/messenger/mailWindowOverlay.js          (content/mailWindowOverlay.js)
 *   content/messenger/mailWindowOverlay.xul         (content/mailWindowOverlay.xul)
 *   content/messenger/mailOverlay.xul               (content/mailOverlay.xul)
 *   content/messenger/messageWindow.xul             (content/messageWindow.xul)
 *   content/messenger/messageWindow.js              (content/messageWindow.js)
 *   content/messenger/mailContextMenus.js           (content/mailContextMenus.js)
 *   content/messenger/messenger.xul                 (content/messenger.xul)
@@ -46,16 +47,17 @@ messenger.jar:
     content/messenger/startpage-h2-rtl.png          (content/startpage-h2-rtl.png)
     content/messenger/startpage-li.png              (content/startpage-li.png)
     content/messenger/messenger.css                 (content/messenger.css)
 *   content/messenger/search.xml                    (content/search.xml)
 *   content/messenger/tabmail.xml                   (content/tabmail.xml)
 *   content/messenger/newmailalert.xul              (content/newmailalert.xul)
     content/messenger/newmailalert.js               (content/newmailalert.js)
 *   content/messenger/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
+*   content/messenger/configEditorOverlay.xul       (content/configEditorOverlay.xul)
     content/messenger/msgSynchronize.xul            (/mailnews/base/resources/content/msgSynchronize.xul)
     content/messenger/msgSynchronize.js             (/mailnews/base/resources/content/msgSynchronize.js)
     content/messenger/folderProps.xul               (/mailnews/base/resources/content/folderProps.xul)
     content/messenger/retention.js                  (/mailnews/base/resources/content/retention.js)
     content/messenger/folderProps.js                (/mailnews/base/resources/content/folderProps.js)
     content/messenger/folderWidgets.xml             (/mailnews/base/resources/content/folderWidgets.xml)
     content/messenger/threadPane.js                 (/mailnews/base/resources/content/threadPane.js)
     content/messenger/shareglue.js                  (/mailnews/base/resources/content/shareglue.js)
new file mode 100644
--- /dev/null
+++ b/mail/locales/en-US/chrome/messenger/configEditorOverlay.dtd
@@ -0,0 +1,1 @@
+<!ENTITY closeCmd.key "W">
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -80,16 +80,17 @@
   locale/@AB_CD@/messenger/textImportMsgs.properties                    (%chrome/messenger/textImportMsgs.properties)
   locale/@AB_CD@/messenger/appleMailImportMsgs.properties               (%chrome/messenger/appleMailImportMsgs.properties)
   locale/@AB_CD@/messenger/comm4xMailImportMsgs.properties              (%chrome/messenger/comm4xMailImportMsgs.properties)
   locale/@AB_CD@/messenger/eudoraImportMsgs.properties                  (%chrome/messenger/eudoraImportMsgs.properties)
   locale/@AB_CD@/messenger/oeImportMsgs.properties                      (%chrome/messenger/oeImportMsgs.properties)
   locale/@AB_CD@/messenger/outlookImportMsgs.properties                 (%chrome/messenger/outlookImportMsgs.properties)
   locale/@AB_CD@/messenger/shellservice.properties                      (%chrome/messenger/shellservice.properties)
   locale/@AB_CD@/messenger/shutdownWindow.properties                    (%chrome/messenger/shutdownWindow.properties)
+  locale/@AB_CD@/messenger/configEditorOverlay.dtd                      (%chrome/messenger/configEditorOverlay.dtd)
   locale/@AB_CD@/messenger/addressbook/abMainWindow.dtd                 (%chrome/messenger/addressbook/abMainWindow.dtd)
   locale/@AB_CD@/messenger/addressbook/abNewCardDialog.dtd              (%chrome/messenger/addressbook/abNewCardDialog.dtd)
   locale/@AB_CD@/messenger/addressbook/abContactsPanel.dtd              (%chrome/messenger/addressbook/abContactsPanel.dtd)
   locale/@AB_CD@/messenger/addressbook/abAddressBookNameDialog.dtd      (%chrome/messenger/addressbook/abAddressBookNameDialog.dtd)
   locale/@AB_CD@/messenger/addressbook/abCardOverlay.dtd                (%chrome/messenger/addressbook/abCardOverlay.dtd)
   locale/@AB_CD@/messenger/addressbook/abCardViewOverlay.dtd            (%chrome/messenger/addressbook/abCardViewOverlay.dtd)
   locale/@AB_CD@/messenger/addressbook/abDirTreeOverlay.dtd             (%chrome/messenger/addressbook/abDirTreeOverlay.dtd)
   locale/@AB_CD@/messenger/addressbook/abResultsPaneOverlay.dtd         (%chrome/messenger/addressbook/abResultsPaneOverlay.dtd)