Merge remote-tracking branch 'origin/claude/fix-red-text-legibility' into claude/fix-red-text-legibility

# Conflicts:
#	src/applib/warning_colors.h
#	src/gui/gsc_info_window.cpp

src/applib/CMakeLists.txt

@@ -72,6 +72,7 @@ target_sources(applib PRIVATE
 	storage_property_repository.cpp
 	storage_property_repository.h
 	storage_settings.h
+	warning_colors.cpp
 	warning_colors.h
 	warning_level.h
 	window_instance_manager.h

src/applib/gui_utils.cpp

@@ -165,6 +165,29 @@ bool gui_show_text_entry_dialog(const std::string& title, const std::string& mes
 
 
 
+bool gui_is_dark_theme_active()
+{
+	// Try to get the GTK settings to check for dark theme preference.
+	// If GTK is not available or not initialized, get_default() will return null.
+	const Glib::RefPtr<Gtk::Settings> settings = Gtk::Settings::get_default();
+	if (settings) {
+		// Check if the application prefers dark theme
+		if (settings->property_gtk_application_prefer_dark_theme().get_value()) {
+			return true;
+		}
+
+		// Check theme name for common dark theme identifiers
+		Glib::ustring theme_name;
+		settings->get_property("gtk-theme-name", theme_name);
+		const std::string theme_str = theme_name.lowercase();
+		if (theme_str.find("dark") != std::string::npos ||
+			theme_str.find("black") != std::string::npos) {
+			return true;
+		}
+	}
+
+	return false;
+}
 
 
 

src/applib/gui_utils.h

@@ -58,8 +58,8 @@ bool gui_show_text_entry_dialog(const std::string& title, const std::string& mes
 		std::string& result, const std::string& default_str, Gtk::Window* parent = nullptr, bool sec_msg_markup = false);
 
 
-
-
+/// Check if a dark GTK theme is currently active
+bool gui_is_dark_theme_active();
 
 
 #endif

src/applib/warning_colors.cpp

@@ -0,0 +1,88 @@
+/******************************************************************************
+License: GNU General Public License v3.0 only
+Copyright:
+	(C) 2008 - 2026 Alexander Shaduri <ashaduri@gmail.com>
+******************************************************************************/
+/// \file
+/// \author Alexander Shaduri
+/// \ingroup applib
+/// \weakgroup applib
+/// @{
+
+#include <glibmm.h>
+
+#include "warning_colors.h"
+#include "gui_utils.h"
+
+
+bool app_property_get_row_highlight_colors(bool dark_mode, WarningLevel warning, std::string& fg, std::string& bg)
+{
+	// Note: we're setting both fg and bg, to avoid theme conflicts.
+	if (warning == WarningLevel::Notice) {
+		fg = dark_mode ? "#FFFFFF" : "#000000";  // white for dark themes, black for light themes
+		bg = dark_mode ? "#6B2050" : "#FFD5EE";  // dark pinkish for dark themes, pinkish for light themes
+
+	} else if (warning == WarningLevel::Warning) {
+		fg = dark_mode ? "#FFFFFF" : "#000000";  // white for dark themes, black for light themes
+		bg = dark_mode ? "#802020" : "#FFA0A0";  // dark red for dark themes, light red for light themes
+
+	} else if (warning == WarningLevel::Alert) {
+		fg = dark_mode ? "#FFFFFF" : "#000000";  // white for dark themes, black for light themes
+		bg = dark_mode ? "#AA0000" : "#FF0000";  // darker red for dark themes, bright red for light themes
+	}
+
+	return !(fg.empty());
+}
+
+
+
+bool app_property_get_label_highlight_color(bool dark_mode, WarningLevel warning, std::string& fg)
+{
+	if (warning == WarningLevel::None) {
+		return false;
+	}
+
+	if (warning == WarningLevel::Notice) {
+		fg = dark_mode ? "#FF9999" : "#770000";  // lighter red for dark themes, very dark red for light themes
+
+	} else if (warning == WarningLevel::Warning) {
+		fg = dark_mode ? "#FF6666" : "#C00000";  // lighter red for dark themes, dark red for light themes
+
+	} else if (warning == WarningLevel::Alert) {
+		fg = dark_mode ? "#FF4444" : "#FF0000";  // lighter/pink red for dark themes, bright red for light themes
+	}
+
+	return !(fg.empty());
+}
+
+
+
+std::string storage_property_get_warning_reason(const StorageProperty& p)
+{
+	std::string fg, start = "<b>", stop = "</b>";
+	if (app_property_get_label_highlight_color(gui_is_dark_theme_active(), p.warning_level, fg)) {
+		start += "<span color=\"" + fg + "\">";
+		stop = "</span>" + stop;
+	}
+
+	switch (p.warning_level) {
+		case WarningLevel::None:
+			// nothing
+			break;
+		case WarningLevel::Notice:
+			/// Translators: %1 and %2 are HTML tags, %3 is a message.
+			return Glib::ustring::compose(_("%1Notice:%2 %3"), start, stop, Glib::Markup::escape_text(p.warning_reason));
+		case WarningLevel::Warning:
+			/// Translators: %1 and %2 are HTML tags, %3 is a message.
+			return Glib::ustring::compose(_("%1Warning:%2 %3"), start, stop, Glib::Markup::escape_text(p.warning_reason));
+		case WarningLevel::Alert:
+			/// Translators: %1 and %2 are HTML tags, %3 is a message.
+			return Glib::ustring::compose(_("%1ALERT:%2 %3"), start, stop, Glib::Markup::escape_text(p.warning_reason));
+	}
+
+	return {};
+}
+
+
+
+/// @}

src/applib/warning_colors.h

@@ -1,7 +1,7 @@
 /******************************************************************************
 License: GNU General Public License v3.0 only
 Copyright:
-	(C) 2008 - 2021 Alexander Shaduri <ashaduri@gmail.com>
+	(C) 2008 - 2026 Alexander Shaduri <ashaduri@gmail.com>
 ******************************************************************************/
 /// \file
 /// \author Alexander Shaduri
@@ -12,83 +12,24 @@ Copyright:
 #ifndef WARNING_COLORS_H
 #define WARNING_COLORS_H
 
-#include <glibmm.h>
+#include <string>
 
 #include "storage_property.h"
-
+#include "warning_level.h"
 
 
 /// Get colors for tree rows according to warning severity.
 /// \return true if the colors were changed.
-inline bool app_property_get_row_highlight_colors(WarningLevel warning, std::string& fg, std::string& bg)
-{
-	// Note: we're setting both fg and bg, to avoid theme conflicts.
-	if (warning == WarningLevel::Notice) {
-		fg = "#000000";  // black
-		bg = "#FFD5EE";  // pinkish
-
-	} else if (warning == WarningLevel::Warning) {
-		fg = "#000000";  // black
-		bg = "#FFA0A0";  // even more pinkish
-
-	} else if (warning == WarningLevel::Alert) {
-		fg = "#000000";  // black
-		bg = "#FF0000";  // red
-	}
-
-	return !(fg.empty());
-}
-
+bool app_property_get_row_highlight_colors(bool dark_mode, WarningLevel warning, std::string& fg, std::string& bg);
 
 
 /// Get color for labels according to warning severity.
 /// \return true if the color was changed.
-inline bool app_property_get_label_highlight_color(WarningLevel warning, std::string& fg)
-{
-	if (warning == WarningLevel::Notice) {
-		fg = "#770000";  // very dark red
-
-	} else if (warning == WarningLevel::Warning) {
-		fg = "#C00000";  // dark red
-
-	} else if (warning == WarningLevel::Alert) {
-		fg = "#FF0000";  // red
-	}
-
-	return !(fg.empty());
-}
-
-
+bool app_property_get_label_highlight_color(bool dark_mode, WarningLevel warning, std::string& fg);
 
 
 /// Format warning text, but without description
-inline std::string storage_property_get_warning_reason(const StorageProperty& p)
-{
-	std::string fg, start = "<b>", stop = "</b>";
-	if (app_property_get_label_highlight_color(p.warning_level, fg)) {
-		start += "<span color=\"" + fg + "\">";
-		stop = "</span>" + stop;
-	}
-
-	switch (p.warning_level) {
-		case WarningLevel::None:
-			// nothing
-			break;
-		case WarningLevel::Notice:
-			/// Translators: %1 and %2 are HTML tags, %3 is a message.
-			return Glib::ustring::compose(_("%1Notice:%2 %3"), start, stop, Glib::Markup::escape_text(p.warning_reason));
-		case WarningLevel::Warning:
-			/// Translators: %1 and %2 are HTML tags, %3 is a message.
-			return Glib::ustring::compose(_("%1Warning:%2 %3"), start, stop, Glib::Markup::escape_text(p.warning_reason));
-		case WarningLevel::Alert:
-			/// Translators: %1 and %2 are HTML tags, %3 is a message.
-			return Glib::ustring::compose(_("%1ALERT:%2 %3"), start, stop, Glib::Markup::escape_text(p.warning_reason));
-	}
-
-	return {};
-}
-
-
+std::string storage_property_get_warning_reason(const StorageProperty& p);
 
 
 

src/gui/gsc_info_window.cpp

@@ -81,6 +81,7 @@ namespace {
 // 			vbox->pack_start(*label, false, false);
 
 		} else {
+			const bool dark_mode = gui_is_dark_theme_active();
 
 			// add one label per element
 			for (const auto& label_string : label_strings) {
@@ -95,7 +96,7 @@ namespace {
 				label->set_can_focus(false);
 
 				std::string fg;
-				if (app_property_get_label_highlight_color(label_string.property->warning_level, fg)) {
+				if (app_property_get_label_highlight_color(dark_mode, label_string.property->warning_level, fg)) {
 					label->set_markup(
 							std::string("<span color=\"").append(fg).append("\">")
 							.append(label_text).append("</span>") );
@@ -129,7 +130,7 @@ namespace {
 		}
 
 		std::string fg;
-		if (app_property_get_label_highlight_color(warning, fg))
+		if (app_property_get_label_highlight_color(gui_is_dark_theme_active(), warning, fg))
 			label->set_markup_with_mnemonic("<span color=\"" + fg + "\">" + original_label + "</span>");
 	}
 
@@ -805,94 +806,6 @@ bool GscInfoWindow::on_delete_event([[maybe_unused]] GdkEventAny* e)
 
 
 
-bool GscInfoWindow::on_key_press_event(GdkEventKey* event)
-{
-	// Handle Ctrl+Tab and Ctrl+Shift+Tab for tab navigation
-	if (   (event->state & GDK_CONTROL_MASK)
-	    && (event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab)) {
-
-		// Helper to cycle only across visible notebook pages
-		auto cycle_visible_pages = [&](Gtk::Notebook* notebook) -> bool {
-			if (!notebook) {
-				return false;
-			}
-
-			const int n_pages = notebook->get_n_pages();
-			std::vector<int> visible_pages;
-			visible_pages.reserve(n_pages);
-
-			for (int i = 0; i < n_pages; ++i) {
-				if (auto* page = notebook->get_nth_page(i)) {
-					if (page->get_visible()) {
-						visible_pages.push_back(i);
-					}
-				}
-			}
-
-			// Need at least two visible pages to make cycling meaningful
-			if (visible_pages.size() <= 1) {
-				return false;
-			}
-
-			const int current_page = notebook->get_current_page();
-			int visible_index = 0;
-
-			auto it = std::find(visible_pages.begin(), visible_pages.end(), current_page);
-			if (it != visible_pages.end()) {
-				visible_index = static_cast<int>(std::distance(visible_pages.begin(), it));
-			}
-
-			int next_visible_index = 0;
-
-			// Check if Shift is also pressed for backward navigation
-			if (event->state & GDK_SHIFT_MASK) {
-				// Ctrl+Shift+Tab: go to previous visible tab
-				next_visible_index =
-					(visible_index - 1 + static_cast<int>(visible_pages.size())) %
-					static_cast<int>(visible_pages.size());
-			} else {
-				// Ctrl+Tab: go to next visible tab
-				next_visible_index =
-					(visible_index + 1) %
-					static_cast<int>(visible_pages.size());
-			}
-
-			notebook->set_current_page(visible_pages[next_visible_index]);
-			return true;
-		};
-
-		auto* main_notebook = lookup_widget<Gtk::Notebook*>("main_notebook");
-		if (main_notebook) {
-			// Check if we're on the Advanced tab with sub-tabs
-			auto* advanced_tab_vbox = lookup_widget<Gtk::Box*>("advanced_tab_vbox");
-			auto* advanced_notebook = lookup_widget<Gtk::Notebook*>("advanced_notebook");
-
-			// Only handle sub-tab cycling if the Advanced tab is currently active
-			if (advanced_tab_vbox && advanced_notebook && advanced_notebook->get_visible()) {
-				const int advanced_page_num = main_notebook->page_num(*advanced_tab_vbox);
-				const int current_main_page = main_notebook->get_current_page();
-
-				// Advanced tab is active, so cycle through its sub-tabs
-				if (advanced_page_num >= 0 && advanced_page_num == current_main_page) {
-					if (cycle_visible_pages(advanced_notebook)) {
-						return true;  // event handled
-					}
-				}
-			}
-
-			// Otherwise, cycle through main notebook tabs
-			if (cycle_visible_pages(main_notebook)) {
-				return true;  // event handled
-			}
-		}
-	}
-
-	// Call base class handler for other keys
-	return Gtk::Window::on_key_press_event(event);
-}
-
-
-
 void GscInfoWindow::on_refresh_info_button_clicked()
 {
 	this->refresh_info();
@@ -1126,6 +1039,7 @@ void GscInfoWindow::fill_ui_general(const StoragePropertyRepository& property_re
 	identity_table->hide();
 
 	WarningLevel max_tab_warning = WarningLevel::None;
+	const bool dark_mode = gui_is_dark_theme_active();
 	int row = 0;
 
 	for (auto&& p : general_props) {
@@ -1158,7 +1072,7 @@ void GscInfoWindow::fill_ui_general(const StoragePropertyRepository& property_re
 		value->set_markup(Glib::Markup::escape_text(p.format_value()));
 
 		std::string fg;
-		if (app_property_get_label_highlight_color(p.warning_level, fg)) {
+		if (app_property_get_label_highlight_color(dark_mode, p.warning_level, fg)) {
 			name->set_markup("<span color=\"" + fg + "\">" + name->get_label() + "</span>");
 			value->set_markup("<span color=\"" + fg + "\">" + value->get_label() + "</span>");
 		}
@@ -2155,7 +2069,7 @@ WarningLevel GscInfoWindow::fill_ui_directory(const StoragePropertyRepository& p
 inline void cell_renderer_set_warning_fg_bg(Gtk::CellRendererText* crt, const StorageProperty& p)
 {
 	std::string fg, bg;
-	if (app_property_get_row_highlight_colors(p.warning_level, fg, bg)) {
+	if (app_property_get_row_highlight_colors(gui_is_dark_theme_active(), p.warning_level, fg, bg)) {
 		// Note: property_cell_background makes horizontal tree lines disappear around it,
 		// but property_background doesn't play nice with sorted column color.
 		crt->property_cell_background() = bg;
@@ -2532,7 +2446,11 @@ gboolean GscInfoWindow::test_idle_callback(void* data)
 			break;
 		case SelfTestStatusSeverity::Error:
 			if (!result_main_msg.empty()) {  // Highlight in red
-				result_main_msg = "<span color=\"#FF0000\">"s + result_main_msg + "</span>";
+				std::string alert_color;
+				// Use the same color as Alert level warnings for consistency
+				if (app_property_get_label_highlight_color(WarningLevel::Alert, alert_color) && !alert_color.empty()) {
+					result_main_msg = "<span color=\"" + alert_color + "\">"s + result_main_msg + "</span>";
+				}
 			}
 			result_details_msg += "\n"s + _("Check the Self-Test Log for more information.");
 			break;

src/gui/gsc_info_window.h

@@ -217,10 +217,6 @@ class GscInfoWindow : public AppBuilderWidget<GscInfoWindow, true> {
 		/// Reimplemented from Gtk::Window.
 		bool on_delete_event(GdkEventAny* e) override;
 
-		/// Handle key press events for keyboard navigation.
-		/// Reimplemented from Gtk::Window.
-		bool on_key_press_event(GdkEventKey* event) override;
-
 
 		// ---------- Other callbacks
 

src/gui/gsc_init.cpp

@@ -505,6 +505,32 @@ bool app_init_and_loop(int& argc, char**& argv)
 	}
 */
 
+	// Detect Windows dark mode and set GTK theme preference accordingly
+	if constexpr(BuildEnv::is_kernel_family_windows()) {
+		Glib::RefPtr<Gtk::Settings> gtk_settings = Gtk::Settings::get_default();
+		if (gtk_settings) {
+			bool use_dark_theme = false;
+		#ifdef _WIN32
+			// Check Windows registry for dark mode preference
+			// HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize
+			// AppsUseLightTheme = 0 means dark mode, 1 means light mode
+			DWORD apps_use_light_theme = 1;  // Default to light mode
+			if (hz::win32_get_registry_value_dword(HKEY_CURRENT_USER,
+					R"(Software\Microsoft\Windows\CurrentVersion\Themes\Personalize)",
+					"AppsUseLightTheme", apps_use_light_theme)) {
+				use_dark_theme = (apps_use_light_theme == 0);
+				debug_out_dump("app", "Windows theme detected: " << (use_dark_theme ? "dark" : "light") << "\n");
+			} else {
+				debug_out_dump("app", "Could not read Windows theme preference, defaulting to light mode.\n");
+			}
+		#endif
+			// Apply the dark theme preference to GTK
+			gtk_settings->property_gtk_application_prefer_dark_theme().set_value(use_dark_theme);
+			debug_out_dump("app", "GTK dark theme preference set to: " << (use_dark_theme ? "dark" : "light") << "\n");
+		}
+	}
+
+
 	// The application is dpi-aware in Windows.
 	// However, Gtk3 does not support fractional scaling, so at 250% scaling in system settings, the UI will use 200%.
 	//

src/gui/gsc_main_window.cpp

@@ -774,7 +774,7 @@ void GscMainWindow::update_status_widgets()
 		if (health_prop.generic_name == "smart_status/passed") {
 			health_label_->set_text(health_prop.format_value());
 			std::string fg;
-			if (app_property_get_label_highlight_color(health_prop.warning_level, fg)) {
+			if (app_property_get_label_highlight_color(gui_is_dark_theme_active(), health_prop.warning_level, fg)) {
 				health_label_->set_markup("<span color=\"" + fg + "\">"+ Glib::Markup::escape_text(health_label_->get_text()) + "</span>");
 			}
 			// don't set description tooltip - we already have the basic one.

src/gui/gsc_main_window_iconview.cpp

@@ -120,7 +120,7 @@ bool GscMainWindowIconView::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
 		return true;
 	}
 	if (empty_view_message_ != Message::None && this->num_icons_ == 0) {  // no icons
-		Glib::RefPtr<Pango::Layout> layout = this->create_pango_layout("");
+		const Glib::RefPtr<Pango::Layout> layout = this->create_pango_layout("");
 		layout->set_alignment(Pango::ALIGN_CENTER);
 		layout->set_markup(get_message_string(empty_view_message_));
 
@@ -131,6 +131,12 @@ bool GscMainWindowIconView::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
 		const int pos_y = (get_allocation().get_height() - layout_h) / 2;
 		cr->move_to(pos_x, pos_y);
 
+		// Use the foreground color from the widget's style context so
+		// the text is visible in both light and dark themes.
+		const auto style_context = get_style_context();
+		const Gdk::RGBA fg_color = style_context->get_color(style_context->get_state());
+		cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), fg_color.get_alpha());
+
 		layout->show_in_cairo_context(cr);
 
 		return true;

src/hz/win32_tools.h

@@ -79,6 +79,14 @@ inline bool win32_set_registry_value_string(HKEY base,
 		const std::string& keydir, const std::string& key, const std::string& value);
 
 
+/// Get registry value as a DWORD.
+/// Base may be e.g. HKEY_CURRENT_USER.
+/// Note that this works only with REG_DWORD types.
+/// False is returned for all other types.
+inline bool win32_get_registry_value_dword(HKEY base,
+		const std::string& keydir, const std::string& key, DWORD& put_here);
+
+
 /// Redirect stdout and stderr to console window (if open). Requires winxp (at compile-time).
 /// \param create_if_none if true, create a new console if none was found and attach to it.
 /// \return false if failed or unsupported.
@@ -340,6 +348,49 @@ inline bool win32_set_registry_value_string(HKEY base,
 
 
 
+// Get registry value as a DWORD.
+// Note that this works only with REG_DWORD types.
+inline bool win32_get_registry_value_dword(HKEY base,
+		const std::string& keydir, const std::string& key, DWORD& put_here)
+{
+	std::wstring wkeydir = win32_utf8_to_utf16(keydir);
+	if (wkeydir.empty())
+		return false;
+
+	HKEY reg_key = nullptr;
+	bool open_status = (RegOpenKeyExW(base, wkeydir.c_str(), 0, KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS);
+
+	if (!open_status)
+		return false;
+
+	bool ok = false;
+	std::wstring wkey = win32_utf8_to_utf16(key, &ok);
+	if (!ok) {  // conversion error. Note that an empty string is not an error.
+		if (reg_key)
+			RegCloseKey(reg_key);
+		return false;
+	}
+
+	DWORD type = 0;
+	DWORD value = 0;
+	DWORD nbytes = sizeof(DWORD);
+	bool status = (RegQueryValueExW(reg_key, wkey.c_str(), nullptr, &type,
+			reinterpret_cast<BYTE*>(&value), &nbytes) == ERROR_SUCCESS);
+
+	if (status && type == REG_DWORD) {
+		put_here = value;
+	} else {
+		status = false;
+	}
+
+	if (reg_key)
+		RegCloseKey(reg_key);
+
+	return status;
+}
+
+
+
 // Redirect stdout and stderr to console window (if open).
 inline bool win32_redirect_stdio_to_console(bool create_if_none)
 {