diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys/key_14_tab.png b/Learning_is_keyboard/graphics/light_mode/single_keys/key_14_tab.png new file mode 100644 index 0000000..af5dc31 Binary files /dev/null and b/Learning_is_keyboard/graphics/light_mode/single_keys/key_14_tab.png differ diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys/key_15_q.png b/Learning_is_keyboard/graphics/light_mode/single_keys/key_15_q.png new file mode 100644 index 0000000..b7a49af Binary files /dev/null and b/Learning_is_keyboard/graphics/light_mode/single_keys/key_15_q.png differ diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_14_tab.afphoto b/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_14_tab.afphoto new file mode 100644 index 0000000..08dac2d Binary files /dev/null and b/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_14_tab.afphoto differ diff --git a/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_15_q.afphoto b/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_15_q.afphoto new file mode 100644 index 0000000..be04bbc Binary files /dev/null and b/Learning_is_keyboard/graphics/light_mode/single_keys_afphoto/key_15_q.afphoto differ diff --git a/Learning_is_keyboard/src/View/MainFrame/MyImages.java b/Learning_is_keyboard/src/View/MainFrame/MyImages.java index 83f9abf..2384835 100644 --- a/Learning_is_keyboard/src/View/MainFrame/MyImages.java +++ b/Learning_is_keyboard/src/View/MainFrame/MyImages.java @@ -54,6 +54,36 @@ public class MyImages { return oDefaultLightKeyboardBufferedImage.getScaledInstance(76, 64, Image.SCALE_SMOOTH); } + /** + * Doesn't get called since keyevent doesn't recognize if tab was pressed. + * @return + */ + public static Image getLight_Key_14_Tab_Image() { + BufferedImage oDefaultLightKeyboardBufferedImage = null; + try { + oDefaultLightKeyboardBufferedImage = ImageIO.read(new File("Learning_is_keyboard/graphics/light_mode/single_keys/key_14_tab.png")); + } catch (IOException e) { + e.printStackTrace(); + } + + return oDefaultLightKeyboardBufferedImage.getScaledInstance(110, 76, Image.SCALE_SMOOTH); + } + + /** + * Doesn't get called since keyevent doesn't recognize if tab was pressed. + * @return + */ + public static Image getLight_Key_15_Q_Image() { + BufferedImage oDefaultLightKeyboardBufferedImage = null; + try { + oDefaultLightKeyboardBufferedImage = ImageIO.read(new File("Learning_is_keyboard/graphics/light_mode/single_keys/key_15_q.png")); + } catch (IOException e) { + e.printStackTrace(); + } + + return oDefaultLightKeyboardBufferedImage.getScaledInstance(89, 87, Image.SCALE_SMOOTH); + } + public static Image getDarkKeyboardImage() { BufferedImage oDefaultDarkKeyboardBufferedImage = null; try { @@ -80,6 +110,12 @@ public class MyImages { case (3): { oImageToReturn = getLight_Key_2_Two_Image(); }break; + case (14): { + oImageToReturn = getLight_Key_14_Tab_Image(); + }break; + case (15): { + oImageToReturn = getLight_Key_15_Q_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 cb052d8..c013906 100644 --- a/Learning_is_keyboard/src/View/MainFrame/MyLayeredKeyboardPanel.java +++ b/Learning_is_keyboard/src/View/MainFrame/MyLayeredKeyboardPanel.java @@ -55,5 +55,13 @@ public class MyLayeredKeyboardPanel extends JPanel { //2 / @ Key aiiImages[3][1] = 197; aiiImages[3][2] = 0; + + //Tab Key + aiiImages[14][1] = 68; + aiiImages[14][2] = 43; + + //Q Key + aiiImages[15][1] = 156; + aiiImages[15][2] = 45; } } \ 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 872f0eb..01dab4b 100644 --- a/Learning_is_keyboard/src/View/MainFrame/MyMainFrame.java +++ b/Learning_is_keyboard/src/View/MainFrame/MyMainFrame.java @@ -78,24 +78,19 @@ public class MyMainFrame extends JFrame implements KeyListener { @Override public void keyPressed(KeyEvent e) { //Invoked when a physical key is pressed down. Uses KeyCode, int output - switch (e.getKeyChar()) { //Row 1 case ('`'): { oKeyboardPanel.setImage(1, 1); - clip.start(); }break; case ('~'): { oKeyboardPanel.setImage(1, 1); - clip.start(); }break; case ('1'): { oKeyboardPanel.setImage(1, 2); - clip.start(); }break; case ('!'): { oKeyboardPanel.setImage(1, 2); - clip.start(); }break; case ('2'): { oKeyboardPanel.setImage(1, 3); @@ -104,7 +99,7 @@ public class MyMainFrame extends JFrame implements KeyListener { oKeyboardPanel.setImage(1, 3); }break; case ('3'): { - System.out.println("3"); + }break; case ('#'): { System.out.println("#"); @@ -166,10 +161,10 @@ public class MyMainFrame extends JFrame implements KeyListener { //Row 2 case ('q'): { - System.out.println("q"); + oKeyboardPanel.setImage(1, 15); }break; case ('Q'): { - System.out.println("Q"); + oKeyboardPanel.setImage(1, 15); }break; case ('w'): { System.out.println("w"); @@ -431,38 +426,43 @@ public class MyMainFrame extends JFrame implements KeyListener { //Row 1 case ('`'): { oKeyboardPanel.setImage(0, 1); - clip.setMicrosecondPosition(0); + //clip.setMicrosecondPosition(0); + //clip.start(); }break; case ('~'): { oKeyboardPanel.setImage(0, 1); - clip.setMicrosecondPosition(0); + //clip.setMicrosecondPosition(0); + //clip.start(); }break; case ('1'): { oKeyboardPanel.setImage(0, 2); - clip.setMicrosecondPosition(0); + //clip.setMicrosecondPosition(0); + //clip.start(); }break; case ('!'): { oKeyboardPanel.setImage(0, 2); - clip.setMicrosecondPosition(0); + //clip.setMicrosecondPosition(0); + //clip.start(); }break; case ('2'): { oKeyboardPanel.setImage(0, 3); - clip.setMicrosecondPosition(0); + //clip.setMicrosecondPosition(0); + //clip.start(); }break; case ('@'): { oKeyboardPanel.setImage(0, 3); }break; case ('3'): { - System.out.println("3"); + oKeyboardPanel.setImage(0, 4); }break; case ('#'): { - System.out.println("#"); + oKeyboardPanel.setImage(0, 4); }break; case ('4'): { - System.out.println("4"); + oKeyboardPanel.setImage(0, 5); }break; case ('$'): { - System.out.println("$"); + oKeyboardPanel.setImage(0, 5); }break; case ('5'): { System.out.println("5"); @@ -515,10 +515,10 @@ public class MyMainFrame extends JFrame implements KeyListener { //Row 2 case ('q'): { - System.out.println("q"); + oKeyboardPanel.setImage(0, 15); }break; case ('Q'): { - System.out.println("Q"); + oKeyboardPanel.setImage(0, 15); }break; case ('w'): { System.out.println("w");