Show last message sender in conversation list

1 files changed, 83 insertions, 81 deletions

diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui
index d37d8d4e..4c73e341 100644
--- a/main/data/conversation_selector/conversation_row.ui
+++ b/main/data/conversation_selector/conversation_row.ui
@@ -9,11 +9,10 @@
                 <property name="reveal-child">False</property>
                 <property name="visible">True</property>
                 <child>
-                    <object class="GtkGrid">
+                    <object class="GtkBox">
                         <property name="orientation">horizontal</property>
                         <property name="margin">7</property>
                         <property name="margin-right">14</property>
-                        <property name="column-spacing">10</property>
                         <property name="visible">True</property>
                         <child>
                             <object class="GtkImage" id="image">
@@ -23,114 +22,117 @@
                             </object>
                         </child>
                         <child>
-                            <object class="GtkGrid">
+                            <object class="GtkBox">
+                                <property name="margin-left">10</property>
                                 <property name="orientation">vertical</property>
                                 <property name="visible">True</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>
+                                    <object class="GtkBox">
                                         <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>
-                                    <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                    </packing>
                                 </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>
+                                    <object class="GtkBox">
                                         <property name="visible">True</property>
+                                        <property name="orientation">horizontal</property>
                                         <child>
-                                            <object class="GtkLabel" id="time_label">
-                                                <property name="hexpand">False</property>
-                                                <property name="xalign">1</property>
+                                            <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="scale" value="0.7"/>
+                                                    <!--<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>
-                                    <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                    </packing>
                                 </child>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkBox">
+                                <property name="orientation">vertical</property>
+                                <property name="visible">True</property>
                                 <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 class="GtkBox">
+                                        <property name="vexpand">True</property>
+                                        <property name="visible">True</property>
                                     </object>
-                                    <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkBox">
-                                        <property name="orientation">vertical</property>
+                                    <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="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>
+                                            <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="GtkButton" id="x_button">
-                                                        <property name="vexpand">False</property>
+                                                    <object class="GtkImage">
+                                                        <property name="icon-name">window-close-symbolic</property>
+                                                        <property name="icon-size">1</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>
-                                    <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">2</property>
-                                    </packing>
+                                </child>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="vexpand">True</property>
+                                        <property name="visible">True</property>
+                                    </object>
                                 </child>
                             </object>
                         </child>