[Refactor] Main Window: _printToTextbox. textboxへの出力関数のリファクタリング。
view.pyではターゲットタイプとメッセージを渡すだけにして、vrct_gui内でwidgetの取得と、allタブへの出力自動設定を行うように。
This commit is contained in:
21
view.py
21
view.py
@@ -437,8 +437,11 @@ class View():
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _printToTextbox_Info(info_message):
|
def _printToTextbox_Info(info_message):
|
||||||
vrct_gui.printToTextbox(vrct_gui.textbox_all, info_message, "", "INFO")
|
vrct_gui.printToTextbox(
|
||||||
vrct_gui.printToTextbox(vrct_gui.textbox_system, info_message, "", "INFO")
|
target_type="INFO",
|
||||||
|
original_message=info_message,
|
||||||
|
translated_message="",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -447,8 +450,11 @@ class View():
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _printToTextbox_Sent(original_message, translated_message):
|
def _printToTextbox_Sent(original_message, translated_message):
|
||||||
vrct_gui.printToTextbox(vrct_gui.textbox_all, original_message, translated_message, "SEND")
|
vrct_gui.printToTextbox(
|
||||||
vrct_gui.printToTextbox(vrct_gui.textbox_sent, original_message, translated_message, "SEND")
|
target_type="SEND",
|
||||||
|
original_message=original_message,
|
||||||
|
translated_message=translated_message,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def printToTextbox_ReceivedMessage(self, original_message, translated_message):
|
def printToTextbox_ReceivedMessage(self, original_message, translated_message):
|
||||||
@@ -456,8 +462,11 @@ class View():
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _printToTextbox_Received(original_message, translated_message):
|
def _printToTextbox_Received(original_message, translated_message):
|
||||||
vrct_gui.printToTextbox(vrct_gui.textbox_all, original_message, translated_message, "RECEIVE")
|
vrct_gui.printToTextbox(
|
||||||
vrct_gui.printToTextbox(vrct_gui.textbox_received, original_message, translated_message, "RECEIVE")
|
target_type="RECEIVE",
|
||||||
|
original_message=original_message,
|
||||||
|
translated_message=translated_message,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from customtkinter import CTkFont
|
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_raw_data = datetime.now()
|
||||||
now = now_raw_data.strftime('%H:%M:%S')
|
now = now_raw_data.strftime('%H:%M:%S')
|
||||||
now_hm = now_raw_data.strftime('%H:%M')
|
now_hm = now_raw_data.strftime('%H:%M')
|
||||||
|
|||||||
@@ -125,13 +125,30 @@ class VRCT_GUI(CTk):
|
|||||||
target_names=target_names,
|
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(
|
_printToTextbox(
|
||||||
settings=self.settings.main,
|
settings=self.settings.main,
|
||||||
target_textbox=target_textbox,
|
target_textbox=target_textbox,
|
||||||
original_message=original_message,
|
original_message=original_message,
|
||||||
translated_message=translated_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):
|
def setDefaultActiveLanguagePresetTab(self, tab_no:str):
|
||||||
|
|||||||
Reference in New Issue
Block a user