ui: remove adwaita C-API usage

4 files changed, 17 insertions, 16 deletions

diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp
index 7cfe766..9177c9a 100644
--- a/ui/src/windows/participant_editor.cpp
+++ b/ui/src/windows/participant_editor.cpp
@@ -22,9 +22,11 @@
 #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 <adwaita.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
@@ -37,10 +39,10 @@ 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{ADW_COMBO_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("disposition")))}
+      , m_disposition{builder->get_widget<Adwaita::ComboRow>("disposition")}
       , m_finish{builder->get_widget<Gtk::Button>("finish")}
-      , m_name{ADW_ENTRY_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("name")))}
-      , m_priority{ADW_SPIN_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("priority")))}
+      , 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}
@@ -57,14 +59,14 @@ namespace turns::ui::windows
     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));
 
-    adw_combo_row_set_factory(m_disposition, GTK_LIST_ITEM_FACTORY(Glib::unwrap(m_disposition_factory)));
-    adw_combo_row_set_model(m_disposition, G_LIST_MODEL(Glib::unwrap(m_disposition_model)));
+    m_disposition->set_factory(m_disposition_factory);
+    m_disposition->set_model(m_disposition_model);
 
     if (m_participant)
     {
-      gtk_editable_set_text(GTK_EDITABLE(m_name), m_participant->property_name().get_value().c_str());
-      adw_spin_row_set_value(m_priority, m_participant->property_priority());
-      adw_combo_row_set_selected(m_disposition, static_cast<unsigned>(m_participant->property_disposition().get_value()));
+      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()));
     }
   }
 
@@ -75,9 +77,9 @@ namespace turns::ui::windows
 
   auto participant_editor::handle_finish_clicked() -> void
   {
-    auto name = gtk_editable_get_text(GTK_EDITABLE(m_name));
-    auto priority = adw_spin_row_get_value(m_priority);
-    auto disposition = static_cast<core::disposition>(adw_combo_row_get_selected(m_disposition));
+    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)
     {
diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp
index df16a9e..851d233 100644
--- a/ui/src/windows/tracker.cpp
+++ b/ui/src/windows/tracker.cpp
@@ -34,6 +34,7 @@
 #include <adwaitamm/applicationwindow.hpp>
 #include <adwaitamm/toast.hpp>
 #include <adwaitamm/toastoverlay.hpp>
+#include <adwaitamm/windowtitle.hpp>
 
 #include <gtk/gtk.h>
 #include <nlohmann/json.hpp>
@@ -54,11 +55,11 @@ namespace turns::ui::windows
       , m_overlay{builder->get_widget<Adwaita::ToastOverlay>("overlay")}
       , m_stack{builder->get_widget<Gtk::Stack>("stack")}
       , m_start{builder->get_widget<Gtk::Button>("start")}
-      , m_title{builder->get_widget<Gtk::Widget>("title")}
+      , m_title{builder->get_widget<Adwaita::WindowTitle>("title")}
       , m_turn_order{core::turn_order::create()}
       , m_turn_order_view{Gtk::make_managed<widgets::turn_order_view>(m_turn_order)}
       , m_settings{std::move(settings)}
-      , m_subtitle{m_title, "subtitle"}
+      , m_subtitle{m_title->property_subtitle()}
       , m_css{Gtk::CssProvider::create()}
   {
     setup_colors();
diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/windows/tracker/actions.cpp
index 3539816..36d12f3 100644
--- a/ui/src/windows/tracker/actions.cpp
+++ b/ui/src/windows/tracker/actions.cpp
@@ -26,7 +26,6 @@
 #include <adwaitamm/enums.hpp>
 #include <adwaitamm/preferencesdialog.hpp>
 
-#include <adwaita.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
diff --git a/ui/src/windows/tracker/event_handlers.cpp b/ui/src/windows/tracker/event_handlers.cpp
index e33e889..a3cf788 100644
--- a/ui/src/windows/tracker/event_handlers.cpp
+++ b/ui/src/windows/tracker/event_handlers.cpp
@@ -12,7 +12,6 @@
 
 #include <gtkmm/filedialog.h>
 
-#include <adwaita.h>
 #include <nlohmann/json.hpp>
 
 #include <cstddef>