修复耗材检测显示偶尔不正确的问题，有些弹窗会异常问题，以及一点翻译优化
Squashed commit of the following:
commit cf7cafefbcd2274c9a481e58042d11db8cd79961
Merge: dc3478b4 8d259cea
Author: zkk <1007518571@qq.com>
Date: Tue Jan 7 17:26:59 2025 +0800
Merge commit '8d259ceadd5026cecc1dc61224d91aef4f3877b4' into release
commit 8d259ceadd5026cecc1dc61224d91aef4f3877b4
Author: zkk <1007518571@qq.com>
Date: Tue Jan 7 17:15:46 2025 +0800
实现 打印中恢复喷头温度 提示语的翻译
commit dd11c9683cb5af5407e650eea9b683b1066256c7
Author: zkk <1007518571@qq.com>
Date: Tue Jan 7 16:52:04 2025 +0800
优化单个喷头时不显示喷头偏移菜单
commit c3ec7a81bbe1490b76202485d0502a4829a3cee5
Author: zkk <1007518571@qq.com>
Date: Fri Jan 3 17:52:24 2025 +0800
修复屏幕耗材检测显示偶尔不准确的问题
commit 413bf6fc4a740f53d265c63abe7c51eaad483cb0
Author: zkk <1007518571@qq.com>
Date: Fri Jan 3 15:00:54 2025 +0800
修复耗材检测弹窗异常问题
commit dc3478b48c7da1dbae120d1270c9ab64646d6647
Merge: 02c7556c 3bfc1aa7
Author: zkk <1007518571@qq.com>
Date: Thu Jan 2 11:18:07 2025 +0800
Merge commit '3bfc1aa714e282d74b801155d830377ca58d8f59' into release
commit 3bfc1aa714e282d74b801155d830377ca58d8f59
Author: zkk <1007518571@qq.com>
Date: Thu Jan 2 11:17:15 2025 +0800
修复移轴页面移轴功能失效问题
commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date: Tue Dec 31 15:07:54 2024 +0800
Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release
commit 991003e6cbea335eca73d3783aa1837059614724
Author: zkk <1007518571@qq.com>
Date: Tue Dec 31 15:03:34 2024 +0800
优化完整 简体中文和繁体中文的翻译
commit 1a177e90d09b9b9949bff2a1e3c6b12173420620
Author: zkk <1007518571@qq.com>
Date: Tue Dec 31 14:10:03 2024 +0800
优化排除对象的英文语法错误
commit e8d509cb6c2883b1fadb5ab9f9ca658e61849055
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 16:40:52 2024 +0800
优化耗材检测显示内容
commit 1b7670485a918cb334119175777525f768e670be
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 14:56:25 2024 +0800
完善断料自动切头功能描述
commit ecc0c3dd16442497e56f5f8ab3a0c6be00bd180e
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 13:40:01 2024 +0800
实现弹窗翻译功能
commit bc6d60fa183af50b7b16fea685139ca9d5df90ea
Author: zkk <1007518571@qq.com>
Date: Fri Dec 27 09:53:16 2024 +0800
优化不合理名称和不合理大小写
commit 2e650926bdba1c65baa506be1b1dd09621e8d8ea
Author: zkk <1007518571@qq.com>
Date: Thu Dec 26 15:06:11 2024 +0800
修复10寸屏幕偏移值微调页面出界问题
commit c481b551f777a3a6cadf7be3bfcab38448b51694
Author: zkk <1007518571@qq.com>
Date: Wed Dec 25 15:28:26 2024 +0800
优化移轴设置页面没有返回按钮的问题
commit 2b3c9936bd693c8fc265d6352799f382680f4920
Author: zkk <1007518571@qq.com>
Date: Wed Dec 25 10:05:04 2024 +0800
删除移动设置页面中轴反转的选项
commit 5e37d59497c54086d3f1e215cbabc03254857a58
Author: zkk <1007518571@qq.com>
Date: Wed Dec 25 09:05:03 2024 +0800
优化选择语言标题
commit 5214c3697baac78bd0a465e33d6f4f3c1e30862e
Author: zkk <1007518571@qq.com>
Date: Tue Dec 24 10:57:41 2024 +0800
增加设置hostname功能
commit 3709a7465cc2e0d677ecc9979fb18144f7e0ec33
Author: zkk <1007518571@qq.com>
Date: Tue Dec 24 10:43:46 2024 +0800
增加工厂设置中打包模式
commit 0c2a2618beb68d50601e433beef06122fb0ffd40
Author: zkk <1007518571@qq.com>
Date: Mon Dec 23 16:25:37 2024 +0800
实现恢复出厂设置功能
commit e3a38f85613d53a4a063e835c34c701196010c6e
Author: zkk <1007518571@qq.com>
Date: Mon Dec 23 15:48:17 2024 +0800
一点格式化
commit 4e9e452e8bed4b53eaaae8f0a69142de8aa50611
Author: zkk <1007518571@qq.com>
Date: Sat Dec 21 14:20:22 2024 +0800
优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头
commit 3b85e8e8d59b0d4eae75f80d9e637fe9dc272cbe
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date: Wed Dec 18 17:26:08 2024 +0800
Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop
commit 882850dbde648598e5f91281101d0ea01fd56d56
Author: zkk <1007518571@qq.com>
Date: Wed Dec 18 17:21:16 2024 +0800
补充双喷头偏移校准页面二维码图片
commit 10ec2029eb73e66874d5a0ec492c016480641110
Author: ruipeng <1041589370@qq.com>
Date: Wed Dec 18 17:17:18 2024 +0800
增加自动切换喷头开关选项
commit 3d6eed9d9526b77472ba7df29014b5768c594026
Author: zkk <1007518571@qq.com>
Date: Mon Dec 16 16:33:34 2024 +0800
喷头偏移值校准功能的实现
commit 40ecbb3ea4827c9bac1aa271cccc958c94c1114a
Author: zkk <1007518571@qq.com>
Date: Fri Dec 13 09:20:00 2024 +0800
z探针校准时指定默认激活工具头为第一个头
commit bce3caa409618ef5bc2067865940d14a1441c0f8
Author: zkk <1007518571@qq.com>
Date: Fri Dec 13 09:19:19 2024 +0800
优化z探针校准时候移动过慢问题
commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date: Thu Dec 12 10:33:58 2024 +0800
Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release
commit 4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date: Thu Dec 12 10:30:00 2024 +0800
Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop
commit 1a69b5180de733f15550a1294a7221d6070306a0
Author: ruipeng <1041589370@qq.com>
Date: Wed Dec 11 11:44:36 2024 +0800
新增D600pro2、D1000的V0版机型
commit e3fd413d6256414441e9fe653c1132b1799a5cb2
Author: zkk <1007518571@qq.com>
Date: Tue Dec 10 14:34:13 2024 +0800
修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug
commit 594fb668fe94fe907c028bf65ecced43ea8660cb
Author: zkk <1007518571@qq.com>
Date: Tue Dec 10 14:25:04 2024 +0800
设置自适应调平选项默认为关闭状态
commit 1a87ced3f5725569a6b9a7ee5f5250044d01d852
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date: Fri Nov 29 10:18:32 2024 +0800
Merge branch 'develop' into release
# Conflicts:
# config/main_menu.conf
# ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo resolved by cf7cafefbcd2274c9a481e58042d11db8cd79961 version
# ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po
# ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo resolved by cf7cafefbcd2274c9a481e58042d11db8cd79961 version
# ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po
# ks_includes/prompts_text.py
# ks_includes/widgets/prompts.py
# screen.py
This commit is contained in:
parent
7fb4963292
commit
7f8d113e74
@ -38,6 +38,7 @@ panel: zcalibrate
|
||||
name: {{ gettext('Nozzle Offset') }}
|
||||
icon: nozzle_offset
|
||||
panel: nozzle_offset
|
||||
enable: {{ printer.extruders.count > 1 }}
|
||||
|
||||
[menu __main more limits]
|
||||
name: {{ gettext('Limits') }}
|
||||
|
||||
Binary file not shown.
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: KlipperScreen\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-12-31 14:57+0800\n"
|
||||
"POT-Creation-Date: 2025-01-07 17:11+0800\n"
|
||||
"PO-Revision-Date: 2024-06-03 19:09+0000\n"
|
||||
"Last-Translator: wsj20050623 <2129426599@qq.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
|
||||
@ -853,11 +853,8 @@ msgstr "恢复出厂设置"
|
||||
msgid "Restores your print job after a power outage"
|
||||
msgstr "在断电后恢复您的打印作业"
|
||||
|
||||
msgid "Restoring Left extruder temperature, this may take some time"
|
||||
msgstr "恢复左挤出机温度，这可能需要一些时间"
|
||||
|
||||
msgid "Restoring Right extruder temperature, this may take some time"
|
||||
msgstr "恢复右挤出机温度，这可能需要一些时间"
|
||||
msgid "Restoring activated extruder temperature, this may take some time."
|
||||
msgstr "恢复激活喷头的温度，可能需要一些时间。"
|
||||
|
||||
msgid "Resume"
|
||||
msgstr "继续"
|
||||
@ -1168,6 +1165,9 @@ msgid "second"
|
||||
msgid_plural "seconds"
|
||||
msgstr[0] "秒"
|
||||
|
||||
#~ msgid "Restoring Left extruder temperature, this may take some time"
|
||||
#~ msgstr "恢复左挤出机温度，这可能需要一些时间"
|
||||
|
||||
#~ msgid "Manual Calibration"
|
||||
#~ msgstr "手动校准"
|
||||
|
||||
|
||||
Binary file not shown.
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: KlipperScreen\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-12-31 14:57+0800\n"
|
||||
"POT-Creation-Date: 2025-01-07 17:11+0800\n"
|
||||
"PO-Revision-Date: 2024-06-01 12:09+0000\n"
|
||||
"Last-Translator: 峻瑜哥 <a728728728@gmail.com>\n"
|
||||
"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
|
||||
@ -853,11 +853,8 @@ msgstr "恢復出廠設置"
|
||||
msgid "Restores your print job after a power outage"
|
||||
msgstr "在斷電後恢復您的打印作業"
|
||||
|
||||
msgid "Restoring Left extruder temperature, this may take some time"
|
||||
msgstr "恢復左擠出機溫度，這可能需要一些時間"
|
||||
|
||||
msgid "Restoring Right extruder temperature, this may take some time"
|
||||
msgstr "恢復右擠出機溫度，這可能需要一些時間"
|
||||
msgid "Restoring activated extruder temperature, this may take some time."
|
||||
msgstr "恢複激活噴頭的溫度，可能需要一些時間。"
|
||||
|
||||
msgid "Resume"
|
||||
msgstr "繼續"
|
||||
@ -1168,6 +1165,9 @@ msgid "second"
|
||||
msgid_plural "seconds"
|
||||
msgstr[0] "秒"
|
||||
|
||||
#~ msgid "Restoring Left extruder temperature, this may take some time"
|
||||
#~ msgstr "恢復左擠出機溫度，這可能需要一些時間"
|
||||
|
||||
#~ msgid "Channel"
|
||||
#~ msgstr "群組"
|
||||
|
||||
|
||||
@ -4,14 +4,13 @@ prompts_text = [
|
||||
_("Cancel"),
|
||||
_("Recovery in progress, please wait"),
|
||||
_("RESUME ABORTED !"),
|
||||
_("Noting! Left extruder filament has been run out.")
|
||||
_("Noting! Right extruder filament has been run out.")
|
||||
_("Noting! All extruders filament has been run out.")
|
||||
_("Restoring Left extruder temperature, this may take some time")
|
||||
_("Restoring Right extruder temperature, this may take some time")
|
||||
_("Left extruder not hot enough, will reheat and continue.")
|
||||
_("Right extruder not hot enough, will reheat and continue.")
|
||||
_("Left extruder detects no filament, please load filament and continue.")
|
||||
_("Right extruder detects no filament, please load filament and continue.")
|
||||
_("Ok")
|
||||
_("Noting! Left extruder filament has been run out."),
|
||||
_("Noting! Right extruder filament has been run out."),
|
||||
_("Noting! All extruders filament has been run out."),
|
||||
_("Restoring activated extruder temperature, this may take some time."),
|
||||
_("Left extruder not hot enough, will reheat and continue."),
|
||||
_("Right extruder not hot enough, will reheat and continue."),
|
||||
_("Left extruder detects no filament, please load filament and continue."),
|
||||
_("Right extruder detects no filament, please load filament and continue."),
|
||||
_("Ok"),
|
||||
]
|
||||
|
||||
@ -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 ', '')
|
||||
|
||||
@ -138,6 +138,10 @@ class Panel(ScreenPanel):
|
||||
speedbox.add(speedgrid)
|
||||
|
||||
filament_sensors = self._printer.get_filament_sensors()
|
||||
res = self._screen.apiclient.send_request("printer/objects/query?" + "&".join(filament_sensors))
|
||||
if res.get('status'):
|
||||
self._printer.data.update(res['status'])
|
||||
|
||||
sensors = Gtk.Grid(valign=Gtk.Align.CENTER, row_spacing=5, column_spacing=5)
|
||||
if len(filament_sensors) > 0:
|
||||
for s, x in enumerate(filament_sensors):
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user