From ca91e6a677009079c247c407bc062d982256fcec Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 9 Jun 2024 00:05:45 +0200
Subject: [PATCH] Improve meminfo debug formatting

---
 novelwriter/dialogs/preferences.py |  4 ++--
 novelwriter/gui/statusbar.py       | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py
index 4395c5bc..fcd463b5 100644
--- a/novelwriter/dialogs/preferences.py
+++ b/novelwriter/dialogs/preferences.py
@@ -895,8 +895,8 @@ class GuiPreferences(NDialog):
         refreshTree  = False
 
         # Appearance
-        guiLocale   = self.guiLocale.currentData()
-        guiTheme    = self.guiTheme.currentData()
+        guiLocale = self.guiLocale.currentData()
+        guiTheme  = self.guiTheme.currentData()
 
         updateTheme  |= CONFIG.guiTheme != guiTheme
         needsRestart |= CONFIG.guiLocale != guiLocale
diff --git a/novelwriter/gui/statusbar.py b/novelwriter/gui/statusbar.py
index 78e6e22c..e7459c53 100644
--- a/novelwriter/gui/statusbar.py
+++ b/novelwriter/gui/statusbar.py
@@ -239,9 +239,7 @@ class GuiMainStatus(QStatusBar):
         """
         import tracemalloc
 
-        from collections import Counter
-
-        widgets = QApplication.allWidgets()
+        count = len(QApplication.allWidgets())
         if not self._debugInfo:
             if tracemalloc.is_tracing():
                 self._traceMallocRef = "Total"
@@ -249,19 +247,14 @@ class GuiMainStatus(QStatusBar):
                 self._traceMallocRef = "Relative"
                 tracemalloc.start()
             self._debugInfo = True
-            self._wCounts = Counter([type(x).__name__ for x in widgets])
 
-        if hasattr(self, "_wCounts"):
-            diff = Counter([type(x).__name__ for x in widgets]) - self._wCounts
-            for name, count in diff.items():
-                logger.debug("Widget '%s': +%d", name, count)
-
-        mem = tracemalloc.get_traced_memory()
+        current, peak = tracemalloc.get_traced_memory()
         stamp = datetime.now().strftime("%H:%M:%S")
-        self.showMessage((
-            f"Debug [{stamp}]"
-            f" \u2013 Widgets: {len(widgets)}"
-            f" \u2013 {self._traceMallocRef} Memory: {mem[0]:n}"
-            f" \u2013 Peak: {mem[1]:n}"
-        ), 6000)
+        message = (
+            f"Widgets: {count} \u2013 "
+            f"{self._traceMallocRef} Memory: {current/1024:,.2f} kiB \u2013 "
+            f"Peak: {peak/1024:,.2f} kiB"
+        )
+        self.showMessage(f"Debug [{stamp}] {message}", 6000)
+        logger.debug("[MEMINFO] %s", message)
         return