From 3ff5bd46952144926d9bd9beedf50023a51913ee Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 29 Apr 2025 16:33:32 +0200 Subject: ui: flatten namespace hierarchy --- ui/src/widgets/participant_editor.cpp | 139 ------------------------------- ui/src/widgets/participant_editor.ui | 71 ---------------- ui/src/widgets/participant_row.cpp | 149 ---------------------------------- ui/src/widgets/participant_row.ui | 89 -------------------- ui/src/widgets/preferences.cpp | 81 ------------------ ui/src/widgets/preferences.ui | 104 ------------------------ ui/src/widgets/turn_order_view.cpp | 64 --------------- ui/src/widgets/turn_order_view.ui | 38 --------- 8 files changed, 735 deletions(-) delete mode 100644 ui/src/widgets/participant_editor.cpp delete mode 100644 ui/src/widgets/participant_editor.ui delete mode 100644 ui/src/widgets/participant_row.cpp delete mode 100644 ui/src/widgets/participant_row.ui delete mode 100644 ui/src/widgets/preferences.cpp delete mode 100644 ui/src/widgets/preferences.ui delete mode 100644 ui/src/widgets/turn_order_view.cpp delete mode 100644 ui/src/widgets/turn_order_view.ui (limited to 'ui/src/widgets') diff --git a/ui/src/widgets/participant_editor.cpp b/ui/src/widgets/participant_editor.cpp deleted file mode 100644 index 816ad09..0000000 --- a/ui/src/widgets/participant_editor.cpp +++ /dev/null @@ -1,139 +0,0 @@ -#include "turns/ui/widgets/participant_editor.hpp" - -#include "turns/core/disposition.hpp" -#include "turns/core/participant.hpp" -#include "turns/lang/messages.hpp" -#include "turns/ui/widgets/template_widget.hpp" - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include -#include -#include - -namespace turns::ui::widgets -{ - namespace - { - auto constexpr static TYPE_NAME = "ParticipantEditor"; - auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_editor.ui"; - } // namespace - - ParticipantEditor::ParticipantEditor(Glib::RefPtr participant) - : Glib::ObjectBase{TYPE_NAME} - , template_widget{TEMPLATE} - , m_disposition{get_widget("disposition")} - , m_finish{get_widget("finish")} - , m_name{get_widget("name")} - , m_priority{get_widget("priority")} - , m_disposition_factory{Gtk::SignalListItemFactory::create()} - , m_disposition_model{Gtk::StringList::create()} - , m_participant{participant} - { - set_title(_(m_participant ? lang::edit_participant : lang::add_participant)); - - m_finish->signal_clicked().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_finish_clicked)); - - for (auto n : std::views::iota(std::uint8_t{}, static_cast(core::disposition::END))) - { - m_disposition_model->append(presentation_name_for(core::disposition{n})); - } - - m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_item_bind)); - m_disposition_factory->signal_setup().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_item_setup)); - - m_disposition->set_factory(m_disposition_factory); - m_disposition->set_model(m_disposition_model); - - if (m_participant) - { - set_name(m_participant->property_name().get_value()); - set_priority(m_participant->property_priority()); - set_disposition(m_participant->property_disposition().get_value()); - } - } - - auto ParticipantEditor::get_disposition() const -> core::disposition - { - return static_cast(m_disposition->get_selected()); - } - - auto ParticipantEditor::get_name() const -> Glib::ustring - { - return m_name->get_text(); - } - - auto ParticipantEditor::get_priority() const -> double - { - return m_priority->get_value(); - } - - auto ParticipantEditor::set_disposition(core::disposition value) -> void - { - m_disposition->set_selected(static_cast(value)); - } - - auto ParticipantEditor::set_name(Glib::ustring const & value) -> void - { - m_name->set_text(value); - } - - auto ParticipantEditor::set_priority(double value) -> void - { - m_priority->set_value(value); - } - - auto ParticipantEditor::signal_finished() -> SignalFinishedType - { - return m_signal_finished; - } - - auto ParticipantEditor::handle_finish_clicked() -> void - { - auto name = m_name->get_text(); - auto priority = m_priority->get_value(); - auto disposition = static_cast(m_disposition->get_selected()); - - if (m_participant) - { - m_participant->property_name() = name; - m_participant->property_priority() = priority; - m_participant->property_disposition() = disposition; - } - - m_signal_finished.emit(name, priority, disposition); - close(); - } - - auto ParticipantEditor::handle_item_bind(Glib::RefPtr item) -> void - { - auto value = std::dynamic_pointer_cast(item->get_item())->get_string(); - dynamic_cast(item->get_child())->set_label(value); - } - - auto ParticipantEditor::handle_item_setup(Glib::RefPtr item) -> void - { - item->set_child(*Gtk::make_managed()); - } - -} // namespace turns::ui::widgets \ No newline at end of file diff --git a/ui/src/widgets/participant_editor.ui b/ui/src/widgets/participant_editor.ui deleted file mode 100644 index 6bcf83e..0000000 --- a/ui/src/widgets/participant_editor.ui +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/widgets/participant_row.cpp deleted file mode 100644 index 6902a1c..0000000 --- a/ui/src/widgets/participant_row.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "turns/ui/widgets/participant_row.hpp" - -#include "turns/core/disposition.hpp" -#include "turns/core/participant.hpp" -#include "turns/lang/messages.hpp" -#include "turns/ui/widgets/template_widget.hpp" - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -namespace turns::ui::widgets -{ - namespace - { - auto constexpr static TYPE_NAME = "participant_row"; - auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_row.ui"; - - auto css_class_for(core::disposition value) -> Glib::ustring - { - switch (value) - { - case core::disposition::friendly: - return "disposition-friendly"; - case core::disposition::hostile: - return "disposition-hostile"; - case core::disposition::secret: - return "disposition-secret"; - default: - return ""; - } - } - } // namespace - - participant_row::participant_row(Glib::RefPtr participant) - : Glib::ObjectBase(TYPE_NAME) - , template_widget{TEMPLATE} - , m_delete{get_widget("delete")} - , m_edit{get_widget("edit")} - , m_subtitle{get_widget("subtitle")} - , m_title{get_widget("title")} - , m_toggle_defeated{get_widget("toggle_defeated")} - , m_delete_enabled{*this, "delete-enabled", true} - , m_edit_enabled{*this, "edit-enabled", true} - - { - m_delete->signal_clicked().connect(sigc::mem_fun(*this, &participant_row::handle_delete)); - m_edit->signal_clicked().connect(sigc::mem_fun(*this, &participant_row::handle_edit)); - - Glib::Binding::bind_property(m_subtitle->property_label(), - m_subtitle->property_visible(), - Glib::Binding::Flags::DEFAULT, - sigc::mem_fun(&Glib::ustring::size)); - Glib::Binding::bind_property(m_title->property_label(), - m_title->property_visible(), - Glib::Binding::Flags::INVERT_BOOLEAN, - sigc::mem_fun(&Glib::ustring::size)); - Glib::Binding::bind_property(m_toggle_defeated->property_active(), - m_toggle_defeated->property_icon_name(), - Glib::Binding::Flags::SYNC_CREATE, - [](auto active) { return active ? "face-sick-symbolic" : "face-smile-symbolic"; }); - - // clang-format off - Glib::Binding::bind_property(delete_enabled(), - m_delete->property_sensitive(), - Glib::Binding::Flags::SYNC_CREATE); - Glib::Binding::bind_property(edit_enabled(), - m_edit->property_sensitive(), - Glib::Binding::Flags::SYNC_CREATE); - // clang-format on - - if (participant) - { - Glib::Binding::bind_property(participant->property_name(), m_title->property_label(), Glib::Binding::Flags::SYNC_CREATE); - - Glib::Binding::bind_property(participant->property_priority(), - m_subtitle->property_label(), - Glib::Binding::Flags::SYNC_CREATE, - [](auto n) { return std::vformat(_(lang::priority_number), std::make_format_args(n)); }); - - Glib::Binding::bind_property(participant->property_disposition(), - m_toggle_defeated->property_css_classes(), - Glib::Binding::Flags::SYNC_CREATE, - [this](auto value) { - auto classes = m_toggle_defeated->get_css_classes(); - auto removed = std::ranges::remove_if(classes, [](auto cls) { - return (cls == "disposition-friendly") | (cls == "disposition-hostile") || (cls == "disposition-secret"); - }); - classes.erase(removed.begin(), removed.end()); - classes.push_back(css_class_for(value)); - return classes; - }); - - Glib::Binding::bind_property(participant->property_is_active(), - property_css_classes(), - Glib::Binding::Flags::SYNC_CREATE, - [this](auto value) { - auto classes = get_css_classes(); - if (!value) - { - std::erase(classes, "active-participant"); - } - else - { - classes.push_back("active-participant"); - } - return classes; - }); - } - } - - auto participant_row::delete_enabled() -> Glib::PropertyProxy - { - return m_delete_enabled.get_proxy(); - } - - auto participant_row::edit_enabled() -> Glib::PropertyProxy - { - return m_edit_enabled.get_proxy(); - } - - auto participant_row::handle_delete() -> void - { - auto index = Glib::Variant::create(get_index()); - activate_action("win.delete", index); - } - - auto participant_row::handle_edit() -> void - { - auto index = Glib::Variant::create(get_index()); - activate_action("win.edit", index); - } - -} // namespace turns::ui::widgets \ No newline at end of file diff --git a/ui/src/widgets/participant_row.ui b/ui/src/widgets/participant_row.ui deleted file mode 100644 index 1a215c6..0000000 --- a/ui/src/widgets/participant_row.ui +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - diff --git a/ui/src/widgets/preferences.cpp b/ui/src/widgets/preferences.cpp deleted file mode 100644 index 327860f..0000000 --- a/ui/src/widgets/preferences.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include "turns/ui/widgets/preferences.hpp" - -#include "turns/core/settings.hpp" -#include "turns/ui/widgets/template_widget.hpp" - -#include -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include - -#include - -namespace turns::ui::widgets -{ - namespace - { - auto constexpr static TYPE_NAME = "preferences"; - auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/preferences.ui"; - } // namespace - - preferences::preferences(Glib::RefPtr settings) - : Glib::ObjectBase{TYPE_NAME} - , template_widget{TEMPLATE} - , m_settings{settings} - , m_friendly_reset_button{get_widget("friendly_reset_button")} - , m_hostile_reset_button{get_widget("hostile_reset_button")} - , m_secret_reset_button{get_widget("secret_reset_button")} - , m_friendly_color_button{get_widget("friendly_color_button")} - , m_hostile_color_button{get_widget("hostile_color_button")} - , m_secret_color_button{get_widget("secret_color_button")} - , m_skip_defeated{get_widget("skip_defeated")} - { - if (!m_settings) - { - return; - } - - bind_reset(core::settings::key::disposition_friendly_color, m_friendly_reset_button); - bind_setting(core::settings::key::disposition_friendly_color, m_friendly_color_button); - bind_reset(core::settings::key::disposition_hostile_color, m_hostile_reset_button); - bind_setting(core::settings::key::disposition_hostile_color, m_hostile_color_button); - bind_reset(core::settings::key::disposition_secret_color, m_secret_reset_button); - bind_setting(core::settings::key::disposition_secret_color, m_secret_color_button); - - m_settings->bind(core::settings::key::skip_defeated, m_skip_defeated->property_active()); - } - - auto preferences::bind_reset(Glib::ustring const & key, Gtk::Button * button) -> void - { - m_settings->signal_changed(key).connect([=, this](auto) { update_sensitive(key, button); }); - update_sensitive(key, button); - button->signal_clicked().connect(sigc::bind(sigc::mem_fun(*m_settings, &Gio::Settings::reset), key)); - } - - auto preferences::bind_setting(Glib::ustring const & key, Gtk::ColorDialogButton * button) -> void - { - m_settings->bind(key, button->property_rgba(), Gio::Settings::BindFlags::DEFAULT, [](auto value) { - return Gdk::RGBA{value}; - }, [](auto color) { return color.to_string(); }); - } - - auto preferences::update_sensitive(Glib::ustring const & key, Gtk::Button * button) -> void - { - auto v = Glib::Variant{}; - button->set_sensitive(m_settings->get_user_value(key, v)); - } - -} // namespace turns::ui::widgets \ No newline at end of file diff --git a/ui/src/widgets/preferences.ui b/ui/src/widgets/preferences.ui deleted file mode 100644 index 3831274..0000000 --- a/ui/src/widgets/preferences.ui +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - diff --git a/ui/src/widgets/turn_order_view.cpp b/ui/src/widgets/turn_order_view.cpp deleted file mode 100644 index 97f3834..0000000 --- a/ui/src/widgets/turn_order_view.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "turns/ui/widgets/turn_order_view.hpp" - -#include "turns/core/participant.hpp" -#include "turns/ui/widgets/participant_row.hpp" -#include "turns/ui/widgets/template_widget.hpp" - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -namespace turns::ui::widgets -{ - namespace - { - auto constexpr static TYPE_NAME = "turn_order_view"; - auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/turn_order_view.ui"; - } // namespace - - turn_order_view::turn_order_view(Glib::RefPtr model) - : Glib::ObjectBase(TYPE_NAME) - , template_widget{TEMPLATE} - , m_model{model} - , m_progress{get_widget("progress")} - , m_view{get_widget("view")} - { - if (!model) - { - return; - } - - set_orientation(Gtk::Orientation::VERTICAL); - - m_view->bind_model(m_model, sigc::mem_fun(*this, &turn_order_view::handle_create_row)); - Glib::Binding::bind_property(m_model->progress(), m_progress->property_fraction(), Glib::Binding::Flags::SYNC_CREATE); - } - - auto turn_order_view::handle_create_row(Glib::RefPtr const item) -> Gtk::Widget * - { - auto participant = std::dynamic_pointer_cast(item); - auto row = Gtk::make_managed(participant); - - Glib::Binding::bind_property(m_model->is_running(), - row->delete_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - - Glib::Binding::bind_property(m_model->is_running(), - row->edit_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - - return row; - } - -} // namespace turns::ui::widgets \ No newline at end of file diff --git a/ui/src/widgets/turn_order_view.ui b/ui/src/widgets/turn_order_view.ui deleted file mode 100644 index d5a1006..0000000 --- a/ui/src/widgets/turn_order_view.ui +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - -- cgit v1.2.3