diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys/key_0_tilde.png b/Learning_is_keyboard/graphics/light_mode/single_keys/key_0_tilde.png index 942d85b..3207f06 100644 Binary files a/Learning_is_keyboard/graphics/light_mode/single_keys/key_0_tilde.png and b/Learning_is_keyboard/graphics/light_mode/single_keys/key_0_tilde.png differ diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys/key_1_one.png b/Learning_is_keyboard/graphics/light_mode/single_keys/key_1_one.png index 1b1bdd0..32e6832 100644 Binary files a/Learning_is_keyboard/graphics/light_mode/single_keys/key_1_one.png and b/Learning_is_keyboard/graphics/light_mode/single_keys/key_1_one.png differ diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys/key_2_two.png b/Learning_is_keyboard/graphics/light_mode/single_keys/key_2_two.png new file mode 100644 index 0000000..36ee8b1 Binary files /dev/null and b/Learning_is_keyboard/graphics/light_mode/single_keys/key_2_two.png differ diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_1_one.afphoto b/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_1_one.afphoto new file mode 100644 index 0000000..be4f776 Binary files /dev/null and b/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_1_one.afphoto differ diff --git a/Learning_is_keyboard/src/View/MainFrame/MyImages.java b/Learning_is_keyboard/src/View/MainFrame/MyImages.java index 02125c5..d819117 100644 --- a/Learning_is_keyboard/src/View/MainFrame/MyImages.java +++ b/Learning_is_keyboard/src/View/MainFrame/MyImages.java @@ -29,7 +29,7 @@ public class MyImages { e.printStackTrace(); } - return oDefaultLightKeyboardBufferedImage.getScaledInstance(74, 62, Image.SCALE_SMOOTH); + return oDefaultLightKeyboardBufferedImage.getScaledInstance(73, 67, Image.SCALE_SMOOTH); } public static Image getLight_Key_1_One_Image() { @@ -43,6 +43,17 @@ public class MyImages { return oDefaultLightKeyboardBufferedImage.getScaledInstance(69, 62, Image.SCALE_SMOOTH); } + public static Image getLight_Key_2_Two_Image() { + BufferedImage oDefaultLightKeyboardBufferedImage = null; + try { + oDefaultLightKeyboardBufferedImage = ImageIO.read(new File("Learning_is_keyboard/graphics/light_mode/single_keys/key_2_two.png")); + } catch (IOException e) { + e.printStackTrace(); + } + + return oDefaultLightKeyboardBufferedImage.getScaledInstance(76, 64, Image.SCALE_SMOOTH); + } + public static Image getDarkKeyboardImage() { BufferedImage oDefaultDarkKeyboardBufferedImage = null; try { @@ -66,6 +77,9 @@ public class MyImages { case (2): { oImageToReturn = getLight_Key_1_One_Image(); }break; + case (3): { + oImageToReturn = getLight_Key_2_Two_Image(); + }break; } return oImageToReturn; } diff --git a/Learning_is_keyboard/src/View/MainFrame/MyLayeredKeyboardPanel.java b/Learning_is_keyboard/src/View/MainFrame/MyLayeredKeyboardPanel.java index 39f1598..a4f4f96 100644 --- a/Learning_is_keyboard/src/View/MainFrame/MyLayeredKeyboardPanel.java +++ b/Learning_is_keyboard/src/View/MainFrame/MyLayeredKeyboardPanel.java @@ -45,11 +45,15 @@ public class MyLayeredKeyboardPanel extends JPanel { aiiImages[0][1] = aiiImages[0][2] = 0; //` / ~ Key - aiiImages[1][1] = 80; - aiiImages[1][2] = 1; + aiiImages[1][1] = 83; + aiiImages[1][2] = 0; //1 / ! Key aiiImages[2][1] = 142; aiiImages[2][2] = 0; + + //2 / @ Key + aiiImages[3][1] = 197; + aiiImages[3][2] = 0; } } \ No newline at end of file diff --git a/Learning_is_keyboard/src/View/MainFrame/MyMainFrame.java b/Learning_is_keyboard/src/View/MainFrame/MyMainFrame.java index 0e58ab2..9cc04bb 100644 --- a/Learning_is_keyboard/src/View/MainFrame/MyMainFrame.java +++ b/Learning_is_keyboard/src/View/MainFrame/MyMainFrame.java @@ -58,23 +58,21 @@ public class MyMainFrame extends JFrame implements KeyListener { //Row 1 case ('`'): { oKeyboardPanel.setImage(1, 1); - oKeyboardPanel.repaint(); }break; case ('~'): { - System.out.println("~"); + oKeyboardPanel.setImage(1, 1); }break; case ('1'): { oKeyboardPanel.setImage(1, 2); - oKeyboardPanel.repaint(); }break; case ('!'): { - System.out.println("!"); + oKeyboardPanel.setImage(1, 2); }break; case ('2'): { - System.out.println("2"); + oKeyboardPanel.setImage(1, 3); }break; case ('@'): { - System.out.println("@"); + oKeyboardPanel.setImage(1, 3); }break; case ('3'): { System.out.println("3"); @@ -346,6 +344,7 @@ public class MyMainFrame extends JFrame implements KeyListener { case ('?'): { System.out.println("?"); }break; + } switch (e.getKeyCode()) { @@ -389,6 +388,8 @@ public class MyMainFrame extends JFrame implements KeyListener { default: break; } + + oKeyboardPanel.repaint(); } @Override @@ -399,23 +400,21 @@ public class MyMainFrame extends JFrame implements KeyListener { //Row 1 case ('`'): { oKeyboardPanel.setImage(0, 1); - oKeyboardPanel.repaint(); }break; case ('~'): { - System.out.println("~"); + oKeyboardPanel.setImage(0, 1); }break; case ('1'): { oKeyboardPanel.setImage(0, 2); - oKeyboardPanel.repaint(); }break; case ('!'): { - System.out.println("!"); + oKeyboardPanel.setImage(0, 2); }break; case ('2'): { - System.out.println("2"); + oKeyboardPanel.setImage(0, 3); }break; case ('@'): { - System.out.println("@"); + oKeyboardPanel.setImage(0, 3); }break; case ('3'): { System.out.println("3"); @@ -726,9 +725,7 @@ public class MyMainFrame extends JFrame implements KeyListener { case (525): { System.out.println("Options"); }break; - - default: - break; } + oKeyboardPanel.repaint(); } }