From 046b0ed78dab3765a89cbfb88263d22c4ebd75d8 Mon Sep 17 00:00:00 2001
From: zkk <1007518571@qq.com>
Date: Sat, 20 Jul 2024 17:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8D=B0=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E7=83=AD=E9=A3=8E=E6=98=BE=E7=A4=BA=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E7=83=AD=E9=A3=8E=E5=9B=BE=E6=A0=87=E5=90=8D=E7=A7=B0=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
panels/base_panel.py | 2 ++
panels/job_status.py | 4 +++-
panels/main_menu.py | 6 +++++
styles/dark/images/chamber.svg | 39 ++++++++++++++++++++++++++++++++
styles/dark/images/heater.svg | 41 +++-------------------------------
5 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 styles/dark/images/chamber.svg
diff --git a/panels/base_panel.py b/panels/base_panel.py
index c742bc1c..568accb1 100644
--- a/panels/base_panel.py
+++ b/panels/base_panel.py
@@ -195,6 +195,8 @@ class BasePanel(ScreenPanel):
return self._gtk.Image("extruder", img_size, img_size)
elif device.startswith("heater_bed"):
return self._gtk.Image("bed", img_size, img_size)
+ elif device.startswith("heater_generic chamber"):
+ return self._gtk.Image("chamber", img_size, img_size)
# Extra items
elif self.titlebar_name_type is not None:
# The item has a name, do not use an icon
diff --git a/panels/job_status.py b/panels/job_status.py
index 7667d45a..2abcf1e4 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -157,7 +157,7 @@ class Panel(ScreenPanel):
self.buttons['extruder'][extruder].set_halign(Gtk.Align.START)
self.labels['temp_grid'] = Gtk.Grid()
- nlimit = 2 if self._screen.width <= 500 else 3
+ nlimit = 3 if self._screen.width <= 500 else 4
n = 0
if nlimit > 2 and len(self._printer.get_tools()) == 2:
for extruder in self.buttons['extruder']:
@@ -174,6 +174,8 @@ class Panel(ScreenPanel):
break
if dev == "heater_bed":
self.buttons['heater'][dev] = self._gtk.Button("bed", "", None, self.bts, Gtk.PositionType.LEFT, 1)
+ elif dev == "heater_generic chamber":
+ self.buttons['heater'][dev] = self._gtk.Button("chamber", "", None, self.bts, Gtk.PositionType.LEFT, 1)
else:
self.buttons['heater'][dev] = self._gtk.Button("heater", "", None, self.bts, Gtk.PositionType.LEFT, 1)
self.labels[dev] = Gtk.Label(label="-")
diff --git a/panels/main_menu.py b/panels/main_menu.py
index f952a954..2a53f396 100644
--- a/panels/main_menu.py
+++ b/panels/main_menu.py
@@ -114,6 +114,12 @@ class Panel(MenuPanel):
devname = "Heater Bed"
class_name = "graph_label_heater_bed"
dev_type = "bed"
+ elif device == "heater_generic chamber":
+ self.h += 1
+ image = "chamber"
+ devname = "Heater Chamber"
+ class_name = f"graph_label_sensor_{self.h}"
+ dev_type = "sensor"
elif device.startswith("heater_generic"):
self.h += 1
image = "heater"
diff --git a/styles/dark/images/chamber.svg b/styles/dark/images/chamber.svg
new file mode 100644
index 00000000..ffbe927e
--- /dev/null
+++ b/styles/dark/images/chamber.svg
@@ -0,0 +1,39 @@
+
diff --git a/styles/dark/images/heater.svg b/styles/dark/images/heater.svg
index c9c1e928..5c5808b0 100644
--- a/styles/dark/images/heater.svg
+++ b/styles/dark/images/heater.svg
@@ -1,39 +1,4 @@
-