From 873bf396b904ce477a238f22d1891e1b03f24eff Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 29 Apr 2025 15:55:30 +0200 Subject: ui: convert editor into a template_widget --- ui/src/windows/participant_editor.cpp | 106 ---------------------------------- ui/src/windows/participant_editor.ui | 71 ----------------------- ui/src/windows/tracker/actions.cpp | 13 +---- 3 files changed, 3 insertions(+), 187 deletions(-) delete mode 100644 ui/src/windows/participant_editor.cpp delete mode 100644 ui/src/windows/participant_editor.ui (limited to 'ui/src/windows') diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp deleted file mode 100644 index 9177c9a..0000000 --- a/ui/src/windows/participant_editor.cpp +++ /dev/null @@ -1,106 +0,0 @@ -#include "turns/ui/windows/participant_editor.hpp" - -#include "turns/core/disposition.hpp" -#include "turns/core/participant.hpp" -#include "turns/lang/messages.hpp" - -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -namespace turns::ui::windows -{ - - participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj) - : Dialog{base} - , m_disposition{builder->get_widget("disposition")} - , m_finish{builder->get_widget("finish")} - , m_name{builder->get_widget("name")} - , m_priority{builder->get_widget("priority")} - , m_disposition_factory{Gtk::SignalListItemFactory::create()} - , m_disposition_model{Gtk::StringList::create()} - , m_participant{obj} - - { - set_title(_(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(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)); - - m_disposition->set_factory(m_disposition_factory); - m_disposition->set_model(m_disposition_model); - - if (m_participant) - { - m_name->set_text(m_participant->property_name().get_value()); - m_priority->set_value(m_participant->property_priority()); - m_disposition->set_selected(static_cast(m_participant->property_disposition().get_value())); - } - } - - auto participant_editor::signal_finished() -> signal_finished_type - { - return m_signal_finished; - } - - auto participant_editor::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 participant_editor::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 participant_editor::handle_item_setup(Glib::RefPtr item) -> void - { - item->set_child(*Gtk::make_managed()); - } - -} // namespace turns::ui::windows \ No newline at end of file diff --git a/ui/src/windows/participant_editor.ui b/ui/src/windows/participant_editor.ui deleted file mode 100644 index 1cbaf5c..0000000 --- a/ui/src/windows/participant_editor.ui +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - True - 18 - 12 - 12 - 18 - vertical - 18 - start - - - - - Name - - - - - - - -1000.0 - 1.0 - 1000.0 - - - 1 - True - Priority - - - - - Disposition - - - - - - - True - Finish - - - - - - - - - - - - - True - - diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/windows/tracker/actions.cpp index bbb0c7e..54580ca 100644 --- a/ui/src/windows/tracker/actions.cpp +++ b/ui/src/windows/tracker/actions.cpp @@ -1,7 +1,7 @@ #include "turns/core/participant.hpp" #include "turns/lang/messages.hpp" +#include "turns/ui/widgets/participant_editor.hpp" #include "turns/ui/widgets/preferences.hpp" -#include "turns/ui/windows/participant_editor.hpp" #include "turns/ui/windows/tracker.hpp" #include @@ -35,12 +35,6 @@ namespace turns::ui::windows { namespace { - auto editor_for(Glib::RefPtr participant) - { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); - return std::pair{builder, Gtk::Builder::get_widget_derived(builder, "participant_editor", participant)}; - } - auto file_filters() { auto filters = Gio::ListStore::create(); @@ -54,7 +48,7 @@ namespace turns::ui::windows auto tracker::add_participant() -> void { - auto [lifeline, dialog] = editor_for(nullptr); + auto dialog = Gtk::make_managed(nullptr); dialog->present(this); dialog->signal_finished().connect([this](auto n, auto p, auto d) { m_turn_order->add(n, p, d); }); } @@ -67,10 +61,9 @@ namespace turns::ui::windows auto tracker::edit_participant(Glib::VariantBase param) -> void { - static_cast(param); auto index = Glib::VariantBase::cast_dynamic>(param); auto participant = m_turn_order->get_typed_object(index.get()); - auto [lifeline, dialog] = editor_for(participant); + auto dialog = Gtk::make_managed(participant); dialog->present(this); } -- cgit v1.2.3