From 7b7c3838fc4dcbeb086dd3bbef73e2b6b8d341c2 Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Mon, 21 Nov 2022 09:18:36 -0300
Subject: [PATCH] printer_initializing: refactor message generation and remove
 markup

markup caused issues with status messages
---
 ks_includes/KlippyWebsocket.py |  5 ++---
 screen.py                      | 22 ++++++++--------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py
index daa067f0..35d5aa90 100644
--- a/ks_includes/KlippyWebsocket.py
+++ b/ks_includes/KlippyWebsocket.py
@@ -62,8 +62,7 @@ class KlippyWebsocket(threading.Thread):
             if state is False:
                 if self.reconnect_count > 2:
                     self._screen.printer_initializing(
-                        _("Cannot connect to Moonraker")
-                        + f'\n\n{self._url}\n\n'
+                        _("Cannot connect to Moonraker") + '\n\n'
                         + _("Retrying") + f' #{self.reconnect_count}'
                     )
                 return False
@@ -159,7 +158,7 @@ class KlippyWebsocket(threading.Thread):
             self.connecting = False
             self._screen.printer_initializing(
                 _("Cannot connect to Moonraker")
-                + f'\n\n{self._url}\n\n{self._screen.apiclient.status}')
+                + f'\n\n{self._screen.apiclient.status}')
             return False
         logging.debug("Attempting to reconnect")
         self.connect()
diff --git a/screen.py b/screen.py
index 6e50d6ce..a4cf5140 100644
--- a/screen.py
+++ b/screen.py
@@ -659,18 +659,13 @@ class KlipperScreen(Gtk.Window):
 
     def state_error(self):
         self.close_screensaver()
-        msg = self.printer.get_stat("webhooks", "state_message")
-        if "FIRMWARE_RESTART" in msg:
-            self.printer_initializing("<b>" + _("Klipper has encountered an error.") + "\n" +
-                                      _("A FIRMWARE_RESTART may fix the issue.") +
-                                      "</b>" + "\n\n" + msg)
-        elif "micro-controller" in msg:
-            self.printer_initializing("<b>" + _("Klipper has encountered an error.") +
-                                      _("Please recompile and flash the micro-controller.") +
-                                      "</b>" + "\n\n" + msg)
-        else:
-            self.printer_initializing("<b>" + _("Klipper has encountered an error.") +
-                                      "</b>" + "\n\n" + msg)
+        msg = _("Klipper has encountered an error.") + "\n"
+        state = self.printer.get_stat("webhooks", "state_message")
+        if "FIRMWARE_RESTART" in state:
+            msg += _("A FIRMWARE_RESTART may fix the issue.") + "\n"
+        elif "micro-controller" in state:
+            msg += _("Please recompile and flash the micro-controller.") + "\n"
+        self.printer_initializing(msg + "\n" + state)
 
     def state_paused(self):
         if "job_status" not in self._cur_panels:
@@ -695,8 +690,7 @@ class KlipperScreen(Gtk.Window):
         self.close_screensaver()
         msg = self.printer.get_stat("webhooks", "state_message")
         msg = msg if "ready" not in msg else ""
-        self.printer_initializing("<b>" + _("Klipper has shutdown") +
-                                  "</b>" + "\n\n" + msg)
+        self.printer_initializing(_("Klipper has shutdown") + "\n\n" + msg)
 
     def toggle_macro_shortcut(self, value):
         self.base_panel.show_macro_shortcut(value)