Commit Graph

133 Commits

Author SHA1 Message Date
zkk
ee29d06f9e 新增图标文件,修复更改主题网络图标不更新的问题
# Conflicts:
#	panels/base_panel.py   resolved by d6fcc79a20 version
2025-03-04 16:11:47 +08:00
zkk
f892315588 优化状态栏显示网络图标,优化IP信息更新不及时问题,实现注册码页面
Squashed commit of the following:

commit 69bcfa4bd0
Merge: 2dba9f8e 964a81c3
Author: zkk <1007518571@qq.com>
Date:   Mon Mar 3 15:25:49 2025 +0800

    Merge commit '964a81c37cd165b9f8df20db87fd915ba03d10b5' into release

commit 964a81c37c
Author: zkk <1007518571@qq.com>
Date:   Fri Feb 28 16:27:57 2025 +0800

    状态栏增加网络连接图标

commit 9c99cd9125
Author: zkk <1007518571@qq.com>
Date:   Fri Feb 28 16:20:52 2025 +0800

    修复网络页面IP更新不及时的问题

commit 842a616c25
Author: zkk <1007518571@qq.com>
Date:   Tue Feb 25 14:53:31 2025 +0800

    注册码功能的实现

commit 2dba9f8ee2
Merge: 03cd3722 18f05cc5
Author: zkk <1007518571@qq.com>
Date:   Fri Feb 14 15:21:36 2025 +0800

    Merge commit '18f05cc52dfb7889853a4f84aad975309ab7dbbe' into release

commit 18f05cc52d
Author: zkk <1007518571@qq.com>
Date:   Wed Feb 5 10:59:00 2025 +0800

    修复连接不了未加密网络的旧问题

commit 025a26209c
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 24 15:48:52 2025 +0800

    重构网络页面,解决卡顿问题

commit fdc851c4e6
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 24 15:13:41 2025 +0800

    优化菜单页面的点击效果和增加列表风格属性

commit e6cfa87420
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 21 15:11:28 2025 +0800

    优化进入工厂模式的方式为10s内点击5次

commit 03cd37229e
Merge: cf7cafef adcbaa17
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 17 14:38:18 2025 +0800

    Merge commit 'adcbaa1795bffedc3000bc9e59eabba04d946dd4' into release

commit adcbaa1795
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 14 15:34:10 2025 +0800

    实现探针偏移值校准保存前范围检测,避免保存错误值无法启动问题

commit cf7cafefbc
Merge: dc3478b4 8d259cea
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 17:26:59 2025 +0800

    Merge commit '8d259ceadd5026cecc1dc61224d91aef4f3877b4' into release

commit 8d259ceadd
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 17:15:46 2025 +0800

    实现 打印中恢复喷头温度 提示语的翻译

commit dd11c9683c
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 16:52:04 2025 +0800

    优化单个喷头时不显示喷头偏移菜单

commit c3ec7a81bb
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 3 17:52:24 2025 +0800

    修复屏幕耗材检测显示偶尔不准确的问题

commit 413bf6fc4a
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 3 15:00:54 2025 +0800

    修复耗材检测弹窗异常问题

commit dc3478b48c
Merge: 02c7556c 3bfc1aa7
Author: zkk <1007518571@qq.com>
Date:   Thu Jan 2 11:18:07 2025 +0800

    Merge commit '3bfc1aa714e282d74b801155d830377ca58d8f59' into release

commit 3bfc1aa714
Author: zkk <1007518571@qq.com>
Date:   Thu Jan 2 11:17:15 2025 +0800

    修复移轴页面移轴功能失效问题

commit 02c7556cda
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:07:54 2024 +0800

    Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

commit 991003e6cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d0
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa18
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bd
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f7
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697b
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465c
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618be
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f8561
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8b
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d5
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 882850dbde
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d95
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 6bfa42e036
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:33:58 2024 +0800

    Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

commit 4f3aa9aa4c
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 1a69b5180d
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 11 11:44:36 2024 +0800

    新增D600pro2、D1000的V0版机型

commit e3fd413d62
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release

