ContactRequest: show vCard info
Show the photo, the username/ring id and the profile name which
come from the vCard of the ContactRequest.
Add icons for accept and block.
[SS: reduce code repetition; use nullptr instead of NULL; improve ci msg]
Change-Id: Ide07c99e5990572bae17c8726a77e35fc6d5a16f
Signed-off-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
Reviewed-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
diff --git a/ui/contactrequestcontentview.ui b/ui/contactrequestcontentview.ui
index 4b82719..4d0c21b 100644
--- a/ui/contactrequestcontentview.ui
+++ b/ui/contactrequestcontentview.ui
@@ -2,20 +2,35 @@
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
+ <object class="GtkImage" id="image_accept">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resource">/cx/ring/RingGnome/add</property>
+ </object>
<object class="GtkImage" id="image_back_arrow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
</object>
+ <object class="GtkImage" id="image_hangup">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resource">/cx/ring/RingGnome/block</property>
+ </object>
+ <object class="GtkImage" id="image_reject">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resource">/cx/ring/RingGnome/end</property>
+ </object>
<template class="ContactRequestContentView" parent="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="hbox_contact_request_info">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="button_close_contact_request_content_view">
@@ -33,17 +48,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_peer">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -56,56 +66,162 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox_contact_request_input">
+ <object class="GtkFrame" id="frame_call">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkButton" id="button_accept_contact_request">
- <property name="label" translatable="yes">Accept invitation</property>
+ <object class="GtkBox" id="vbox_call">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="page_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Invitation from</property>
+ <attributes>
+ <attribute name="scale" value="1.5"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox_incoming_info">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="border_width">15</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">15</property>
+ <child>
+ <object class="GtkImage" id="image_peer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_peer">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">end</property>
+ <attributes>
+ <attribute name="scale" value="1.5"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_bestId">
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="placeholder">
+ <property name="height_request">25</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox_action_bar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="border_width">20</property>
+ <property name="spacing">20</property>
+ <child>
+ <object class="GtkButton" id="button_accept_contact_request">
+ <property name="label" translatable="yes">Accept</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="image">image_accept</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_ignore_contact_request">
+ <property name="label" translatable="yes">Reject</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="image">image_reject</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_block_contact_request">
+ <property name="label" translatable="yes">Block</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="image">image_hangup</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_ignore_contact_request">
- <property name="label">Ignore</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Ignore invitation</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_block_contact_request">
- <property name="label">Block</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Block invitation from this contact</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</template>