From 05da49e65bd9c3e9badab589edac704d89199e66 Mon Sep 17 00:00:00 2001
From: Bjoern Kerler <info@revskills.de>
Date: Mon, 29 Apr 2024 13:20:55 +0200
Subject: [PATCH] Bring back commit #3769

---
 src/common/str_utils.cpp      | 16 ++++++++++++++++
 src/common/str_utils.hpp      |  3 +++
 src/gui/MItem_menus.cpp       | 22 +++++++++++++++++-----
 src/lang/string_view_utf8.hpp |  5 +++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/common/str_utils.cpp b/src/common/str_utils.cpp
index b80f2788ec..6970f198c4 100644
--- a/src/common/str_utils.cpp
+++ b/src/common/str_utils.cpp
@@ -261,6 +261,22 @@ void StringBuilder::append_string(const char *str) {
     *current_pos_ = '\0';
 }
 
+void StringBuilder::append_string_view(string_view_utf8 str) {
+
+    while (true) {
+        if (is_problem()) {
+            return;
+        }
+
+        char b = str.getbyte();
+        if (b == '\0') {
+            return;
+        }
+
+        append_char(b);
+    }
+}
+
 void StringBuilder::append_printf(const char *fmt, ...) {
     va_list args;
     va_start(args, fmt);
diff --git a/src/common/str_utils.hpp b/src/common/str_utils.hpp
index 7b1f0288cc..a822d17525 100644
--- a/src/common/str_utils.hpp
+++ b/src/common/str_utils.hpp
@@ -6,6 +6,7 @@
 #include <cstdint>
 #include <algorithm>
 #include <assert.h>
+#include "../lang/string_view_utf8.hpp"
 
 inline constexpr char CHAR_SPACE = ' ';
 inline constexpr char CHAR_NBSP = '\xA0'; /// Non Breaking Space
@@ -384,6 +385,8 @@ class StringBuilder {
 
     void append_string(const char *str);
 
+    void append_string_view(string_view_utf8 str);
+
     /// Appends text to the builder, using vsnprintf under the hood.
     void __attribute__((format(__printf__, 2, 3)))
     append_printf(const char *fmt, ...);
diff --git a/src/gui/MItem_menus.cpp b/src/gui/MItem_menus.cpp
index 66a81cf800..a5f077d4cf 100644
--- a/src/gui/MItem_menus.cpp
+++ b/src/gui/MItem_menus.cpp
@@ -1,5 +1,6 @@
 #include "MItem_menus.hpp"
 #include "ScreenHandler.hpp"
+#include "str_utils.hpp"
 #include <option/buddy_enable_connect.h>
 #if BUDDY_ENABLE_CONNECT()
     #include <connect/marlin_printer.hpp>
@@ -411,16 +412,27 @@ MI_LOAD_SETTINGS::MI_LOAD_SETTINGS()
 }
 
 void MI_LOAD_SETTINGS::click(IWindowMenu & /*window_menu*/) {
-    // FIXME: Some error handling/reporting
-    // TODO: Loading other things than just network
-    if (netdev_load_ini_to_eeprom()) {
+    auto build_message = [](StringBuilder &msg_builder, string_view_utf8 name, bool ok) {
+        msg_builder.append_string_view(name);
+        msg_builder.append_string(": ");
+        msg_builder.append_string_view(ok ? _("Ok") : _("Failed"));
+        msg_builder.append_char('\n');
+    };
+    std::array<char, 150> msg;
+    StringBuilder msg_builder(msg);
+    msg_builder.append_string_view(_("\nLoading settings finished.\n\n"));
+
+    const bool network_settings_loaded = netdev_load_ini_to_eeprom();
+    if (network_settings_loaded) {
         notify_reconfigure();
     }
+    build_message(msg_builder, _("Network"), network_settings_loaded);
 
-// FIXME: Error handling
 #if BUDDY_ENABLE_CONNECT()
-    connect_client::MarlinPrinter::load_cfg_from_ini();
+    build_message(msg_builder, _("Connect"), connect_client::MarlinPrinter::load_cfg_from_ini());
 #endif
+
+    MsgBoxInfo(string_view_utf8::MakeRAM((const uint8_t *)msg.data()), Responses_Ok);
 }
 
 /**********************************************************************************************/
diff --git a/src/lang/string_view_utf8.hpp b/src/lang/string_view_utf8.hpp
index 32e9253803..4d4ca033ad 100644
--- a/src/lang/string_view_utf8.hpp
+++ b/src/lang/string_view_utf8.hpp
@@ -145,6 +145,11 @@ class string_view_utf8 {
         , s(0xff) {}
     ~string_view_utf8() = default;
 
+    /// @returns one uint8_t from the input data
+    uint8_t getbyte() {
+        return getbyte(attrs);
+    }
+
     /// @returns one UTF-8 character from the input data
     /// and advances internal pointers (in derived classes) to the next one
     unichar getUtf8Char() {