Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #283 from toolbox4minecraft/added-zoom-menu-entries-with-shortcuts 

added zoom menu entries and shortcuts
master
Stefan Dollase 2016-11-20 19:23:44 +01:00 committed by GitHub
parent a0dac9c0d9 a583c5599e
commit 60d94a5a5f
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/amidst/gui/main/Actions.java
View File

@ -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) @CalledOnlyBy(AmidstThread.EDT)
public void savePlayerLocations() { public void savePlayerLocations() {
ViewerFacade viewerFacade = this.viewerFacade.get(); ViewerFacade viewerFacade = this.viewerFacade.get();
@ -247,7 +257,7 @@ public class Actions {
} }
@CalledOnlyBy(AmidstThread.EDT) @CalledOnlyBy(AmidstThread.EDT)
public void adjustZoom(int notches) { private void adjustZoom(int notches) {
ViewerFacade viewerFacade = this.viewerFacade.get(); ViewerFacade viewerFacade = this.viewerFacade.get();
if (viewerFacade != null) { if (viewerFacade != null) {
viewerFacade.adjustZoom(notches); viewerFacade.adjustZoom(notches);

17
src/main/java/amidst/gui/main/MainWindow.java
View File

@ -2,8 +2,6 @@ package amidst.gui.main;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Container; import java.awt.Container;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.File; import java.io.File;
@ -80,7 +78,6 @@ public class MainWindow {
this.actions = createActions(); this.actions = createActions();
this.menuBar = createMenuBar(); this.menuBar = createMenuBar();
this.seedSearcherWindow = createSeedSearcherWindow(); this.seedSearcherWindow = createSeedSearcherWindow();
initKeyListener();
initCloseListener(); initCloseListener();
showFrame(); showFrame();
clearViewerFacade(); clearViewerFacade();
@ -131,20 +128,6 @@ public class MainWindow {
threadMaster.getWorkerExecutor())); 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) @CalledOnlyBy(AmidstThread.EDT)
private void initCloseListener() { private void initCloseListener() {
frame.addWindowListener(new WindowAdapter() { frame.addWindowListener(new WindowAdapter() {

5
src/main/java/amidst/gui/main/menu/AmidstMenuBuilder.java
View File

@ -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::goToStronghold, "Go to Stronghold", KeyEvent.VK_H, "menu shift H");
Menus.item(result, actions::goToPlayer, "Go to Player", KeyEvent.VK_P, "menu shift P"); Menus.item(result, actions::goToPlayer, "Go to Player", KeyEvent.VK_P, "menu shift P");
result.addSeparator(); 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 = savePlayerLocationsMenu =
Menus.item(result, actions::savePlayerLocations, "Save player locations", KeyEvent.VK_V, "menu S"); Menus.item(result, actions::savePlayerLocations, "Save player locations", KeyEvent.VK_V, "menu S");
savePlayerLocationsMenu.setEnabled(false); savePlayerLocationsMenu.setEnabled(false);
@ -94,7 +97,7 @@ public class AmidstMenuBuilder {
Menus.item(result, actions::howCanIMoveAPlayer, "How can I move a player?", KeyEvent.VK_M); Menus.item(result, actions::howCanIMoveAPlayer, "How can I move a player?", KeyEvent.VK_M);
result.addSeparator(); result.addSeparator();
Menus.item(result, actions::copySeedToClipboard, "Copy Seed to Clipboard", KeyEvent.VK_B, "menu C"); 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 // @formatter:on
return result; return result;
} }