diff options
author | Simon Rettberg | 2015-07-28 15:12:16 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-07-28 15:12:16 +0200 |
commit | c268e549a7f30c13ddf90971ec6744031f420c22 (patch) | |
tree | 604d134ad23091ded938bf8be401c6b68daddffd /dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | |
parent | [client] Use font anti-aliasing (diff) | |
download | tutor-module-c268e549a7f30c13ddf90971ec6744031f420c22.tar.gz tutor-module-c268e549a7f30c13ddf90971ec6744031f420c22.tar.xz tutor-module-c268e549a7f30c13ddf90971ec6744031f420c22.zip |
[client] Re-introduce parent param to showMessageBox (needed for proper placement)
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 | 33 |
1 files changed, 17 insertions, 16 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 820f5b21..4b6098e0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -63,8 +63,8 @@ public abstract class MainWindow { currentPage = pages.get(clazz); if (currentPage == null) { - Gui.showMessageBox("Tried to show unknown page " + clazz.getSimpleName(), MessageType.ERROR, - LOGGER, null); + Gui.showMessageBox(mainWindow, "Tried to show unknown page " + clazz.getSimpleName(), + MessageType.ERROR, LOGGER, null); Gui.exit(1); return; } @@ -109,7 +109,8 @@ public abstract class MainWindow { return Gui.syncExec(new GuiCallable<Boolean>() { @Override public Boolean run() { - return Gui.showMessageBox(THRIFT_CONNECTION_ERROR, MessageType.ERROR_RETRY, LOGGER, t); + return Gui.showMessageBox(mainWindow, THRIFT_CONNECTION_ERROR, + MessageType.ERROR_RETRY, LOGGER, t); } }); } @@ -122,18 +123,17 @@ public abstract class MainWindow { Gui.asyncExec(new Runnable() { @Override public void run() { - Gui.showMessageBox("Konnte Programmeinstellungen nicht speichern", MessageType.WARNING, - LOGGER, t); + Gui.showMessageBox(mainWindow, "Konnte Programmeinstellungen nicht speichern", + MessageType.WARNING, LOGGER, t); } }); } }); // Global key listener - KeyboardFocusManager.getCurrentKeyboardFocusManager() - .addKeyEventDispatcher(new KeyEventDispatcher() { - @Override - public boolean dispatchKeyEvent(KeyEvent event) { + KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(new KeyEventDispatcher() { + @Override + public boolean dispatchKeyEvent(KeyEvent event) { if (event.getKeyChar() == 17) { // Ctrl-Q = Quit askApplicationQuit(); event.consume(); @@ -180,7 +180,8 @@ public abstract class MainWindow { */ protected static void askApplicationQuit() { // TODO: Only ask if an upload or download is running,, wizard is open etc.. - if (Gui.showMessageBox("Are you sure you want to quit?", MessageType.QUESTION_YESNO, null, null)) { + if (Gui.showMessageBox(mainWindow, "Are you sure you want to quit?", MessageType.QUESTION_YESNO, + null, null)) { QuickTimer.cancel(); Gui.exit(0); } @@ -204,16 +205,16 @@ public abstract class MainWindow { // the File menu button JMenuBar menuBar = new JMenuBar(); mainWindow.setJMenuBar(menuBar); - + JMenu cascadeFileMenu = new JMenu("&File"); menuBar.add(cascadeFileMenu); JMenuItem exitItem = new JMenuItem("&Exit"); cascadeFileMenu.add(exitItem); - + exitItem.addMouseListener(new MouseAdapter() { @Override - public void mousePressed(MouseEvent arg0) { + public void mouseClicked(MouseEvent arg0) { askApplicationQuit(); } }); @@ -226,17 +227,17 @@ public abstract class MainWindow { JMenuItem virtualizerNoticeItem = new JMenuItem("&Virtualizer"); cascadeAboutMenu.add(disclaimerItem); cascadeAboutMenu.add(virtualizerNoticeItem); - + disclaimerItem.addMouseListener(new MouseAdapter() { @Override - public void mousePressed(MouseEvent arg0) { + public void mouseClicked(MouseEvent arg0) { DisclaimerWindow.open(false); } }); virtualizerNoticeItem.addMouseListener(new MouseAdapter() { @Override - public void mousePressed(MouseEvent arg0) { + public void mouseClicked(MouseEvent arg0) { VirtualizerNoticeWindow.open(false); } }); |