anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[feature/handy]: Adapt OMEMO dialog (#985)

Browse source 
* Wrap OMEMO automatically accept label

* Change OMEMO fingerprint label to wrap with max-width

* Set contact OMEMO dialog as resizable

* Disable expanding grid in contact details
This commit is contained in:
Michel Le Bihan 2021-02-08 17:54:17 +01:00 committed by fiaxh
parent 114b7114d9
commit db1bff1c87
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/data/contact_details_dialog.ui
View file

@ -36,6 +36,7 @@
<property name="margin-top">20</property> <property name="margin-top">20</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
<property name="column-spacing">10</property> <property name="column-spacing">10</property>
<property name="expand">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<object class="DinoUiAvatarImage" id="avatar"> <object class="DinoUiAvatarImage" id="avatar">

7
plugins/omemo/data/contact_details_dialog.ui
View file

@ -2,7 +2,6 @@
<interface> <interface>
<template class="DinoPluginsOmemoContactDetailsDialog"> <template class="DinoPluginsOmemoContactDetailsDialog">
<property name="modal">True</property> <property name="modal">True</property>
<property name="resizable">False</property>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -37,6 +36,8 @@
<object class="GtkLabel" id="automatically_accept_new_label"> <object class="GtkLabel" id="automatically_accept_new_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
<attributes> <attributes>
<attribute name="scale" value="1.1"/> <attribute name="scale" value="1.1"/>
</attributes> </attributes>
@ -114,8 +115,10 @@
<object class="GtkLabel" id="own_fingerprint_label"> <object class="GtkLabel" id="own_fingerprint_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="justify">right</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="max_width_chars">35</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
</object> </object>
</child> </child>
<child> <child>

2
plugins/omemo/src/ui/contact_details_dialog.vala
View file

@ -288,7 +288,7 @@ public class ContactDetailsDialog : Gtk.Dialog {
public class FingerprintRow : ListBoxRow { public class FingerprintRow : ListBoxRow {
private Image trust_image = new Image() { visible = true, halign = Align.END, icon_size = IconSize.BUTTON }; private Image trust_image = new Image() { visible = true, halign = Align.END, icon_size = IconSize.BUTTON };
private Label fingerprint_label = new Label("") { use_markup=true, justify=Justification.RIGHT, visible=true, halign = Align.START, valign = Align.CENTER, hexpand = false }; private Label fingerprint_label = new Label("") { use_markup=true, max_width_chars=35, wrap=true, visible=true, halign = Align.START, valign = Align.CENTER, hexpand = false, xalign = 0 };
private Label trust_label = new Label(null) { visible = true, hexpand = true, xalign = 0 }; private Label trust_label = new Label(null) { visible = true, hexpand = true, xalign = 0 };
public Row row; public Row row;

3
plugins/omemo/src/ui/util.vala
View file

@ -51,9 +51,8 @@ public static string fingerprint_markup(string s) {
b = (uint8) (b * factor); b = (uint8) (b * factor);
} }
if (i % 32 == 0 && i != 0) markup += "\n";
markup += @"<span foreground=\"$("#%02x%02x%02x".printf(r, g, b))\">$four_chars</span>"; markup += @"<span foreground=\"$("#%02x%02x%02x".printf(r, g, b))\">$four_chars</span>";
if (i % 8 == 4 && i % 32 != 28) markup += " "; if (i % 8 == 4) markup += " ";
} }
return "<span font_family='monospace' font='8'>" + markup + "</span>"; return "<span font_family='monospace' font='8'>" + markup + "</span>";