зеркало из https://github.com/mozilla/gecko-dev.git
Bug 495731: Remove shortcut editor related files, r=gavin
This commit is contained in:
Mark Finkle
Родитель
bd65ab2303
Коммит
60f37743af
|
|
@ -1,581 +0,0 @@
|
|||
// -*- Mode: js2; tab-width: 4; indent-tabs-mode: nil; js2-basic-offset: 4; js2-skip-preprocessor-directives: t; -*-
|
||||
/* ***** 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 Mobile Browser.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2008
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Daniel Brooks <db48x@yahoo.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 ***** */
|
||||
|
||||
// TODO: see about grouping the keys into categories
|
||||
// TODO: move the shortcut editor to the prefs, if the prefs exist
|
||||
// TODO: needs theme work, do we have someone who does that sort of thing?
|
||||
// TODO: support multiple keys per command
|
||||
// TODO: a single click should allow you to edit a shortcut, rather than the
|
||||
// double click you have to use at the moment
|
||||
|
||||
var nsIJSON = Components.classes["@mozilla.org/dom/json;1"]
|
||||
.createInstance(Components.interfaces.nsIJSON);
|
||||
|
||||
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
|
||||
|
||||
function ShortcutEditor()
|
||||
{
|
||||
var prefsvc = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefService);
|
||||
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefBranch2);
|
||||
var keyPrefs = prefsvc.getBranch("shortcut.");
|
||||
var keyCache;
|
||||
|
||||
var tree;
|
||||
|
||||
// first, we need to be able to manipulate the keys and commands themselves
|
||||
function getCommandNames()
|
||||
{
|
||||
return Array.map(document.getElementsByTagNameNS(XUL_NS, "command"), function(c) { return c.getAttribute("id"); });
|
||||
}
|
||||
|
||||
function getKeys()
|
||||
{
|
||||
if (keyCache)
|
||||
return keyCache;
|
||||
|
||||
keyCache = { };
|
||||
Array.map(document.getElementsByTagNameNS(XUL_NS, "key"), function(k) { keyCache[k.getAttribute("command")] = k; });
|
||||
return keyCache;
|
||||
}
|
||||
|
||||
function findKeyForCommand(command)
|
||||
{
|
||||
// returns the key the calls the named command, or null if there isn't one
|
||||
var keys = getKeys();
|
||||
return command in keys && keys[command];
|
||||
}
|
||||
|
||||
function findKeyForSpec(keySpec)
|
||||
{
|
||||
// TODO: This is a bit simplistic as yet. For example, we should match
|
||||
// a key with an optional modifier even if that modifier isn't
|
||||
// specified in our arguments. Also, we need to differentiate
|
||||
// between a key element with an attribute that is an empty string
|
||||
// and one without that attribute at all.
|
||||
var keys = document.getElementsByTagNameNS(XUL_NS, "key");
|
||||
var l = keys.length;
|
||||
for (var i = 0; i < l; i++)
|
||||
{
|
||||
if (keys[i].getAttribute("modifiers") == getModifiersFromFlags(keySpec.modifiers) &&
|
||||
keys[i].getAttribute("key") == keySpec.key &&
|
||||
keys[i].getAttribute("keycode") == keySpec.keycode)
|
||||
return keys[i];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function addKey(command, keySpec)
|
||||
{
|
||||
// generally adds a new key to the document that runs command,
|
||||
// but if a key for command already exists it instead modifies
|
||||
// that key. If a key already exists that matches the
|
||||
// arguments, no modifications are made and null is
|
||||
// returned. Otherwise, the new key is returned.
|
||||
|
||||
if (!keySpec)
|
||||
return null;
|
||||
|
||||
var key = findKeyForCommand(command);
|
||||
if (keySpec.exists)
|
||||
{
|
||||
if (findKeyForSpec(keySpec))
|
||||
return null;
|
||||
|
||||
if (key)
|
||||
{
|
||||
keySpec.modifiers ? key.setAttribute("modifiers", getModifiersFromFlags(keySpec.modifiers))
|
||||
: key.removeAttribute("modifiers");
|
||||
keySpec.key ? key.setAttribute("key", keySpec.key)
|
||||
: key.removeAttribute("key");
|
||||
keySpec.keycode ? key.setAttribute("keycode", keySpec.keycode)
|
||||
: key.removeAttribute("keycode");
|
||||
}
|
||||
else
|
||||
{
|
||||
key = document.createElementNS(XUL_NS, "key");
|
||||
if (keySpec.modifiers)
|
||||
key.setAttribute("modifiers", getModifiersFromFlags(keySpec.modifiers));
|
||||
if (keySpec.key)
|
||||
key.setAttribute("key", keySpec.key);
|
||||
if (keySpec.keycode)
|
||||
key.setAttribute("keycode", keySpec.keycode);
|
||||
key.setAttribute("command", command);
|
||||
document.getElementById("mainKeyset").appendChild(key);
|
||||
}
|
||||
|
||||
keyCache[command] = key;
|
||||
return key;
|
||||
}
|
||||
|
||||
if (key)
|
||||
{
|
||||
delete keyCache[command];
|
||||
key.parentNode.removeChild(key);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function makeKeySpec(modifiers, key, keycode)
|
||||
{
|
||||
// TODO: make this check more specific, once key elements implement a unique interface
|
||||
if (modifiers instanceof Components.interfaces.nsIDOMElement)
|
||||
{
|
||||
return {
|
||||
exists: true,
|
||||
modifiers: getFlagsForModifiers(modifiers.getAttribute("modifiers")),
|
||||
key: modifiers.getAttribute("key") || false,
|
||||
keycode: modifiers.getAttribute("keycode") || false
|
||||
};
|
||||
}
|
||||
|
||||
if (modifiers instanceof Components.interfaces.nsIDOMKeyEvent)
|
||||
{
|
||||
return {
|
||||
exists: true,
|
||||
modifiers: getEventModifiers(modifiers),
|
||||
key: getEventKey(modifiers) || false,
|
||||
keycode: getEventKeyCode(modifiers) || false
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
exists: !!(key || keycode),
|
||||
modifiers: getFlagsForModifiers(modifiers),
|
||||
key: key || false,
|
||||
keycode: keycode || false
|
||||
};
|
||||
}
|
||||
|
||||
var modifierFlags = { alt: 1, control: 2, meta: 4, shift: 8 };
|
||||
function getFlagsForModifiers(modifiers)
|
||||
{
|
||||
if (!modifiers)
|
||||
return 0;
|
||||
|
||||
var result;
|
||||
for each (m in modifiers.split(/,\s*|\s+/))
|
||||
result |= m in modifierFlags && modifierFlags[m];
|
||||
return result;
|
||||
}
|
||||
|
||||
function getModifiersFromFlags(flags)
|
||||
{
|
||||
var result = [], i = 1;
|
||||
for each (m in ["alt", "control", "meta", "shift"])
|
||||
{
|
||||
if (flags & i)
|
||||
result.push(m);
|
||||
i += i;
|
||||
}
|
||||
return result.join(" ");
|
||||
}
|
||||
|
||||
function getEventModifiers(event)
|
||||
{
|
||||
var result, i = 1;
|
||||
for each (m in [event.altKey, event.ctrlKey, event.metaKey, event.shiftKey])
|
||||
{
|
||||
result |= (m && i);
|
||||
i += i;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function getEventKey(event)
|
||||
{
|
||||
if (event.charCode)
|
||||
return String.fromCharCode(event.charCode);
|
||||
}
|
||||
|
||||
var keyCodeMap = { };
|
||||
var nsIDOMKeyEvent = Components.interfaces.nsIDOMKeyEvent;
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_CANCEL] = "VK_CANCEL";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_HELP] = "VK_HELP";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_BACK_SPACE] = "VK_BACK";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_TAB] = "VK_TAB";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_CLEAR] = "VK_CLEAR";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_RETURN] = "VK_RETURN";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_ENTER] = "VK_ENTER";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SHIFT] = "VK_SHIFT";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_CONTROL] = "VK_CONTROL";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_ALT] = "VK_ALT";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_PAUSE] = "VK_PAUSE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_CAPS_LOCK] = "VK_CAPS_LOCK";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_ESCAPE] = "VK_ESCAPE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SPACE] = "VK_SPACE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_PAGE_UP] = "VK_PAGE_UP";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_PAGE_DOWN] = "VK_PAGE_DOWN";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_END] = "VK_END";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_HOME] = "VK_HOME";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_LEFT] = "VK_LEFT";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_UP] = "VK_UP";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_RIGHT] = "VK_RIGHT";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_DOWN] = "VK_DOWN";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_PRINTSCREEN] = "VK_PRINTSCREEN";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_INSERT] = "VK_INSERT";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_DELETE] = "VK_DELETE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SEMICOLON] = "VK_SEMICOLON";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_EQUALS] = "VK_EQUALS";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_CONTEXT_MENU] = "VK_CONTEXT_MENU";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_MULTIPLY] = "VK_MULTIPLY";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_ADD] = "VK_ADD";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SEPARATOR] = "VK_SEPARATOR";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SUBTRACT] = "VK_SUBTRACT";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_DECIMAL] = "VK_DECIMAL";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_DIVIDE] = "VK_DIVIDE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F1] = "VK_F1";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F2] = "VK_F2";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F3] = "VK_F3";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F4] = "VK_F4";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F5] = "VK_F5";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F6] = "VK_F6";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F7] = "VK_F7";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F8] = "VK_F8";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F9] = "VK_F9";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F10] = "VK_F10";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F11] = "VK_F11";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F12] = "VK_F12";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F13] = "VK_F13";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F14] = "VK_F14";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F15] = "VK_F15";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F16] = "VK_F16";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F17] = "VK_F17";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F18] = "VK_F18";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F19] = "VK_F19";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F20] = "VK_F20";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F21] = "VK_F21";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F22] = "VK_F22";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F23] = "VK_F23";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_F24] = "VK_F24";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_NUM_LOCK] = "VK_NUM_LOCK";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SCROLL_LOCK] = "VK_SCROLL_LOCK";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_COMMA] = "VK_COMMA";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_PERIOD] = "VK_PERIOD";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_SLASH] = "VK_SLASH";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_BACK_QUOTE] = "VK_BACK_QUOTE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET] = "VK_OPEN_BRACKET";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_BACK_SLASH] = "VK_BACK_SLASH";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET] = "VK_CLOSE_BRACKET";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_QUOTE] = "VK_QUOTE";
|
||||
keyCodeMap[nsIDOMKeyEvent.DOM_VK_META] = "VK_META";
|
||||
|
||||
function getEventKeyCode(event)
|
||||
{
|
||||
return keyCodeMap[event.keyCode];
|
||||
}
|
||||
|
||||
// This code is all about converting key elements into human-readable
|
||||
// descriptions of the keys they match. Copied essentially verbatim from
|
||||
// nsMenuFrame::BuildAcceleratorText
|
||||
// TODO: write some tests
|
||||
|
||||
// first, we need to look up the right names of the various modifier keys.
|
||||
var platformBundle = document.getElementById("bundle_platformKeys");
|
||||
function doGetString(n) { try { return platformBundle.getString(n); } catch (ex) { dump(">>"+ex+"\n"); return undefined; } };
|
||||
var platformKeys = {
|
||||
shift: doGetString("VK_SHIFT") || "Shift",
|
||||
meta: doGetString("VK_META") || "Meta",
|
||||
alt: doGetString("VK_ALT") || "Alt",
|
||||
control: doGetString("VK_CONTROL") || "Ctrl"
|
||||
};
|
||||
var modifierSeparator = doGetString("MODIFIER_SEPARATOR") || "+";
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
var accelKey = Components.interfaces.nsIDOMKeyEvent.DOM_VK_META;
|
||||
#else
|
||||
var accelKey = Components.interfaces.nsIDOMKeyEvent.DOM_VK_CONTROL;
|
||||
#endif
|
||||
|
||||
try {
|
||||
accelKey = prefs.getCharPref("ui.key.accelKey");
|
||||
} catch (e) { }
|
||||
|
||||
// convert from the accel keycode to the right string
|
||||
var platformAccel = { };
|
||||
platformAccel[Components.interfaces.nsIDOMKeyEvent.DOM_VK_META] = platformKeys.meta;
|
||||
platformAccel[Components.interfaces.nsIDOMKeyEvent.DOM_VK_ALT] = platformKeys.alt;
|
||||
platformAccel[Components.interfaces.nsIDOMKeyEvent.DOM_VK_CONTROL] = platformKeys.control;
|
||||
platformKeys.accel = platformAccel[accelKey] || platformKeys.control;
|
||||
|
||||
function getKeyName(keySpec) {
|
||||
// convert a key element into a string describing what keys to push.
|
||||
// "Control-C" or "Control-Meta-Hyper-Shift-Q" or whatever
|
||||
if (!keySpec)
|
||||
return "";
|
||||
if (keySpec instanceof Components.interfaces.nsIDOMElement)
|
||||
keySpec = makeKeySpec(keySpec);
|
||||
if (!keySpec.exists)
|
||||
return "";
|
||||
|
||||
var accel = [];
|
||||
var keybundle = document.getElementById("bundle_keys");
|
||||
|
||||
// this is sorta dumb, but whatever
|
||||
var modifiers = [], i = 1;
|
||||
for each (m in ["control", "alt", "meta", "shift"])
|
||||
if (keySpec.modifiers & modifierFlags[m])
|
||||
modifiers.push(m);
|
||||
for each (m in modifiers)
|
||||
if (m in platformKeys)
|
||||
accel.push(platformKeys[m]);
|
||||
|
||||
var key = (keySpec.key && keySpec.key.toUpperCase());
|
||||
|
||||
var keyCode;
|
||||
try
|
||||
{
|
||||
keyCode = keySpec.keycode && keybundle.getString(keySpec.keycode);
|
||||
}
|
||||
catch (ex)
|
||||
{
|
||||
var m = /VK_(\w+)/(keySpec.keycode);
|
||||
if (m)
|
||||
keyCode = m[1] || keySpec.keycode;
|
||||
}
|
||||
|
||||
accel.push(key || keyCode || "");
|
||||
return accel.join(modifierSeparator);
|
||||
}
|
||||
|
||||
// this listens to keyup events and converts them into the proper display name for the textbox
|
||||
function keyListener(event)
|
||||
{
|
||||
if (!event instanceof Components.interfaces.nsIDOMKeyEvent)
|
||||
return;
|
||||
|
||||
var keySpec = makeKeySpec(event);
|
||||
this.value = getKeyName(keySpec);
|
||||
tree.setAttribute("spec", nsIJSON.encode(keySpec));
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
}
|
||||
|
||||
function resetListener(event)
|
||||
{
|
||||
tree.setAttribute("spec", nsIJSON.encode(makeKeySpec()));
|
||||
}
|
||||
|
||||
function modificationListener(event)
|
||||
{
|
||||
if (event.attrName == "label" && event.newValue != event.prevValue)
|
||||
{
|
||||
var keySpec = tree.getAttribute("spec");
|
||||
tree.removeAttribute("spec");
|
||||
var cell = event.relatedNode.ownerElement;
|
||||
cell.setAttribute("value", keySpec);
|
||||
var command = cell.previousSibling.getAttribute("value");
|
||||
keySpec = keySpec ? nsIJSON.decode(keySpec) : makeKeySpec();
|
||||
addKey(command, keySpec);
|
||||
save(command, keySpec);
|
||||
}
|
||||
}
|
||||
|
||||
this.init = function()
|
||||
{
|
||||
if (tree)
|
||||
return; // we've already been called
|
||||
|
||||
tree = document.getElementById("shortcuts");
|
||||
|
||||
var textbox = document.getAnonymousElementByAttribute(tree, "anonid", "input");
|
||||
textbox.addEventListener("keypress", keyListener, true);
|
||||
textbox.addEventListener("reset", resetListener, true);
|
||||
tree.addEventListener("DOMAttrModified", modificationListener, true);
|
||||
|
||||
fillShortcutList();
|
||||
};
|
||||
|
||||
function hack()
|
||||
{
|
||||
// TODO: this is a hack, so I want to remove it. to do so, key elements
|
||||
// will have to respond to direct dom manipulation.
|
||||
Array.map(document.getElementsByTagNameNS(XUL_NS, "keyset"),
|
||||
function(e) { return e.parentNode.removeChild(e); })
|
||||
.forEach(function(e) { document.documentElement.appendChild(e); });
|
||||
keyCache = undefined;
|
||||
}
|
||||
|
||||
this.deinit = function()
|
||||
{
|
||||
if (!tree)
|
||||
return; // got called early, just return
|
||||
|
||||
hack();
|
||||
var textbox = document.getAnonymousElementByAttribute(tree, "anonid", "input");
|
||||
textbox.removeEventListener("keypress", keyListener, true);
|
||||
textbox.removeEventListener("reset", resetListener, true);
|
||||
tree.removeEventListener("DOMAttrModified", modificationListener, true);
|
||||
};
|
||||
|
||||
// also, updating the UI is helpful
|
||||
function fillShortcutList()
|
||||
{
|
||||
var commands = getCommandNames();
|
||||
var sb = document.getElementById("shortcut-bundles").childNodes;
|
||||
|
||||
function doAppend(command)
|
||||
{
|
||||
// TODO: alter the listbox xbl binding so that if appendItem is
|
||||
// given more than 2 arguments, it interprets the additional
|
||||
// arguments as labels for additional cells.
|
||||
var key = findKeyForCommand(command);
|
||||
var cell1 = document.createElementNS(XUL_NS, "treecell");
|
||||
cell1.setAttribute("label", doGetString(command +".name") || command);
|
||||
cell1.setAttribute("value", command);
|
||||
var cell2 = document.createElementNS(XUL_NS, "treecell");
|
||||
cell2.setAttribute("label", getKeyName(key));
|
||||
cell2.setAttribute("value", makeKeySpec(key));
|
||||
var row = document.createElementNS(XUL_NS, "treerow");
|
||||
row.appendChild(cell1);
|
||||
row.appendChild(cell2);
|
||||
var item = document.createElementNS(XUL_NS, "treeitem");
|
||||
item.appendChild(row);
|
||||
children.appendChild(item);
|
||||
}
|
||||
|
||||
function doGetString(name)
|
||||
{
|
||||
var l = sb.length;
|
||||
for (var i = 0; i < l; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
return sb[i].getString(name);
|
||||
}
|
||||
catch (e) { return null; }
|
||||
}
|
||||
}
|
||||
|
||||
var children = document.getElementById("shortcuts-children");
|
||||
tree.removeChild(children);
|
||||
children = document.createElementNS(XUL_NS, "treechildren");
|
||||
children.setAttribute("id", "shortcuts-children");
|
||||
tree.appendChild(children);
|
||||
|
||||
commands.forEach(doAppend);
|
||||
}
|
||||
|
||||
// saving and restoring a key assignment to the prefs
|
||||
function save(command, keySpec)
|
||||
{
|
||||
var str = Components.classes["@mozilla.org/supports-string;1"]
|
||||
.createInstance(Components.interfaces.nsISupportsString);
|
||||
str.data = nsIJSON.encode(keySpec);
|
||||
keyPrefs.setComplexValue(command, Components.interfaces.nsISupportsString, str);
|
||||
}
|
||||
|
||||
function load(command)
|
||||
{
|
||||
try
|
||||
{
|
||||
return nsIJSON.decode(keyPrefs.getComplexValue(command, Components.interfaces.nsISupportsString).data);
|
||||
}
|
||||
catch (ex)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
// and of course, none of this would be any use unless at some point we
|
||||
// ensure that all the keys in the window match the user's choices
|
||||
this.restore = function()
|
||||
{
|
||||
getCommandNames().forEach(function(cmd) { addKey(cmd, load(cmd)); });
|
||||
hack();
|
||||
};
|
||||
|
||||
// last but not least, we need to be able to test that everything is working
|
||||
this.test = function()
|
||||
{
|
||||
// TODO: write a mochitest .xul file, and add it to the build
|
||||
// TODO: test findKeyForSpec() and findKeyForCommand()
|
||||
function eq(a, b)
|
||||
{
|
||||
for (p in a)
|
||||
if (a[p] != b[p])
|
||||
return false;
|
||||
for (p in b)
|
||||
if (a[p] != b[p])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
function ok(t, msg)
|
||||
{
|
||||
if (!t)
|
||||
dump("ERROR FAILURE: "+ msg +"\n");
|
||||
}
|
||||
|
||||
[[[undefined, "a"], {exists: true, modifiers: 0, key: "a", keycode: false}, "A"],
|
||||
[["alt", "a"], {exists: true, modifiers: 1, key: "a", keycode: false}, "Alt+A"],
|
||||
[["control", "a"], {exists: true, modifiers: 2, key: "a", keycode: false}, "Ctrl+A"],
|
||||
[["meta", "a"], {exists: true, modifiers: 4, key: "a", keycode: false}, "Meta+A"],
|
||||
[["shift", "a"], {exists: true, modifiers: 8, key: "a", keycode: false}, "Shift+A"],
|
||||
[["control,alt", "a"], {exists: true, modifiers: 3, key: "a", keycode: false}, "Ctrl+Alt+A"],
|
||||
[["alt, shift", "a"], {exists: true, modifiers: 9, key: "a", keycode: false}, "Alt+Shift+A"],
|
||||
[["shift ,meta", "a"], {exists: true, modifiers: 12, key: "a", keycode: false}, "Meta+Shift+A"],
|
||||
[["control , alt shift", "a"], {exists: true, modifiers: 11, key: "a", keycode: false}, "Ctrl+Alt+Shift+A"],
|
||||
[["alt shift meta", "a"], {exists: true, modifiers: 13, key: "a", keycode: false}, "Alt+Meta+Shift+A"],
|
||||
[[undefined, undefined, "VK_BACK"], {exists: true, modifiers: 0, key: false, keycode: "VK_BACK"}, "Backspace"],
|
||||
[["control", undefined, "VK_BACK"], {exists: true, modifiers: 2, key: false, keycode: "VK_BACK"}, "Ctrl+Backspace"],
|
||||
[["control", undefined, "VK_A"], {exists: true, modifiers: 2, key: false, keycode: "VK_A"}, "Ctrl+A"],
|
||||
[["meta shift alt control", undefined, "VK_A"], {exists: true, modifiers: 15, key: false, keycode: "VK_A"}, "Ctrl+Alt+Meta+Shift+A"],
|
||||
[[], {exists: false, modifiers: 0, key: false, keycode: false}, ""],
|
||||
[["control"], {exists: false, modifiers: 2, key: false, keycode: false}, ""],
|
||||
[["foobar", "a"], {exists: true, modifiers: 0, key: "a", keycode: false}, "A"],
|
||||
[["alt", "α"], {exists: true, modifiers: 1, key: "α", keycode: false}, "Alt+Α"],
|
||||
[["alt", "א"], {exists: true, modifiers: 1, key: "א", keycode: false}, "Alt+א"]
|
||||
].forEach(function doTests(t)
|
||||
{
|
||||
var v, prefname;
|
||||
ok(eq((v = makeKeySpec.apply(undefined, t[0])), t[1]),
|
||||
"key spec for "+ t[0].toSource() +" should be "+ t[1].toSource() +", but was actually "+ v.toSource());
|
||||
ok((v = getKeyName(t[1])) == t[2],
|
||||
"key name for "+ t[0].toSource() +" should be '"+ t[2] +"', but was actually '"+ v +"'");
|
||||
save((prefname = "test-" + t[2]), t[1]);
|
||||
ok(eq((v = load(prefname)), t[1]),
|
||||
"key spec for "+ t[2].toSource() +" should be "+ t[1].toSource() +", but was actually "+ v.toSource() +" after save+load");
|
||||
keyPrefs.clearUserPref(prefname);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
var Shortcuts = new ShortcutEditor();
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
cmd_back.name=Go back
|
||||
cmd_forward.name=Go forward
|
||||
cmd_reload.name=Reload page
|
||||
cmd_stop.name=Stop loading
|
||||
cmd_search.name=Search
|
||||
cmd_go.name=Load URL
|
||||
cmd_openLocation.name=Open location
|
||||
cmd_star.name=Star page
|
||||
cmd_bookmarks.name=View bookmarks
|
||||
cmd_find.name=Find in page
|
||||
cmd_findAgain.name=Find again
|
||||
cmd_findPrevious.name=Find previous
|
||||
cmd_menu.name=Show menu
|
||||
cmd_fullscreen.name=Use full screen
|
||||
cmd_scrollPageUp.name=Page up
|
||||
cmd_scrollToBeginning.name=Scroll to beginning
|
||||
cmd_scrollPageDown.name=Page down
|
||||
cmd_scrollToEnd.name=Scroll to end
|
||||
cmd_cut.name=Cut
|
||||
cmd_copy.name=Copy
|
||||
cmd_copylink.name=Copy link URL
|
||||
cmd_paste.name=Paste
|
||||
cmd_delete.name=Delete
|
||||
cmd_selectAll.name=Select All
|
||||
cmd_newTab.name=Open new tab
|
||||
cmd_closeTab.name=Close current tab
|
||||
cmd_actions.name=Open Actions list
|
||||
cmd_panel.name=Open panel of stuff
|
||||
cmd_sanitize.name=Delete all saved personal information
|
||||
cmd_zoomin.name=Zoom In
|
||||
cmd_zoomout.name=Zoom Out
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
% locale browser @AB_CD@ %locale/@AB_CD@/browser/
|
||||
locale/@AB_CD@/browser/browser.dtd (%chrome/browser.dtd)
|
||||
locale/@AB_CD@/browser/browser.properties (%chrome/browser.properties)
|
||||
locale/@AB_CD@/browser/shortcuts.properties (%chrome/shortcuts.properties)
|
||||
locale/@AB_CD@/browser/search.properties (%chrome/search.properties)
|
||||
locale/@AB_CD@/browser/region.properties (%chrome/region.properties)
|
||||
locale/@AB_CD@/browser/preferences.dtd (%chrome/preferences.dtd)
|
||||
|
|
|
|||
|
|
@ -600,12 +600,6 @@ richpref {
|
|||
background-color: white;
|
||||
}
|
||||
|
||||
/* Shortcut editor ------------------------------------------------------- */
|
||||
#shortcuts {
|
||||
border: 0;
|
||||
padding: .2em;
|
||||
}
|
||||
|
||||
/* alerts popup ----------------------------------------------------------- */
|
||||
#alerts-container {
|
||||
color: #000;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче