Support showing a role of a contactfeature/role-details

The role property contains 2 (optional) elements: an organisation name
(note that "organisation" is broader than "company"), and the role of
the person in that organisation (for example: "Board Member").

This is mostly useful for people who work in a corporate setting, but
can also be nice to keep track of what your relatives are doing.

In the ContactSheet (ie. viewing mode), the property shows itself as a
single row: "$ROLE at $ORGANISATION"; the text may slightly differ if
one of the two is not available. In the ContactEditor, it gets split up
into two rows in the same listbox: one for the organisation and one for
the actual role.

Finally, note that a contact can have multiple roles/organisations, so
this property can occur more than once.

3 files changed, 14 insertions, 5 deletions

diff --git a/data/contacts.gresource.xml b/data/contacts.gresource.xml
index 25f44e1..0455ec7 100644
--- a/data/contacts.gresource.xml
+++ b/data/contacts.gresource.xml
@@ -4,6 +4,7 @@
     <file compressed="true">ui/style.css</file>
 
     <file preprocess="xml-stripblanks">icons/scalable/actions/birthday-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">icons/scalable/actions/building-symbolic.svg</file>
     <file preprocess="xml-stripblanks">icons/scalable/actions/calendar-symbolic.svg</file>
     <file preprocess="xml-stripblanks">icons/scalable/actions/chat-symbolic.svg</file>
     <file preprocess="xml-stripblanks">icons/scalable/actions/external-link-symbolic.svg</file>
diff --git a/data/icons/scalable/actions/building-symbolic.svg b/data/icons/scalable/actions/building-symbolic.svg
new file mode 100644
index 0000000..fcf36a6
--- /dev/null
+++ b/data/icons/scalable/actions/building-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 2 0 c -0.554688 0 -1.027344 0.445312 -1 1 v 14 h -1 v 1 h 16 v -1 h -1 v -14 c 0 -1 -1 -1 -1 -1 z m 1.25 2 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 4 0 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 4 0 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m -8 3 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 4 0 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 4 0 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m -8 3 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 4 0 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 4 0 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m -8 3 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 3.75 1 h 2 v 3 h -2 z m 4.25 -1 h 1.5 c 0.136719 0 0.25 0.113281 0.25 0.25 v 1.5 c 0 0.136719 -0.113281 0.25 -0.25 0.25 h -1.5 c -0.136719 0 -0.25 -0.113281 -0.25 -0.25 v -1.5 c 0 -0.136719 0.113281 -0.25 0.25 -0.25 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/ui/style.css b/data/ui/style.css
index 4e68694..c80cfb8 100644
--- a/data/ui/style.css
+++ b/data/ui/style.css
@@ -70,11 +70,14 @@ flowboxchild.circular {
 .contacts-editor-property {
 }
 
-  .contacts-editor-property .contacts-property-icon,
-  .contacts-editor-property entry.contacts-editor-main-widget image {
+  .contacts-editor-property .contacts-property-icon {
     margin: 12px 12px;
   }
 
+  .contacts-editor-property entry.contacts-editor-main-widget image {
+    margin: 9px 12px;
+  }
+
   .contacts-editor-property entry.contacts-editor-main-widget {
     padding: 4px 6px 4px 0; /* left padding is for the icon */
   }
@@ -83,13 +86,14 @@ flowboxchild.circular {
     padding: 10px 0;
   }
 
-/* Class for editing postal address */
-.contacts-editor-address {
+.contacts-editor-address,
+.contacts-editor-role {
   padding-top: 6px;
   padding-bottom: 6px;
 }
 
-  .contacts-editor-address entry {
+  .contacts-editor-address entry,
+  .contacts-editor-role entry {
     padding: 6px 3px;
   }