From 413bf6fc4a740f53d265c63abe7c51eaad483cb0 Mon Sep 17 00:00:00 2001 From: zkk <1007518571@qq.com> Date: Fri, 3 Jan 2025 15:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=BC=B9=E7=AA=97=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ks_includes/widgets/prompts.py | 4 ++-- screen.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ks_includes/widgets/prompts.py b/ks_includes/widgets/prompts.py index caaeaede..f5818f00 100644 --- a/ks_includes/widgets/prompts.py +++ b/ks_includes/widgets/prompts.py @@ -23,14 +23,14 @@ class Prompt: def decode(self, data): logging.info(f'{data}') if data.startswith('prompt_begin'): - self.header = _(data.replace('prompt_begin', '').lstrip()) + self.header = _(cleaned_data) if (cleaned_data := data.replace("prompt_begin", "").strip()) else "" if self.header: self.window_title = self.header self.text = "" self.buttons = [] return elif data.startswith('prompt_text'): - self.text = _(data.replace('prompt_text ', '').lstrip()) + self.text = _(cleaned_data) if (cleaned_data := data.replace("prompt_text", "").strip()) else "" return elif data.startswith('prompt_button ') or data.startswith('prompt_footer_button'): data = data.replace('prompt_button ', '') diff --git a/screen.py b/screen.py index 728d9c68..9a558431 100755 --- a/screen.py +++ b/screen.py @@ -876,7 +876,7 @@ class KlipperScreen(Gtk.Window): elif action == "notify_update_response": if 'message' in data and 'Error' in data['message']: logging.error(f"{action}:{data['message']}") - self.show_popup_message(_(data['message'].lstrip()), 3, from_ws=True) + self.show_popup_message(_(cleaned_data) if (cleaned_data := data['message'].strip()) else "", 3, from_ws=True) if "KlipperScreen" in data['message']: self.restart_ks() elif action == "notify_power_changed": @@ -895,9 +895,9 @@ class KlipperScreen(Gtk.Window): return self.prompt.decode(action) elif data.startswith("echo: "): - self.show_popup_message(_(data[6:].lstrip()), 1, from_ws=True) + self.show_popup_message(_(cleaned_data) if (cleaned_data := data[6:].strip()) else "", 1, from_ws=True) elif data.startswith("!! "): - self.show_popup_message(_(data[3:].lstrip()), 3, from_ws=True) + self.show_popup_message(_(cleaned_data) if (cleaned_data := data[3:].strip()) else "", 3, from_ws=True) elif "unknown" in data.lower() and \ not ("TESTZ" in data or "MEASURE_AXES_NOISE" in data or "ACCELEROMETER_QUERY" in data): self.show_popup_message(data, from_ws=True)