Changeset 12639 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2017-08-25T01:37:31+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
r12636 r12639 394 394 // 395 395 MapView.addZoomChangeListener(new ZoomChangeAdapter()); 396 Main .addMapFrameListener(new MapFrameAdapter());396 MainApplication.addMapFrameListener(new MapFrameAdapter()); 397 397 initEnabledState(); 398 398 } -
trunk/src/org/openstreetmap/josm/actions/CopyAction.java
r10605 r12639 16 16 import org.openstreetmap.josm.data.osm.DataSet; 17 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 18 import org.openstreetmap.josm.gui.MainApplication; 18 19 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; 19 20 import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable; … … 36 37 putValue("help", ht("/Action/Copy")); 37 38 // CUA shortcut for copy (https://en.wikipedia.org/wiki/IBM_Common_User_Access#Description) 38 Main .registerActionShortcut(this,39 MainApplication.registerActionShortcut(this, 39 40 Shortcut.registerShortcut("system:copy:cua", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_INSERT, Shortcut.CTRL)); 40 41 } -
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r12637 r12639 79 79 sc = shortcut; 80 80 if (sc != null && !sc.isAutomatic()) { 81 Main .registerActionShortcut(this, sc);81 MainApplication.registerActionShortcut(this, sc); 82 82 } 83 83 setTooltip(tooltip); … … 218 218 public void destroy() { 219 219 if (sc != null && !sc.isAutomatic()) { 220 Main .unregisterActionShortcut(this);220 MainApplication.unregisterActionShortcut(this); 221 221 } 222 222 if (layerChangeAdapter != null) { -
trunk/src/org/openstreetmap/josm/actions/JumpToAction.java
r12630 r12639 216 216 super.installAdapters(); 217 217 // make this action listen to mapframe change events 218 Main .addMapFrameListener((o, n) -> updateEnabledState());218 MainApplication.addMapFrameListener((o, n) -> updateEnabledState()); 219 219 } 220 220 } -
trunk/src/org/openstreetmap/josm/actions/PasteAction.java
r10766 r12639 8 8 import java.awt.event.KeyEvent; 9 9 10 import org.openstreetmap.josm. Main;10 import org.openstreetmap.josm.gui.MainApplication; 11 11 import org.openstreetmap.josm.tools.Shortcut; 12 12 … … 25 25 putValue("help", ht("/Action/Paste")); 26 26 // CUA shortcut for paste (https://en.wikipedia.org/wiki/IBM_Common_User_Access#Description) 27 Main .registerActionShortcut(this,27 MainApplication.registerActionShortcut(this, 28 28 Shortcut.registerShortcut("system:paste:cua", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_INSERT, Shortcut.SHIFT)); 29 29 } -
trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
r12636 r12639 75 75 null, toolbar, "save_as-session", installAdapters); 76 76 putValue("help", ht("/Action/SessionSaveAs")); 77 Main .addMapFrameListener(this);77 MainApplication.addMapFrameListener(this); 78 78 } 79 79 -
trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java
r12636 r12639 8 8 import java.awt.event.KeyEvent; 9 9 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.gui.MainApplication; 12 11 import org.openstreetmap.josm.tools.Shortcut; … … 32 31 putValue("help", ht("/Action/ZoomIn")); 33 32 // On standard QWERTY, AZERTY and other common layouts the '+' key is obtained with Shift+EQUALS 34 Main .registerActionShortcut(this,33 MainApplication.registerActionShortcut(this, 35 34 Shortcut.registerShortcut("view:zoominbis", tr("View: {0}", tr("Zoom In")), 36 35 KeyEvent.VK_EQUALS, Shortcut.SHIFT)); 37 36 // But on some systems (Belgian keyboard under Ubuntu) it seems not to work, so use also EQUALS 38 Main .registerActionShortcut(this,37 MainApplication.registerActionShortcut(this, 39 38 Shortcut.registerShortcut("view:zoominter", tr("View: {0}", tr("Zoom In")), 40 39 KeyEvent.VK_EQUALS, Shortcut.DIRECT)); 41 40 // make numpad + behave like + 42 Main .registerActionShortcut(this,41 MainApplication.registerActionShortcut(this, 43 42 Shortcut.registerShortcut("view:zoominkeypad", tr("View: {0}", tr("Zoom In (Keypad)")), 44 43 KeyEvent.VK_ADD, Shortcut.DIRECT)); -
trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java
r12636 r12639 8 8 import java.awt.event.KeyEvent; 9 9 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.gui.MainApplication; 12 11 import org.openstreetmap.josm.tools.Shortcut; … … 26 25 putValue("help", ht("/Action/ZoomOut")); 27 26 // make numpad - behave like - 28 Main .registerActionShortcut(this,27 MainApplication.registerActionShortcut(this, 29 28 Shortcut.registerShortcut("view:zoomoutkeypad", tr("View: {0}", tr("Zoom Out (Keypad)")), 30 29 KeyEvent.VK_SUBTRACT, Shortcut.DIRECT)); -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r12636 r12639 274 274 MapFrame map = MainApplication.getMap(); 275 275 map.statusLine.getAnglePanel().addMouseListener(snapHelper.anglePopupListener); 276 Main .registerActionShortcut(backspaceAction, backspaceShortcut);276 MainApplication.registerActionShortcut(backspaceAction, backspaceShortcut); 277 277 278 278 map.mapView.addMouseListener(this); … … 294 294 map.mapView.removeTemporaryLayer(this); 295 295 SelectionEventManager.getInstance().removeSelectionListener(this); 296 Main .unregisterActionShortcut(backspaceAction, backspaceShortcut);296 MainApplication.unregisterActionShortcut(backspaceAction, backspaceShortcut); 297 297 snapHelper.unsetFixedMode(); 298 298 snapCheckboxMenuItem.getAction().setEnabled(false); -
trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
r12636 r12639 59 59 ); 60 60 launchAction = new LaunchEditorAction(); 61 Main .registerActionShortcut(launchAction, shortcut);61 MainApplication.registerActionShortcut(launchAction, shortcut); 62 62 } 63 63 … … 115 115 @Override 116 116 public void destroy() { 117 Main .unregisterActionShortcut(launchAction, shortcut);117 MainApplication.unregisterActionShortcut(launchAction, shortcut); 118 118 super.destroy(); 119 119 }
Note:
See TracChangeset
for help on using the changeset viewer.