From b0eba9b4bea0e86aaf60d659c5954afba3944710 Mon Sep 17 00:00:00 2001
From: CHEVALIER Noemy <noemy.chevalier7@etu.univ-lorraine.fr>
Date: Thu, 25 May 2023 15:48:58 +0000
Subject: [PATCH] Ajout des semestres
---
shukan/ShukanController.java | 45 ++++++++++++++++++------------------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/shukan/ShukanController.java b/shukan/ShukanController.java
index 8c4357d..606f6a2 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();
}
}
--
GitLab