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

Use QR-code icon for OMEMO QR-code button

Browse source
This commit is contained in:
fiaxh 2018-11-10 17:24:48 +01:00
parent 214906e1a5
commit 7e6668d283
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/CMakeLists.txt
View file

@ -14,6 +14,7 @@ find_packages(MAIN_PACKAGES REQUIRED
set(RESOURCE_LIST set(RESOURCE_LIST
icons/dino-changes-prevent-symbolic.svg icons/dino-changes-prevent-symbolic.svg
icons/dino-double-tick-symbolic.svg icons/dino-double-tick-symbolic.svg
icons/dino-qr-code-symbolic.svg
icons/dino-status-away.svg icons/dino-status-away.svg
icons/dino-status-chat.svg icons/dino-status-chat.svg
icons/dino-status-dnd.svg icons/dino-status-dnd.svg
@ -161,6 +162,7 @@ install(FILES
data/icons/dino-changes-prevent-symbolic.svg data/icons/dino-changes-prevent-symbolic.svg
data/icons/dino-double-tick-symbolic.svg data/icons/dino-double-tick-symbolic.svg
data/icons/dino-qr-code-symbolic.svg
data/icons/dino-tick-symbolic.svg data/icons/dino-tick-symbolic.svg
DESTINATION DESTINATION
${ICON_INSTALL_DIR}/hicolor/scalable/status ${ICON_INSTALL_DIR}/hicolor/scalable/status

4
main/data/icons/dino-qr-code-symbolic.svg Normal file
View file

@ -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>
Side by side

After

Width:  |  Height:  |  Size: 369 B

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

@ -45,7 +45,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel" id="automatically_accept_new_descr">
<property name="visible">True</property> <property name="visible">True</property>
<property name="max_width_chars">1</property> <property name="max_width_chars">1</property>
<property name="expand">True</property> <property name="expand">True</property>
@ -136,8 +136,7 @@
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="halign">end</property> <property name="icon-name">dino-qr-code-symbolic</property>
<property name="icon-name">camera-photo-symbolic</property>
<property name="icon-size">1</property> <property name="icon-size">1</property>
</object> </object>
</child> </child>

3
plugins/omemo/src/contact_details_dialog.vala
View file

@ -17,6 +17,7 @@ public class ContactDetailsDialog : Gtk.Dialog {
private bool own = false; private bool own = false;
private int own_id = 0; private int own_id = 0;
[GtkChild] private Label automatically_accept_new_descr;
[GtkChild] private Box own_fingerprint_container; [GtkChild] private Box own_fingerprint_container;
[GtkChild] private Label own_fingerprint_label; [GtkChild] private Label own_fingerprint_label;
[GtkChild] private Box new_keys_container; [GtkChild] private Box new_keys_container;
@ -46,6 +47,8 @@ public class ContactDetailsDialog : Gtk.Dialog {
own = true; own = true;
own_id = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id]; 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; 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]; string own_b64 = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.identity_key_public_base64];