diff options
| author | Jonathan Bauer | 2015-09-15 17:06:20 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-15 17:06:20 +0200 |
| commit | 28f84e5923208b3ff32dcd332a1212caf132cf89 (patch) | |
| tree | e71ac6d8ca11b1e890493da7bfbbf09cc9401ee2 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | |
| parent | [client] reworked german text (diff) | |
| parent | [client] Shift key for forcing satellite selection now works. (diff) | |
| download | tutor-module-28f84e5923208b3ff32dcd332a1212caf132cf89.tar.gz tutor-module-28f84e5923208b3ff32dcd332a1212caf132cf89.tar.xz tutor-module-28f84e5923208b3ff32dcd332a1212caf132cf89.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java index ee3727ab..7a0c1b56 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -192,24 +192,7 @@ public abstract class MainWindow { } }); - KeyEventDispatcher satelliteShiftDispatcher = new KeyEventDispatcher() { - // TODO Fix to register shift key - @Override - public boolean dispatchKeyEvent(KeyEvent event) { - int type = event.getID(); - int code = event.getKeyChar(); - LOGGER.info("SHIFT!: " + " type: " + type + " code: " + code); - if (code == KeyEvent.VK_SHIFT) { // ESC or Ctrl-W closes current window - if (type == KeyEvent.KEY_PRESSED) { - ThriftActions.forceCustomSattelite = true; - } else if ( type == KeyEvent.KEY_RELEASED) - ThriftActions.forceCustomSattelite = false; - event.consume(); - } - return event.isConsumed(); - } - }; - KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(satelliteShiftDispatcher); + // Set layout for the mainshell, items added to the shell should get a gridData mainContainer.setLayout(new BoxLayout(mainContainer, BoxLayout.PAGE_AXIS)); |