CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 05:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
Bryan Housel
2017-05-16 15:30:12 -04:00
parent d45063dd69
commit 0e3b372abd
2 changed files with 26 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/shortcuts.json
+20 -67
View File
@@ -4,77 +4,47 @@
"desc": "shortcuts.display.desc",
"shortcuts": [
{
"shortcut": [
"↓",
"↑",
"←",
"→"
],
"shortcut": ["↓", "↑", "←", "→"],
"key": "shortcuts.display.pan_map"
},
{
"shortcut": [
"⇧↓",
"⇧↑",
"⇧←",
"⇧→"
],
"shortcut": ["⇧↓", "⇧↑", "⇧←", "⇧→"],
"key": "shortcuts.display.pan_map_screen"
},
{
"shortcut": [
"+",
"-"
],
"shortcut": ["+", "-"],
"key": "shortcuts.display.zoom"
},
{
"shortcut": [
"⌘+",
"⌘-"
],
"shortcut": ["⌘+", "⌘-"],
"key": "shortcuts.display.zoom_large"
},
{
"shortcut": [
"B"
],
"shortcut": ["B"],
"key": "shortcuts.display.bg_switcher"
},
{
"shortcut": [
"⌘B"
],
"shortcut": ["⌘B"],
"key": "shortcuts.display.bg"
},
{
"shortcut": [
"W"
],
"shortcut": ["W"],
"key": "shortcuts.display.wireframe"
},
{
"shortcut": [
"H"
],
"shortcut": ["H"],
"key": "shortcuts.display.help"
},
{
"shortcut": [
"/"
],
"shortcut": ["/"],
"key": "shortcuts.display.minimap"
},
{
"shortcut": [
"⌘I"
],
"shortcut": ["⌘I"],
"key": "shortcuts.display.infobox"
},
{
"shortcut": [
"Space"
],
"shortcut": ["Space"],
"key": "shortcuts.display.radial_menu"
}
]
@@ -84,54 +54,37 @@
"desc": "shortcuts.edit.desc",
"shortcuts": [
{
"shortcut": [
"1"
],
"shortcut": ["1"],
"key": "shortcuts.edit.add_point"
},
{
"shortcut": [
"2"
],
"shortcut": ["2"],
"key": "shortcuts.edit.add_line"
},
{
"shortcut": [
"3"
],
"shortcut": ["3"],
"key": "shortcuts.edit.add_area"
},
{
"shortcut": [
"A"
],
"shortcut": ["A"],
"key": "shortcuts.edit.continue_line"
},
{
"shortcut": [
"↵ Enter",
"Esc"
],
"shortcut": ["↵ Enter", "Esc"],
"key": "shortcuts.edit.stop_line"
},
{
"shortcut": [
"⌘Z"
],
"shortcut": ["⌘Z"],
"key": "shortcuts.edit.undo"
},
{
"shortcut": [
"⌘⇧Z"
],
"shortcut": ["⌘⇧Z"],
"key": "shortcuts.edit.redo"
},
{
"shortcut": [
"⌘S"
],
"shortcut": ["⌘S"],
"key": "shortcuts.edit.save"
}
]
}
]}
]}
modules/ui/shortcuts.js
+6 -2
View File
@@ -5,6 +5,7 @@ import { d3keybinding } from '../lib/d3.keybinding.js';
import { t } from '../util/locale';
import { dataShortcuts } from '../../data';
export function uiShortcuts() {
var key = '⇧/';
var activeTab = 0;
@@ -23,7 +24,8 @@ export function uiShortcuts() {
d3.select(document)
.call(keybinding);
function shortcutsModal(modalSelection) {
modalSelection.select('.modal')
.attr('class', 'modal modal-shortcuts fillL col6');
@@ -35,11 +37,12 @@ export function uiShortcuts() {
.attr('class', 'modal-section')
.append('h3')
.text(t('shortcuts.modal.title'));
shortcutsModal
.call(renderTabs);
}
function renderTabs(selection) {
var wrapper = selection
.selectAll('.wrapper')
@@ -133,6 +136,7 @@ export function uiShortcuts() {
});
}
return function(selection, show) {
savedSelection = selection;
if (show) {