Added emoji support, refactored, internalized pyautogui
This commit is contained in:
@@ -6,7 +6,7 @@ gi.require_version('Gtk', '3.0')
|
||||
from gi.repository import Gtk
|
||||
|
||||
# Application imports
|
||||
from ..widgets.defined_keys import Tab_Key
|
||||
from ..widgets.defined_keys import Symbols_Key
|
||||
from ..widgets.defined_keys import Del_Key
|
||||
from ..widgets.defined_keys import Ctrl_Key
|
||||
from ..widgets.defined_keys import Shift_Key
|
||||
@@ -26,7 +26,7 @@ class Button_Box(Gtk.ButtonBox):
|
||||
def __init__(self):
|
||||
super(Button_Box, self).__init__()
|
||||
|
||||
for key in [Tab_Key(), Del_Key(), Ctrl_Key(), Shift_Key(), Alt_Key(), PrtSc_Key()]:
|
||||
for key in [Symbols_Key(), Del_Key(), Ctrl_Key(), Shift_Key(), Alt_Key(), PrtSc_Key()]:
|
||||
self.add(key)
|
||||
|
||||
|
||||
|
||||
@@ -38,17 +38,15 @@ class Keys_Column(Gtk.Box):
|
||||
for child in children:
|
||||
pKeys = keys[child]["pKeys"]
|
||||
sKeys = keys[child]["sKeys"]
|
||||
eKeys = keys[child]["eKeys"]
|
||||
|
||||
row_box = self.add_row()
|
||||
if len(pKeys) == len(sKeys) and len(pKeys) == len(eKeys):
|
||||
if len(pKeys) == len(sKeys):
|
||||
for i in range(10):
|
||||
pkey = pKeys[i]
|
||||
sKey = sKeys[i]
|
||||
eKey = eKeys[i]
|
||||
row_box.add(Key(pkey, sKey, eKey))
|
||||
row_box.add(Key(pkey, sKey))
|
||||
else:
|
||||
raise KeyboardRowMatchError("A row in keys_json has missmatched pKeys, sKeys, or eKeys lengths.")
|
||||
raise KeyboardRowMatchError("A row in keys_json has missmatched pKeys to sKeys lengths.")
|
||||
|
||||
self.add(Bottom_Key_Row())
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ from gi.repository import Gtk
|
||||
|
||||
# Application imports
|
||||
from ..widgets.defined_keys import Esc_Key
|
||||
from ..widgets.defined_keys import Symbols_Key
|
||||
from ..widgets.defined_keys import Tab_Key
|
||||
from ..widgets.defined_keys import CAPS_Key
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ class Left_Column(Gtk.Box):
|
||||
|
||||
self.setup_styling()
|
||||
|
||||
for key in [Symbols_Key(), Esc_Key(), CAPS_Key()]:
|
||||
for key in [Tab_Key(), Esc_Key(), CAPS_Key()]:
|
||||
self.add(key)
|
||||
|
||||
self.show_all()
|
||||
|
||||
@@ -6,12 +6,14 @@ gi.require_version('Gtk', '3.0')
|
||||
from gi.repository import Gtk
|
||||
|
||||
# Application imports
|
||||
from ..widgets.defined_keys import Emoji_Keys
|
||||
from ..widgets.emoji_popover import Emoji_Popover
|
||||
from ..widgets.defined_keys import Emoji_Key
|
||||
from ..widgets.defined_keys import Backspace_Key
|
||||
from ..widgets.defined_keys import Enter_Key
|
||||
|
||||
|
||||
|
||||
|
||||
class Right_Column(Gtk.Box):
|
||||
"""docstring for Right_Column."""
|
||||
|
||||
@@ -20,7 +22,14 @@ class Right_Column(Gtk.Box):
|
||||
|
||||
self.setup_styling()
|
||||
|
||||
for key in [Emoji_Keys(), Backspace_Key(), Enter_Key()]:
|
||||
emoji_popover = Emoji_Popover()
|
||||
emoji_key = Emoji_Key(emoji_popover)
|
||||
|
||||
emoji_popover.set_parent_key(emoji_key)
|
||||
emoji_popover.set_relative_to(emoji_key)
|
||||
emoji_popover.set_constrain_to(0) # LEFT = 0, RIGHT = 1, TOP = 2, BOTTOM = 3
|
||||
|
||||
for key in [emoji_key, Backspace_Key(), Enter_Key()]:
|
||||
self.add(key)
|
||||
|
||||
self.show_all()
|
||||
|
||||
Reference in New Issue
Block a user