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()
|
||||
|
||||
@@ -63,21 +63,25 @@ class Backspace_Key(Key):
|
||||
def _clicked(self, widget = None):
|
||||
typwriter.press_special_keys(self.get_label())
|
||||
|
||||
class Emoji_Keys(Key):
|
||||
def __init__(self):
|
||||
super(Emoji_Keys, self).__init__("Emoji", "Emoji", iscontrol=True)
|
||||
class Emoji_Key(Key):
|
||||
def __init__(self, emoji_popover):
|
||||
super(Emoji_Key, self).__init__("Emoji", "Emoji", iscontrol=True)
|
||||
|
||||
self._ctx = self.get_style_context()
|
||||
self._emoji_popover = emoji_popover
|
||||
|
||||
def setup_signals(self):
|
||||
self.connect("released", self._clicked)
|
||||
|
||||
def _clicked(self, widget = None):
|
||||
ctx = widget.get_style_context()
|
||||
ctx.remove_class("toggled_bttn") if ctx.has_class("toggled_bttn") else ctx.add_class("toggled_bttn")
|
||||
self._ctx.add_class("toggled_bttn")
|
||||
self._emoji_popover.popup()
|
||||
|
||||
def unset_selected(self, widget = None):
|
||||
self._ctx.remove_class("toggled_bttn")
|
||||
|
||||
|
||||
|
||||
key_columns = self.get_parent().get_parent().get_children()[1]
|
||||
for row in key_columns.get_children():
|
||||
for key in row:
|
||||
key.emit("toggle-emoji-keys", ())
|
||||
|
||||
class Enter_Key(Key):
|
||||
def __init__(self):
|
||||
|
||||
101
src/core/widgets/emoji_popover.py
Normal file
101
src/core/widgets/emoji_popover.py
Normal file
@@ -0,0 +1,101 @@
|
||||
# Python imports
|
||||
from collections import defaultdict
|
||||
import json
|
||||
|
||||
# Lib imports
|
||||
import gi
|
||||
gi.require_version('Gtk', '3.0')
|
||||
from gi.repository import Gtk
|
||||
|
||||
# Application imports
|
||||
from .key import Key
|
||||
|
||||
|
||||
|
||||
|
||||
class Emoji_Notebook(Gtk.Notebook):
|
||||
"""docstring for Emoji_Notebook."""
|
||||
|
||||
def __init__(self):
|
||||
super(Emoji_Notebook, self).__init__()
|
||||
|
||||
self.load_ui( self.get_data(EMOJI_FILE) )
|
||||
|
||||
self.setup_styling()
|
||||
self.show_all()
|
||||
|
||||
|
||||
def setup_styling(self):
|
||||
self.set_current_page(0)
|
||||
self.set_scrollable(True)
|
||||
|
||||
def get_data(self, file):
|
||||
emoji_grouping = defaultdict(list)
|
||||
|
||||
with open(file, 'r') as f:
|
||||
emoji_data = json.load(f)
|
||||
for emoji in emoji_data:
|
||||
category = emoji['category']
|
||||
del emoji['category']
|
||||
del emoji['unicode_version']
|
||||
del emoji['ios_version']
|
||||
emoji_grouping[category].append(emoji)
|
||||
|
||||
return emoji_grouping
|
||||
|
||||
def load_ui(self, emoji_grouping):
|
||||
width = 1
|
||||
height = 1
|
||||
for group in emoji_grouping:
|
||||
tab_widget = Gtk.Label(label=group)
|
||||
scroll, grid = self.create_scroll_and_grid()
|
||||
|
||||
top = 0
|
||||
left = 0
|
||||
for emoji in emoji_grouping[group]:
|
||||
key = Key(emoji["emoji"], emoji["emoji"])
|
||||
key._is_emoji = True
|
||||
grid.attach(key, left, top, width, height)
|
||||
|
||||
left += 1
|
||||
if left > 8:
|
||||
left = 0
|
||||
top += 1
|
||||
|
||||
self.append_page(scroll, tab_widget)
|
||||
self.set_tab_reorderable(scroll, False)
|
||||
self.set_tab_detachable(scroll, False)
|
||||
|
||||
def create_scroll_and_grid(self):
|
||||
scroll = Gtk.ScrolledWindow()
|
||||
grid = Gtk.Grid()
|
||||
scroll.add(grid)
|
||||
|
||||
return scroll, grid
|
||||
|
||||
|
||||
|
||||
class Emoji_Popover(Gtk.Popover):
|
||||
"""docstring for Emoji_Popover."""
|
||||
|
||||
def __init__(self):
|
||||
super(Emoji_Popover, self).__init__()
|
||||
|
||||
emoji_notebook = Emoji_Notebook()
|
||||
self.add(emoji_notebook)
|
||||
self.set_default_widget(emoji_notebook)
|
||||
self.setup_styling()
|
||||
|
||||
self._emoji_key = None
|
||||
|
||||
|
||||
def setup_styling(self):
|
||||
self.set_vexpand(True)
|
||||
self.set_size_request(480, 280)
|
||||
|
||||
def setup_signals(self):
|
||||
self.connect("closed", self._emoji_key.unset_selected)
|
||||
|
||||
def set_parent_key(self, emoji_key):
|
||||
self._emoji_key = emoji_key
|
||||
self.setup_signals()
|
||||
@@ -9,13 +9,12 @@ from gi.repository import Gtk
|
||||
|
||||
|
||||
class Key(Gtk.Button or Gtk.ToggleButton):
|
||||
def __init__(self, primary = "NULL", secondary = "NULL", emoji = "NULL", iscontrol=False):
|
||||
def __init__(self, primary = "NULL", secondary = "NULL", iscontrol=False):
|
||||
super(Key, self).__init__()
|
||||
|
||||
self.iscontrol = iscontrol
|
||||
self._primary_symbol = primary
|
||||
self._secondary_symbol = secondary
|
||||
self._emoji_symbol = emoji
|
||||
self._is_upper = False
|
||||
self._is_symbol = False
|
||||
self._is_emoji = False
|
||||
@@ -30,13 +29,17 @@ class Key(Gtk.Button or Gtk.ToggleButton):
|
||||
|
||||
def setup_signals(self):
|
||||
self.connect("released", self._do_type)
|
||||
# self.connect("toggle-caps", self.toggle_caps)
|
||||
# self.connect("toggle-symbol-keys", self.toggle_symbol_keys)
|
||||
self.connect("toggle-emoji-keys", self.toggle_emoji_keys)
|
||||
|
||||
def _do_type(self, widget = None):
|
||||
key = self.get_label().strip()
|
||||
typwriter.type(key)
|
||||
if not self._is_emoji:
|
||||
typwriter.type(key)
|
||||
else:
|
||||
typwriter.set_clipboard_data(key, "utf-16")
|
||||
typwriter.isCtrlOn = True
|
||||
typwriter.type('v')
|
||||
typwriter.isCtrlOn = False
|
||||
|
||||
def _do_press_special_key(self, widget = None):
|
||||
key = self.get_label()
|
||||
@@ -51,18 +54,13 @@ class Key(Gtk.Button or Gtk.ToggleButton):
|
||||
self._is_symbol = not self._is_symbol
|
||||
if self._is_symbol:
|
||||
self.set_label(self._secondary_symbol)
|
||||
elif self._is_emoji:
|
||||
self.set_label(self._emoji_symbol)
|
||||
else:
|
||||
self.set_label(self._primary_symbol.upper()) if self._is_upper else self.set_label(self._primary_symbol.lower())
|
||||
|
||||
# NOTE: Might use name attrib on widgets and de-duplicate this and the above logic.
|
||||
def toggle_emoji_keys(self, widget = None, eve = None):
|
||||
if not self.iscontrol:
|
||||
self._is_emoji = not self._is_emoji
|
||||
if self._is_emoji:
|
||||
self.set_label(self._emoji_symbol)
|
||||
elif self._is_symbol:
|
||||
if self._is_symbol:
|
||||
self.set_label(self._secondary_symbol)
|
||||
else:
|
||||
self.set_label(self._primary_symbol.upper()) if self._is_upper else self.set_label(self._primary_symbol.lower())
|
||||
|
||||
@@ -16,9 +16,6 @@ from .container import Container
|
||||
|
||||
|
||||
|
||||
class MissingConfigError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class Window(SignalsMixin, Gtk.ApplicationWindow):
|
||||
"""docstring for Window."""
|
||||
@@ -26,22 +23,6 @@ class Window(SignalsMixin, Gtk.ApplicationWindow):
|
||||
def __init__(self, args, unknownargs):
|
||||
super(Window, self).__init__()
|
||||
|
||||
self._USER_HOME = os.path.expanduser('~')
|
||||
self._USR_PATH = f"/usr/share/{app_name.lower()}"
|
||||
self._CONFIG_PATH = f"{self._USER_HOME}/.config/{app_name.lower()}"
|
||||
self._ICON_FILE = f"{self._CONFIG_PATH}/icon.png"
|
||||
self._CSS_FILE = f"{self._CONFIG_PATH}/stylesheet.css"
|
||||
|
||||
if not os.path.exists(self._ICON_FILE):
|
||||
self._ICON_FILE = f"{self._USR_PATH}/icon.png"
|
||||
if not os.path.exists(self._ICON_FILE):
|
||||
raise MissingConfigError("Unable to find the application icon.")
|
||||
|
||||
if not os.path.exists(self._ICON_FILE):
|
||||
self._CSS_FILE = f"{self._USR_PATH}/stylesheet.css"
|
||||
if not os.path.exists(self._ICON_FILE):
|
||||
raise MissingConfigError("Unable to find the stylesheet.")
|
||||
|
||||
self.setup_win_settings()
|
||||
self.setup_styling()
|
||||
self.setup_signals()
|
||||
@@ -50,12 +31,11 @@ class Window(SignalsMixin, Gtk.ApplicationWindow):
|
||||
|
||||
self.show_all()
|
||||
|
||||
|
||||
def setup_signals(self):
|
||||
self.connect("delete-event", Gtk.main_quit)
|
||||
|
||||
def setup_win_settings(self):
|
||||
self.set_icon_from_file(self._ICON_FILE)
|
||||
self.set_icon_from_file(ICON_FILE)
|
||||
self.set_title(app_name)
|
||||
self.set_default_size(800, 200)
|
||||
self.set_keep_above(True)
|
||||
@@ -77,7 +57,7 @@ class Window(SignalsMixin, Gtk.ApplicationWindow):
|
||||
self.connect("draw", self._area_draw)
|
||||
|
||||
css_provider = Gtk.CssProvider()
|
||||
css_provider.load_from_path(self._CSS_FILE)
|
||||
css_provider.load_from_path(CSS_FILE)
|
||||
screen = Gdk.Screen.get_default()
|
||||
style_context = Gtk.StyleContext()
|
||||
style_context.add_provider_for_screen(screen, css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
|
||||
|
||||
Reference in New Issue
Block a user