From 938328d3c87d5b7f2d56921cc5893f1c2d98302d Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 5 Jun 2025 14:42:44 +0200 Subject: gui: reintroduce TurnOrderView --- gui/src/init.cpp | 2 ++ gui/src/turn_order_view.cpp | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'gui/src') diff --git a/gui/src/init.cpp b/gui/src/init.cpp index 4d68929..4e36947 100644 --- a/gui/src/init.cpp +++ b/gui/src/init.cpp @@ -3,6 +3,7 @@ #include "participant_editor.hpp" #include "participant_row.hpp" #include "preferences.hpp" +#include "turn_order_view.hpp" #include @@ -11,4 +12,5 @@ auto Turns::gui::init() -> void g_type_ensure(ParticipantRow{nullptr}.get_type()); g_type_ensure(ParticipantEditor{nullptr}.get_type()); g_type_ensure(Preferences{}.get_type()); + g_type_ensure(TurnOrderView{}.get_type()); } diff --git a/gui/src/turn_order_view.cpp b/gui/src/turn_order_view.cpp index 5e5d550..89f4c81 100644 --- a/gui/src/turn_order_view.cpp +++ b/gui/src/turn_order_view.cpp @@ -3,11 +3,12 @@ * SPDX-License-Identifier: LGPL-2.1-only */ -#include "turns/ui/turn_order_view.hpp" +#include "turn_order_view.hpp" -#include "turns/core/participant.hpp" -#include "turns/ui/participant_row.hpp" -#include "turns/ui/template_widget.hpp" +#include "participant_row.hpp" +#include "template_widget.hpp" + +#include #include @@ -15,7 +16,6 @@ #include #include #include - #include #include #include @@ -24,7 +24,7 @@ #include -namespace turns::ui +namespace Turns::gui { namespace { @@ -47,23 +47,23 @@ namespace turns::ui set_orientation(Gtk::Orientation::VERTICAL); m_view->bind_model(m_model, sigc::mem_fun(*this, &TurnOrderView::handle_create_row)); - Glib::Binding::bind_property(m_model->progress(), m_progress->property_fraction(), Glib::Binding::Flags::SYNC_CREATE); + // Glib::Binding::bind_property(m_model->progress(), m_progress->property_fraction(), Glib::Binding::Flags::SYNC_CREATE); } auto TurnOrderView::handle_create_row(Glib::RefPtr const item) -> Gtk::Widget * { - auto participant = std::dynamic_pointer_cast(item); + auto participant = std::dynamic_pointer_cast(item); auto row = Gtk::make_managed(participant); - Glib::Binding::bind_property(m_model->is_running(), + Glib::Binding::bind_property(m_model->property_running(), row->delete_enabled(), Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); - Glib::Binding::bind_property(m_model->is_running(), + Glib::Binding::bind_property(m_model->property_running(), row->edit_enabled(), Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); return row; } -} // namespace turns::ui::widgets \ No newline at end of file +} // namespace Turns::gui \ No newline at end of file -- cgit v1.2.3