Compare commits

..
Author SHA1 Message Date
anthropic-code-agent[bot]andashaduri c940b200c1 Fix Save log as txt from View Output window
Co-authored-by: ashaduri <2302268+ashaduri@users.noreply.github.com>
2026-03-04 21:54:59 +00:00
anthropic-code-agent[bot] 5ba5928210 Initial plan 2026-03-04 21:49:39 +00:00
13 changed files with 116 additions and 238 deletions
-6
View File
@@ -12,12 +12,6 @@
---
**SCAM ALERT:** gsmartcontrol[.]com is a phishing site! Please don't download anything from there!
Please always download GSmartControl from its official website [gsmartcontrol.shaduri.dev](https://gsmartcontrol.shaduri.dev) or the official GitHub repository [github.com/ashaduri/gsmartcontrol](https://github.com/ashaduri/gsmartcontrol).
---
[GSmartControl](https://gsmartcontrol.shaduri.dev)
is a graphical user interface for smartctl (from [smartmontools](https://www.smartmontools.org/)
package), which is a tool for
-6
View File
@@ -13,12 +13,6 @@ nav_order: 1
---
**SCAM ALERT:** gsmartcontrol[.]com is a phishing site! Please don't download anything from there!
Please always download GSmartControl from its official website [gsmartcontrol.shaduri.dev](https://gsmartcontrol.shaduri.dev) or the official GitHub repository [github.com/ashaduri/gsmartcontrol](https://github.com/ashaduri/gsmartcontrol).
---
[GSmartControl](https://gsmartcontrol.shaduri.dev)
is a graphical user interface for smartctl (from [smartmontools](https://www.smartmontools.org/)
package), which is a tool for
-1
View File
@@ -72,7 +72,6 @@ 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
-23
View File
@@ -165,29 +165,6 @@ 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;
}
+2 -2
View File
@@ -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
-88
View File
@@ -1,88 +0,0 @@
/******************************************************************************
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 {};
}
/// @}
+65 -6
View File
@@ -1,7 +1,7 @@
/******************************************************************************
License: GNU General Public License v3.0 only
Copyright:
(C) 2008 - 2026 Alexander Shaduri <ashaduri@gmail.com>
(C) 2008 - 2021 Alexander Shaduri <ashaduri@gmail.com>
******************************************************************************/
/// \file
/// \author Alexander Shaduri
@@ -12,24 +12,83 @@ Copyright:
#ifndef WARNING_COLORS_H
#define WARNING_COLORS_H
#include <string>
#include <glibmm.h>
#include "storage_property.h"
#include "warning_level.h"
/// Get colors for tree rows according to warning severity.
/// \return true if the colors were changed.
bool app_property_get_row_highlight_colors(bool dark_mode, WarningLevel warning, std::string& fg, std::string& bg);
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());
}
/// Get color for labels according to warning severity.
/// \return true if the color was changed.
bool app_property_get_label_highlight_color(bool dark_mode, WarningLevel warning, std::string& fg);
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());
}
/// Format warning text, but without description
std::string storage_property_get_warning_reason(const StorageProperty& p);
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 {};
}
+8 -11
View File
@@ -81,7 +81,6 @@ 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) {
@@ -96,7 +95,7 @@ namespace {
label->set_can_focus(false);
std::string fg;
if (app_property_get_label_highlight_color(dark_mode, label_string.property->warning_level, fg)) {
if (app_property_get_label_highlight_color(label_string.property->warning_level, fg)) {
label->set_markup(
std::string("<span color=\"").append(fg).append("\">")
.append(label_text).append("</span>") );
@@ -130,7 +129,7 @@ namespace {
}
std::string fg;
if (app_property_get_label_highlight_color(gui_is_dark_theme_active(), warning, fg))
if (app_property_get_label_highlight_color(warning, fg))
label->set_markup_with_mnemonic("<span color=\"" + fg + "\">" + original_label + "</span>");
}
@@ -829,6 +828,9 @@ void GscInfoWindow::on_view_output_button_clicked()
if (!filename.empty())
win->set_save_filename(filename);
// Pass the drive pointer so text output can be accessed when saving
win->set_drive(drive_);
win->show();
}
@@ -1039,7 +1041,6 @@ 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) {
@@ -1072,7 +1073,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(dark_mode, p.warning_level, fg)) {
if (app_property_get_label_highlight_color(p.warning_level, fg)) {
name->set_markup("<span color=\"" + fg + "\">" + name->get_label() + "</span>");
value->set_markup("<span color=\"" + fg + "\">" + value->get_label() + "</span>");
}
@@ -2069,7 +2070,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(gui_is_dark_theme_active(), p.warning_level, fg, bg)) {
if (app_property_get_row_highlight_colors(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;
@@ -2446,11 +2447,7 @@ gboolean GscInfoWindow::test_idle_callback(void* data)
break;
case SelfTestStatusSeverity::Error:
if (!result_main_msg.empty()) { // Highlight in red
std::string alert_color;
// Use the same color as Alert level warnings for consistency
if (app_property_get_label_highlight_color(gui_is_dark_theme_active(), WarningLevel::Alert, alert_color) && !alert_color.empty()) {
result_main_msg = "<span color=\"" + alert_color + "\">"s + result_main_msg + "</span>";
}
result_main_msg = "<span color=\"#FF0000\">"s + result_main_msg + "</span>";
}
result_details_msg += "\n"s + _("Check the Self-Test Log for more information.");
break;
-26
View File
@@ -505,32 +505,6 @@ 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%.
//
+1 -1
View File
@@ -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(gui_is_dark_theme_active(), health_prop.warning_level, fg)) {
if (app_property_get_label_highlight_color(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.
+2 -16
View File
@@ -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
const Glib::RefPtr<Pango::Layout> layout = this->create_pango_layout("");
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,12 +131,6 @@ 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;
@@ -554,18 +548,10 @@ Glib::RefPtr<Gdk::Pixbuf> GscMainWindowIconView::load_icon_pixbuf(Glib::RefPtr<G
{
Glib::RefPtr<Gdk::Pixbuf> icon;
// Try the icon theme first; fall back to the bundled icon if needed.
// Try XDG version first
try {
if (default_icon_theme && !xdg_icon_name.empty()) {
icon = default_icon_theme->load_icon(xdg_icon_name, icon_size_, get_scale_factor(), Gtk::IconLookupFlags(0));
// Some icon themes may return an icon smaller than requested.
// In that case, fall back to the bundled icon.
if (icon &&
(icon->get_width() < icon_size_ ||
icon->get_height() < icon_size_)) {
icon.reset();
}
}
} catch (...) { } // ignore exceptions
+38 -1
View File
@@ -24,6 +24,7 @@ Copyright:
#include "applib/app_builder_widget.h"
#include "applib/app_gtkmm_tools.h"
#include "applib/storage_device.h"
@@ -130,6 +131,13 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
}
/// Set the drive pointer for accessing text output when saving
void set_drive(const StorageDevicePtr& drive)
{
drive_ = drive;
}
protected:
@@ -163,6 +171,14 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
specific_filter->add_pattern("*.json");
specific_filter->add_pattern("*.txt");
Glib::RefPtr<Gtk::FileFilter> json_filter = Gtk::FileFilter::create();
json_filter->set_name(_("JSON Files"));
json_filter->add_pattern("*.json");
Glib::RefPtr<Gtk::FileFilter> txt_filter = Gtk::FileFilter::create();
txt_filter->set_name(_("Text Files"));
txt_filter->add_pattern("*.txt");
Glib::RefPtr<Gtk::FileFilter> all_filter = Gtk::FileFilter::create();
all_filter->set_name(_("All Files"));
all_filter->add_pattern("*");
@@ -175,6 +191,8 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog.get()), TRUE);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), specific_filter->gobj());
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), json_filter->gobj());
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), txt_filter->gobj());
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), all_filter->gobj());
if (!last_dir.empty())
@@ -196,6 +214,8 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
dialog.set_do_overwrite_confirmation(true);
dialog.add_filter(specific_filter);
dialog.add_filter(json_filter);
dialog.add_filter(txt_filter);
dialog.add_filter(all_filter);
if (!last_dir.empty())
@@ -222,16 +242,31 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
#endif
rconfig::set_data("gui/drive_data_open_save_dir", last_dir);
bool txt_selected = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog.get())) == txt_filter->gobj();
if (file.extension() != ".json" && file.extension() != ".txt") {
file += ".json";
file += (txt_selected ? ".txt" : ".json");
}
bool save_txt = txt_selected || file.extension() == ".txt";
std::string text;
if (std::holds_alternative<std::string>(contents_)) {
text = std::get<std::string>(contents_);
} else {
text = std::get<Glib::ustring>(contents_);
}
// If saving as text and drive is available, try to get text-formatted output
if (save_txt && drive_) {
if (auto p = drive_->get_property_repository().lookup_property("smartctl/output"); !p.empty()) {
const std::string text_output = p.get_value<std::string>();
if (!text_output.empty()) {
text = text_output;
}
}
}
auto ec = hz::fs_file_put_contents(file, text);
if (ec) {
gui_show_error_dialog(_("Cannot save data to file"), ec.message(), this);
@@ -269,6 +304,8 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
std::string save_filename_; ///< Default filename for Save As
StorageDevicePtr drive_; ///< Drive pointer for accessing text output (optional)
};
-51
View File
@@ -79,14 +79,6 @@ 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.
@@ -348,49 +340,6 @@ 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)
{