added zoom menu entries and shortcuts
This replaces the old shortcuts + and - by CTRL+G and CTRL+H.master
parent
a0dac9c0d9
commit
a583c5599e
|
@ -155,6 +155,16 @@ public class Actions {
|
|||
}
|
||||
}
|
||||
|
||||
@CalledOnlyBy(AmidstThread.EDT)
|
||||
public void zoomIn() {
|
||||
adjustZoom(-1);
|
||||
}
|
||||
|
||||
@CalledOnlyBy(AmidstThread.EDT)
|
||||
public void zoomOut() {
|
||||
adjustZoom(1);
|
||||
}
|
||||
|
||||
@CalledOnlyBy(AmidstThread.EDT)
|
||||
public void savePlayerLocations() {
|
||||
ViewerFacade viewerFacade = this.viewerFacade.get();
|
||||
|
@ -247,7 +257,7 @@ public class Actions {
|
|||
}
|
||||
|
||||
@CalledOnlyBy(AmidstThread.EDT)
|
||||
public void adjustZoom(int notches) {
|
||||
private void adjustZoom(int notches) {
|
||||
ViewerFacade viewerFacade = this.viewerFacade.get();
|
||||
if (viewerFacade != null) {
|
||||
viewerFacade.adjustZoom(notches);
|
||||
|
|
|
@ -2,8 +2,6 @@ package amidst.gui.main;
|
|||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Container;
|
||||
import java.awt.event.KeyAdapter;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import java.io.File;
|
||||
|
@ -80,7 +78,6 @@ public class MainWindow {
|
|||
this.actions = createActions();
|
||||
this.menuBar = createMenuBar();
|
||||
this.seedSearcherWindow = createSeedSearcherWindow();
|
||||
initKeyListener();
|
||||
initCloseListener();
|
||||
showFrame();
|
||||
clearViewerFacade();
|
||||
|
@ -131,20 +128,6 @@ public class MainWindow {
|
|||
threadMaster.getWorkerExecutor()));
|
||||
}
|
||||
|
||||
@CalledOnlyBy(AmidstThread.EDT)
|
||||
private void initKeyListener() {
|
||||
frame.addKeyListener(new KeyAdapter() {
|
||||
@Override
|
||||
public void keyTyped(KeyEvent e) {
|
||||
if (e.getKeyChar() == '+') {
|
||||
actions.adjustZoom(-1);
|
||||
} else if (e.getKeyChar() == '-') {
|
||||
actions.adjustZoom(1);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@CalledOnlyBy(AmidstThread.EDT)
|
||||
private void initCloseListener() {
|
||||
frame.addWindowListener(new WindowAdapter() {
|
||||
|
|
|
@ -85,6 +85,9 @@ public class AmidstMenuBuilder {
|
|||
Menus.item(result, actions::goToStronghold, "Go to Stronghold", KeyEvent.VK_H, "menu shift H");
|
||||
Menus.item(result, actions::goToPlayer, "Go to Player", KeyEvent.VK_P, "menu shift P");
|
||||
result.addSeparator();
|
||||
Menus.item(result, actions::zoomIn, "Zoom in", KeyEvent.VK_I, "menu G");
|
||||
Menus.item(result, actions::zoomOut, "Zoom out", KeyEvent.VK_O, "menu H");
|
||||
result.addSeparator();
|
||||
savePlayerLocationsMenu =
|
||||
Menus.item(result, actions::savePlayerLocations, "Save player locations", KeyEvent.VK_V, "menu S");
|
||||
savePlayerLocationsMenu.setEnabled(false);
|
||||
|
@ -94,7 +97,7 @@ public class AmidstMenuBuilder {
|
|||
Menus.item(result, actions::howCanIMoveAPlayer, "How can I move a player?", KeyEvent.VK_M);
|
||||
result.addSeparator();
|
||||
Menus.item(result, actions::copySeedToClipboard, "Copy Seed to Clipboard", KeyEvent.VK_B, "menu C");
|
||||
Menus.item(result, actions::saveCaptureImage, "Save capture image ...", KeyEvent.VK_I, "menu T");
|
||||
Menus.item(result, actions::saveCaptureImage, "Save capture image ...", KeyEvent.VK_T, "menu T");
|
||||
// @formatter:on
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue