From 43a880775b74d35a425f890ed76de5af6c8036e2 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 14 Sep 2023 03:06:12 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20Main=20Window:=20=5FprintToTextbox?= =?UTF-8?q?.=20textbox=E3=81=B8=E3=81=AE=E5=87=BA=E5=8A=9B=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E3=81=AE=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=B0=E3=80=82=20view.py=E3=81=A7?= =?UTF-8?q?=E3=81=AF=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83=E3=83=88=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=81=A8=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E6=B8=A1=E3=81=99=E3=81=A0=E3=81=91=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=80=81vrct=5Fgui=E5=86=85=E3=81=A7widget?= =?UTF-8?q?=E3=81=AE=E5=8F=96=E5=BE=97=E3=81=A8=E3=80=81all=E3=82=BF?= =?UTF-8?q?=E3=83=96=E3=81=B8=E3=81=AE=E5=87=BA=E5=8A=9B=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view.py | 21 +++++++++++++++------ vrct_gui/_printToTextbox.py | 2 +- vrct_gui/vrct_gui.py | 21 +++++++++++++++++++-- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/view.py b/view.py index 568a4bae..e7f72a0e 100644 --- a/view.py +++ b/view.py @@ -437,8 +437,11 @@ class View(): @staticmethod def _printToTextbox_Info(info_message): - vrct_gui.printToTextbox(vrct_gui.textbox_all, info_message, "", "INFO") - vrct_gui.printToTextbox(vrct_gui.textbox_system, info_message, "", "INFO") + vrct_gui.printToTextbox( + target_type="INFO", + original_message=info_message, + translated_message="", + ) @@ -447,8 +450,11 @@ class View(): @staticmethod def _printToTextbox_Sent(original_message, translated_message): - vrct_gui.printToTextbox(vrct_gui.textbox_all, original_message, translated_message, "SEND") - vrct_gui.printToTextbox(vrct_gui.textbox_sent, original_message, translated_message, "SEND") + vrct_gui.printToTextbox( + target_type="SEND", + original_message=original_message, + translated_message=translated_message, + ) def printToTextbox_ReceivedMessage(self, original_message, translated_message): @@ -456,8 +462,11 @@ class View(): @staticmethod def _printToTextbox_Received(original_message, translated_message): - vrct_gui.printToTextbox(vrct_gui.textbox_all, original_message, translated_message, "RECEIVE") - vrct_gui.printToTextbox(vrct_gui.textbox_received, original_message, translated_message, "RECEIVE") + vrct_gui.printToTextbox( + target_type="RECEIVE", + original_message=original_message, + translated_message=translated_message, + ) @staticmethod diff --git a/vrct_gui/_printToTextbox.py b/vrct_gui/_printToTextbox.py index 88bcc87b..9becc64d 100644 --- a/vrct_gui/_printToTextbox.py +++ b/vrct_gui/_printToTextbox.py @@ -1,7 +1,7 @@ from datetime import datetime from customtkinter import CTkFont -def _printToTextbox(settings, target_textbox, original_message, translated_message, tags=None): +def _printToTextbox(settings, target_textbox, original_message=None, translated_message=None, tags=None): now_raw_data = datetime.now() now = now_raw_data.strftime('%H:%M:%S') now_hm = now_raw_data.strftime('%H:%M') diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index 36287308..f525ff4a 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -125,13 +125,30 @@ class VRCT_GUI(CTk): target_names=target_names, ) - def printToTextbox(self, target_textbox, original_message, translated_message, tags=None): + def printToTextbox(self, target_type, original_message=None, translated_message=None): + match (target_type): + case "INFO": + target_textbox = self.textbox_system + case "SEND": + target_textbox = self.textbox_sent + case "RECEIVE": + target_textbox = self.textbox_received + case (_): + raise ValueError(f"No matching case for target_type: {target_type}") _printToTextbox( settings=self.settings.main, target_textbox=target_textbox, original_message=original_message, translated_message=translated_message, - tags=tags, + tags=target_type, + ) + # To automatically print the same log to the textbox_all widget as well. + _printToTextbox( + settings=self.settings.main, + target_textbox=self.textbox_all, + original_message=original_message, + translated_message=translated_message, + tags=target_type, ) def setDefaultActiveLanguagePresetTab(self, tab_no:str):