diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | res/ui.cmb (renamed from res/windows/windows.cmb) | 100 | ||||
| -rw-r--r-- | res/widgets/participant_row.ui | 21 | ||||
| -rw-r--r-- | res/widgets/turn_order_view.ui | 24 | ||||
| -rw-r--r-- | res/widgets/widgets.cmb | 83 | ||||
| -rw-r--r-- | res/windows/main.ui | 22 |
6 files changed, 108 insertions, 143 deletions
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index 64ec023..fda52b8 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -6,6 +6,7 @@ target_add_glib_resources("res" PREFIX "ch/arknet/Turns" UI_FILES "widgets/participant_row.ui" + "widgets/turn_order_view.ui" "windows/main.ui" "windows/participant_editor.ui" CSS_FILES diff --git a/res/windows/windows.cmb b/res/ui.cmb index 60370d8..119c828 100644 --- a/res/windows/windows.cmb +++ b/res/ui.cmb @@ -2,14 +2,17 @@ <!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd"> <cambalache-project version="0.17.3" target_tk="gtk-4.0"> <ui> - (1,None,"main_window.ui","main.ui",None,None,None,None,None,None,None), - (2,None,None,"participant_editor.ui",None,None,None,None,None,None,None) + (1,None,None,"windows/main.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) + (2,"libadwaita","1.5",None), + (3,"gtk","4.14",None) </ui_library> <object> (1,1,"AdwApplicationWindow","main",None,None,None,None,-1,None,None), @@ -21,9 +24,6 @@ (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,13,"GtkScrolledWindow","turn_order",11,None,None,None,1,None,None), - (1,14,"AdwClamp",None,13,None,None,None,None,None,None), - (1,15,"GtkListBox","participant_list",14,None,None,None,None,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), @@ -38,7 +38,20 @@ (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) + (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), @@ -59,14 +72,6 @@ (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,13,"GtkScrolledWindow","child",None,None,None,None,None,14,None,None,None,None), - (1,14,"AdwClamp","child",None,None,None,None,None,15,None,None,None,None), - (1,14,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None), - (1,14,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None), - (1,14,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None), - (1,14,"GtkWidget","margin-top","18",None,None,None,None,None,None,None,None,None), - (1,14,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), - (1,15,"GtkListBox","selection-mode","none",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), @@ -100,7 +105,32 @@ (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) + (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,"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), + (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), @@ -111,19 +141,47 @@ (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,15,"GtkWidget",1,1,None,None,None,None,None,None), - (1,15,"GtkWidget",2,2,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) + (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) </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,15,"GtkWidget",2,2,"name","boxed-list"), (1,17,"GtkWidget",2,2,"name","pill"), - (1,17,"GtkWidget",2,3,"name","suggested-action") + (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") </object_data_arg> </cambalache-project> diff --git a/res/widgets/participant_row.ui b/res/widgets/participant_row.ui index 683fbb6..7948eab 100644 --- a/res/widgets/participant_row.ui +++ b/res/widgets/participant_row.ui @@ -1,13 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Created with Cambalache 0.90.4 --> <interface> - <!-- interface-name participant_list_item.ui --> <requires lib="gtk" version="4.14"/> <template class="gtkmm__CustomObject_participant_row" parent="GtkListBoxRow"> <property name="activatable">False</property> <property name="child"> <object class="GtkBox"> - <property name="css-classes">header</property> <child> <object class="GtkBox"> <child> @@ -33,7 +31,7 @@ <property name="valign">center</property> <child> <object class="GtkLabel" id="title"> - <property name="visible">False</property> + <property name="wrap-mode">word-char</property> <property name="xalign">0.0</property> <style> <class name="title"/> @@ -42,21 +40,13 @@ </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> - <!-- Custom object fragments --> - <property name="sensitive" bind-source="toggle_defeated" bind-property="active" bind-flags="sync-create|invert-boolean"/> </object> </child> - <style> - <class name="title"/> - </style> </object> </child> <child> @@ -65,8 +55,6 @@ <child> <object class="GtkButton" id="delete"> <property name="icon-name">edit-delete-symbolic</property> - <!-- Custom object fragments --> - <property name="sensitive" bind-source="toggle_defeated" bind-property="active" bind-flags="sync-create|invert-boolean"/> <property name="tooltip-text" translatable="yes">Delete participant</property> <style> <class name="circular"/> @@ -77,13 +65,10 @@ <child> <object class="GtkButton" id="edit"> <property name="icon-name">document-edit-symbolic</property> - <property name="tooltip-text" translatable="yes">Edit participant</property> <style> <class name="circular"/> <class name="suggested-action"/> </style> - <!-- Custom object fragments --> - <property name="sensitive" bind-source="toggle_defeated" bind-property="active" bind-flags="sync-create|invert-boolean"/> </object> </child> <style> @@ -91,9 +76,11 @@ </style> </object> </child> + <style> + <class name="header"/> + </style> </object> </property> <property name="valign">center</property> - <style/> </template> </interface> diff --git a/res/widgets/turn_order_view.ui b/res/widgets/turn_order_view.ui new file mode 100644 index 0000000..d00c3c8 --- /dev/null +++ b/res/widgets/turn_order_view.ui @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Created with Cambalache 0.90.4 --> +<interface> + <requires lib="gtk" version="4.0"/> + <requires lib="libadwaita" version="1.4"/> + <template class="gtkmm__CustomObject_turn_order_view" parent="GtkScrolledWindow"> + <property name="child"> + <object class="AdwClamp"> + <property name="child"> + <object class="GtkListBox" id="view"> + <property name="valign">start</property> + <style> + <class name="boxed-list"/> + </style> + </object> + </property> + <property name="margin-bottom">18</property> + <property name="margin-end">12</property> + <property name="margin-start">12</property> + <property name="margin-top">12</property> + </object> + </property> + </template> +</interface> diff --git a/res/widgets/widgets.cmb b/res/widgets/widgets.cmb deleted file mode 100644 index 983dbea..0000000 --- a/res/widgets/widgets.cmb +++ /dev/null @@ -1,83 +0,0 @@ -<?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_row.ui",None,None,None,None,None,None,None) - </ui> - <ui_library> - (1,"gtk","4.14",None) - </ui_library> - <object> - (1,1,"GtkListBoxRow","gtkmm__CustomObject_participant_row",None,None,None,None,-1,None,None), - (1,2,"GtkBox",None,1,None,None,None,-1,None,None), - (1,3,"GtkBox",None,2,None,None,None,-1,None,None), - (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,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,15,"GtkLabel","title",5,None,None,None,None,None,None) - </object> - <object_property> - (1,1,"GtkListBoxRow","activatable","False",None,None,None,None,None,None,None,None,None), - (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,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,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), - (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","tooltip-text","Mark as defeated",1,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,13,"GtkWidget","tooltip-text","Edit participant",1,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","tooltip-text","Delete participant",1,None,None,None,None,None,None,None,None), - (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) - </object_property> - <object_data> - (1,5,"GtkWidget",1,1,None,None,None,None,None,None), - (1,5,"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,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), - (1,13,"GtkWidget",2,2,None,1,None,None,None,None), - (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,15,"GtkWidget",1,1,None,None,None,None,None,None), - (1,15,"GtkWidget",2,2,None,1,None,None,None,None) - </object_data> - <object_data_arg> - (1,5,"GtkWidget",2,2,"name","title"), - (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,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,15,"GtkWidget",2,2,"name","title") - </object_data_arg> -</cambalache-project> diff --git a/res/windows/main.ui b/res/windows/main.ui index 4361f5e..e01c8d1 100644 --- a/res/windows/main.ui +++ b/res/windows/main.ui @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Created with Cambalache 0.90.4 --> <interface> - <!-- interface-name main_window.ui --> <requires lib="gtk" version="4.14"/> <requires lib="libadwaita" version="1.5"/> <requires lib="gio" version="2.0"/> @@ -27,27 +26,6 @@ <property name="icon-name">contact-new-symbolic</property> </object> </child> - <child> - <object class="GtkScrolledWindow" id="turn_order"> - <property name="child"> - <object class="AdwClamp"> - <property name="child"> - <object class="GtkListBox" id="participant_list"> - <property name="selection-mode">none</property> - <style> - <class name="boxed-list"/> - </style> - </object> - </property> - <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="valign">start</property> - </object> - </property> - </object> - </child> </object> </property> <child type="top"> |
