RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:47:35 +00:00
Code Issues Activity Actions

DisplaySettings: Propagate errors in ThemesSettingsWidget

Browse source
This commit is contained in:
implicitfield 2023-02-11 18:29:58 +02:00 • committed by Andreas Kling
parent 83eca15e51
commit 9c7dfd4fd4
2 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp
View file

@ -24,15 +24,20 @@ static DeprecatedString get_color_scheme_name_from_pathname(DeprecatedString con
return color_scheme_path.replace("/res/color-schemes/"sv, ""sv, ReplaceMode::FirstOnly).replace(".ini"sv, ""sv, ReplaceMode::FirstOnly); return color_scheme_path.replace("/res/color-schemes/"sv, ""sv, ReplaceMode::FirstOnly).replace(".ini"sv, ""sv, ReplaceMode::FirstOnly);
}; };
ThemesSettingsWidget::ThemesSettingsWidget(bool& background_settings_changed) ErrorOr<NonnullRefPtr<ThemesSettingsWidget>> ThemesSettingsWidget::try_create(bool& background_settings_changed) {
: m_background_settings_changed { background_settings_changed } auto theme_settings_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ThemesSettingsWidget(background_settings_changed)));
{ TRY(theme_settings_widget->load_from_gml(themes_settings_gml));
load_from_gml(themes_settings_gml).release_value_but_fixme_should_propagate_errors(); TRY(theme_settings_widget->setup_interface());
m_themes = MUST(Gfx::list_installed_system_themes());
return theme_settings_widget;
}
ErrorOr<void> ThemesSettingsWidget::setup_interface() {
m_themes = TRY(Gfx::list_installed_system_themes());
size_t current_theme_index; size_t current_theme_index;
auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme(); auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme();
m_theme_names.ensure_capacity(m_themes.size()); TRY(m_theme_names.try_ensure_capacity(m_themes.size()));
for (auto& theme_meta : m_themes) { for (auto& theme_meta : m_themes) {
m_theme_names.append(theme_meta.name); m_theme_names.append(theme_meta.name);
if (current_theme_name == theme_meta.name) { if (current_theme_name == theme_meta.name) {
@ -40,6 +45,7 @@ ThemesSettingsWidget::ThemesSettingsWidget(bool& background_settings_changed)
current_theme_index = m_theme_names.size() - 1; current_theme_index = m_theme_names.size() - 1;
} }
} }
m_theme_preview = find_descendant_of_type_named<GUI::Frame>("preview_frame")->add<ThemePreviewWidget>(palette()); m_theme_preview = find_descendant_of_type_named<GUI::Frame>("preview_frame")->add<ThemePreviewWidget>(palette());
m_themes_combo = *find_descendant_of_type_named<GUI::ComboBox>("themes_combo"); m_themes_combo = *find_descendant_of_type_named<GUI::ComboBox>("themes_combo");
m_themes_combo->set_only_allow_values_from_model(true); m_themes_combo->set_only_allow_values_from_model(true);
@ -54,7 +60,7 @@ ThemesSettingsWidget::ThemesSettingsWidget(bool& background_settings_changed)
}; };
m_themes_combo->set_selected_index(current_theme_index, GUI::AllowCallback::No); m_themes_combo->set_selected_index(current_theme_index, GUI::AllowCallback::No);
auto mouse_settings_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/app-mouse.png"sv).release_value_but_fixme_should_propagate_errors(); auto mouse_settings_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-mouse.png"sv));
m_color_scheme_names.clear(); m_color_scheme_names.clear();
Core::DirIterator iterator("/res/color-schemes", Core::DirIterator::SkipParentAndBaseDir); Core::DirIterator iterator("/res/color-schemes", Core::DirIterator::SkipParentAndBaseDir);
@ -125,26 +131,44 @@ ThemesSettingsWidget::ThemesSettingsWidget(bool& background_settings_changed)
++index; ++index;
} }
}; };
return {};
}
ThemesSettingsWidget::ThemesSettingsWidget(bool& background_settings_changed)
: m_background_settings_changed {background_settings_changed }
{
} }
void ThemesSettingsWidget::apply_settings() void ThemesSettingsWidget::apply_settings()
{ {
m_background_settings_changed = false;
Optional<DeprecatedString> color_scheme_path = DeprecatedString::formatted("/res/color-schemes/{}.ini", m_selected_color_scheme_name); Optional<DeprecatedString> color_scheme_path = DeprecatedString::formatted("/res/color-schemes/{}.ini", m_selected_color_scheme_name);
if (!m_color_scheme_is_file_based && find_descendant_of_type_named<GUI::CheckBox>("custom_color_scheme_checkbox")->is_checked()) if (!m_color_scheme_is_file_based && find_descendant_of_type_named<GUI::CheckBox>("custom_color_scheme_checkbox")->is_checked()) {
VERIFY(GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name, m_background_settings_changed, "Custom"sv)); auto set_theme_result = GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name, m_background_settings_changed, "Custom"sv);
else if (find_descendant_of_type_named<GUI::CheckBox>("custom_color_scheme_checkbox")->is_checked()) if(!set_theme_result)
VERIFY(GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name, m_background_settings_changed, color_scheme_path)); GUI::MessageBox::show_error(window(), "Failed to apply theme settings"sv);
else { } else if (find_descendant_of_type_named<GUI::CheckBox>("custom_color_scheme_checkbox")->is_checked()) {
VERIFY(GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name, m_background_settings_changed, OptionalNone())); auto set_theme_result = GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name, m_background_settings_changed, color_scheme_path);
if(!set_theme_result)
GUI::MessageBox::show_error(window(), "Failed to apply theme settings"sv);
} else {
auto set_theme_result = GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name, m_background_settings_changed, OptionalNone());
if (!set_theme_result) {
GUI::MessageBox::show_error(window(), "Failed to apply theme settings"sv);
return;
}
// Update the color scheme combobox to match the new theme. // Update the color scheme combobox to match the new theme.
auto const theme_config = Core::ConfigFile::open(m_selected_theme->path).release_value_but_fixme_should_propagate_errors(); auto theme_config = Core::ConfigFile::open(m_selected_theme->path);
auto const color_scheme_index = m_color_scheme_names.find_first_index(get_color_scheme_name_from_pathname(theme_config->read_entry("Paths", "ColorScheme"))); if (theme_config.is_error()) {
GUI::MessageBox::show_error(window(), "Failed to open theme config file"sv);
return;
}
auto const color_scheme_index = m_color_scheme_names.find_first_index(get_color_scheme_name_from_pathname(theme_config.release_value()->read_entry("Paths", "ColorScheme")));
if (color_scheme_index.has_value()) if (color_scheme_index.has_value())
find_descendant_of_type_named<GUI::ComboBox>("color_scheme_combo")->set_selected_index(color_scheme_index.value()); find_descendant_of_type_named<GUI::ComboBox>("color_scheme_combo")->set_selected_index(color_scheme_index.value());
} }
m_background_settings_changed = false;
} }
} }

4
Userland/Applications/DisplaySettings/ThemesSettingsWidget.h
View file

@ -17,12 +17,14 @@
namespace DisplaySettings { namespace DisplaySettings {
class ThemesSettingsWidget final : public GUI::SettingsWindow::Tab { class ThemesSettingsWidget final : public GUI::SettingsWindow::Tab {
C_OBJECT(ThemesSettingsWidget); C_OBJECT_ABSTRACT(ThemesSettingsWidget);
public: public:
static ErrorOr<NonnullRefPtr<ThemesSettingsWidget>> try_create(bool& background_settings_changed);
virtual void apply_settings() override; virtual void apply_settings() override;
private: private:
ErrorOr<void> setup_interface();
Vector<Gfx::SystemThemeMetaData> m_themes; Vector<Gfx::SystemThemeMetaData> m_themes;
Vector<DeprecatedString> m_theme_names; Vector<DeprecatedString> m_theme_names;
Vector<DeprecatedString> m_color_scheme_names; Vector<DeprecatedString> m_color_scheme_names;