| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 section.addRelatedKeys(nextAndPrevFrameKeys, Common.UIString('Next/previous
call frame')); | 99 section.addRelatedKeys(nextAndPrevFrameKeys, Common.UIString('Next/previous
call frame')); |
| 100 | 100 |
| 101 section.addAlternateKeys( | 101 section.addAlternateKeys( |
| 102 UI.ShortcutsScreen.SourcesPanelShortcuts.EvaluateSelectionInConsole, | 102 UI.ShortcutsScreen.SourcesPanelShortcuts.EvaluateSelectionInConsole, |
| 103 Common.UIString('Evaluate selection in console')); | 103 Common.UIString('Evaluate selection in console')); |
| 104 section.addAlternateKeys( | 104 section.addAlternateKeys( |
| 105 UI.ShortcutsScreen.SourcesPanelShortcuts.AddSelectionToWatch, Common.UIS
tring('Add selection to watch')); | 105 UI.ShortcutsScreen.SourcesPanelShortcuts.AddSelectionToWatch, Common.UIS
tring('Add selection to watch')); |
| 106 section.addAlternateKeys( | 106 section.addAlternateKeys( |
| 107 UI.ShortcutsScreen.SourcesPanelShortcuts.ToggleBreakpoint, Common.UIStri
ng('Toggle breakpoint')); | 107 UI.ShortcutsScreen.SourcesPanelShortcuts.ToggleBreakpoint, Common.UIStri
ng('Toggle breakpoint')); |
| 108 section.addAlternateKeys( | 108 section.addAlternateKeys( |
| 109 UI.ShortcutsScreen.SourcesPanelShortcuts.ToggleBreakpointEnabled, Common
.UIString('Toggle breakpoint enabled')); |
| 110 section.addAlternateKeys( |
| 109 UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.toggle-breakp
oints-active'), | 111 UI.shortcutRegistry.shortcutDescriptorsForAction('debugger.toggle-breakp
oints-active'), |
| 110 Common.UIString('Toggle all breakpoints')); | 112 Common.UIString('Toggle all breakpoints')); |
| 111 | 113 |
| 112 // Editing | 114 // Editing |
| 113 section = UI.shortcutsScreen.section(Common.UIString('Text Editor')); | 115 section = UI.shortcutsScreen.section(Common.UIString('Text Editor')); |
| 114 section.addAlternateKeys(UI.ShortcutsScreen.SourcesPanelShortcuts.GoToMember
, Common.UIString('Go to member')); | 116 section.addAlternateKeys(UI.ShortcutsScreen.SourcesPanelShortcuts.GoToMember
, Common.UIString('Go to member')); |
| 115 section.addAlternateKeys( | 117 section.addAlternateKeys( |
| 116 UI.ShortcutsScreen.SourcesPanelShortcuts.ToggleAutocompletion, Common.UI
String('Autocompletion')); | 118 UI.ShortcutsScreen.SourcesPanelShortcuts.ToggleAutocompletion, Common.UI
String('Autocompletion')); |
| 117 section.addAlternateKeys(UI.ShortcutsScreen.SourcesPanelShortcuts.GoToLine,
Common.UIString('Go to line')); | 119 section.addAlternateKeys(UI.ShortcutsScreen.SourcesPanelShortcuts.GoToLine,
Common.UIString('Go to line')); |
| 118 section.addAlternateKeys( | 120 section.addAlternateKeys( |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 AddSelectionToWatch: [UI.KeyboardShortcut.makeDescriptor( | 427 AddSelectionToWatch: [UI.KeyboardShortcut.makeDescriptor( |
| 426 'a', UI.KeyboardShortcut.Modifiers.Shift | UI.KeyboardShortcut.Modifiers.C
trl)], | 428 'a', UI.KeyboardShortcut.Modifiers.Shift | UI.KeyboardShortcut.Modifiers.C
trl)], |
| 427 | 429 |
| 428 GoToMember: [UI.KeyboardShortcut.makeDescriptor( | 430 GoToMember: [UI.KeyboardShortcut.makeDescriptor( |
| 429 'o', UI.KeyboardShortcut.Modifiers.CtrlOrMeta | UI.KeyboardShortcut.Modifi
ers.Shift)], | 431 'o', UI.KeyboardShortcut.Modifiers.CtrlOrMeta | UI.KeyboardShortcut.Modifi
ers.Shift)], |
| 430 | 432 |
| 431 GoToLine: [UI.KeyboardShortcut.makeDescriptor('g', UI.KeyboardShortcut.Modifie
rs.Ctrl)], | 433 GoToLine: [UI.KeyboardShortcut.makeDescriptor('g', UI.KeyboardShortcut.Modifie
rs.Ctrl)], |
| 432 | 434 |
| 433 ToggleBreakpoint: [UI.KeyboardShortcut.makeDescriptor('b', UI.KeyboardShortcut
.Modifiers.CtrlOrMeta)], | 435 ToggleBreakpoint: [UI.KeyboardShortcut.makeDescriptor('b', UI.KeyboardShortcut
.Modifiers.CtrlOrMeta)], |
| 434 | 436 |
| 437 ToggleBreakpointEnabled: [UI.KeyboardShortcut.makeDescriptor( |
| 438 'b', UI.KeyboardShortcut.Modifiers.CtrlOrMeta | UI.KeyboardShortcut.Modifi
ers.Shift)], |
| 439 |
| 435 NextCallFrame: | 440 NextCallFrame: |
| 436 [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Period, UI.Ke
yboardShortcut.Modifiers.Ctrl)], | 441 [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Period, UI.Ke
yboardShortcut.Modifiers.Ctrl)], |
| 437 | 442 |
| 438 PrevCallFrame: | 443 PrevCallFrame: |
| 439 [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Comma, UI.Key
boardShortcut.Modifiers.Ctrl)], | 444 [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Comma, UI.Key
boardShortcut.Modifiers.Ctrl)], |
| 440 | 445 |
| 441 ToggleComment: | 446 ToggleComment: |
| 442 [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Slash, UI.Key
boardShortcut.Modifiers.CtrlOrMeta)], | 447 [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Slash, UI.Key
boardShortcut.Modifiers.CtrlOrMeta)], |
| 443 | 448 |
| 444 JumpToPreviousLocation: | 449 JumpToPreviousLocation: |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 }; | 489 }; |
| 485 | 490 |
| 486 UI.ShortcutsScreen.PerformancePanelShortcuts = { | 491 UI.ShortcutsScreen.PerformancePanelShortcuts = { |
| 487 PreviousRecording: [UI.KeyboardShortcut.makeDescriptor( | 492 PreviousRecording: [UI.KeyboardShortcut.makeDescriptor( |
| 488 UI.KeyboardShortcut.Keys.Left, | 493 UI.KeyboardShortcut.Keys.Left, |
| 489 Host.isMac() ? UI.KeyboardShortcut.Modifiers.Meta : UI.KeyboardShortcut.Mo
difiers.Alt)], | 494 Host.isMac() ? UI.KeyboardShortcut.Modifiers.Meta : UI.KeyboardShortcut.Mo
difiers.Alt)], |
| 490 NextRecording: [UI.KeyboardShortcut.makeDescriptor( | 495 NextRecording: [UI.KeyboardShortcut.makeDescriptor( |
| 491 UI.KeyboardShortcut.Keys.Right, | 496 UI.KeyboardShortcut.Keys.Right, |
| 492 Host.isMac() ? UI.KeyboardShortcut.Modifiers.Meta : UI.KeyboardShortcut.Mo
difiers.Alt)], | 497 Host.isMac() ? UI.KeyboardShortcut.Modifiers.Meta : UI.KeyboardShortcut.Mo
difiers.Alt)], |
| 493 }; | 498 }; |
| OLD | NEW |