diff options
| author | fiaxh <git@mx.ax.lt> | 2018-11-10 17:24:48 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2018-11-10 17:24:48 +0100 |
| commit | 7e6668d283194538d53a3b04708807564e591e22 (patch) | |
| tree | 543dcc031e766b5871f62376e5f889c24c7c7d81 | |
| parent | 214906e1a527e618852fcef20e3d941ec3285301 (diff) | |
| download | dino-7e6668d283194538d53a3b04708807564e591e22.tar.gz dino-7e6668d283194538d53a3b04708807564e591e22.zip | |
Use QR-code icon for OMEMO QR-code button
| -rw-r--r-- | main/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | main/data/icons/dino-qr-code-symbolic.svg | 4 | ||||
| -rw-r--r-- | plugins/omemo/data/contact_details_dialog.ui | 5 | ||||
| -rw-r--r-- | plugins/omemo/src/contact_details_dialog.vala | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 2f1e082b..65d547c6 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -14,6 +14,7 @@ find_packages(MAIN_PACKAGES REQUIRED set(RESOURCE_LIST icons/dino-changes-prevent-symbolic.svg icons/dino-double-tick-symbolic.svg + icons/dino-qr-code-symbolic.svg icons/dino-status-away.svg icons/dino-status-chat.svg icons/dino-status-dnd.svg @@ -161,6 +162,7 @@ install(FILES data/icons/dino-changes-prevent-symbolic.svg data/icons/dino-double-tick-symbolic.svg + data/icons/dino-qr-code-symbolic.svg data/icons/dino-tick-symbolic.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/status diff --git a/main/data/icons/dino-qr-code-symbolic.svg b/main/data/icons/dino-qr-code-symbolic.svg new file mode 100644 index 00000000..0465fac3 --- /dev/null +++ b/main/data/icons/dino-qr-code-symbolic.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg style="width:24px;height:24px" viewBox="0 0 24 24"> + <path fill="#000000" d="M3,11H5V13H3V11M11,5H13V9H11V5M9,11H13V15H11V13H9V11M15,11H17V13H19V11H21V13H19V15H21V19H19V21H17V19H13V21H11V17H15V15H17V13H15V11M19,19V15H17V19H19M15,3H21V9H15V3M17,5V7H19V5H17M3,3H9V9H3V3M5,5V7H7V5H5M3,15H9V21H3V15M5,17V19H7V17H5Z" /> +</svg> diff --git a/plugins/omemo/data/contact_details_dialog.ui b/plugins/omemo/data/contact_details_dialog.ui index dc97cb56..c16d8b46 100644 --- a/plugins/omemo/data/contact_details_dialog.ui +++ b/plugins/omemo/data/contact_details_dialog.ui @@ -45,7 +45,7 @@ </object> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="automatically_accept_new_descr"> <property name="visible">True</property> <property name="max_width_chars">1</property> <property name="expand">True</property> @@ -136,8 +136,7 @@ <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="halign">end</property> - <property name="icon-name">camera-photo-symbolic</property> + <property name="icon-name">dino-qr-code-symbolic</property> <property name="icon-size">1</property> </object> </child> diff --git a/plugins/omemo/src/contact_details_dialog.vala b/plugins/omemo/src/contact_details_dialog.vala index c61d75c2..1865c5f0 100644 --- a/plugins/omemo/src/contact_details_dialog.vala +++ b/plugins/omemo/src/contact_details_dialog.vala @@ -17,6 +17,7 @@ public class ContactDetailsDialog : Gtk.Dialog { private bool own = false; private int own_id = 0; + [GtkChild] private Label automatically_accept_new_descr; [GtkChild] private Box own_fingerprint_container; [GtkChild] private Label own_fingerprint_label; [GtkChild] private Box new_keys_container; @@ -46,6 +47,8 @@ public class ContactDetailsDialog : Gtk.Dialog { own = true; own_id = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id]; + automatically_accept_new_descr.label = _("When you add new encryption keys to your account, automatically accept them."); + own_fingerprint_container.visible = true; string own_b64 = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.identity_key_public_base64]; |