# Conflicts:
#	ks_includes/locales/KlipperScreen.pot   resolved by 69bcfa4bd0 version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by 69bcfa4bd0 version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po   resolved by 69bcfa4bd0 version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by 69bcfa4bd0 version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po   resolved by 69bcfa4bd0 version
#	panels/factory_settings.py   resolved by 69bcfa4bd0 version
#	panels/network.py   resolved by 69bcfa4bd0 version
2025-03-03 15:28:36 +08:00
zkk
d822333489 优化翻译,耗材检测提示和一些细节问题
Squashed commit of the following:

commit 02c7556cda
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:07:54 2024 +0800

    Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

commit 991003e6cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d0
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa18
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bd
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f7
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697b
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465c
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618be
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f8561
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8b
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d5
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 882850dbde
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d95
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 6bfa42e036
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:33:58 2024 +0800

    Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

commit 4f3aa9aa4c
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 1a69b5180d
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 11 11:44:36 2024 +0800

    新增D600pro2、D1000的V0版机型

commit e3fd413d62
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release

# Conflicts:
#	panels/advanced.py
#	panels/nozzle_offset.py
#	panels/offset_fine_tune.py
#	panels/zcalibrate.py
2024-12-31 15:14:35 +08:00
zkk
9b0ce1e78e 修复文件管理路径过长时 屏幕出界的问题,优化打印页面热端分成两行,增加语言设置引导页面,优化断开连接页面隐藏侧边栏 2024-12-03 13:48:15 +08:00
zkk
32f565f65e 修改没有返回页面时 侧边栏不显示返回按钮 2024-07-25 15:28:49 +08:00
zkk
046b0ed78d 优化打印页面热风显示以及热风图标名称修改 2024-07-20 18:10:21 +08:00
zkk
757c5bc8d9 修改侧边栏按钮选中高亮 2024-07-12 15:12:34 +08:00
zkk
2f92e33d5b 修改侧边栏和首页图标以及首页和预热界面布局 2024-07-10 15:03:47 +08:00
zkk
3b11fc5605 修改侧边栏点击逻辑 回显返回按钮一级页面除文件页面 不显示返回按钮 2024-07-01 14:42:45 +08:00
zkk
be83515f08 添加未连接时不显示侧边栏按钮 2024-07-01 14:40:22 +08:00
zkk
656371fce3 将挤出机菜单移动到侧边栏 2024-07-01 08:57:40 +08:00
zkk
afd3a370a1 设置打印状态下侧边栏设置按钮不可用 2024-06-29 17:08:49 +08:00
zkk
074c1707e1 把文件菜单移到侧边栏 2024-06-29 17:08:17 +08:00
zkk
210e1ab84a 删除侧边栏的关机菜单 2024-06-29 14:50:25 +08:00
zkk
9fc8291ad9 将设置菜单挪到侧边栏 2024-06-29 14:23:46 +08:00
zkk
1fbb63f354 删除侧边栏的宏指令菜单按钮 2024-06-29 11:30:45 +08:00
zkk
5fe60298d1 将移轴菜单按钮移到边栏 2024-06-29 09:28:08 +08:00
Alfredo Monclus
2d2e80c3fd panels: allow to call them without name 2024-06-04 11:16:50 -03:00
Alfredo Monclus
5abfb6f226 screen: theme doesn't need a restart anymore 2024-06-03 08:22:48 -03:00
林玮 (Jade Lin)
7e94c68993 printer: tempstore fixup (#1353)
temp from get_stat could be {} if the device is not available
2024-05-04 15:11:59 -03:00
alfrix
52754a61a8 rework websocket disconnect fixes #1352
used a solution closer to the webscocket-client docs
2024-05-03 22:03:25 -03:00
alfrix
616574ed3b drop set_dev_stat and get_dev_stat
this creates a parallel set of data that could become desynced
2024-05-02 19:01:39 -03:00
alfrix
80668faa3e Optimize: update temp avoid extra casting 2024-05-02 16:34:53 -03:00
alfrix
b93fd08b6f base_panel: resource warning changes
make the notification contain the name of the printer

use avg cpu instead of individual core to be less intrusive, also because moonraker seems to report higher core usage than htop, which is strange
2024-04-01 11:46:32 -03:00
alfrix
703e136d45 base_panel: always show title when switching panels
the high usage report will come back if necessary
2024-03-20 22:01:30 -03:00
alfrix
1ac7465e82 base_panel: usage report count at least 3 cycles of high usage 2024-03-20 08:43:48 -03:00
alfrix
441cde585c base_panel: cpu report less intrusive, needs two cycles to enter high usage report 2024-03-20 08:16:47 -03:00
alfrix
8f75259e0f base_panel: add early return for update response 2024-03-16 15:49:16 -03:00
alfrix
489bd495ea base_panel: titlebar: turn red if high cpu or memory is in use, show usage
base_panel: rate limit usage notification
2024-03-16 15:47:31 -03:00
alfrix
b7d9517008 base: disable shutdown shortcut when in panel 2024-03-09 14:31:38 -03:00
alfrix
68c4025902 create the shutdown panel, add it to the action bar, remove items from system panel
shutdown maintain estop during printing
add option to shudown both host and printer close #1207
simplify host and printer dialog if ks is local, do both
2024-03-09 12:19:01 -03:00
alfrix
6ee52f13e8 base_panel: fix issue with panel not loading during shutdown status 2024-02-01 12:15:29 -03:00
alfrix
6f6f0d3f13 job_status and base_panel: supress is twice as slow than directly checking if the key exist 2024-01-26 09:14:06 -03:00
alfrix
eecb41df93 base_panel and printer optimizations 2024-01-13 00:46:02 -03:00
alfrix
8143636adb base_panel: minor fixup for the new titlebar func 2024-01-11 22:26:10 -03:00
alfrix
98da293cee refactor job_status and titlebar_items to allow multiple extruders 2024-01-10 23:30:39 -03:00
alfrix
6cf639c083 refactor widget creation
improves performance and makes the code cleaner

* add parameters instead of calling methods afterwards
* remove a a lot of size requests
* remove parameters that are being set to the default value
* simplify dialogs containers
2024-01-02 08:14:51 -03:00
Alfredo Monclus
1794d8aa24 feat: macro prompts close #1216 (#1219)
* feat: macro prompts close #1216

now the user can have confirmation on macros using this feature close #835

* prompt: remove separator and remove the header and close button if windowed

* prompt: wakeup screen

* prompt: slightly larger close icon
2024-01-02 08:04:02 -03:00
alfrix
6f32cdacbe layout: fix issues 2023-10-13 23:24:03 -03:00
alfrix
e2068cf2c9 dialogs: remove steppers since they cause issues 2023-09-03 22:39:29 -03:00
alfrix
e01b6e5f26 macros: hide the panel if there are no elegible macros 2023-08-31 22:27:12 -03:00
alfrix
e80ef7eff5 dialogs: simplify dialog calls, fix layout issue 2023-08-30 01:21:17 -03:00
alfrix
f3c2736f9f refactor temp updates for devices fix extruder_stepper icon error 2023-08-26 13:05:44 -03:00
alfrix
353bdc730f base_panel: fix printer select fixes #1093 2023-08-21 14:09:07 -03:00
alfrix
bd98e758ec base_panel improvements
* generalize macro shortcut to allow changing it in the future
* action_bar functionality is now handled in one place for better maintainability
2023-08-18 11:48:37 -03:00
alfrix
5fa1e44f16 main_menu: allow closing the keypad with the back button 2023-08-18 11:48:37 -03:00
alfrix
34f9b958a7 remove unnecessary params from labels 2023-07-30 12:22:58 -03:00
alfrix
8d9236a2df screen: simplify panel loading
this removes create_panel function from panels and mandates a class name Panel

remove panel_type param and only use a panel_name that is it's filename

remove load_panel dict

always reinit panel, (simpler and safer but slower)
2023-07-30 12:22:58 -03:00
alfrix
3c69bcb4c4 add parameter to labels to silence IDE warnings 2023-07-30 12:22:58 -03:00
alfrix
a149796b19 reduce the use of contextlib 2023-07-30 12:22:58 -03:00