diff options
author | fiaxh <git@lightrise.org> | 2024-12-24 16:02:13 +0100 |
---|---|---|
committer | fiaxh <git@lightrise.org> | 2025-01-12 19:35:58 +0100 |
commit | 5ee322cbd987d36497522b82b876659e1d19da43 (patch) | |
tree | c22d0bdbf92b30207b64ec74e925af4263ce91fc /main/data | |
parent | d78ec0562288fa4ed7d414d2269c00b7b8c2c588 (diff) | |
download | dino-5ee322cbd987d36497522b82b876659e1d19da43.tar.gz dino-5ee322cbd987d36497522b82b876659e1d19da43.zip |
Contact details dialog: Add encryption tab
Diffstat (limited to 'main/data')
-rw-r--r-- | main/data/conversation_details.css | 30 | ||||
-rw-r--r-- | main/data/conversation_details.ui | 45 | ||||
-rw-r--r-- | main/data/gresource.xml | 1 | ||||
-rw-r--r-- | main/data/muc_member_list_row.ui | 86 |
4 files changed, 147 insertions, 15 deletions
diff --git a/main/data/conversation_details.css b/main/data/conversation_details.css index 0eaf60c0..f0cbf666 100644 --- a/main/data/conversation_details.css +++ b/main/data/conversation_details.css @@ -1,7 +1,31 @@ -.extended-headerbar { - background-color: @headerbar_bg_color; -} .extended-headerbar-end { padding-bottom: 24px; border-bottom: 1px solid @borders; +} + +.extended-headerbar { + background-color: @headerbar_bg_color; + padding-bottom: 0; +} + +.dino-underlined-tabs .toggle { + background: none; + padding: 0; + margin: 0 12px 0 0; + border-left: none; + min-width: 0; +} + +.dino-underlined-tabs .toggle label { + border-bottom: 2px solid transparent; + margin: 0; + padding: 6px; +} + +.dino-underlined-tabs .toggle:checked label { + border-bottom-color: @accent_color; +} + +.dino-underlined-tabs .toggle:hover:not(:checked) label { + border-bottom-color: alpha(@accent_color, 0.25); }
\ No newline at end of file diff --git a/main/data/conversation_details.ui b/main/data/conversation_details.ui index 5ee156bb..593dd4bf 100644 --- a/main/data/conversation_details.ui +++ b/main/data/conversation_details.ui @@ -134,25 +134,46 @@ </child> </object> </child> + <child> + <object class="GtkStackSwitcher"> + <property name="stack">stack</property> + <property name="halign">start</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> + <style> + <class name="dino-underlined-tabs"/> + </style> + </object> + </child> </object> </child> </object> </child> <child> - <object class="GtkScrolledWindow"> - <property name="propagate-natural-height">True</property> + <object class="GtkStack" id="stack"> <child> - <object class="AdwClamp"> - <child> - <object class="GtkBox" id="about_box"> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <property name="margin-end">12</property> - <property name="margin-start">12</property> - <property name="margin-top">12</property> - <property name="margin-bottom">40</property> + <object class="GtkStackPage"> + <property name="title">About</property> + <property name="name">about</property> + <property name="child"> + <object class="GtkScrolledWindow"> + <property name="propagate-natural-height">True</property> + <child> + <object class="AdwClamp"> + <child> + <object class="GtkBox" id="about_box"> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <property name="margin-end">12</property> + <property name="margin-start">12</property> + <property name="margin-top">18</property> + <property name="margin-bottom">40</property> + </object> + </child> + </object> + </child> </object> - </child> + </property> </object> </child> </object> diff --git a/main/data/gresource.xml b/main/data/gresource.xml index 661185ab..88858e13 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -70,6 +70,7 @@ <file>menu_conversation.ui</file> <file>menu_encryption.ui</file> <file>message_item_widget_edit_mode.ui</file> + <file>muc_member_list_row.ui</file> <file>occupant_list.ui</file> <file>occupant_list_item.ui</file> <file>quote.ui</file> diff --git a/main/data/muc_member_list_row.ui b/main/data/muc_member_list_row.ui new file mode 100644 index 00000000..cefad3fc --- /dev/null +++ b/main/data/muc_member_list_row.ui @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <template class="GtkListItem"> + <property name="child"> + <object class="GtkBox"> + <property name="orientation">horizontal</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> + <property name="margin-start">7</property> + <property name="margin-end">14</property> + <child> + <object class="DinoUiAvatarPicture" id="picture"> + <property name="height-request">35</property> + <property name="width-request">35</property> + <property name="valign">start</property> + <binding name="model"> + <lookup name="avatar" type="DinoUiViewModelConferenceMemberListRow"> + <lookup name="item">GtkListItem</lookup> + </lookup> + </binding> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="margin-start">10</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="orientation">horizontal</property> + <child> + <object class="GtkLabel" id="name_label"> + <property name="max_width_chars">1</property> + <property name="ellipsize">end</property> + <property name="hexpand">True</property> + <property name="margin-end">7</property> + <property name="xalign">0</property> + <binding name="label"> + <lookup name="name" type="DinoUiViewModelConferenceMemberListRow"> + <lookup name="item">GtkListItem</lookup> + </lookup> + </binding> + </object> + </child> + <child> + <object class="GtkLabel" id="affiliation_label"> + <property name="margin-end">6</property> + <property name="xalign">1</property> + <binding name="label"> + <lookup name="affiliation-str" type="DinoUiViewModelConferenceMemberListRow"> + <lookup name="item">GtkListItem</lookup> + </lookup> + </binding> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="spacing">4</property> + <property name="orientation">horizontal</property> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <property name="margin-end">7</property> + <style> + <class name="dim-label"/> + </style> + <attributes> + <attribute name="scale" value="0.8"/> + </attributes> + <binding name="label"> + <lookup name="jid" type="DinoUiViewModelConferenceMemberListRow"> + <lookup name="item">GtkListItem</lookup> + </lookup> + </binding> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + </property> + </template> +</interface>
\ No newline at end of file |