1 files changed, 27 insertions, 29 deletions

diff --git a/gui/src/tracker_actions.cpp b/gui/src/tracker_actions.cpp
index 7149f0e..8c9820a 100644
--- a/gui/src/tracker_actions.cpp
+++ b/gui/src/tracker_actions.cpp
@@ -3,40 +3,38 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-#include "turns/core/participant.hpp"
-#include "turns/lang/messages.hpp"
-#include "turns/ui/participant_editor.hpp"
-#include "turns/ui/preferences.hpp"
-#include "turns/ui/tracker.hpp"
+#include "messages.hpp"
+#include "participant_editor.hpp"
+#include "preferences.hpp"
+#include "tracker.hpp"
+
+#include <turnsmm/participant.hpp>
 
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
 
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+#include <adwaitamm/alertdialog.hpp>
+#include <adwaitamm/dialog.hpp>
+#include <adwaitamm/enums.hpp>
+#include <adwaitamm/preferencesdialog.hpp>
+#include <giomm/liststore.h>
+#include <giomm/settings.h>
 #include <glibmm/i18n.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
 #include <glibmm/wrap.h>
-
-#include <giomm/liststore.h>
-#include <giomm/settings.h>
-
 #include <gtkmm/builder.h>
 #include <gtkmm/filedialog.h>
 #include <gtkmm/filefilter.h>
 #include <gtkmm/object.h>
 
-#include <adwaitamm/alertdialog.hpp>
-#include <adwaitamm/dialog.hpp>
-#include <adwaitamm/enums.hpp>
-#include <adwaitamm/preferencesdialog.hpp>
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
 #include <utility>
 
-namespace turns::ui
+namespace Turns::gui
 {
   namespace
   {
@@ -54,20 +52,20 @@ namespace turns::ui
   auto Tracker::add_participant() -> void
   {
     auto dialog = Gtk::make_managed<ParticipantEditor>(nullptr);
-    dialog->signal_finished().connect([this](auto n, auto p, auto d) { m_turn_order->add(n, p, d); });
+    dialog->signal_finished().connect([this](auto n, auto p, auto d) { m_turn_order->add(Participant::create(n, p, d)); });
     dialog->present(this);
   }
 
   auto Tracker::delete_participant(Glib::VariantBase param) -> void
   {
     auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-    m_turn_order->remove(index.get());
+    m_turn_order->remove_at(index.get());
   }
 
   auto Tracker::edit_participant(Glib::VariantBase param) -> void
   {
     auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-    auto participant = m_turn_order->get_typed_object<core::Participant>(index.get());
+    auto participant = m_turn_order->get_typed_object<Participant>(index.get());
     auto dialog = Gtk::make_managed<ParticipantEditor>(participant);
     dialog->present(this);
   }
@@ -81,7 +79,7 @@ namespace turns::ui
 
   auto Tracker::preferences() -> void
   {
-    auto preferences = Gtk::make_managed<struct Preferences>(m_settings);
+    auto preferences = Gtk::make_managed<Preferences>(m_settings);
     auto dialog = Gtk::make_managed<Adwaita::PreferencesDialog>();
     dialog->add(*preferences);
     dialog->set_visible_page(*preferences);
@@ -97,7 +95,7 @@ namespace turns::ui
     else
     {
       auto dialog = Gtk::FileDialog::create();
-      m_file ? dialog->set_initial_file(m_file) : dialog->set_initial_name(_(lang::new_turn_order_file_name));
+      m_file ? dialog->set_initial_file(m_file) : dialog->set_initial_name(_(message::new_turn_order_file_name));
       dialog->set_filters(file_filters());
       dialog->save(*this, sigc::bind(sigc::mem_fun(*this, &Tracker::on_save_response), dialog));
     }
@@ -105,12 +103,12 @@ namespace turns::ui
 
   auto Tracker::stop() -> void
   {
-    auto dialog = Adwaita::AlertDialog::create(_(lang::stop_turn_order), _(lang::question_clear_turn_order));
-    dialog->add_response("stop", _(lang::stop));
+    auto dialog = Adwaita::AlertDialog::create(_(message::stop_turn_order), _(message::question_clear_turn_order));
+    dialog->add_response("stop", _(message::stop));
     dialog->set_response_appearance("stop", Adwaita::ResponseAppearance::Suggested);
-    dialog->add_response("clear", _(lang::stop_and_clear));
+    dialog->add_response("clear", _(message::stop_and_clear));
     dialog->set_response_appearance("clear", Adwaita::ResponseAppearance::Destructive);
-    dialog->add_response("cancel", _(lang::cancel));
+    dialog->add_response("cancel", _(message::cancel));
     dialog->set_response_appearance("cancel", Adwaita::ResponseAppearance::Default);
     dialog->set_close_response("cancel");
     dialog->set_default_response("cancel");
@@ -124,7 +122,7 @@ namespace turns::ui
       {
         m_turn_order->clear();
       }
-      m_turn_order->stop();
+      // m_turn_order->stop();
     });
   }
-}  // namespace turns::ui
\ No newline at end of file
+}  // namespace Turns::gui
\ No newline at end of file