diff --git a/shukan/ShukanParameters.java b/shukan/ShukanParameters.java index 148df38e1a3a08c105c80e59dcf0bfcbacc902ea..ab0217f98ccfdc9d03c2bd211c6a8274c0d90c6f 100644 --- a/shukan/ShukanParameters.java +++ b/shukan/ShukanParameters.java @@ -71,7 +71,7 @@ class ShukanParameters extends JFrame { } }); - theme2 = new JButton("Thème clair"); + theme2 = new JButton("Thème modéré"); theme2.setPreferredSize(new Dimension(150, 25)); theme2.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -90,7 +90,7 @@ class ShukanParameters extends JFrame { } }); - theme3 = new JButton("Thème modéré"); + theme3 = new JButton("Thème clair"); theme3.setPreferredSize(new Dimension(150, 25)); theme3.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -104,7 +104,6 @@ class ShukanParameters extends JFrame { canvas.setForeground(TEXT_COLOR, HOLLY_COLOR, INACTIVE_COLOR); student.setBackgroundColor(BACK_COLOR2); student.setForeground(TEXT_COLOR); - } canvas.repaint(); } diff --git a/shukan/ShukanStudent.java b/shukan/ShukanStudent.java index 81fa86ce4df23606c8b1972c1a6ffd0f792faea7..147a4a4776414ac0c32b8371b56e20dd75e28eb7 100644 --- a/shukan/ShukanStudent.java +++ b/shukan/ShukanStudent.java @@ -48,6 +48,9 @@ public class ShukanStudent extends JPanel{ private final Color GRID_COLOR = Color.BLACK; /** Text color */ private Color TEXT_COLOR = Color.BLACK; + /** Color background, text, hollydays*/ + private Color BACK_COLOR2 = Color.LIGHT_GRAY; + /** Displayed data */ private ShukanData data = null; @@ -74,7 +77,7 @@ public class ShukanStudent extends JPanel{ fontMetrics = g2.getFontMetrics(); fontHeight = fontMetrics.getAscent(); - g2.setColor(BACK_COLOR); + g2.setColor(BACK_COLOR2); g2.fillRect(appliWidth - w, appliHeight - h, w, h); drawBox (g2, appliWidth - w, appliHeight - h, w, h); displayCalendar(g2); @@ -167,5 +170,5 @@ public class ShukanStudent extends JPanel{ public void setForeground(Color c){ TEXT_COLOR = c; repaint(); - } + } }