gui keyboard with all the keys, a bit misaligned.

1 files changed, 46 insertions, 6 deletions

diff --git a/src/keyboard.py b/src/keyboard.py
index a0ca9ad..540bf3a 100644
--- a/src/keyboard.py
+++ b/src/keyboard.py
@@ -33,22 +33,43 @@ class keyboard:
         Xdim = bounds[2] - bounds[0]
         Ydim = bounds[3] - bounds[1]
         col = 10
-        key_width = int(Xdim / 18)
-        key_height = int(Ydim / 7)
+        key_width = int(Xdim / 20)
+        key_height = int(Ydim / 8)
+        key_height0 = int(key_height * 0.75)
         key_gap = int(key_width / 5)
         row_gap = int(key_height / 5)
-        row_level_0 = 70
-        row_level_1 = 100
+        row_level_0 = 10
+        row_level_1 = 50
         row_level_2 = row_level_1 + key_height + row_gap
         row_level_3 = row_level_2 + key_height + row_gap
         row_level_4 = row_level_3 + key_height + row_gap
         row_level_5 = row_level_4 + key_height + row_gap
         keys = []
         #Row 1
+        row0A = [("X","X"), ("O","O")]
+        row0B = [("X","X"), ("O","O")]
         row1 = [("1","!"),("2","@"),("3","#"),("4","$"),("5","%"),("6","^"),("7","&"),("8","*"),("9","("),("0",")"),("-","_"),("=","+")]
         row2 = [("q","Q"),("w","W"),("e","E"),("r","R"),("t","T"),("y","Y"),("u","U"),("i","I"),("o","O"),("p","P"),("[","{"),("]","}")]        
         row3 = [("a","A"),("s","S"),("d","D"),("f","F"),("g","G"),("h","H"),("j","J"),("k","K"),("l","L"),(";",":"),("'",")"),("\"","|")]
         row4 = [("z","Z"),("x","X"),("c","C"),("v","V"),("b","B"),("n","N"),("m","M"),(",","<"),(".",">"),("/","?")]
+        row5A = [("fn","fn"), ("HA","HA"), ("alt","alt")]
+        row5B = [("alt gr","alt gr"), ("HA","HA"), ("<-","<-"), ("dn","dn"), ("->","->")]
+        #Row 0
+        myCol = col
+        for text in row0A:
+            keys.append(Key(text,(myCol,row_level_0,key_width,key_height0)))
+            myCol += (key_width + key_gap)
+        keys.append(Key(("O","O"),(myCol,row_level_0,(4*key_width),key_height0)))
+        myCol += (4*key_width+key_gap)
+        keys.append(Key(("O","O"),(myCol,row_level_0,(4*key_width),key_height0)))
+        myCol += (4*key_width+key_gap)
+        keys.append(Key(("O","O"),(myCol,row_level_0,(4*key_width),key_height0)))
+        myCol += (4*key_width+key_gap)
+        for text in row0B:
+            keys.append(Key(text,(myCol,row_level_0,key_width,key_height0)))
+            myCol += (key_width + key_gap)
+            
+        #Row 1
         myCol = col
         keys.append(Key(("`","~"),(myCol,row_level_1,(key_width-key_gap),key_height)))
         myCol += (key_width)
@@ -65,6 +86,7 @@ class keyboard:
             keys.append(Key(text,(myCol,row_level_2,key_width,key_height)))
             myCol += (key_width + key_gap)
         
+        
         #Row 3
         myCol = col
         keys.append(Key(("ctrl","ctrl"),(myCol,row_level_3,key_width+key_gap,key_height)))
@@ -72,7 +94,8 @@ class keyboard:
         for text in row3:
             keys.append(Key(text,(myCol,row_level_3,key_width,key_height)))
             myCol += (key_width + key_gap)
-
+        keys.append(Key(("enter","enter"),(myCol,row_level_2,key_width*2+key_gap,key_height*2+row_gap)))
+        
         #Row 4
         myCol = col
         keys.append(Key(("shift","shift"),(myCol,row_level_4,key_width*2,key_height)))
@@ -80,8 +103,25 @@ class keyboard:
         for text in row4:
             keys.append(Key(text,(myCol,row_level_4,key_width,key_height)))
             myCol += (key_width + key_gap)
+        keys.append(Key(("shift","shift"),(myCol,row_level_4,key_width*2,key_height)))
+        myCol += (2*key_width + key_gap)
+        keys.append(Key(("up","up"),(myCol,row_level_4,key_width,key_height)))
+        myCol += (key_width + key_gap)
+        keys.append(Key(("AB","AB"),(myCol,row_level_4,key_width,key_height)))
+        myCol += (key_width + key_gap)
+        
+        #Row 5
+        myCol = col
+        for text in row5A:
+            keys.append(Key(text,(myCol,row_level_5,key_width,key_height)))
+            myCol += (key_width + key_gap)
+        keys.append(Key((" "," "),(myCol,row_level_5,key_width*9,key_height)))
+        myCol += (9*key_width + key_gap)
+        for text in row5B:
+            keys.append(Key(text,(myCol,row_level_5,key_width,key_height)))
+            myCol += (key_width + key_gap)
 
-        for i in range(0,51):
+        for i in range(0,71):
             self.draw_key(keys[i])
         return True