From df69067b78a30010706e10e5f7860f41eecd2d65 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 14 Jul 2024 22:56:55 +0200 Subject: app/ui: make row title non-editable --- .../turns/app/widgets/participant_list_row.hpp | 3 +-- app/src/widgets/participant_list_row.cpp | 2 +- res/widgets/participant_list_row.ui | 5 ++--- res/widgets/widgets.cmb | 19 ++++++++++--------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/include/turns/app/widgets/participant_list_row.hpp b/app/include/turns/app/widgets/participant_list_row.hpp index f282992..2e3b176 100644 --- a/app/include/turns/app/widgets/participant_list_row.hpp +++ b/app/include/turns/app/widgets/participant_list_row.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -36,7 +35,7 @@ namespace turns::app::widgets Gtk::Button * m_delete; Gtk::Button * m_edit; Gtk::Label * m_subtitle; - Gtk::EditableLabel * m_title; + Gtk::Label * m_title; Gtk::ToggleButton * m_toggle_defeated; }; } // namespace turns::app::widgets diff --git a/app/src/widgets/participant_list_row.cpp b/app/src/widgets/participant_list_row.cpp index 11715d3..94350f8 100644 --- a/app/src/widgets/participant_list_row.cpp +++ b/app/src/widgets/participant_list_row.cpp @@ -21,7 +21,7 @@ namespace turns::app::widgets m_delete = get_widget("delete"); m_edit = get_widget("edit"); m_subtitle = get_widget("subtitle"); - m_title = get_widget("title"); + m_title = get_widget("title"); m_toggle_defeated = get_widget("toggle_defeated"); signal_map().connect([this]{ diff --git a/res/widgets/participant_list_row.ui b/res/widgets/participant_list_row.ui index b3cab2e..f1e4fe1 100644 --- a/res/widgets/participant_list_row.ui +++ b/res/widgets/participant_list_row.ui @@ -31,13 +31,12 @@ vertical center - + False + 0.0 - - diff --git a/res/widgets/widgets.cmb b/res/widgets/widgets.cmb index 373bd40..d6c54a8 100644 --- a/res/widgets/widgets.cmb +++ b/res/widgets/widgets.cmb @@ -14,10 +14,10 @@ (1,5,"GtkBox",None,2,None,None,None,-1,None,None), (1,7,"GtkLabel","subtitle",5,None,None,None,1,"<property name=\"sensitive\"\n bind-source=\"toggle_defeated\"\n bind-property=\"active\"\n bind-flags=\"sync-create|invert-boolean\" />",None), (1,8,"GtkBox",None,2,None,None,None,-1,None,None), - (1,10,"GtkEditableLabel","title",5,None,None,None,None,"<property name=\"sensitive\"\n bind-source=\"toggle_defeated\"\n bind-property=\"active\"\n bind-flags=\"sync-create|invert-boolean\" />",None), (1,12,"GtkToggleButton","toggle_defeated",3,None,None,None,-1,None,None), (1,13,"GtkButton","edit",8,None,None,None,1,"<property name=\"sensitive\"\n bind-source=\"toggle_defeated\"\n bind-property=\"active\"\n bind-flags=\"sync-create|invert-boolean\" />",None), - (1,14,"GtkButton","delete",8,None,None,None,None,None,None) + (1,14,"GtkButton","delete",8,None,None,None,None,None,None), + (1,15,"GtkLabel","title",5,None,None,None,None,None,None) (1,1,"GtkListBoxRow","activatable","False",None,None,None,None,None,None,None,None,None), @@ -33,13 +33,14 @@ (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), - (1,10,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None), (1,12,"GtkButton","icon-name","face-smile-symbolic",None,None,None,None,None,None,None,None,None), (1,12,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), (1,12,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), (1,13,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None), (1,14,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None), - (1,14,"GtkWidget","sensitive",None,None," Custom object fragments ",None,None,None,12,"GtkToggleButton","active","sync-create|invert-boolean") + (1,14,"GtkWidget","sensitive",None,None," Custom object fragments ",None,None,None,12,"GtkToggleButton","active","sync-create|invert-boolean"), + (1,15,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), + (1,15,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None) (1,5,"GtkWidget",1,1,None,None,None,None,None,None), @@ -52,8 +53,6 @@ (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,10,"GtkWidget",1,1,None,None,None,None,None,None), - (1,10,"GtkWidget",2,2,None,1,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), (1,13,"GtkWidget",1,1,None,None,None,None,None,None), @@ -61,7 +60,9 @@ (1,13,"GtkWidget",2,3,None,1,None,None,None,None), (1,14,"GtkWidget",1,1,None,None,None,None,None,None), (1,14,"GtkWidget",2,2,None,1,None,None,None,None), - (1,14,"GtkWidget",2,3,None,1,None,None,None,None) + (1,14,"GtkWidget",2,3,None,1,None,None,None,None), + (1,15,"GtkWidget",1,1,None,None,None,None,None,None), + (1,15,"GtkWidget",2,2,None,1,None,None,None,None) (1,5,"GtkWidget",2,2,"name","title"), @@ -69,11 +70,11 @@ (1,7,"GtkWidget",2,2,"name","subtitle"), (1,8,"GtkWidget",2,2,"name","suffixes"), (1,1,"GtkWidget",2,2,"name","property"), - (1,10,"GtkWidget",2,2,"name","title"), (1,12,"GtkWidget",2,2,"name","circular"), (1,13,"GtkWidget",2,2,"name","circular"), (1,13,"GtkWidget",2,3,"name","suggested-action"), (1,14,"GtkWidget",2,2,"name","circular"), - (1,14,"GtkWidget",2,3,"name","destructive-action") + (1,14,"GtkWidget",2,3,"name","destructive-action"), + (1,15,"GtkWidget",2,2,"name","title") -- cgit v1.2.3