From f55539f5f01ad8ab23bd7c0f07f6d30a39a3f4ce Mon Sep 17 00:00:00 2001
From: Sander Speetjens <sander.speetjens@gmail.com>
Date: Sat, 18 Oct 2025 11:07:02 +0200
Subject: [PATCH] UI status bar

Uses base class text for status bar message
---
 UI/ui_status_bar.cpp      | 11 ++++++-----
 UI/ui_status_bar.hpp      |  1 -
 client/simulator_base.cpp |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/UI/ui_status_bar.cpp b/UI/ui_status_bar.cpp
index d7cdbc1..7888255 100644
--- a/UI/ui_status_bar.cpp
+++ b/UI/ui_status_bar.cpp
@@ -2,36 +2,37 @@
 
 UI_status_bar::UI_status_bar(QObject *parent) : UI_item{UI_STATUS_BAR_TYPE, parent}
 {
+    setup_item(true, false, false);
 }
 
 UI_status_bar::UI_status_bar(std::string message, QObject *parent)
-    : UI_item(UI_STATUS_BAR_TYPE, parent), m_current_message(message)
+    : UI_item(UI_STATUS_BAR_TYPE, parent)
 {
+    m_text = message;
+    setup_item(true, false, false);
 }
 
 void UI_status_bar::show_message(std::string message, size_t timeout)
 {
-    m_current_message = message;
+    m_text = message;
     m_timeout = timeout;
     emit ui_changed();
 }
 
 std::string UI_status_bar::message() const
 {
-    return m_current_message;
+    return m_text;
 }
 
 void UI_status_bar::from_json(const json &j)
 {
     UI_item::from_json(j);
-    m_current_message = j.at("current_message");
     m_timeout = j.at("timeout");
 }
 
 json UI_status_bar::to_json(size_t id) const
 {
     json j = UI_item::to_json(id);
-    j["current_message"] = m_current_message;
     j["timeout"] = m_timeout;
     return j;
 }
diff --git a/UI/ui_status_bar.hpp b/UI/ui_status_bar.hpp
index 08e4973..8249ce0 100644
--- a/UI/ui_status_bar.hpp
+++ b/UI/ui_status_bar.hpp
@@ -16,6 +16,5 @@ class UI_status_bar : public UI_item
     json to_json(size_t id) const override;
 
   private:
-    std::string m_current_message;
     size_t m_timeout;
 };
diff --git a/client/simulator_base.cpp b/client/simulator_base.cpp
index 9fa14d6..6bc1f50 100644
--- a/client/simulator_base.cpp
+++ b/client/simulator_base.cpp
@@ -775,9 +775,9 @@ void Simulator_base::process_ui_status_bar(json &ui_item, QWidget *widget)
         return;
     }
 
-    if (status_bar->currentMessage() != QString::fromStdString(ui_item.at("current_message")))
+    if (status_bar->currentMessage() != QString::fromStdString(ui_item.at("text")))
     {
-        status_bar->showMessage(QString::fromStdString(ui_item.at("current_message")), ui_item.at("timeout"));
+        status_bar->showMessage(QString::fromStdString(ui_item.at("text")), ui_item.at("timeout"));
     }
 }