diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/application.cpp | 6 | ||||
| -rw-r--r-- | app/src/widgets/participant_row.cpp | 133 | ||||
| -rw-r--r-- | app/src/widgets/turn_order_view.cpp | 49 | ||||
| -rw-r--r-- | app/src/windows/participant_editor.cpp | 91 | ||||
| -rw-r--r-- | app/src/windows/tracker.cpp | 177 |
5 files changed, 3 insertions, 453 deletions
diff --git a/app/src/application.cpp b/app/src/application.cpp index 211d7d9..c0aba86 100644 --- a/app/src/application.cpp +++ b/app/src/application.cpp @@ -1,7 +1,7 @@ #include "turns/app/application.hpp" -#include "turns/app/widgets/turn_order_view.hpp" -#include "turns/app/windows/tracker.hpp" +#include "turns/ui/widgets/turn_order_view.hpp" +#include "turns/ui/windows/tracker.hpp" #include <sigc++/functors/mem_fun.h> @@ -41,7 +41,7 @@ namespace turns::app auto application::on_activate() -> void { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); m_tracker = Gtk::Builder::get_widget_derived<windows::tracker>(builder, "tracker"); m_application->add_window(*m_tracker); diff --git a/app/src/widgets/participant_row.cpp b/app/src/widgets/participant_row.cpp deleted file mode 100644 index c04eee0..0000000 --- a/app/src/widgets/participant_row.cpp +++ /dev/null @@ -1,133 +0,0 @@ -#include "turns/app/widgets/participant_row.hpp" - -#include "turns/core/disposition.hpp" -#include "turns/core/participant.hpp" -#include "turns/lang/messages.hpp" - -#include <glibmm/binding.h> -#include <glibmm/i18n.h> -#include <glibmm/ustring.h> -#include <glibmm/variant.h> - -#include <algorithm> -#include <format> - -namespace turns::app::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<core::participant> participant) - : Glib::ObjectBase(TYPE_NAME) - , template_widget<participant_row, Gtk::ListBoxRow>{TEMPLATE} - , m_delete{get_widget<Gtk::Button>("delete")} - , m_edit{get_widget<Gtk::Button>("edit")} - , m_subtitle{get_widget<Gtk::Label>("subtitle")} - , m_title{get_widget<Gtk::Label>("title")} - , m_toggle_defeated{get_widget<Gtk::ToggleButton>("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(property_delete_enabled(), - m_delete->property_sensitive(), - Glib::Binding::Flags::SYNC_CREATE); - Glib::Binding::bind_property(property_edit_enabled(), - m_edit->property_sensitive(), - Glib::Binding::Flags::SYNC_CREATE); - // clang-format on - - if (participant) - { - Glib::Binding::bind_property(participant->name(), m_title->property_label(), Glib::Binding::Flags::SYNC_CREATE); - - Glib::Binding::bind_property(participant->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->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->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::property_delete_enabled() -> Glib::PropertyProxy<bool> - { - return m_delete_enabled.get_proxy(); - } - - auto participant_row::property_edit_enabled() -> Glib::PropertyProxy<bool> - { - return m_edit_enabled.get_proxy(); - } - - auto participant_row::handle_delete() -> void - { - auto index = Glib::Variant<int>::create(get_index()); - activate_action("win.delete", index); - } - - auto participant_row::handle_edit() -> void - { - auto index = Glib::Variant<int>::create(get_index()); - activate_action("win.edit", index); - } - -} // namespace turns::app::widgets
\ No newline at end of file diff --git a/app/src/widgets/turn_order_view.cpp b/app/src/widgets/turn_order_view.cpp deleted file mode 100644 index 9e69127..0000000 --- a/app/src/widgets/turn_order_view.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "turns/app/widgets/turn_order_view.hpp" - -#include "turns/app/widgets/participant_row.hpp" -#include "turns/core/participant.hpp" -#include "turns/core/turn_order.hpp" - -#include <sigc++/functors/mem_fun.h> - -#include <glibmm/binding.h> - -#include <memory> - -namespace turns::app::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_type> model) - : Glib::ObjectBase(TYPE_NAME) - , template_widget<turn_order_view, Gtk::ScrolledWindow>{TEMPLATE} - , m_model{model} - , m_view{get_widget<Gtk::ListBox>("view")} - { - if (model) - { - m_view->bind_model(m_model, sigc::mem_fun(*this, &turn_order_view::handle_create_row)); - } - } - - auto turn_order_view::handle_create_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget * - { - auto participant = std::dynamic_pointer_cast<core::participant>(item); - auto row = Gtk::make_managed<widgets::participant_row>(participant); - - Glib::Binding::bind_property(m_model->is_running(), - row->property_delete_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - - Glib::Binding::bind_property(m_model->is_running(), - row->property_edit_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - - return row; - } - -} // namespace turns::app::widgets
\ No newline at end of file diff --git a/app/src/windows/participant_editor.cpp b/app/src/windows/participant_editor.cpp deleted file mode 100644 index 1c8d05c..0000000 --- a/app/src/windows/participant_editor.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "turns/app/windows/participant_editor.hpp" - -#include "turns/core/disposition.hpp" -#include "turns/core/participant.hpp" -#include "turns/lang/messages.hpp" - -#include <glibmm/i18n.h> - -#include <gtkmm/editable.h> -#include <gtkmm/label.h> -#include <gtkmm/listboxrow.h> -#include <gtkmm/stringobject.h> - -#include <ranges> - -namespace turns::app::windows -{ - - participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj) - : Gtk::Widget{base} - , m_adw{ADW_DIALOG(gobj())} - , m_disposition{ADW_COMBO_ROW(builder->get_widget<Gtk::ListBoxRow>("disposition")->gobj())} - , m_finish{builder->get_widget<Gtk::Button>("finish")} - , m_name{ADW_ENTRY_ROW(builder->get_widget<Gtk::ListBoxRow>("name")->gobj())} - , m_priority{ADW_SPIN_ROW(builder->get_widget<Gtk::ListBoxRow>("priority")->gobj())} - , m_disposition_factory{Gtk::SignalListItemFactory::create()} - , m_disposition_model{Gtk::StringList::create()} - , m_participant{obj} - - { - adw_dialog_set_title(m_adw, _(obj ? lang::edit_participant : lang::add_participant)); - m_finish->signal_clicked().connect(sigc::mem_fun(*this, &participant_editor::handle_finish_clicked)); - - for (auto n : std::views::iota(std::uint8_t{}, static_cast<std::uint8_t>(core::disposition::END))) - { - m_disposition_model->append(presentation_name_for(core::disposition{n})); - } - - m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &participant_editor::handle_item_bind)); - m_disposition_factory->signal_setup().connect(sigc::mem_fun(*this, &participant_editor::handle_item_setup)); - - adw_combo_row_set_factory(m_disposition, GTK_LIST_ITEM_FACTORY(m_disposition_factory->gobj())); - adw_combo_row_set_model(m_disposition, G_LIST_MODEL(m_disposition_model->gobj())); - - if (m_participant) - { - gtk_editable_set_text(GTK_EDITABLE(m_name), m_participant->name().get_value().c_str()); - adw_spin_row_set_value(m_priority, m_participant->priority()); - adw_combo_row_set_selected(m_disposition, static_cast<unsigned>(m_participant->disposition().get_value())); - } - } - - auto participant_editor::present(Gtk::Widget * parent) -> void - { - adw_dialog_present(m_adw, parent->gobj()); - } - - auto participant_editor::signal_finished() -> signal_finished_type - { - return m_signal_finished; - } - - auto participant_editor::handle_finish_clicked() -> void - { - auto name = gtk_editable_get_text(GTK_EDITABLE(m_name)); - auto priority = adw_spin_row_get_value(m_priority); - auto disposition = static_cast<core::disposition>(adw_combo_row_get_selected(m_disposition)); - - if (m_participant) - { - m_participant->name() = name; - m_participant->priority() = priority; - m_participant->disposition() = disposition; - } - - m_signal_finished.emit(name, priority, disposition); - adw_dialog_close(m_adw); - } - - auto participant_editor::handle_item_bind(Glib::RefPtr<Gtk::ListItem> item) -> void - { - auto value = std::dynamic_pointer_cast<Gtk::StringObject>(item->get_item())->get_string(); - dynamic_cast<Gtk::Label *>(item->get_child())->set_label(value); - } - - auto participant_editor::handle_item_setup(Glib::RefPtr<Gtk::ListItem> item) -> void - { - item->set_child(*Gtk::make_managed<Gtk::Label>()); - } - -} // namespace turns::app::windows
\ No newline at end of file diff --git a/app/src/windows/tracker.cpp b/app/src/windows/tracker.cpp deleted file mode 100644 index 7188968..0000000 --- a/app/src/windows/tracker.cpp +++ /dev/null @@ -1,177 +0,0 @@ -#include "turns/app/windows/tracker.hpp" - -#include "turns/app/windows/participant_editor.hpp" -#include "turns/core/participant.hpp" -#include "turns/core/turn_order.hpp" -#include "turns/lang/messages.hpp" - -#include <glibmm/binding.h> -#include <glibmm/i18n.h> - -#include <adwaita.h> - -#include <utility> - -namespace turns::app::windows -{ - - namespace - { - auto editor_for(Glib::RefPtr<core::participant> participant) - { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); - return std::pair{builder, Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor", participant)}; - } - - auto stop_dialog_callback(AdwAlertDialog * dialog, GAsyncResult * result, core::turn_order * order) - { - auto response = adw_alert_dialog_choose_finish(dialog, result); - if (response == Glib::ustring{"clear"}) - { - order->clear(); - } - order->stop(); - } - - } // namespace - - tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder) - : Gtk::ApplicationWindow{base} - , m_adw{ADW_APPLICATION_WINDOW(gobj())} - , m_controls{builder->get_widget<Gtk::Revealer>("controls")} - , m_empty(builder->get_widget<Gtk::Widget>("empty")) - , m_stack{builder->get_widget<Gtk::Stack>("stack")} - , m_start{builder->get_widget<Gtk::Button>("start")} - , m_title(ADW_WINDOW_TITLE(builder->get_widget<Gtk::Widget>("title")->gobj())) - , m_turn_order{core::turn_order::create()} - , m_turn_order_view{Gtk::make_managed<widgets::turn_order_view>(m_turn_order)} - , m_subtitle{Glib::wrap(GTK_WIDGET(m_title)), "subtitle"} - { - setup_actions(); - - m_stack->add(*m_turn_order_view); - - // clang-format off - Glib::Binding::bind_property(m_turn_order->is_empty(), - m_stack->property_visible_child(), - Glib::Binding::Flags::SYNC_CREATE, - [this](auto empty) { return empty ? m_empty : m_turn_order_view; }); - - Glib::Binding::bind_property(m_turn_order->is_running(), - m_controls->property_reveal_child(), - Glib::Binding::Flags::SYNC_CREATE); - - Glib::Binding::bind_property(m_turn_order->is_empty(), - m_subtitle, - Glib::Binding::Flags::SYNC_CREATE, - [](auto empty) { return empty ? _(lang::no_active_turn_order) : ""; }); - // clang-format on - } - - auto tracker::handle_add_participant() -> void - { - auto [lifeline, dialog] = editor_for(nullptr); - dialog->present(this); - dialog->signal_finished().connect([this](auto n, auto p, auto d) { m_turn_order->add(n, p, d); }); - } - - auto tracker::handle_delete_participant(Glib::VariantBase param) -> void - { - auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param); - m_turn_order->remove(index.get()); - } - - auto tracker::handle_edit_participant(Glib::VariantBase param) -> void - { - static_cast<void>(param); - auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param); - auto participant = m_turn_order->get_typed_object<core::participant>(index.get()); - auto [lifeline, dialog] = editor_for(participant); - dialog->present(this); - } - - auto tracker::handle_stop() -> void - { - auto dialog = ADW_ALERT_DIALOG(adw_alert_dialog_new("Stop turn order", "Do you want to clear the turn order?")); - adw_alert_dialog_add_response(dialog, "stop", "Stop"); - adw_alert_dialog_set_response_appearance(dialog, "stop", ADW_RESPONSE_SUGGESTED); - adw_alert_dialog_add_response(dialog, "clear", "Stop and clear"); - adw_alert_dialog_set_response_appearance(dialog, "clear", ADW_RESPONSE_DESTRUCTIVE); - adw_alert_dialog_set_close_response(dialog, "stop"); - adw_alert_dialog_set_default_response(dialog, "stop"); - adw_alert_dialog_choose(dialog, - GTK_WIDGET(this->gobj()), - NULL, - reinterpret_cast<GAsyncReadyCallback>(stop_dialog_callback), - m_turn_order.get()); - } - - auto tracker::setup_actions() -> void - { - // win.add_participant - // depends-on: turn_order:state == stopped - { - auto action = add_action("add_participant", sigc::mem_fun(*this, &tracker::handle_add_participant)); - - Glib::Binding::bind_property(m_turn_order->is_running(), - action->property_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - } - - // win.clear - // depends-on: turn_order:is_empty == false - { - auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &core::turn_order::clear)); - - Glib::Binding::bind_property(m_turn_order->is_empty(), - action->property_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - } - - // win.next - // depends-on: turn_order:state == running - { - auto action = add_action("next", sigc::mem_fun(*m_turn_order, &core::turn_order::next)); - - Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); - } - - // win.previous - // depends-on: turn_order:has_previous == true - { - auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &core::turn_order::previous)); - - Glib::Binding::bind_property(m_turn_order->has_previous(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); - } - - // win.start - // depends-on: turn_order:is_empty == false - { - auto action = add_action("start", sigc::mem_fun(*m_turn_order, &core::turn_order::start)); - - Glib::Binding::bind_property(m_turn_order->is_running(), - action->property_enabled(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - - Glib::Binding::bind_property(m_turn_order->is_running(), - m_start->property_visible(), - Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - } - - // win.stop - // depends-on: turn_order:running == true - { - auto action = add_action("stop", sigc::mem_fun(*this, &tracker::handle_stop)); - - Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); - } - - // win.delete - // win.edit - { - add_action_with_parameter("delete", Glib::VARIANT_TYPE_INT32, sigc::mem_fun(*this, &tracker::handle_delete_participant)); - add_action_with_parameter("edit", Glib::VARIANT_TYPE_INT32, sigc::mem_fun(*this, &tracker::handle_edit_participant)); - } - } - -} // namespace turns::app::windows |