From 022954918c17e9f0c5a4634f76c6b023bd446ebf Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Wed, 16 Nov 2022 10:38:17 -0300
Subject: [PATCH] create ks_printer_cfg

---
 ks_includes/screen_panel.py |  1 +
 panels/base_panel.py        | 44 ++++++++++++++++++-------------------
 screen.py                   |  1 +
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py
index 399dfbdb..5f6eafc2 100644
--- a/ks_includes/screen_panel.py
+++ b/ks_includes/screen_panel.py
@@ -19,6 +19,7 @@ class ScreenPanel:
         self.title = title
         self.devices = {}
         self.active_heaters = []
+        self.ks_printer_cfg = None
 
         self.layout = Gtk.Layout()
         self.layout.set_size(self._screen.width, self._screen.height)
diff --git a/panels/base_panel.py b/panels/base_panel.py
index 0bb24ebe..ed39ae42 100644
--- a/panels/base_panel.py
+++ b/panels/base_panel.py
@@ -19,6 +19,7 @@ class BasePanel(ScreenPanel):
         self.time_min = -1
         self.time_format = self._config.get_main_config().getboolean("24htime", True)
         self.time_update = None
+        self.titlebar_items = []
         self.titlebar_name_type = None
         self.buttons_showing = {
             'back': not back,
@@ -123,13 +124,6 @@ class BasePanel(ScreenPanel):
             if not show or self._screen.printer.get_temp_store_devices() is None:
                 return
 
-            printer_cfg = self._config.get_printer_config(self._screen.connected_printer)
-            if printer_cfg is not None:
-                self.titlebar_name_type = printer_cfg.get("titlebar_name_type", None)
-            else:
-                self.titlebar_name_type = None
-            logging.info(f"Titlebar name type: {self.titlebar_name_type}")
-
             img_size = self._gtk.img_scale * .5
             for device in self._screen.printer.get_temp_store_devices():
                 self.labels[device] = Gtk.Label(label="100º")
@@ -156,21 +150,16 @@ class BasePanel(ScreenPanel):
                 n += 1
 
             # Options in the config have priority
-            if printer_cfg is not None:
-                titlebar_items = printer_cfg.get("titlebar_items", None)
-                if titlebar_items is not None:
-                    titlebar_items = [str(i.strip()) for i in titlebar_items.split(',')]
-                    logging.info(f"Titlebar items: {titlebar_items}")
-                    for device in self._screen.printer.get_temp_store_devices():
-                        # Users can fill the bar if they want
-                        if n >= nlimit + 1:
-                            break
-                        name = device.split()[1] if len(device.split()) > 1 else device
-                        for item in titlebar_items:
-                            if name == item:
-                                self.control['temp_box'].add(self.labels[f"{device}_box"])
-                                n += 1
-                                break
+            for device in self._screen.printer.get_temp_store_devices():
+                # Users can fill the bar if they want
+                if n >= nlimit + 1:
+                    break
+                name = device.split()[1] if len(device.split()) > 1 else device
+                for item in self.titlebar_items:
+                    if name == item:
+                        self.control['temp_box'].add(self.labels[f"{device}_box"])
+                        n += 1
+                        break
 
             # If there is enough space fill with heater_generic
             for device in self._screen.printer.get_temp_store_devices():
@@ -321,3 +310,14 @@ class BasePanel(ScreenPanel):
         elif show is False and self.buttons_showing['estop']:
             self.control['estop'].set_sensitive(False)
             self.buttons_showing['estop'] = False
+
+    def set_ks_printer_cfg(self, printer):
+        self.ks_printer_cfg = self._config.get_printer_config(printer)
+        if self.ks_printer_cfg is not None:
+            self.titlebar_name_type = self.ks_printer_cfg.get("titlebar_name_type", None)
+            titlebar_items = self.ks_printer_cfg.get("titlebar_items", None)
+            if titlebar_items is not None:
+                self.titlebar_items = [str(i.strip()) for i in titlebar_items.split(',')]
+                logging.info(f"Titlebar name type: {self.titlebar_name_type} items: {self.titlebar_items}")
+            else:
+                self.titlebar_items = []
diff --git a/screen.py b/screen.py
index 9af3ae8e..d4a1d176 100644
--- a/screen.py
+++ b/screen.py
@@ -253,6 +253,7 @@ class KlipperScreen(Gtk.Window):
         self.connecting = False
 
         self.connected_printer = name
+        self.base_panel.set_ks_printer_cfg(name)
         logging.debug(f"Connected to printer: {name}")
 
     def ws_subscribe(self):