From 12cd56612dd6edd056e2cd8aae59ea3ae8f05d1e Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Sun, 29 Mar 2020 20:23:47 +0200
Subject: Store entity identity info, use it in conversation list tooltips

---
 main/data/conversation_row.ui                      | 148 +++++++++++++++++++++
 .../data/conversation_selector/chat_row_tooltip.ui |  22 ---
 .../data/conversation_selector/conversation_row.ui | 148 ---------------------
 main/data/icons/dino-device-desktop-symbolic.svg   |   5 +
 main/data/icons/dino-device-phone-symbolic.svg     |   6 +
 5 files changed, 159 insertions(+), 170 deletions(-)
 create mode 100644 main/data/conversation_row.ui
 delete mode 100644 main/data/conversation_selector/chat_row_tooltip.ui
 delete mode 100644 main/data/conversation_selector/conversation_row.ui
 create mode 100644 main/data/icons/dino-device-desktop-symbolic.svg
 create mode 100644 main/data/icons/dino-device-phone-symbolic.svg

(limited to 'main/data')

diff --git a/main/data/conversation_row.ui b/main/data/conversation_row.ui
new file mode 100644
index 00000000..7772c907
--- /dev/null
+++ b/main/data/conversation_row.ui
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <template class="DinoUiConversationSelectorRow">
+        <property name="visible">True</property>
+        <child>
+            <object class="GtkRevealer" id="main_revealer">
+                <property name="transition-type">slide-down</property>
+                <property name="transition-duration">200</property>
+                <property name="reveal-child">False</property>
+                <property name="visible">True</property>
+                <child>
+                    <object class="GtkBox">
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="margin-start">7</property>
+                        <property name="margin-end">14</property>
+                        <property name="visible">True</property>
+                        <child>
+                            <object class="DinoUiAvatarImage" id="image">
+                                <property name="height">35</property>
+                                <property name="width">35</property>
+                                <property name="valign">center</property>
+                                <property name="visible">True</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkBox">
+                                <property name="margin-left">10</property>
+                                <property name="orientation">vertical</property>
+                                <property name="visible">True</property>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="valign">start</property>
+                                        <property name="visible">True</property>
+                                        <property name="orientation">horizontal</property>
+                                        <child>
+                                            <object class="GtkLabel" id="name_label">
+                                                <property name="max_width_chars">1</property>
+                                                <property name="ellipsize">end</property>
+                                                <property name="expand">True</property>
+                                                <property name="margin-right">7</property>
+                                                <property name="xalign">0</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkRevealer" id="time_revealer">
+                                                <property name="transition-type">slide-right</property>
+                                                <property name="transition-duration">100</property>
+                                                <property name="reveal-child">True</property>
+                                                <property name="visible">True</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="time_label">
+                                                        <property name="hexpand">False</property>
+                                                        <property name="xalign">1</property>
+                                                        <attributes>
+                                                            <attribute name="scale" value="0.7"/>
+                                                        </attributes>
+                                                    </object>
+                                                </child>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </child>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="valign">end</property>
+                                        <property name="visible">True</property>
+                                        <property name="orientation">horizontal</property>
+                                        <child>
+                                            <object class="GtkLabel" id="nick_label">
+                                                <property name="max_width_chars">15</property>
+                                                <property name="ellipsize">end</property>
+                                                <property name="xalign">0</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                                <attributes>
+                                                    <!--<attribute name="weight" value="bold"/>-->
+                                                    <attribute name="scale" value="0.8"/>
+                                                </attributes>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel" id="message_label">
+                                                <property name="max_width_chars">1</property>
+                                                <property name="ellipsize">end</property>
+                                                <property name="expand">True</property>
+                                                <property name="xalign">0</property>
+                                                <attributes>
+                                                    <attribute name="scale" value="0.8"/>
+                                                </attributes>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </child>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkBox">
+                                <property name="orientation">vertical</property>
+                                <property name="visible">True</property>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="vexpand">True</property>
+                                        <property name="visible">True</property>
+                                    </object>
+                                </child>
+                                <child>
+                                    <object class="GtkRevealer" id="xbutton_revealer">
+                                        <property name="transition-type">slide-left</property>
+                                        <property name="transition-duration">100</property>
+                                        <property name="reveal-child">False</property>
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkButton" id="x_button">
+                                                <property name="vexpand">False</property>
+                                                <property name="visible">True</property>
+                                                <style>
+                                                    <class name="conversation_list_row_xbutton"/>
+                                                    <class name="circular"/>
+                                                    <class name="flat"/>
+                                                </style>
+                                                <child>
+                                                    <object class="GtkImage">
+                                                        <property name="icon-name">window-close-symbolic</property>
+                                                        <property name="icon-size">1</property>
+                                                        <property name="visible">True</property>
+                                                    </object>
+                                                </child>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </child>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="vexpand">True</property>
+                                        <property name="visible">True</property>
+                                    </object>
+                                </child>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+            </object>
+        </child>
+    </template>
+</interface>
diff --git a/main/data/conversation_selector/chat_row_tooltip.ui b/main/data/conversation_selector/chat_row_tooltip.ui
deleted file mode 100644
index 6596cd62..00000000
--- a/main/data/conversation_selector/chat_row_tooltip.ui
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <object class="GtkBox" id="main_box">
-        <property name="orientation">vertical</property>
-        <property name="visible">True</property>
-        <child>
-            <object class="GtkLabel" id="jid_label">
-                <property name="xalign">0</property>
-                <property name="visible">True</property>
-                <attributes>
-                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                </attributes>
-            </object>
-        </child>
-        <child>
-            <object class="GtkBox" id="inner_box">
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
-            </object>
-        </child>
-    </object>
-</interface>
diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui
deleted file mode 100644
index 7772c907..00000000
--- a/main/data/conversation_selector/conversation_row.ui
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <template class="DinoUiConversationSelectorRow">
-        <property name="visible">True</property>
-        <child>
-            <object class="GtkRevealer" id="main_revealer">
-                <property name="transition-type">slide-down</property>
-                <property name="transition-duration">200</property>
-                <property name="reveal-child">False</property>
-                <property name="visible">True</property>
-                <child>
-                    <object class="GtkBox">
-                        <property name="orientation">horizontal</property>
-                        <property name="margin">10</property>
-                        <property name="margin-start">7</property>
-                        <property name="margin-end">14</property>
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="DinoUiAvatarImage" id="image">
-                                <property name="height">35</property>
-                                <property name="width">35</property>
-                                <property name="valign">center</property>
-                                <property name="visible">True</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="margin-left">10</property>
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkBox">
-                                        <property name="valign">start</property>
-                                        <property name="visible">True</property>
-                                        <property name="orientation">horizontal</property>
-                                        <child>
-                                            <object class="GtkLabel" id="name_label">
-                                                <property name="max_width_chars">1</property>
-                                                <property name="ellipsize">end</property>
-                                                <property name="expand">True</property>
-                                                <property name="margin-right">7</property>
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                        </child>
-                                        <child>
-                                            <object class="GtkRevealer" id="time_revealer">
-                                                <property name="transition-type">slide-right</property>
-                                                <property name="transition-duration">100</property>
-                                                <property name="reveal-child">True</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel" id="time_label">
-                                                        <property name="hexpand">False</property>
-                                                        <property name="xalign">1</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="0.7"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkBox">
-                                        <property name="valign">end</property>
-                                        <property name="visible">True</property>
-                                        <property name="orientation">horizontal</property>
-                                        <child>
-                                            <object class="GtkLabel" id="nick_label">
-                                                <property name="max_width_chars">15</property>
-                                                <property name="ellipsize">end</property>
-                                                <property name="xalign">0</property>
-                                                <style>
-                                                    <class name="dim-label"/>
-                                                </style>
-                                                <attributes>
-                                                    <!--<attribute name="weight" value="bold"/>-->
-                                                    <attribute name="scale" value="0.8"/>
-                                                </attributes>
-                                            </object>
-                                        </child>
-                                        <child>
-                                            <object class="GtkLabel" id="message_label">
-                                                <property name="max_width_chars">1</property>
-                                                <property name="ellipsize">end</property>
-                                                <property name="expand">True</property>
-                                                <property name="xalign">0</property>
-                                                <attributes>
-                                                    <attribute name="scale" value="0.8"/>
-                                                </attributes>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkBox">
-                                        <property name="vexpand">True</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkRevealer" id="xbutton_revealer">
-                                        <property name="transition-type">slide-left</property>
-                                        <property name="transition-duration">100</property>
-                                        <property name="reveal-child">False</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkButton" id="x_button">
-                                                <property name="vexpand">False</property>
-                                                <property name="visible">True</property>
-                                                <style>
-                                                    <class name="conversation_list_row_xbutton"/>
-                                                    <class name="circular"/>
-                                                    <class name="flat"/>
-                                                </style>
-                                                <child>
-                                                    <object class="GtkImage">
-                                                        <property name="icon-name">window-close-symbolic</property>
-                                                        <property name="icon-size">1</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkBox">
-                                        <property name="vexpand">True</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                    </object>
-                </child>
-            </object>
-        </child>
-    </template>
-</interface>
diff --git a/main/data/icons/dino-device-desktop-symbolic.svg b/main/data/icons/dino-device-desktop-symbolic.svg
new file mode 100644
index 00000000..4e4e02ab
--- /dev/null
+++ b/main/data/icons/dino-device-desktop-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="m3 4h18a1 1 0 0 1 1 1v11a1 1 0 0 1-1 1h1l2 3v1h-24v-1l2-3h1a1 1 0 0 1-1-1v-11a1 1 0 0 1 1-1m1 2v9h16v-9h-16z"/>
+  <rect x="4" y="6" width="16" height="9" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
+</svg>
diff --git a/main/data/icons/dino-device-phone-symbolic.svg b/main/data/icons/dino-device-phone-symbolic.svg
new file mode 100644
index 00000000..64a69e17
--- /dev/null
+++ b/main/data/icons/dino-device-phone-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M17.25,18H6.75V4H17.25M14,21H10V20H14M16,1H8A3,3 0 0,0 5,4V20A3,3 0 0,0 8,23H16A3,3 0 0,0 19,20V4A3,3 0 0,0 16,1Z"/>
+  <rect x="6.75" y="4" width="10.5" height="14" fill="#030202" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
+  <rect x="10" y="20" width="4" height="1" fill="#070504" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
+</svg>
-- 
cgit v1.2.3-70-g09d2