1 files changed, 13 insertions, 23 deletions

diff --git a/app/src/windows/main.cpp b/app/src/windows/main.cpp
index 68d2c5f..04d7329 100644
--- a/app/src/windows/main.cpp
+++ b/app/src/windows/main.cpp
@@ -27,60 +27,50 @@ namespace turns::app::windows
       : Gtk::ApplicationWindow{base}
       , m_adw{ADW_APPLICATION_WINDOW(gobj())}
       , m_empty(builder->get_widget<Gtk::Widget>("empty"))
-      , m_participant_list{builder->get_widget<Gtk::ListBox>("participant_list")}
       , m_stack{builder->get_widget<Gtk::Stack>("stack")}
       , m_title(ADW_WINDOW_TITLE(builder->get_widget<Gtk::Widget>("title")->gobj()))
-      , m_turn_order{builder->get_widget<Gtk::ScrolledWindow>("turn_order")}
-      , m_participant_list_data{domain::turn_order::create()}
+      , m_turn_order{Gtk::make_managed<widgets::turn_order_view>()}
       , m_subtitle{Glib::wrap(GTK_WIDGET(m_title)), "subtitle"}
-      , m_clear_action{add_action("clear", sigc::mem_fun(*this, &main::handle_clear))}
+      , m_clear_action{add_action("clear", sigc::mem_fun(*m_turn_order, &widgets::turn_order_view::clear))}
   {
-    m_clear_action_enabled = Glib::Binding::bind_property(m_participant_list_data->property_n_items(),
+    m_stack->add(*m_turn_order);
+
+    // clang-format off
+    m_clear_action_enabled = Glib::Binding::bind_property(m_turn_order->property_n_items(),
                                                           m_clear_action->property_enabled(),
                                                           Glib::Binding::Flags::SYNC_CREATE);
 
-    m_visible_child_widget = Glib::Binding::bind_property(m_participant_list_data->property_n_items(),
+    m_visible_child_widget = Glib::Binding::bind_property(m_turn_order->property_n_items(),
                                                           m_stack->property_visible_child(),
                                                           Glib::Binding::Flags::SYNC_CREATE,
                                                           [this](auto count) { return count ? m_turn_order : m_empty; });
 
-    m_subtitle_text = Glib::Binding::bind_property(m_participant_list_data->property_n_items(),
+    m_subtitle_text = Glib::Binding::bind_property(m_turn_order->property_n_items(),
                                                    m_subtitle,
                                                    Glib::Binding::Flags::SYNC_CREATE,
                                                    [](auto count) { return count ? "" : _(lang::no_active_turn_order); });
-
-    m_participant_list->bind_model(m_participant_list_data, sigc::mem_fun(*this, &main::handle_create_list_row));
+    // clang-format on
 
     add_action("add_participant", sigc::mem_fun(*this, &main::handle_add_participant));
     add_action_with_parameter("delete", Glib::VARIANT_TYPE_INT32, [this](auto param) {
       auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-      m_participant_list_data->remove(index.get());
+      m_turn_order->remove(index.get());
     });
     add_action_with_parameter("edit", Glib::VARIANT_TYPE_INT32, sigc::mem_fun(*this, &main::handle_edit_participant));
   }
 
-  auto main::handle_create_list_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *
-  {
-    auto participant = std::dynamic_pointer_cast<domain::participant>(item);
-    return Gtk::make_managed<widgets::participant_row>(participant);
-  }
-
   auto main::handle_add_participant() -> void
   {
     auto [lifeline, dialog] = editor_for(nullptr);
     dialog->present(this);
-    dialog->signal_finished().connect([this](auto name, auto priority, auto disposition) { m_participant_list_data->append(name, priority, disposition); });
-  }
-
-  auto main::handle_clear() -> void
-  {
-    m_participant_list_data->remove_all();
+    dialog->signal_finished().connect(sigc::mem_fun(*m_turn_order, &widgets::turn_order_view::append));
   }
 
   auto main::handle_edit_participant(Glib::VariantBase param) -> void
   {
+    static_cast<void>(param);
     auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-    auto participant = m_participant_list_data->get_item(index.get());
+    auto participant = m_turn_order->get(index.get());
     auto [lifeline, dialog] = editor_for(participant);
     dialog->present(this);
   }