diff options
| -rw-r--r-- | app/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | app/include/turns/app/widgets/participant_list_row.hpp | 44 | ||||
| -rw-r--r-- | app/include/turns/app/widgets/template_widget.hpp | 63 | ||||
| -rw-r--r-- | app/include/turns/app/windows/main.hpp | 9 | ||||
| -rw-r--r-- | app/src/widgets/participant_list_row.cpp | 38 | ||||
| -rw-r--r-- | app/src/windows/main.cpp | 25 | ||||
| -rw-r--r-- | res/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | res/widgets/participant_list_row.ui | 81 | ||||
| -rw-r--r-- | res/widgets/widgets.cmb | 71 | ||||
| -rw-r--r-- | res/windows/main_window.ui | 25 | ||||
| -rw-r--r-- | res/windows/windows.cmb | 34 |
11 files changed, 383 insertions, 9 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 3dddc65..aa65a86 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -2,6 +2,7 @@ add_library("app" "src/application.cpp" + "src/widgets/participant_list_row.cpp" "src/windows/main.cpp" ) diff --git a/app/include/turns/app/widgets/participant_list_row.hpp b/app/include/turns/app/widgets/participant_list_row.hpp new file mode 100644 index 0000000..b9efbd6 --- /dev/null +++ b/app/include/turns/app/widgets/participant_list_row.hpp @@ -0,0 +1,44 @@ +#ifndef TURNS_APP_WIDGETS_PARTICIPANT_LIST_ROW_HPP +#define TURNS_APP_WIDGETS_PARTICIPANT_LIST_ROW_HPP + +#include "turns/app/widgets/template_widget.hpp" + +#include <array> + +#include <glibmm/ustring.h> +#include <gtkmm/box.h> +#include <gtkmm/image.h> +#include <gtkmm/label.h> +#include <gtkmm/listboxrow.h> + +namespace turns::app::widgets +{ + struct participant_list_row : template_widget<participant_list_row, Gtk::ListBoxRow> + { + auto constexpr inline static children = std::array{ + "header", + "prefixes", + "image", + "title_box", + "title", + "subtitle", + "suffixes", + }; + + participant_list_row(); + + auto set_subtitle(Glib::ustring const & value) -> void; + auto set_title(Glib::ustring const & value) -> void; + + private: + Gtk::Box * m_header; + Gtk::Image * m_image; + Gtk::Box * m_prefixes; + Gtk::Label * m_subtitle; + Gtk::Box * m_suffixes; + Gtk::Label * m_title; + Gtk::Box * m_title_box; + }; +} // namespace turns::app::widgets + +#endif
\ No newline at end of file diff --git a/app/include/turns/app/widgets/template_widget.hpp b/app/include/turns/app/widgets/template_widget.hpp new file mode 100644 index 0000000..62b82e7 --- /dev/null +++ b/app/include/turns/app/widgets/template_widget.hpp @@ -0,0 +1,63 @@ +#ifndef TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP +#define TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP + +#include <algorithm> +#include <utility> + +#include <glibmm/extraclassinit.h> +#include <glibmm/objectbase.h> +#include <glibmm/ustring.h> +#include <gtk/gtk.h> +#include <gtkmm/widget.h> + +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/app/include/turns/app/windows/main.hpp b/app/include/turns/app/windows/main.hpp index e27c1c7..fd55e72 100644 --- a/app/include/turns/app/windows/main.hpp +++ b/app/include/turns/app/windows/main.hpp @@ -2,11 +2,15 @@ #define TURNS_APP_WINDOWS_MAIN_WINDOW_HPP #include <adwaita.h> +#include <glibmm/object.h> #include <glibmm/refptr.h> #include <gtkmm/applicationwindow.h> #include <gtkmm/builder.h> #include <gtkmm/button.h> +#include <gtkmm/listbox.h> #include <gtkmm/menubutton.h> +#include <gtkmm/stringlist.h> +#include <gtkmm/widget.h> namespace turns::app::windows { @@ -16,10 +20,15 @@ namespace turns::app::windows main(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder); private: + auto handle_create_list_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *; + Gtk::Button * m_add_participant; AdwApplicationWindow * m_adw; Gtk::MenuButton * m_open_main_menu; + Gtk::ListBox * m_participant_list; AdwWindowTitle * m_title; + + Glib::RefPtr<Gtk::StringList> m_tests; }; } // namespace turns::app::windows diff --git a/app/src/widgets/participant_list_row.cpp b/app/src/widgets/participant_list_row.cpp new file mode 100644 index 0000000..bc3108e --- /dev/null +++ b/app/src/widgets/participant_list_row.cpp @@ -0,0 +1,38 @@ +#include "turns/app/widgets/participant_list_row.hpp" + +#include <glibmm/ustring.h> + +namespace turns::app::widgets +{ + namespace + { + auto constexpr static TYPE_NAME = "participant_list_row"; + auto constexpr static TEMPLATE = "/turns/widgets/participant_list_row.ui"; + } // namespace + + participant_list_row::participant_list_row() + : Glib::ObjectBase(TYPE_NAME) + , template_widget<participant_list_row, Gtk::ListBoxRow>{TEMPLATE} + { + m_header = get_widget<Gtk::Box>("header"); + m_image = get_widget<Gtk::Image>("image"); + m_prefixes = get_widget<Gtk::Box>("prefixes"); + m_subtitle = get_widget<Gtk::Label>("subtitle"); + m_suffixes = get_widget<Gtk::Box>("suffixes"); + m_title = get_widget<Gtk::Label>("title"); + m_title_box = get_widget<Gtk::Box>("title_box"); + } + + auto participant_list_row::set_subtitle(Glib::ustring const & value) -> void + { + m_subtitle->set_text(value); + m_subtitle->set_visible(!value.empty()); + } + + auto participant_list_row::set_title(Glib::ustring const & value) -> void + { + m_title->set_text(value); + m_title->set_visible(!value.empty()); + } + +} // namespace turns::app::widgets
\ No newline at end of file diff --git a/app/src/windows/main.cpp b/app/src/windows/main.cpp index 2ad9117..20d0649 100644 --- a/app/src/windows/main.cpp +++ b/app/src/windows/main.cpp @@ -1,9 +1,14 @@ #include "turns/app/windows/main.hpp" +#include "turns/app/widgets/participant_list_row.hpp" #include "turns/lang/messages.hpp" +#include <format> +#include <ranges> + #include <adwaita.h> #include <glibmm/i18n.h> +#include <gtkmm/stringobject.h> namespace turns::app::windows { @@ -15,11 +20,29 @@ namespace turns::app::windows , m_add_participant{builder->get_widget<Gtk::Button>("add_participant")} , m_adw{ADW_APPLICATION_WINDOW(gobj())} , m_open_main_menu{builder->get_widget<Gtk::MenuButton>("open_main_menu")} + , m_participant_list{builder->get_widget<Gtk::ListBox>("participant_list")} , m_title(ADW_WINDOW_TITLE(builder->get_widget<Gtk::Widget>("title")->gobj())) + , m_tests{Gtk::StringList::create()} { m_add_participant->set_tooltip_text(_(tooltips::add_a_participant)); m_open_main_menu->set_tooltip_text(_(tooltips::main_menu)); adw_window_title_set_subtitle(m_title, _(labels::no_active_turn_order)); + + for (auto n : std::views::iota(0, 32)) + { + m_tests->append(std::format("Participant #{}", n)); + } + + m_participant_list->bind_model(m_tests, sigc::mem_fun(*this, &main::handle_create_list_row)); + } + + auto main::handle_create_list_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget * + { + auto data = std::dynamic_pointer_cast<Gtk::StringObject>(item); + auto widget = Gtk::make_managed<widgets::participant_list_row>(); + widget->set_title(data->get_string()); + widget->set_subtitle("Details for " + data->get_string()); + return widget; } -} // namespace turns::app::windows
\ No newline at end of file +} // namespace turns::app::windows diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index f823bec..b2b723a 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -5,6 +5,7 @@ add_library("res") target_add_glib_resources("res" PREFIX "turns" UI_FILES + "widgets/participant_list_row.ui" "windows/main_window.ui" ) diff --git a/res/widgets/participant_list_row.ui b/res/widgets/participant_list_row.ui new file mode 100644 index 0000000..66506c8 --- /dev/null +++ b/res/widgets/participant_list_row.ui @@ -0,0 +1,81 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Created with Cambalache 0.90.4 --> +<!--Adapted from: https://gitlab.gnome.org/GNOME/libadwaita--> +<interface> + <!-- interface-name participant_list_item.ui --> + <requires lib="gtk" version="4.14"/> + <template class="gtkmm__CustomObject_participant_list_row" parent="GtkListBoxRow"> + <property name="child"> + <object class="GtkBox" id="header"> + <property name="css-classes">header</property> + <child> + <object class="GtkBox" id="prefixes"> + <property name="visible">False</property> + <style> + <class name="prefixes"/> + </style> + </object> + </child> + <child> + <object class="GtkImage" id="image"> + <property name="icon-name">face-smile</property> + <property name="valign">center</property> + <property name="visible">False</property> + <style> + <class name="icon"/> + </style> + </object> + </child> + <child> + <object class="GtkBox" id="title_box"> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="valign">center</property> + <child> + <object class="GtkLabel" id="title"> + <property name="lines">0</property> + <property name="visible">False</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="xalign">0.0</property> + <style> + <class name="title"/> + </style> + </object> + </child> + <child> + <object class="GtkLabel" id="subtitle"> + <property name="lines">0</property> + <property name="visible">False</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="xalign">0.0</property> + <style> + <class name="subtitle"/> + </style> + </object> + </child> + <style> + <class name="title"/> + </style> + </object> + </child> + <child> + <object class="GtkBox" id="suffixes"> + <property name="valign">center</property> + <child> + <object class="GtkSwitch"/> + </child> + <style> + <class name="suffixes"/> + </style> + </object> + </child> + </object> + </property> + <property name="valign">center</property> + <style> + <class name="view"/> + </style> + </template> +</interface> diff --git a/res/widgets/widgets.cmb b/res/widgets/widgets.cmb new file mode 100644 index 0000000..ce44dd0 --- /dev/null +++ b/res/widgets/widgets.cmb @@ -0,0 +1,71 @@ +<?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,1,"participant_list_item.ui","participant_list_row.ui",None,None,None,None,None,"Adapted from: https://gitlab.gnome.org/GNOME/libadwaita",None) + </ui> + <ui_library> + (1,"gtk","4.14",None) + </ui_library> + <object> + (1,1,"GtkListBoxRow","gtkmm__CustomObject_participant_list_row",None,None,None,None,-1,None,None), + (1,2,"GtkBox","header",1,None,None,None,-1,None,None), + (1,3,"GtkBox","prefixes",2,None,None,None,-1,None,None), + (1,4,"GtkImage","image",2,None,None,None,-1,None,None), + (1,5,"GtkBox","title_box",2,None,None,None,-1,None,None), + (1,6,"GtkLabel","title",5,None,None,None,-1,None,None), + (1,7,"GtkLabel","subtitle",5,None,None,None,-1,None,None), + (1,8,"GtkBox","suffixes",2,None,None,None,-1,None,None), + (1,9,"GtkSwitch",None,8,None,None,None,-1,None,None) + </object> + <object_property> + (1,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None), + (1,1,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (1,2,"GtkWidget","css-classes","header",None,None,None,None,None,None,None,None,None), + (1,3,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None), + (1,4,"GtkImage","icon-name","face-smile",None,None,None,None,None,None,None,None,None), + (1,4,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (1,4,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None), + (1,5,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), + (1,5,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), + (1,5,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), + (1,6,"GtkLabel","lines","0",None,None,None,None,None,None,None,None,None), + (1,6,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None), + (1,6,"GtkLabel","wrap-mode","word-char",None,None,None,None,None,None,None,None,None), + (1,6,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), + (1,6,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None), + (1,7,"GtkLabel","lines","0",None,None,None,None,None,None,None,None,None), + (1,7,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None), + (1,7,"GtkLabel","wrap-mode","word-char",None,None,None,None,None,None,None,None,None), + (1,7,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), + (1,7,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None), + (1,8,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None) + </object_property> + <object_data> + (1,6,"GtkWidget",1,1,None,None,None,None,None,None), + (1,6,"GtkWidget",2,2,None,1,None,None,None,None), + (1,5,"GtkWidget",1,1,None,None,None,None,None,None), + (1,5,"GtkWidget",2,2,None,1,None,None,None,None), + (1,4,"GtkWidget",1,1,None,None,None,None,None,None), + (1,4,"GtkWidget",2,2,None,1,None,None,None,None), + (1,3,"GtkWidget",1,1,None,None,None,None,None,None), + (1,3,"GtkWidget",2,2,None,1,None,None,None,None), + (1,7,"GtkWidget",1,1,None,None,None,None,None,None), + (1,7,"GtkWidget",2,2,None,1,None,None,None,None), + (1,8,"GtkWidget",1,1,None,None,None,None,None,None), + (1,8,"GtkWidget",2,2,None,1,None,None,None,None), + (1,1,"GtkWidget",2,2,None,1,None,None,None,None), + (1,1,"GtkWidget",1,3,None,None,None,None,None,None), + (1,1,"GtkWidget",2,4,None,3,None,None,None,None) + </object_data> + <object_data_arg> + (1,6,"GtkWidget",2,2,"name","title"), + (1,5,"GtkWidget",2,2,"name","title"), + (1,4,"GtkWidget",2,2,"name","icon"), + (1,3,"GtkWidget",2,2,"name","prefixes"), + (1,7,"GtkWidget",2,2,"name","subtitle"), + (1,8,"GtkWidget",2,2,"name","suffixes"), + (1,1,"GtkWidget",2,2,"name","property"), + (1,1,"GtkWidget",2,4,"name","view") + </object_data_arg> +</cambalache-project> diff --git a/res/windows/main_window.ui b/res/windows/main_window.ui index 5dc17d8..4712455 100644 --- a/res/windows/main_window.ui +++ b/res/windows/main_window.ui @@ -10,8 +10,23 @@ <object class="AdwToolbarView"> <property name="content"> <object class="GtkScrolledWindow"> + <property name="vexpand">True</property> <child> - <object class="GtkListBox" id="entry_list"/> + <object class="AdwClamp"> + <property name="child"> + <object class="GtkListBox" id="participant_list"> + <property name="margin-bottom">18</property> + <property name="margin-end">12</property> + <property name="margin-start">12</property> + <property name="margin-top">18</property> + <property name="selection-mode">none</property> + <property name="valign">start</property> + <style> + <class name="boxed-list"/> + </style> + </object> + </property> + </object> </child> </object> </property> @@ -33,12 +48,16 @@ <property name="icon-name">contact-new</property> </object> </child> + <style/> </object> </child> + <style/> </object> </property> - <property name="height-request">720</property> - <property name="width-request">360</property> + <property name="default-height">720</property> + <property name="default-width">360</property> + <property name="height-request">480</property> + <property name="width-request">240</property> </object> <menu id="main_menu"> <item> diff --git a/res/windows/windows.cmb b/res/windows/windows.cmb index c26082d..198105f 100644 --- a/res/windows/windows.cmb +++ b/res/windows/windows.cmb @@ -13,24 +13,48 @@ (1,2,"AdwToolbarView",None,1,None,None,None,-1,None,None), (1,3,"AdwHeaderBar","header",2,None,"top",None,-1,None,None), (1,4,"GtkScrolledWindow",None,2,None,None,None,-1,None,None), - (1,5,"GtkListBox","entry_list",4,None,None,None,-1,None,None), (1,6,"AdwWindowTitle","title",3,None,None,None,-1,None,None), (1,7,"GtkMenuButton","open_main_menu",3,None,"start",None,None,None,None), (1,8,"GtkButton","add_participant",3,None,"start",None,None,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,10,"(item)",None,9,None,None,None,-1,None,None), + (1,11,"AdwClamp",None,4,None,None,None,-1,None,None), + (1,12,"GtkListBox","participant_list",11,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","720",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,"GtkWidget","height-request","480",None,None,None,None,None,None,None,None,None), + (1,1,"GtkWidget","width-request","240",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,4,None,None,None,None), (1,3,"AdwHeaderBar","title-widget",None,None,None,None,None,6,None,None,None,None), + (1,4,"GtkWidget","vexpand","True",None,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,8,"GtkButton","icon-name","contact-new",None,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,10,"(item)","label","_Quit",1,None,None,None,None,None,None,None,None), + (1,11,"AdwClamp","child",None,None,None,None,None,12,None,None,None,None), + (1,12,"GtkListBox","selection-mode","none",None,None,None,None,None,None,None,None,None), + (1,12,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None), + (1,12,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None), + (1,12,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None), + (1,12,"GtkWidget","margin-top","18",None,None,None,None,None,None,None,None,None), + (1,12,"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,4,"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), + (1,12,"GtkWidget",1,1,None,None,None,None,None,None), + (1,12,"GtkWidget",2,2,None,1,None,None,None,None) + </object_data> + <object_data_arg> + (1,1,"GtkWidget",2,2,"name","background"), + (1,4,"GtkWidget",2,2,"name","boxed-list"), + (1,12,"GtkWidget",2,2,"name","boxed-list") + </object_data_arg> </cambalache-project> |
