aboutsummaryrefslogtreecommitdiff
path: root/plugins/omemo/src/ui
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-10-28 01:27:34 +0100
committerfiaxh <git@lightrise.org>2019-10-28 01:28:40 +0100
commit0082d376af65b7a9bcb67c9f133884dec6a2006d (patch)
treea99d3152551188f70b31847d12a16da06ff051bd /plugins/omemo/src/ui
parentdf217fb1171e848d28857d946edbaaa8d1d6e613 (diff)
downloaddino-0082d376af65b7a9bcb67c9f133884dec6a2006d.tar.gz
dino-0082d376af65b7a9bcb67c9f133884dec6a2006d.zip
Fix accept/reject new OMEMO key buttons in current Adwaita theme versions
Diffstat (limited to 'plugins/omemo/src/ui')
-rw-r--r--plugins/omemo/src/ui/contact_details_dialog.vala35
1 files changed, 16 insertions, 19 deletions
diff --git a/plugins/omemo/src/ui/contact_details_dialog.vala b/plugins/omemo/src/ui/contact_details_dialog.vala
index ad43f00e..39be401e 100644
--- a/plugins/omemo/src/ui/contact_details_dialog.vala
+++ b/plugins/omemo/src/ui/contact_details_dialog.vala
@@ -187,24 +187,24 @@ public class ContactDetailsDialog : Gtk.Dialog {
ListBoxRow lbr = new ListBoxRow() { visible = true, activatable = false, hexpand = true };
Box box = new Box(Gtk.Orientation.HORIZONTAL, 40) { visible = true, margin_start = 20, margin_end = 20, margin_top = 14, margin_bottom = 14, hexpand = true };
- Box control_box = new Box(Gtk.Orientation.HORIZONTAL, 0) { visible = true, hexpand = true };
-
- Button yes_button = new Button() { visible = true, valign = Align.CENTER, hexpand = true };
- yes_button.image = new Image.from_icon_name("emblem-ok-symbolic", IconSize.BUTTON);
- yes_button.get_style_context().add_class("suggested-action");
+ Button accept_button = new Button() { visible = true, valign = Align.CENTER, hexpand = true };
+ accept_button.add(new Image.from_icon_name("emblem-ok-symbolic", IconSize.BUTTON) { visible=true }); // using .image = sets .image-button. Together with .suggested/destructive action that breaks the button Adwaita
+ accept_button.get_style_context().add_class("suggested-action");
+ accept_button.tooltip_text = _("Accept key");
- Button no_button = new Button() { visible = true, valign = Align.CENTER, hexpand = true };
- no_button.image = new Image.from_icon_name("action-unavailable-symbolic", IconSize.BUTTON);
- no_button.get_style_context().add_class("destructive-action");
+ Button reject_button = new Button() { visible = true, valign = Align.CENTER, hexpand = true };
+ reject_button.add(new Image.from_icon_name("action-unavailable-symbolic", IconSize.BUTTON) { visible=true });
+ reject_button.get_style_context().add_class("destructive-action");
+ reject_button.tooltip_text = _("Reject key");
- yes_button.clicked.connect(() => {
+ accept_button.clicked.connect(() => {
plugin.trust_manager.set_device_trust(account, jid, device[plugin.db.identity_meta.device_id], TrustLevel.TRUSTED);
add_fingerprint(device, TrustLevel.TRUSTED);
new_keys_listbox.remove(lbr);
if (new_keys_listbox.get_children().length() < 1) new_keys_container.visible = false;
});
- no_button.clicked.connect(() => {
+ reject_button.clicked.connect(() => {
plugin.trust_manager.set_device_trust(account, jid, device[plugin.db.identity_meta.device_id], TrustLevel.UNTRUSTED);
add_fingerprint(device, TrustLevel.UNTRUSTED);
new_keys_listbox.remove(lbr);
@@ -212,16 +212,13 @@ public class ContactDetailsDialog : Gtk.Dialog {
});
string res = fingerprint_markup(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64]));
- Label lbl = new Label(res)
- { use_markup=true, justify=Justification.RIGHT, visible=true, halign = Align.START, valign = Align.CENTER, hexpand = false };
-
-
- box.add(lbl);
-
- control_box.add(yes_button);
- control_box.add(no_button);
- control_box.get_style_context().add_class("linked");
+ Label fingerprint_label = new Label(res) { use_markup=true, justify=Justification.RIGHT, visible=true, halign = Align.START, valign = Align.CENTER, hexpand = false };
+ box.add(fingerprint_label);
+ Box control_box = new Box(Gtk.Orientation.HORIZONTAL, 0) { visible = true, hexpand = true };
+ control_box.add(accept_button);
+ control_box.add(reject_button);
+ control_box.get_style_context().add_class("linked"); // .linked: Visually link the accept / reject buttons
box.add(control_box);
lbr.add(box);