jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-24 14:20:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expanded emoji rendering to alternate input scripts

Browse Source
This commit is contained in:
Mark Qvist 2024-06-01 15:07:38 +02:00
parent b3b9b55863
commit 3bf142d21a
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbapp/main.py
View File

@ -388,7 +388,7 @@ class SidebandApp(MDApp):
LabelBase.register(name="emoji", LabelBase.register(name="emoji",
fn_regular=fb_path+"NotoEmoji-Regular.ttf") fn_regular=fb_path+"NotoEmoji-Regular.ttf")
LabelBase.register(name="default_input", LabelBase.register(name="defaultinput",
fn_regular=fb_path+"DefaultInput.ttf") fn_regular=fb_path+"DefaultInput.ttf")
LabelBase.register(name="combined", LabelBase.register(name="combined",
@ -400,12 +400,20 @@ class SidebandApp(MDApp):
def update_input_language(self): def update_input_language(self):
language = self.sideband.config["input_language"] language = self.sideband.config["input_language"]
if language == None: if language == None:
self.input_font = "default_input" self.input_font = "defaultinput"
RNS.log("Setting input language to default set", RNS.LOG_DEBUG)
else: else:
self.input_font = language self.input_font = language
RNS.log("Setting input language to "+str(language), RNS.LOG_DEBUG)
RNS.log("Setting input language to "+str(self.input_font), RNS.LOG_DEBUG)
# def modify_input_font(self, ids):
# BIND_CLASSES = ["kivymd.uix.textfield.textfield.MDTextField",]
# for e in ids:
# te = ids[e]
# ts = str(te).split(" ")[0].replace("<", "")
# if ts in BIND_CLASSES:
# RNS.log("MODIFYING "+str(e)+" to "+self.input_font)
# te.font_name = self.input_font
def update_ui_colors(self): def update_ui_colors(self):
if self.sideband.config["dark_ui"]: if self.sideband.config["dark_ui"]:
@ -2056,7 +2064,7 @@ class SidebandApp(MDApp):
if self.settings_screen.ids.settings_lang_default.active: if self.settings_screen.ids.settings_lang_default.active:
self.sideband.config["input_language"] = None self.sideband.config["input_language"] = None
self.settings_screen.ids.settings_display_name.font_name = "" self.settings_screen.ids.settings_display_name.font_name = "defaultinput"
elif self.settings_screen.ids.settings_lang_chinese.active: elif self.settings_screen.ids.settings_lang_chinese.active:
self.sideband.config["input_language"] = "chinese" self.sideband.config["input_language"] = "chinese"
self.settings_screen.ids.settings_display_name.font_name = "chinese" self.settings_screen.ids.settings_display_name.font_name = "chinese"
@ -2074,7 +2082,7 @@ class SidebandApp(MDApp):
self.settings_screen.ids.settings_display_name.font_name = "hebrew" self.settings_screen.ids.settings_display_name.font_name = "hebrew"
else: else:
self.sideband.config["input_language"] = None self.sideband.config["input_language"] = None
self.settings_screen.ids.settings_display_name.font_name = "" self.settings_screen.ids.settings_display_name.font_name = "defaultinput"
self.sideband.save_configuration() self.sideband.save_configuration()
@ -2283,7 +2291,7 @@ class SidebandApp(MDApp):
elif input_lang == "korean": elif input_lang == "korean":
self.settings_screen.ids.settings_lang_korean.active = True self.settings_screen.ids.settings_lang_korean.active = True
self.settings_screen.ids.settings_display_name.font_name = "korean" self.settings_screen.ids.settings_display_name.font_name = "korean"
elif input_lang == "devangari": elif input_lang == "combined":
self.settings_screen.ids.settings_lang_devangari.active = True self.settings_screen.ids.settings_lang_devangari.active = True
self.settings_screen.ids.settings_display_name.font_name = "combined" self.settings_screen.ids.settings_display_name.font_name = "combined"
elif input_lang == "hebrew": elif input_lang == "hebrew":

5
sbapp/ui/conversations.py
View File

@ -220,10 +220,7 @@ class Conversations():
no_button = MDRectangleFlatButton(text="Cancel",font_size=dp(18)) no_button = MDRectangleFlatButton(text="Cancel",font_size=dp(18))
dialog_content = ConvSettings(disp_name=disp_name, context_dest=RNS.hexrep(dest, delimit=False), trusted=is_trusted, dialog_content = ConvSettings(disp_name=disp_name, context_dest=RNS.hexrep(dest, delimit=False), trusted=is_trusted,
telemetry=send_telemetry, allow_requests=allow_requests, is_object=is_object) telemetry=send_telemetry, allow_requests=allow_requests, is_object=is_object)
if self.app.sideband.config["input_language"] != None: dialog_content.ids.name_field.font_name = self.app.input_font
dialog_content.ids.name_field.font_name = self.app.sideband.config["input_language"]
else:
dialog_content.ids.name_field.font_name = ""
dialog = MDDialog( dialog = MDDialog(
title="Edit Conversation", title="Edit Conversation",