diff --git a/shukan/ShukanController.java b/shukan/ShukanController.java index 8c4357d80d6551bfeacca718a77d9525f7252f85..606f6a2279d45322b7b70eb39cb695014722e228 100644 --- a/shukan/ShukanController.java +++ b/shukan/ShukanController.java @@ -80,23 +80,6 @@ public class ShukanController data.toggleLoad (1); canvas.repaint (); } - break; - case KeyEvent.VK_UP : - case KeyEvent.VK_KP_UP : - if (pressed) - { - data.toggleCursus (false); - canvas.repaint (); - } - break; - case KeyEvent.VK_DOWN : - case KeyEvent.VK_KP_DOWN : - if (pressed) - { - data.toggleCursus (true); - canvas.repaint (); - } - break; case KeyEvent.VK_X : if (pressed && e.isControlDown ()) { @@ -107,6 +90,8 @@ public class ShukanController } } + + /** Invoked when a key has been typed. * Implementation from KeyListener. * @param e detected key event. @@ -222,18 +207,32 @@ public class ShukanController System.out.println("plus"); else if (e.getSource()==bar.buttons[3]) System.out.println("delete"); - else if (e.getSource()==bar.buttons[4]) { if (data.followLeft ()) canvas.repaint (); } - else if (e.getSource()==bar.buttons[5]) { if (data.followRight ()) canvas.repaint (); } - else if (e.getSource()==bar.buttons[6]) new ShukanTex (data); - - else if (e.getSource()==bar.buttons[7]){ + else if (e.getSource()==bar.buttons[4]) + System.out.println("left"); + //if (data.followLeft ()) canvas.repaint (); + else if (e.getSource()==bar.buttons[5]) + System.out.println("right"); + else if (e.getSource()== bar.buttons[6]) + { + data.toggleCursus (false); + canvas.repaint (); + } + else if (e.getSource() == bar.buttons[7]) + { + data.toggleCursus(true); + canvas.repaint(); + } + //if (data.followRight ()) canvas.repaint (); + else if (e.getSource()==bar.buttons[8]) + new ShukanTex (data); + else if (e.getSource()==bar.buttons[9]){ + EventQueue.invokeLater(() -> { ShukanParameters myParameters = new ShukanParameters("Changer de thème", canvas); myParameters.setSize(300, 300); myParameters.setVisible(true); }); } - canvas.requestFocusInWindow(); } }