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/include/turns/ui/widgets/fwd.hpp | 1 + ui/include/turns/ui/widgets/participant_editor.hpp | 73 ++++++++++++++++++++++ ui/include/turns/ui/windows/fwd.hpp | 1 - ui/include/turns/ui/windows/participant_editor.hpp | 54 ---------------- 4 files changed, 74 insertions(+), 55 deletions(-) create mode 100644 ui/include/turns/ui/widgets/participant_editor.hpp delete mode 100644 ui/include/turns/ui/windows/participant_editor.hpp (limited to 'ui/include') diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/widgets/fwd.hpp index 7bf8714..69f324d 100644 --- a/ui/include/turns/ui/widgets/fwd.hpp +++ b/ui/include/turns/ui/widgets/fwd.hpp @@ -3,6 +3,7 @@ namespace turns::ui::widgets { + struct participant_editor; struct participant_row; struct turn_order_view; struct preferences; diff --git a/ui/include/turns/ui/widgets/participant_editor.hpp b/ui/include/turns/ui/widgets/participant_editor.hpp new file mode 100644 index 0000000..2fab47d --- /dev/null +++ b/ui/include/turns/ui/widgets/participant_editor.hpp @@ -0,0 +1,73 @@ +#ifndef TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP +#define TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP + +#include "turns/core/disposition.hpp" +#include "turns/core/fwd.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 +{ + + struct ParticipantEditor : template_widget + { + using SignalFinishedType = sigc::signal; + + auto constexpr inline static children = std::array{ + "disposition", + "finish", + "name", + "priority", + }; + + ParticipantEditor(Glib::RefPtr participant); + + [[nodiscard]] auto get_disposition() const -> core::disposition; + [[nodiscard]] auto get_name() const -> Glib::ustring; + [[nodiscard]] auto get_priority() const -> double; + + auto set_disposition(core::disposition value) -> void; + auto set_name(Glib::ustring const & value) -> void; + auto set_priority(double value) -> void; + + auto signal_finished() -> SignalFinishedType; + + private: + auto handle_finish_clicked() -> void; + auto handle_item_bind(Glib::RefPtr item) -> void; + auto handle_item_setup(Glib::RefPtr item) -> void; + + Adwaita::ComboRow * m_disposition; + Gtk::Button * m_finish; + Adwaita::EntryRow * m_name; + Adwaita::SpinRow * m_priority; + + Glib::RefPtr m_disposition_factory; + Glib::RefPtr m_disposition_model; + + Glib::RefPtr m_participant; + + SignalFinishedType m_signal_finished{}; + }; + +} // namespace turns::ui::widgets + +#endif \ No newline at end of file diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp index f228d7b..14dbfd1 100644 --- a/ui/include/turns/ui/windows/fwd.hpp +++ b/ui/include/turns/ui/windows/fwd.hpp @@ -3,7 +3,6 @@ namespace turns::ui::windows { - struct participant_editor; struct tracker; } // namespace turns::ui::windows diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp deleted file mode 100644 index 81ea3e1..0000000 --- a/ui/include/turns/ui/windows/participant_editor.hpp +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef TURNS_UI_WINDOWS_PARTICIPANT_EDITOR_HPP -#define TURNS_UI_WINDOWS_PARTICIPANT_EDITOR_HPP - -#include "turns/core/fwd.hpp" - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -namespace turns::ui::windows -{ - - struct participant_editor : Adwaita::Dialog - { - using signal_finished_type = sigc::signal; - - participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj = {}); - - auto signal_finished() -> signal_finished_type; - - private: - auto handle_finish_clicked() -> void; - auto handle_item_bind(Glib::RefPtr item) -> void; - auto handle_item_setup(Glib::RefPtr item) -> void; - - Adwaita::ComboRow * m_disposition; - Gtk::Button * m_finish; - Adwaita::EntryRow * m_name; - Adwaita::SpinRow * m_priority; - - Glib::RefPtr m_disposition_factory; - Glib::RefPtr m_disposition_model; - - Glib::RefPtr m_participant; - - signal_finished_type m_signal_finished{}; - }; - -} // namespace turns::ui::windows - -#endif \ No newline at end of file -- cgit v1.2.3