Merge remote-tracking branch 'upstream/master' into upstream_merge141024

LynxCrew · Nov 30, 2024 · 1e59651 · 1e59651
2 parents 9e7e790 + 7431ad8
commit 1e59651
Show file tree

Hide file tree

Showing 102 changed files with 1,511 additions and 165 deletions.
diff --git a/config/move_menu.conf b/config/move_menu.conf
@@ -37,7 +37,8 @@ name: {{ gettext('Quad Gantry Level') }}
 icon: home-z
 method: printer.gcode.script
 params: {"script":"QUAD_GANTRY_LEVEL"}
-enable: {{ 'quad_gantry_level' in printer.config_sections }}
+enable: {{ 'QUAD_GANTRY_LEVEL' in printer.available_commands }}
+active: {{ printer.quad_gantry_level.applied }}
 
 [menu move homing homefull]
 name: Home Full
@@ -51,7 +52,8 @@ name: {{ gettext('Z Tilt') }}
 icon: z-tilt
 method: printer.gcode.script
 params: {"script":"Z_TILT_ADJUST"}
-enable: {{ 'z_tilt' in printer.config_sections or 'z_tilt_ng' in printer.config_sections }}
+enable: {{ 'Z_TILT_ADJUST' in printer.available_commands }}
+active: {{ printer.z_tilt.applied }}
 
 [menu move motors_off disable_x]
 name: {{ gettext('Disable X') }}

diff --git a/docs/Configuration.md b/docs/Configuration.md
@@ -217,6 +217,7 @@ printer.gcode_macros.count # Number of gcode macros
 printer.gcode_macros.list # List of names of the gcode macros
 printer.leds.count # Number of leds
 printer.config_sections # Array of section headers of Klipper config (printer.cfg)
+printer.available_commands # List of all the commands that the printer supports
 ```
 
 

diff --git a/ks_includes/KlippyGtk.py b/ks_includes/KlippyGtk.py
@@ -2,6 +2,7 @@
 import logging
 import os
 import pathlib
+
 import gi
 
 gi.require_version("Gtk", "3.0")
@@ -265,6 +266,8 @@ def remove_dialog(self, dialog, *args):
             return
         if self.screen.updating:
             return
+        if dialog == self.screen.confirm:
+            self.screen.confirm = None
         dialog.destroy()
         if dialog in self.screen.dialogs:
             logging.info("Removing Dialog")

diff --git a/ks_includes/KlippyRest.py b/ks_includes/KlippyRest.py
@@ -1,5 +1,6 @@
 import logging
 import re
+
 import requests
 
 

diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
-import threading
 import json
 import logging
+import threading
 
 import gi
 import websocket

diff --git a/ks_includes/config.py b/ks_includes/config.py
@@ -6,10 +6,11 @@
 import json
 import re
 import copy
-import pathlib
+import gettext
+import json
 import locale
 import sys
-
+import pathlib
 from io import StringIO
 
 SCREEN_BLANKING_OPTIONS = [

diff --git a/ks_includes/files.py b/ks_includes/files.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/functions.py b/ks_includes/functions.py
@@ -1,17 +1,14 @@
+import ctypes
 import logging
 import logging.handlers
 import os
-import re
+import struct
 import subprocess
 import sys
 import threading
-import time
 import traceback
 from queue import SimpleQueue as Queue
 
-import ctypes
-import struct
-
 dpms_loaded = False
 try:
     ctypes.cdll.LoadLibrary('libXext.so.6')

diff --git a/ks_includes/locales/KlipperScreen.pot b/ks_includes/locales/KlipperScreen.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-09 18:08-0300\n"
+"POT-Creation-Date: 2024-11-26 12:31-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
+msgid "Lock"
+msgstr ""
+
 msgid "Lost Connection to Moonraker"
 msgstr ""
 
@@ -926,6 +929,12 @@ msgstr ""
 msgid "Unload"
 msgstr ""
 
+msgid "Unlock"
+msgstr ""
+
+msgid "Unlock failed"
+msgstr ""
+
 msgid "Unretract Extra Length"
 msgstr ""
 

diff --git a/ks_includes/locales/ar/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/ar/LC_MESSAGES/KlipperScreen.mo
diff --git a/ks_includes/locales/ar/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/ar/LC_MESSAGES/KlipperScreen.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-09 18:08-0300\n"
+"POT-Creation-Date: 2024-11-26 12:31-0300\n"
 "PO-Revision-Date: 2024-08-14 14:09+0000\n"
 "Last-Translator: Rashid Al Haqbany <haqbany@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/klipperscreen/"
@@ -422,10 +422,8 @@ msgstr "باطل"
 msgid "Invalid password"
 msgstr "كلمة سر غير صالحة"
 
-#, fuzzy
-#| msgid "Temperature"
 msgid "Invalid temperature"
-msgstr "درجة الحرارة"
+msgstr ""
 
 msgid "Inversely affects the icon size"
 msgstr "يؤثر عكسيا على حجم الأيقونة"
@@ -503,6 +501,9 @@ msgstr "حمل"
 msgid "Loading..."
 msgstr "جاري التحميل..."
 
+msgid "Lock"
+msgstr ""
+
 msgid "Lost Connection to Moonraker"
 msgstr "فقد الاتصال ب Moonraker"
 
@@ -645,10 +646,8 @@ msgstr[5] "تحديث الحزم"
 msgid "Part Fan"
 msgstr "مروحة تبريد المطبوعات"
 
-#, fuzzy
-#| msgid "Password saved"
 msgid "Password"
-msgstr "تم حفظ كلمة المرور"
+msgstr ""
 
 msgid "Password saved"
 msgstr "تم حفظ كلمة المرور"
@@ -918,6 +917,12 @@ msgstr "نوع أمان غير معروف"
 msgid "Unload"
 msgstr "أفرغ"
 
+msgid "Unlock"
+msgstr ""
+
+msgid "Unlock failed"
+msgstr ""
+
 msgid "Unretract Extra Length"
 msgstr "لا تتراجع عن الطول الإضافي"
 

diff --git a/ks_includes/locales/bg/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/bg/LC_MESSAGES/KlipperScreen.mo