diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/CMakeLists.txt | 60 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/fwd.hpp | 10 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/participant_row.hpp | 49 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/template_widget.hpp | 64 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/turn_order_view.hpp | 36 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/fwd.hpp | 10 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/participant_editor.hpp | 54 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/tracker.hpp | 48 | ||||
| -rw-r--r-- | ui/res/.gitignore | 1 | ||||
| -rw-r--r-- | ui/res/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | ui/res/ui.cmb | 223 | ||||
| -rw-r--r-- | ui/src/widgets/participant_row.cpp | 133 | ||||
| -rw-r--r-- | ui/src/widgets/turn_order_view.cpp | 49 | ||||
| -rw-r--r-- | ui/src/windows/participant_editor.cpp | 91 | ||||
| -rw-r--r-- | ui/src/windows/tracker.cpp | 177 | ||||
| -rw-r--r-- | ui/tests/widgets/participant_row.cpp | 24 | ||||
| -rw-r--r-- | ui/tests/windows/participant_editor.cpp | 111 | ||||
| -rw-r--r-- | ui/tests/windows/resources.cpp | 13 | ||||
| -rw-r--r-- | ui/tests/windows/tracker.cpp | 75 |
19 files changed, 1251 insertions, 0 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt new file mode 100644 index 0000000..e3d8941 --- /dev/null +++ b/ui/CMakeLists.txt @@ -0,0 +1,60 @@ +# Library + +add_library("ui" + "src/widgets/participant_row.cpp" + "src/widgets/turn_order_view.cpp" + "src/windows/participant_editor.cpp" + "src/windows/tracker.cpp" + + $<TARGET_OBJECTS:ui-res> +) + +add_library("turns::ui" ALIAS "ui") + +target_compile_options("ui" PUBLIC + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall>" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wextra>" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-pedantic-errors>" +) + +target_include_directories("ui" PUBLIC + "include" +) + +target_link_libraries("ui" PUBLIC + "turns::core" + "turns::lang" + "PkgConfig::adwaita" + "PkgConfig::gtkmm" +) + +enable_coverage("ui") + +# Resources + +add_subdirectory("res") + +# Tests + +add_executable("ui-tests" + "tests/widgets/participant_row.cpp" + "tests/windows/participant_editor.cpp" + "tests/windows/resources.cpp" + "tests/windows/tracker.cpp" +) + +target_link_libraries("ui-tests" PRIVATE + "Catch2::Catch2" + + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--whole-archive>" + "turns::ui" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--no-whole-archive>" + "turns::gtk-test-main" +) + +target_link_options("ui-tests" PRIVATE + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" +) + +catch_discover_tests("ui-tests") diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/widgets/fwd.hpp new file mode 100644 index 0000000..cbb9cae --- /dev/null +++ b/ui/include/turns/ui/widgets/fwd.hpp @@ -0,0 +1,10 @@ +#ifndef TURNS_UI_WIDGETS_FWD_HPP +#define TURNS_UI_WIDGETS_FWD_HPP + +namespace turns::app::widgets +{ + struct participant_row; + struct turn_order_view; +} // namespace turns::app::windows + +#endif
\ No newline at end of file diff --git a/ui/include/turns/ui/widgets/participant_row.hpp b/ui/include/turns/ui/widgets/participant_row.hpp new file mode 100644 index 0000000..5564ef4 --- /dev/null +++ b/ui/include/turns/ui/widgets/participant_row.hpp @@ -0,0 +1,49 @@ +#ifndef TURNS_APP_WIDGETS_PARTICIPANT_ROW_HPP +#define TURNS_APP_WIDGETS_PARTICIPANT_ROW_HPP + +#include "turns/ui/widgets/template_widget.hpp" +#include "turns/core/fwd.hpp" + +#include <glibmm/property.h> +#include <glibmm/refptr.h> + +#include <gtkmm/button.h> +#include <gtkmm/label.h> +#include <gtkmm/listboxrow.h> +#include <gtkmm/togglebutton.h> + +#include <array> + +namespace turns::app::widgets +{ + struct participant_row : template_widget<participant_row, Gtk::ListBoxRow> + { + auto constexpr inline static children = std::array{ + "delete", + "edit", + "subtitle", + "title", + "toggle_defeated", + }; + + participant_row(Glib::RefPtr<core::participant> participant); + + auto property_delete_enabled() -> Glib::PropertyProxy<bool>; + auto property_edit_enabled() -> Glib::PropertyProxy<bool>; + + private: + auto handle_delete() -> void; + auto handle_edit() -> void; + + Gtk::Button * m_delete; + Gtk::Button * m_edit; + Gtk::Label * m_subtitle; + Gtk::Label * m_title; + Gtk::ToggleButton * m_toggle_defeated; + + Glib::Property<bool> m_delete_enabled; + Glib::Property<bool> m_edit_enabled; + }; +} // namespace turns::app::widgets + +#endif
\ No newline at end of file diff --git a/ui/include/turns/ui/widgets/template_widget.hpp b/ui/include/turns/ui/widgets/template_widget.hpp new file mode 100644 index 0000000..5643cb4 --- /dev/null +++ b/ui/include/turns/ui/widgets/template_widget.hpp @@ -0,0 +1,64 @@ +#ifndef TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP +#define TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP + +#include <glibmm/extraclassinit.h> +#include <glibmm/ustring.h> + +#include <gtkmm/widget.h> + +#include <gtk/gtk.h> + +#include <algorithm> +#include <utility> + +namespace turns::app::widgets +{ + + template<typename CustomWidgetType, typename BaseWidgetType> + struct template_widget : Glib::ExtraClassInit, + BaseWidgetType + { + template<typename... BaseWidgetCtorArgTypes> + template_widget(Glib::ustring && resource_path, BaseWidgetCtorArgTypes &&... base_widget_ctor_args) + : Glib::ExtraClassInit{class_init, &resource_path, instance_init} + , BaseWidgetType{std::forward<BaseWidgetCtorArgTypes>(base_widget_ctor_args)...} + { + } + + protected: + template<typename WidgetType = Gtk::Widget> + auto get_widget(char const * name) -> WidgetType * + { + auto self = static_cast<CustomWidgetType *>(this); + auto widget = GTK_WIDGET(self->gobj()); + auto type = G_OBJECT_TYPE(self->gobj()); + auto child = GTK_WIDGET(gtk_widget_get_template_child(widget, type, name)); + g_assert_nonnull(child); + return dynamic_cast<WidgetType *>(Glib::wrap(child)); + } + + private: + auto static class_init(void * g_class, void * g_class_data) -> void + { + g_return_if_fail(GTK_IS_WIDGET_CLASS(g_class)); + + auto resource_path = static_cast<Glib::ustring const *>(g_class_data); + + gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS(g_class), resource_path->c_str()); + + std::ranges::for_each(CustomWidgetType::children, [g_class](auto const & child) { + gtk_widget_class_bind_template_child_full(GTK_WIDGET_CLASS(g_class), child, false, 0); + }); + } + + auto static instance_init(GTypeInstance * instance, void * /* type_class */) -> void + { + g_return_if_fail(GTK_IS_WIDGET(instance)); + + gtk_widget_init_template(GTK_WIDGET(instance)); + } + }; + +} // namespace turns::app::widgets + +#endif
\ No newline at end of file diff --git a/ui/include/turns/ui/widgets/turn_order_view.hpp b/ui/include/turns/ui/widgets/turn_order_view.hpp new file mode 100644 index 0000000..b174ce7 --- /dev/null +++ b/ui/include/turns/ui/widgets/turn_order_view.hpp @@ -0,0 +1,36 @@ +#ifndef TURNS_APP_WIDGETS_TURN_ORDER_VIEW_HPP +#define TURNS_APP_WIDGETS_TURN_ORDER_VIEW_HPP + +#include "turns/ui/widgets/template_widget.hpp" +#include "turns/core/fwd.hpp" + +#include <glibmm/object.h> +#include <glibmm/refptr.h> + +#include <gtkmm/listbox.h> +#include <gtkmm/scrolledwindow.h> +#include <gtkmm/widget.h> + +#include <array> + +namespace turns::app::widgets +{ + struct turn_order_view : template_widget<turn_order_view, Gtk::ScrolledWindow> + { + using model_type = core::turn_order; + + auto constexpr inline static children = std::array{ + "view", + }; + + explicit turn_order_view(Glib::RefPtr<model_type> model = {}); + + private: + auto handle_create_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *; + + Glib::RefPtr<model_type> m_model; + Gtk::ListBox * m_view; + }; +} // namespace turns::app::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 new file mode 100644 index 0000000..95d9acd --- /dev/null +++ b/ui/include/turns/ui/windows/fwd.hpp @@ -0,0 +1,10 @@ +#ifndef TURNS_UI_WINDOWS_FWD_HPP +#define TURNS_UI_WINDOWS_FWD_HPP + +namespace turns::app::windows +{ + struct participant_editor; + struct tracker; +} // namespace turns::app::windows + +#endif
\ No newline at end of file diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp new file mode 100644 index 0000000..1fa42bb --- /dev/null +++ b/ui/include/turns/ui/windows/participant_editor.hpp @@ -0,0 +1,54 @@ +#ifndef TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP +#define TURNS_APP_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 <adwaita.h> + +namespace turns::app::windows +{ + + struct participant_editor : Gtk::Widget + { + 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 present(Gtk::Widget * parent) -> void; + + 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; + + AdwDialog * m_adw; + AdwComboRow * m_disposition; + Gtk::Button * m_finish; + AdwEntryRow * m_name; + AdwSpinRow * 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::app::windows + +#endif
\ No newline at end of file diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp new file mode 100644 index 0000000..4af7c43 --- /dev/null +++ b/ui/include/turns/ui/windows/tracker.hpp @@ -0,0 +1,48 @@ +#ifndef TURNS_APP_WINDOWS_TRACKER_HPP +#define TURNS_APP_WINDOWS_TRACKER_HPP + +#include "turns/ui/widgets/turn_order_view.hpp" +#include "turns/core/turn_order.hpp" + +#include <glibmm/refptr.h> +#include <glibmm/ustring.h> +#include <glibmm/variant.h> + +#include <gtkmm/applicationwindow.h> +#include <gtkmm/builder.h> +#include <gtkmm/button.h> +#include <gtkmm/revealer.h> +#include <gtkmm/stack.h> +#include <gtkmm/widget.h> + +#include <adwaita.h> + +namespace turns::app::windows +{ + + struct tracker : Gtk::ApplicationWindow + { + tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder); + + private: + auto handle_add_participant() -> void; + auto handle_delete_participant(Glib::VariantBase param) -> void; + auto handle_edit_participant(Glib::VariantBase param) -> void; + auto handle_stop() -> void; + + auto setup_actions() -> void; + + AdwApplicationWindow * m_adw; + Gtk::Revealer * m_controls; + Gtk::Widget * m_empty; + Gtk::Stack * m_stack; + Gtk::Button * m_start; + AdwWindowTitle * m_title; + Glib::RefPtr<core::turn_order> m_turn_order; + widgets::turn_order_view * m_turn_order_view; + Glib::PropertyProxy<Glib::ustring> m_subtitle; + }; + +} // namespace turns::app::windows + +#endif
\ No newline at end of file diff --git a/ui/res/.gitignore b/ui/res/.gitignore new file mode 100644 index 0000000..25284c2 --- /dev/null +++ b/ui/res/.gitignore @@ -0,0 +1 @@ +*.ui
\ No newline at end of file diff --git a/ui/res/CMakeLists.txt b/ui/res/CMakeLists.txt new file mode 100644 index 0000000..94d41ef --- /dev/null +++ b/ui/res/CMakeLists.txt @@ -0,0 +1,23 @@ +add_library("ui-res" OBJECT) + +target_link_libraries("ui-res" PRIVATE + "PkgConfig::giomm" +) + +set(UI_FILES + "widgets/participant_row.ui" + "widgets/turn_order_view.ui" + "windows/participant_editor.ui" + "windows/tracker.ui" +) + +export_cambalache_files("ui.cmb" + UI_FILES ${UI_FILES} +) + +target_add_glib_resources("ui-res" + PREFIX "/" + UI_FILES ${UI_FILES} +) + +enable_coverage("ui-res")
\ No newline at end of file diff --git a/ui/res/ui.cmb b/ui/res/ui.cmb new file mode 100644 index 0000000..f3cc8e8 --- /dev/null +++ b/ui/res/ui.cmb @@ -0,0 +1,223 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd"> +<cambalache-project version="0.17.3" target_tk="gtk-4.0"> + <ui> + (1,None,None,"windows/tracker.ui",None,None,None,None,None,None,None), + (2,None,None,"windows/participant_editor.ui",None,None,None,None,None,None,None), + (3,1,None,"widgets/participant_row.ui",None,None,None,None,None,None,None), + (4,1,None,"widgets/turn_order_view.ui",None,None,None,None,None,None,None) + </ui> + <ui_library> + (1,"gtk","4.14",None), + (1,"libadwaita","1.5",None), + (2,"gtk","4.14",None), + (2,"libadwaita","1.5",None), + (3,"gtk","4.14",None) + </ui_library> + <object> + (1,1,"AdwApplicationWindow","tracker",None,None,None,None,-1,None,None), + (1,2,"AdwToolbarView",None,1,None,None,None,-1,None,None), + (1,3,"AdwHeaderBar","header",2,None,"top",None,-1,None,None), + (1,6,"AdwWindowTitle","title",3,None,None,None,3,None,None), + (1,7,"GtkMenuButton","open_main_menu",3,None,"end",None,None,None,None), + (1,8,"GtkButton","add_participant",3,None,"start",None,1,None,None), + (1,9,"(menu)","main_menu",None,None,None,None,-1,None,None), + (1,10,"(item)",None,9,None,None,None,1,None,None), + (1,11,"GtkStack","stack",2,None,None,None,-1,None,None), + (1,16,"AdwStatusPage","empty",11,None,None,None,-1,None,None), + (1,17,"GtkButton",None,16,None,None,None,-1,None,None), + (1,18,"GtkButton","start",3,None,"start",None,2,None,None), + (1,19,"(item)",None,9,None,None,None,None,None,None), + (1,20,"GtkRevealer","controls",2,None,"bottom",None,-1,None,None), + (1,21,"GtkActionBar",None,20,None,None,None,-1,None,None), + (1,22,"GtkButton",None,21,None,"start",None,-1,None,None), + (1,23,"GtkButton",None,21,None,"center",None,-1,None,None), + (1,24,"GtkButton",None,21,None,"end",None,-1,None,None), + (2,1,"AdwDialog","participant_editor",None,None,None,None,-1,None,None), + (2,2,"AdwToolbarView",None,1,None,None,None,-1,None,None), + (2,3,"AdwHeaderBar",None,2,None,"top",None,-1,None,None), + (2,4,"AdwClamp",None,2,None,None,None,-1,None,None), + (2,5,"GtkBox",None,4,None,None,None,-1,None,None), + (2,6,"GtkListBox",None,5,None,None,None,None,None,None), + (2,7,"AdwEntryRow","name",6,None,None,None,None,None,None), + (2,9,"GtkButton","finish",5,None,None,None,1,None,None), + (2,10,"AdwSpinRow","priority",6,None,None,None,1,None,None), + (2,11,"AdwComboRow","disposition",6,None,None,None,2,None,None), + (2,12,"GtkAdjustment",None,10,None,None,None,-1,None,None), + (3,1,"GtkListBoxRow","gtkmm__CustomObject_participant_row",None,None,None,None,-1,None,None), + (3,2,"GtkBox",None,1,None,None,None,-1,None,None), + (3,3,"GtkBox",None,2,None,None,None,-1,None,None), + (3,4,"GtkBox",None,2,None,None,None,-1,None,None), + (3,5,"GtkBox",None,2,None,None,None,-1,None,None), + (3,6,"GtkToggleButton","toggle_defeated",3,None,None,None,-1,None,None), + (3,7,"GtkLabel","title",4,None,None,None,-1,None,None), + (3,8,"GtkLabel","subtitle",4,None,None,None,-1,None,None), + (3,9,"GtkButton","delete",5,None,None,None,-1,None,None), + (3,10,"GtkButton","edit",5,None,None,None,-1,None,None), + (4,1,"GtkScrolledWindow","gtkmm__CustomObject_turn_order_view",None,None,None,None,-1,None,None), + (4,2,"AdwClamp",None,1,None,None,None,-1,None,None), + (4,3,"GtkListBox","view",2,None,None,None,-1,None,None) + </object> + <object_property> + (1,1,"AdwApplicationWindow","content",None,None,None,None,None,2,None,None,None,None), + (1,1,"GtkWidget","height-request","480",None,None,None,None,None,None,None,None,None), + (1,1,"GtkWidget","width-request","360",None,None,None,None,None,None,None,None,None), + (1,1,"GtkWindow","default-height","720",None,None,None,None,None,None,None,None,None), + (1,1,"GtkWindow","default-width","360",None,None,None,None,None,None,None,None,None), + (1,2,"AdwToolbarView","content",None,None,None,None,None,11,None,None,None,None), + (1,3,"AdwHeaderBar","title-widget",None,None,None,None,None,6,None,None,None,None), + (1,6,"AdwWindowTitle","subtitle","No active turn order",1,None,None,None,None,None,None,None,None), + (1,6,"AdwWindowTitle","title","Turns",1,None,None,None,None,None,None,None,None), + (1,7,"GtkMenuButton","icon-name","open-menu",None,None,None,None,None,None,None,None,None), + (1,7,"GtkMenuButton","menu-model","9",None,None,None,None,None,None,None,None,None), + (1,7,"GtkWidget","tooltip-text","Main Menu",1,None,None,None,None,None,None,None,None), + (1,8,"GtkActionable","action-name","win.add_participant",None,None,None,None,None,None,None,None,None), + (1,8,"GtkButton","icon-name","contact-new",None,None,None,None,None,None,None,None,None), + (1,8,"GtkWidget","tooltip-text","Add participant",1,None,None,None,None,None,None,None,None), + (1,10,"(item)","action","app.quit",None,None,None,None,None,None,None,None,None), + (1,10,"(item)","label","_Quit",1,None,None,None,None,None,None,None,None), + (1,11,"GtkStack","transition-type","crossfade",None,None,None,None,None,None,None,None,None), + (1,16,"AdwStatusPage","child",None,None,None,None,None,17,None,None,None,None), + (1,16,"AdwStatusPage","icon-name","contact-new-symbolic",None,None,None,None,None,None,None,None,None), + (1,17,"GtkActionable","action-name","win.add_participant",None,None,None,None,None,None,None,None,None), + (1,17,"GtkButton","label","Add participant",1,None,None,None,None,None,None,None,None), + (1,17,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), + (1,18,"GtkActionable","action-name","win.start",None,None,None,None,None,None,None,None,None), + (1,18,"GtkButton","icon-name","media-playback-start-symbolic",None,None,None,None,None,None,None,None,None), + (1,18,"GtkWidget","tooltip-text","Start turn order",1,None,None,None,None,None,None,None,None), + (1,19,"(item)","action","win.clear",None,None,None,None,None,None,None,None,None), + (1,19,"(item)","label","_Clear",1,None,None,None,None,None,None,None,None), + (1,20,"GtkRevealer","child",None,None,None,None,None,21,None,None,None,None), + (1,20,"GtkRevealer","transition-type","slide-up",None,None,None,None,None,None,None,None,None), + (1,22,"GtkActionable","action-name","win.previous",None,None,None,None,None,None,None,None,None), + (1,22,"GtkButton","icon-name","media-skip-backward-symbolic",None,None,None,None,None,None,None,None,None), + (1,22,"GtkWidget","tooltip-markup","Previous participant",1,None,None,None,None,None,None,None,None), + (1,23,"GtkActionable","action-name","win.stop",None,None,None,None,None,None,None,None,None), + (1,23,"GtkButton","icon-name","media-playback-stop-symbolic",None,None,None,None,None,None,None,None,None), + (1,23,"GtkWidget","tooltip-markup","End turn order",1,None,None,None,None,None,None,None,None), + (1,24,"GtkActionable","action-name","win.next",None,None,None,None,None,None,None,None,None), + (1,24,"GtkButton","icon-name","media-skip-forward-symbolic",None,None,None,None,None,None,None,None,None), + (1,24,"GtkWidget","tooltip-markup","Next participant",1,None,None,None,None,None,None,None,None), + (2,1,"AdwDialog","child",None,None,None,None,None,2,None,None,None,None), + (2,1,"AdwDialog","default-widget",None,None,None,None,None,None,None,None,None,None), + (2,1,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (2,2,"AdwToolbarView","content",None,None,None,None,None,4,None,None,None,None), + (2,4,"AdwClamp","child",None,None,None,None,None,5,None,None,None,None), + (2,5,"GtkBox","spacing","18",None,None,None,None,None,None,None,None,None), + (2,5,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (2,5,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (2,5,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None), + (2,5,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None), + (2,5,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None), + (2,5,"GtkWidget","margin-top","18",None,None,None,None,None,None,None,None,None), + (2,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), + (2,7,"AdwPreferencesRow","title","Name",1,None,None,None,None,None,None,None,None), + (2,9,"GtkButton","label","Finish",1,None,None,None,None,None,None,None,None), + (2,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (2,10,"AdwPreferencesRow","title","Priority",1,None,None,None,None,None,None,None,None), + (2,10,"AdwSpinRow","adjustment",None,None,None,None,None,12,None,None,None,None), + (2,10,"AdwSpinRow","digits","1",None,None,None,None,None,None,None,None,None), + (2,10,"AdwSpinRow","numeric","True",None,None,None,None,None,None,None,None,None), + (2,11,"AdwPreferencesRow","title","Disposition",1,None,None,None,None,None,None,None,None), + (2,12,"GtkAdjustment","lower","-1000.0",None,None,None,None,None,None,None,None,None), + (2,12,"GtkAdjustment","step-increment","1.0",None,None,None,None,None,None,None,None,None), + (2,12,"GtkAdjustment","upper","1000.0",None,None,None,None,None,None,None,None,None), + (3,1,"GtkListBoxRow","activatable","False",None,None,None,None,None,None,None,None,None), + (3,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None), + (3,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None), + (3,1,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (3,4,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (3,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (3,4,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (3,5,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (3,6,"GtkButton","icon-name","face-smile-symbolic",None,None,None,None,None,None,None,None,None), + (3,6,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), + (3,6,"GtkWidget","tooltip-text","Mark as defeated",1,None,None,None,None,None,None,None,None), + (3,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (3,7,"GtkLabel","wrap-mode","word-char",None,None,None,None,None,None,None,None,None), + (3,7,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), + (3,8,"GtkLabel","wrap-mode","word-char",None,None,None,None,None,None,None,None,None), + (3,8,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), + (3,9,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None), + (3,9,"GtkWidget","tooltip-text","Delete participant",1,None,None,None,None,None,None,None,None), + (3,10,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None), + (3,10,"GtkWidget","tooltip-text","Edit participant",1,None,None,None,None,None,None,None,None), + (4,1,"GtkScrolledWindow","child",None,None,None,None,None,2,None,None,None,None), + (4,2,"AdwClamp","child",None,None,None,None,None,3,None,None,None,None), + (4,2,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None), + (4,2,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None), + (4,2,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None), + (4,2,"GtkWidget","margin-top","12",None,None,None,None,None,None,None,None,None), + (4,3,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None) + </object_property> + <object_data> + (1,1,"GtkWidget",2,2,None,1,None,None,None,None), + (1,3,"GtkWidget",1,1,None,None,None,None,None,None), + (1,2,"GtkWidget",1,1,None,None,None,None,None,None), + (2,6,"GtkWidget",1,1,None,None,None,None,None,None), + (2,6,"GtkWidget",2,2,None,1,None,None,None,None), + (2,9,"GtkWidget",1,1,None,None,None,None,None,None), + (2,9,"GtkWidget",2,2,None,1,None,None,None,None), + (2,9,"GtkWidget",2,3,None,1,None,None,None,None), + (1,17,"GtkWidget",1,1,None,None,None,None,None,None), + (1,17,"GtkWidget",2,2,None,1,None,None,None,None), + (1,17,"GtkWidget",2,3,None,1,None,None,None,None), + (3,6,"GtkWidget",1,1,None,None,None,None,None,None), + (3,6,"GtkWidget",2,2,None,1,None,None,None,None), + (3,2,"GtkWidget",1,1,None,None,None,None,None,None), + (3,2,"GtkWidget",2,2,None,1,None,None,None,None), + (3,7,"GtkWidget",1,1,None,None,None,None,None,None), + (3,7,"GtkWidget",2,2,None,1,None,None,None,None), + (3,8,"GtkWidget",1,1,None,None,None,None,None,None), + (3,8,"GtkWidget",2,2,None,1,None,None,None,None), + (3,9,"GtkWidget",1,1,None,None,None,None,None,None), + (3,9,"GtkWidget",2,2,None,1,None,None,None,None), + (3,10,"GtkWidget",1,1,None,None,None,None,None,None), + (3,10,"GtkWidget",2,2,None,1,None,None,None,None), + (3,9,"GtkWidget",2,3,None,1,None,None,None,None), + (3,10,"GtkWidget",2,3,None,1,None,None,None,None), + (3,5,"GtkWidget",1,1,None,None,None,None,None,None), + (3,5,"GtkWidget",2,2,None,1,None,None,None,None), + (3,3,"GtkWidget",1,1,None,None,None,None,None,None), + (3,3,"GtkWidget",2,2,None,1,None,None,None,None), + (4,3,"GtkWidget",1,1,None,None,None,None,None,None), + (4,3,"GtkWidget",2,2,None,1,None,None,None,None), + (1,22,"GtkWidget",1,1,None,None,None,None,None,None), + (1,22,"GtkWidget",2,2,None,1,None,None,None,None), + (1,22,"GtkWidget",2,3,None,1,None,None,None,None), + (1,23,"GtkWidget",1,1,None,None,None,None,None,None), + (1,23,"GtkWidget",2,2,None,1,None,None,None,None), + (1,23,"GtkWidget",2,3,None,1,None,None,None,None), + (1,24,"GtkWidget",1,1,None,None,None,None,None,None), + (1,24,"GtkWidget",2,2,None,1,None,None,None,None), + (1,24,"GtkWidget",2,3,None,1,None,None,None,None), + (1,21,"GtkWidget",1,1,None,None,None,None,None,None), + (1,21,"GtkWidget",2,2,None,1,None,None,None,None) + </object_data> + <object_data_arg> + (1,1,"GtkWidget",2,2,"name","background"), + (2,6,"GtkWidget",2,2,"name","boxed-list"), + (2,9,"GtkWidget",2,2,"name","pill"), + (2,9,"GtkWidget",2,3,"name","suggested-action"), + (1,17,"GtkWidget",2,2,"name","pill"), + (1,17,"GtkWidget",2,3,"name","suggested-action"), + (3,6,"GtkWidget",2,2,"name","circular"), + (3,2,"GtkWidget",2,2,"name","header"), + (3,7,"GtkWidget",2,2,"name","title"), + (3,8,"GtkWidget",2,2,"name","subtitle"), + (3,9,"GtkWidget",2,2,"name","circular"), + (3,10,"GtkWidget",2,2,"name","circular"), + (3,9,"GtkWidget",2,3,"name","destructive-action"), + (3,10,"GtkWidget",2,3,"name","suggested-action"), + (3,5,"GtkWidget",2,2,"name","suffixes"), + (3,3,"GtkWidget",2,2,"name","prefixes"), + (4,3,"GtkWidget",2,2,"name","boxed-list"), + (1,22,"GtkWidget",2,2,"name","pill"), + (1,22,"GtkWidget",2,3,"name","suggested-action"), + (1,23,"GtkWidget",2,2,"name","pill"), + (1,23,"GtkWidget",2,3,"name","destructive-action"), + (1,24,"GtkWidget",2,2,"name","pill"), + (1,24,"GtkWidget",2,3,"name","suggested-action"), + (1,21,"GtkWidget",2,2,"name","toolbar") + </object_data_arg> +</cambalache-project> diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/widgets/participant_row.cpp new file mode 100644 index 0000000..3e058b2 --- /dev/null +++ b/ui/src/widgets/participant_row.cpp @@ -0,0 +1,133 @@ +#include "turns/ui/widgets/participant_row.hpp" + +#include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" +#include "turns/lang/messages.hpp" + +#include <glibmm/binding.h> +#include <glibmm/i18n.h> +#include <glibmm/ustring.h> +#include <glibmm/variant.h> + +#include <algorithm> +#include <format> + +namespace turns::app::widgets +{ + namespace + { + auto constexpr static TYPE_NAME = "participant_row"; + auto constexpr static TEMPLATE = "/widgets/participant_row.ui"; + + auto css_class_for(core::disposition value) -> Glib::ustring + { + switch (value) + { + case core::disposition::friendly: + return "disposition-friendly"; + case core::disposition::hostile: + return "disposition-hostile"; + case core::disposition::secret: + return "disposition-secret"; + default: + return ""; + } + } + } // namespace + + participant_row::participant_row(Glib::RefPtr<core::participant> participant) + : Glib::ObjectBase(TYPE_NAME) + , template_widget<participant_row, Gtk::ListBoxRow>{TEMPLATE} + , m_delete{get_widget<Gtk::Button>("delete")} + , m_edit{get_widget<Gtk::Button>("edit")} + , m_subtitle{get_widget<Gtk::Label>("subtitle")} + , m_title{get_widget<Gtk::Label>("title")} + , m_toggle_defeated{get_widget<Gtk::ToggleButton>("toggle_defeated")} + , m_delete_enabled{*this, "delete-enabled", true} + , m_edit_enabled{*this, "edit-enabled", true} + + { + m_delete->signal_clicked().connect(sigc::mem_fun(*this, &participant_row::handle_delete)); + m_edit->signal_clicked().connect(sigc::mem_fun(*this, &participant_row::handle_edit)); + + Glib::Binding::bind_property(m_subtitle->property_label(), + m_subtitle->property_visible(), + Glib::Binding::Flags::DEFAULT, + sigc::mem_fun(&Glib::ustring::size)); + Glib::Binding::bind_property(m_title->property_label(), + m_title->property_visible(), + Glib::Binding::Flags::INVERT_BOOLEAN, + sigc::mem_fun(&Glib::ustring::size)); + Glib::Binding::bind_property(m_toggle_defeated->property_active(), + m_toggle_defeated->property_icon_name(), + Glib::Binding::Flags::SYNC_CREATE, + [](auto active) { return active ? "face-sick-symbolic" : "face-smile-symbolic"; }); + + // clang-format off + Glib::Binding::bind_property(property_delete_enabled(), + m_delete->property_sensitive(), + Glib::Binding::Flags::SYNC_CREATE); + Glib::Binding::bind_property(property_edit_enabled(), + m_edit->property_sensitive(), + Glib::Binding::Flags::SYNC_CREATE); + // clang-format on + + if (participant) + { + Glib::Binding::bind_property(participant->name(), m_title->property_label(), Glib::Binding::Flags::SYNC_CREATE); + + Glib::Binding::bind_property(participant->priority(), m_subtitle->property_label(), Glib::Binding::Flags::SYNC_CREATE, [](auto n) { + return std::vformat(_(lang::priority_number), std::make_format_args(n)); + }); + + Glib::Binding::bind_property(participant->disposition(), + m_toggle_defeated->property_css_classes(), + Glib::Binding::Flags::SYNC_CREATE, + [this](auto value) { + auto classes = m_toggle_defeated->get_css_classes(); + auto removed = std::ranges::remove_if(classes, [](auto cls) { + return (cls == "disposition-friendly") | (cls == "disposition-hostile") || (cls == "disposition-secret"); + }); + classes.erase(removed.begin(), removed.end()); + classes.push_back(css_class_for(value)); + return classes; + }); + + Glib::Binding::bind_property(participant->is_active(), property_css_classes(), Glib::Binding::Flags::SYNC_CREATE, [this](auto value) { + auto classes = get_css_classes(); + if (!value) + { + std::erase(classes, "active-participant"); + } + else + { + classes.push_back("active-participant"); + } + return classes; + }); + } + } + + auto participant_row::property_delete_enabled() -> Glib::PropertyProxy<bool> + { + return m_delete_enabled.get_proxy(); + } + + auto participant_row::property_edit_enabled() -> Glib::PropertyProxy<bool> + { + return m_edit_enabled.get_proxy(); + } + + auto participant_row::handle_delete() -> void + { + auto index = Glib::Variant<int>::create(get_index()); + activate_action("win.delete", index); + } + + auto participant_row::handle_edit() -> void + { + auto index = Glib::Variant<int>::create(get_index()); + activate_action("win.edit", index); + } + +} // namespace turns::app::widgets
\ No newline at end of file diff --git a/ui/src/widgets/turn_order_view.cpp b/ui/src/widgets/turn_order_view.cpp new file mode 100644 index 0000000..9456cbe --- /dev/null +++ b/ui/src/widgets/turn_order_view.cpp @@ -0,0 +1,49 @@ +#include "turns/ui/widgets/turn_order_view.hpp" + +#include "turns/ui/widgets/participant_row.hpp" +#include "turns/core/participant.hpp" +#include "turns/core/turn_order.hpp" + +#include <sigc++/functors/mem_fun.h> + +#include <glibmm/binding.h> + +#include <memory> + +namespace turns::app::widgets +{ + namespace + { + auto constexpr static TYPE_NAME = "turn_order_view"; + auto constexpr static TEMPLATE = "/widgets/turn_order_view.ui"; + } // namespace + + turn_order_view::turn_order_view(Glib::RefPtr<model_type> model) + : Glib::ObjectBase(TYPE_NAME) + , template_widget<turn_order_view, Gtk::ScrolledWindow>{TEMPLATE} + , m_model{model} + , m_view{get_widget<Gtk::ListBox>("view")} + { + if (model) |
