diff options
Diffstat (limited to 'ui/src')
| -rw-r--r-- | ui/src/init.cpp | 2 | ||||
| -rw-r--r-- | ui/src/widgets/participant_editor.cpp | 139 | ||||
| -rw-r--r-- | ui/src/widgets/participant_editor.ui (renamed from ui/src/windows/participant_editor.ui) | 4 | ||||
| -rw-r--r-- | ui/src/windows/participant_editor.cpp | 106 | ||||
| -rw-r--r-- | ui/src/windows/tracker/actions.cpp | 13 |
5 files changed, 146 insertions, 118 deletions
diff --git a/ui/src/init.cpp b/ui/src/init.cpp index f8c9e35..6139044 100644 --- a/ui/src/init.cpp +++ b/ui/src/init.cpp @@ -1,5 +1,6 @@ #include "turns/ui/init.hpp" +#include "turns/ui/widgets/participant_editor.hpp" #include "turns/ui/widgets/participant_row.hpp" #include "turns/ui/widgets/preferences.hpp" #include "turns/ui/widgets/turn_order_view.hpp" @@ -9,6 +10,7 @@ namespace turns::ui auto register_types() -> void { + static_cast<void>(widgets::ParticipantEditor{{}}); static_cast<void>(widgets::participant_row{{}}); static_cast<void>(widgets::preferences{{}}); static_cast<void>(widgets::turn_order_view{{}}); diff --git a/ui/src/widgets/participant_editor.cpp b/ui/src/widgets/participant_editor.cpp new file mode 100644 index 0000000..816ad09 --- /dev/null +++ b/ui/src/widgets/participant_editor.cpp @@ -0,0 +1,139 @@ +#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 <sigc++/functors/mem_fun.h> + +#include <glibmm/i18n.h> +#include <glibmm/objectbase.h> +#include <glibmm/refptr.h> +#include <glibmm/ustring.h> + +#include <gtkmm/button.h> +#include <gtkmm/label.h> +#include <gtkmm/listitem.h> +#include <gtkmm/object.h> +#include <gtkmm/signallistitemfactory.h> +#include <gtkmm/stringlist.h> +#include <gtkmm/stringobject.h> + +#include <adwaitamm/comborow.hpp> +#include <adwaitamm/dialog.hpp> +#include <adwaitamm/entryrow.hpp> +#include <adwaitamm/spinrow.hpp> + +#include <glib/gi18n.h> + +#include <cstdint> +#include <memory> +#include <ranges> + +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<core::participant> participant) + : Glib::ObjectBase{TYPE_NAME} + , template_widget{TEMPLATE} + , m_disposition{get_widget<Adwaita::ComboRow>("disposition")} + , m_finish{get_widget<Gtk::Button>("finish")} + , m_name{get_widget<Adwaita::EntryRow>("name")} + , m_priority{get_widget<Adwaita::SpinRow>("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<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, &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<core::disposition>(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<unsigned>(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<core::disposition>(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<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 ParticipantEditor::handle_item_setup(Glib::RefPtr<Gtk::ListItem> item) -> void + { + item->set_child(*Gtk::make_managed<Gtk::Label>()); + } + +} // namespace turns::ui::widgets
\ No newline at end of file diff --git a/ui/src/windows/participant_editor.ui b/ui/src/widgets/participant_editor.ui index 1cbaf5c..6bcf83e 100644 --- a/ui/src/windows/participant_editor.ui +++ b/ui/src/widgets/participant_editor.ui @@ -4,7 +4,7 @@ <!-- interface-name participant_editor.ui --> <requires lib="gtk" version="4.18"/> <requires lib="libadwaita" version="1.7"/> - <object class="AdwDialog" id="participant_editor"> + <template class="gtkmm__CustomObject_ParticipantEditor" parent="AdwDialog"> <property name="child"> <object class="AdwToolbarView"> <property name="content"> @@ -67,5 +67,5 @@ </object> </property> <property name="hexpand">True</property> - </object> + </template> </interface> 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 <sigc++/functors/mem_fun.h> - -#include <glibmm/i18n.h> -#include <glibmm/refptr.h> -#include <glibmm/wrap.h> - -#include <gtkmm/builder.h> -#include <gtkmm/button.h> -#include <gtkmm/editable.h> -#include <gtkmm/label.h> -#include <gtkmm/listboxrow.h> -#include <gtkmm/listitem.h> -#include <gtkmm/object.h> -#include <gtkmm/signallistitemfactory.h> -#include <gtkmm/stringlist.h> -#include <gtkmm/stringobject.h> -#include <gtkmm/widget.h> - -#include <adwaitamm/comborow.hpp> -#include <adwaitamm/dialog.hpp> -#include <adwaitamm/entryrow.hpp> -#include <adwaitamm/spinrow.hpp> - -#include <gio/gio.h> -#include <gtk/gtk.h> - -#include <cstdint> -#include <memory> -#include <ranges> - -namespace turns::ui::windows -{ - - participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj) - : Dialog{base} - , m_disposition{builder->get_widget<Adwaita::ComboRow>("disposition")} - , m_finish{builder->get_widget<Gtk::Button>("finish")} - , m_name{builder->get_widget<Adwaita::EntryRow>("name")} - , m_priority{builder->get_widget<Adwaita::SpinRow>("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<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)); - - 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<unsigned>(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<core::disposition>(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<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::ui::windows
\ No newline at end of file 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 <sigc++/adaptors/bind.h> @@ -35,12 +35,6 @@ namespace turns::ui::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<participant_editor>(builder, "participant_editor", participant)}; - } - auto file_filters() { auto filters = Gio::ListStore<Gtk::FileFilter>::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<widgets::ParticipantEditor>(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<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); + auto dialog = Gtk::make_managed<widgets::ParticipantEditor>(participant); dialog->present(this); } |