summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@gmail.com>2025-04-29 15:55:30 +0200
committerFelix Morgner <felix.morgner@gmail.com>2025-04-29 15:55:30 +0200
commit873bf396b904ce477a238f22d1891e1b03f24eff (patch)
tree3b1906644e032a94ce7968851e98349e4acb9501
parente84e5e463ce9fc735e9a9d8e03da884d3babb71b (diff)
downloadturns-873bf396b904ce477a238f22d1891e1b03f24eff.tar.xz
turns-873bf396b904ce477a238f22d1891e1b03f24eff.zip
ui: convert editor into a template_widget
-rw-r--r--ui/CMakeLists.txt4
-rw-r--r--ui/include/turns/ui/widgets/fwd.hpp1
-rw-r--r--ui/include/turns/ui/widgets/participant_editor.hpp73
-rw-r--r--ui/include/turns/ui/windows/fwd.hpp1
-rw-r--r--ui/include/turns/ui/windows/participant_editor.hpp54
-rw-r--r--ui/src/init.cpp2
-rw-r--r--ui/src/widgets/participant_editor.cpp139
-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.cpp106
-rw-r--r--ui/src/windows/tracker/actions.cpp13
-rw-r--r--ui/tests/widgets/participant_editor.cpp (renamed from ui/tests/windows/participant_editor.cpp)29
-rw-r--r--ui/tests/windows/resources.cpp10
-rw-r--r--ui/ui.cmb2
13 files changed, 235 insertions, 203 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 736db84..212559c 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -2,10 +2,10 @@
add_library("ui"
"src/init.cpp"
+ "src/widgets/participant_editor.cpp"
"src/widgets/participant_row.cpp"
"src/widgets/preferences.cpp"
"src/widgets/turn_order_view.cpp"
- "src/windows/participant_editor.cpp"
"src/windows/tracker.cpp"
"src/windows/tracker/actions.cpp"
"src/windows/tracker/event_handlers.cpp"
@@ -50,7 +50,7 @@ add_executable("ui-tests"
"tests/gtk_test_init.cpp"
"tests/widgets/participant_row.cpp"
- "tests/windows/participant_editor.cpp"
+ "tests/widgets/participant_editor.cpp"
"tests/windows/resources.cpp"
"tests/windows/tracker.cpp"
)
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 <sigc++/signal.h>
+
+#include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/listitem.h>
+#include <gtkmm/signallistitemfactory.h>
+#include <gtkmm/stringlist.h>
+#include <gtkmm/widget.h>
+
+#include <adwaitamm/comborow.hpp>
+#include <adwaitamm/dialog.hpp>
+#include <adwaitamm/entryrow.hpp>
+#include <adwaitamm/spinrow.hpp>
+
+#include <array>
+
+namespace turns::ui::widgets
+{
+
+ struct ParticipantEditor : template_widget<ParticipantEditor, Adwaita::Dialog>
+ {
+ using SignalFinishedType = sigc::signal<void(Glib::ustring, float, core::disposition)>;
+
+ auto constexpr inline static children = std::array{
+ "disposition",
+ "finish",
+ "name",
+ "priority",
+ };
+
+ ParticipantEditor(Glib::RefPtr<core::participant> 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<Gtk::ListItem> item) -> void;
+ auto handle_item_setup(Glib::RefPtr<Gtk::ListItem> item) -> void;
+
+ Adwaita::ComboRow * m_disposition;
+ Gtk::Button * m_finish;
+ Adwaita::EntryRow * m_name;
+ Adwaita::SpinRow * m_priority;
+
+ Glib::RefPtr<Gtk::SignalListItemFactory> m_disposition_factory;
+ Glib::RefPtr<Gtk::StringList> m_disposition_model;
+
+ Glib::RefPtr<core::participant> 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 <sigc++/signal.h>
-
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-
-#include <gtkmm/builder.h>
-#include <gtkmm/button.h>
-#include <gtkmm/listitem.h>
-#include <gtkmm/signallistitemfactory.h>
-#include <gtkmm/stringlist.h>
-#include <gtkmm/widget.h>
-
-#include <adwaitamm/comborow.hpp>
-#include <adwaitamm/dialog.hpp>
-#include <adwaitamm/entryrow.hpp>
-#include <adwaitamm/spinrow.hpp>
-
-namespace turns::ui::windows
-{
-
- struct participant_editor : Adwaita::Dialog
- {
- using signal_finished_type = sigc::signal<void(Glib::ustring, float, core::disposition)>;
-
- participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj = {});
-
- auto signal_finished() -> signal_finished_type;
-
- private:
- auto handle_finish_clicked() -> void;
- auto handle_item_bind(Glib::RefPtr<Gtk::ListItem> item) -> void;
- auto handle_item_setup(Glib::RefPtr<Gtk::ListItem> item) -> void;
-
- Adwaita::ComboRow * m_disposition;
- Gtk::Button * m_finish;
- Adwaita::EntryRow * m_name;
- Adwaita::SpinRow * m_priority;
-
- Glib::RefPtr<Gtk::SignalListItemFactory> m_disposition_factory;
- Glib::RefPtr<Gtk::StringList> m_disposition_model;
-
- Glib::RefPtr<core::participant> m_participant;
-
- signal_finished_type m_signal_finished{};
- };
-
-} // namespace turns::ui::windows
-
-#endif \ No newline at end of file
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);
}
diff --git a/ui/tests/windows/participant_editor.cpp b/ui/tests/widgets/participant_editor.cpp
index 02e387f..41ba5bd 100644
--- a/ui/tests/windows/participant_editor.cpp
+++ b/ui/tests/widgets/participant_editor.cpp
@@ -1,4 +1,4 @@
-#include "turns/ui/windows/participant_editor.hpp"
+#include "turns/ui/widgets/participant_editor.hpp"
#include "turns/core/disposition.hpp"
#include "turns/core/participant.hpp"
@@ -21,8 +21,9 @@
#include <gtk/gtk.h>
#include <clocale>
+#include <memory>
-namespace turns::ui::windows::tests
+namespace turns::ui::widgets::tests
{
TEST_CASE("A freshly constructed participant editor without a participant", "[windows]")
@@ -30,8 +31,7 @@ namespace turns::ui::windows::tests
auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
setlocale(LC_ALL, locale);
- auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
- auto instance = Gtk::Builder::get_widget_derived<participant_editor>(builder, "participant_editor");
+ auto instance = std::make_shared<ParticipantEditor>(nullptr);
auto window = Gtk::Window{};
SECTION("was successfully constructed")
@@ -49,16 +49,14 @@ namespace turns::ui::windows::tests
REQUIRE(instance->get_title() == _(lang::add_participant));
}
- SECTION("has an empty name field")
+ SECTION("has an empty name")
{
- auto widget = builder->get_widget<Adwaita::EntryRow>("name");
- REQUIRE(widget->get_text().empty());
+ REQUIRE(instance->get_name().empty());
}
- SECTION("has a zero priority field")
+ SECTION("has a zero priority")
{
- auto widget = builder->get_widget<Adwaita::SpinRow>("priority");
- REQUIRE(widget->get_value() == 0);
+ REQUIRE(instance->get_priority() == 0);
}
SECTION("allows binding to the finished signal")
@@ -73,8 +71,7 @@ namespace turns::ui::windows::tests
setlocale(LC_ALL, locale);
auto participant = core::participant::create("Qibi Babblebranch", 12, core::disposition::neutral);
- auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui");
- auto instance = Gtk::Builder::get_widget_derived<participant_editor>(builder, "participant_editor", participant);
+ auto instance = std::make_shared<ParticipantEditor>(participant);
auto window = Gtk::Window{};
SECTION("was successfully constructed")
@@ -94,14 +91,12 @@ namespace turns::ui::windows::tests
SECTION("has its name field set according to its participant")
{
- auto widget = builder->get_widget<Adwaita::EntryRow>("name");
- REQUIRE(widget->get_text() == participant->property_name().get_value());
+ REQUIRE(instance->get_name() == participant->property_name().get_value());
}
SECTION("has its priority field set according to its participant")
{
- auto widget = builder->get_widget<Adwaita::SpinRow>("priority");
- REQUIRE(widget->get_value() == participant->property_priority());
+ REQUIRE(instance->get_priority() == participant->property_priority());
}
SECTION("allows binding to the finished signal")
@@ -110,4 +105,4 @@ namespace turns::ui::windows::tests
}
}
-} // namespace turns::ui::windows::tests \ No newline at end of file
+} // namespace turns::ui::widgets::tests \ No newline at end of file
diff --git a/ui/tests/windows/resources.cpp b/ui/tests/windows/resources.cpp
index b9ac42e..022f3c4 100644
--- a/ui/tests/windows/resources.cpp
+++ b/ui/tests/windows/resources.cpp
@@ -12,13 +12,3 @@ TEST_CASE("GResource for tracker")
REQUIRE(builder);
}
}
-
-TEST_CASE("GResource for participant_editor")
-{
- auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
-
- SECTION("can create Gtk.Builder for the participant_editor window UI definition")
- {
- REQUIRE(builder);
- }
-} \ No newline at end of file
diff --git a/ui/ui.cmb b/ui/ui.cmb
index c16dfb7..d042398 100644
--- a/ui/ui.cmb
+++ b/ui/ui.cmb
@@ -3,7 +3,7 @@
<!-- Created with Cambalache 0.96.0 -->
<cambalache-project version="0.96.0" target_tk="gtk-4.0">
<ui filename="src/windows/tracker.ui" sha256="42f969578c4270a07d66510c5694aea2f84dd44a8cd486a194d6c4441384b6c8"/>
- <ui filename="src/windows/participant_editor.ui" sha256="9e57bbf2ce59f58ecec91145368b82f5d8869e6a220a2b4360c23953ede9b28e"/>
+ <ui template-class="gtkmm__CustomObject_ParticipantEditor" filename="src/widgets/participant_editor.ui" sha256="175e5445abfe35525885929739b998e9b5d5379bc01dfbef798c52ef8870cf96"/>
<ui template-class="gtkmm__CustomObject_participant_row" filename="src/widgets/participant_row.ui" sha256="c807d84027f3c957b38b3aca21d13aa07bcf01ef4df3e1c3451eef098d6da046"/>
<ui template-class="gtkmm__CustomObject_turn_order_view" filename="src/widgets/turn_order_view.ui" sha256="d8b41adf9c578f70d7e94bde8983a22c73a861847e28f7b9e5665f44cdb05cbf"/>
<ui template-class="gtkmm__CustomObject_preferences" filename="src/widgets/preferences.ui" sha256="bc7c7622f9533cab9f10346406d6b8bf44a6d2dae0bbae0cee60aea7b7a85bab"/>