From 5a7ffbc1870aeee52fed3c457817010b608e1e52 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Sun, 27 Jan 2019 15:24:58 +0100
Subject: Move app menu into window, make conversation details dialog directly
 accessible, no-CSD option for main window

---
 main/data/conversation_list_titlebar.ui | 43 +++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 10 deletions(-)

(limited to 'main/data/conversation_list_titlebar.ui')

diff --git a/main/data/conversation_list_titlebar.ui b/main/data/conversation_list_titlebar.ui
index 6c5d2d0a..bc490e4b 100644
--- a/main/data/conversation_list_titlebar.ui
+++ b/main/data/conversation_list_titlebar.ui
@@ -1,26 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiConversationListTitlebar" parent="GtkHeaderBar">
+    <template class="DinoUiConversationListTitlebar" parent="GtkBox">
         <property name="hexpand">False</property>
-        <property name="show_close_button">True</property>
         <property name="visible">True</property>
         <style>
-            <class name="dino-left"/>
+            <class name="dino-header-left"/>
         </style>
         <child>
-            <object class="GtkMenuButton" id="add_button">
+            <object class="GtkBox">
+                <property name="margin">5</property>
+                <property name="hexpand">True</property>
                 <property name="visible">True</property>
                 <child>
-                    <object class="GtkImage">
+                    <object class="GtkMenuButton" id="add_button">
+                        <property name="relief">none</property>
                         <property name="visible">True</property>
-                        <property name="icon-name">list-add-symbolic</property>
-                        <property name="icon-size">1</property>
+                        <child>
+                            <object class="GtkImage">
+                                <property name="visible">True</property>
+                                <property name="icon-name">list-add-symbolic</property>
+                                <property name="icon-size">1</property>
+                            </object>
+                        </child>
                     </object>
+                    <packing>
+                        <property name="pack_type">start</property>
+                    </packing>
+                </child>
+                <child>
+                    <object class="GtkMenuButton" id="menu_button">
+                        <property name="relief">none</property>
+                        <property name="visible">True</property>
+                        <child>
+                            <object class="GtkImage">
+                                <property name="visible">True</property>
+                                <property name="icon-name">open-menu-symbolic</property>
+                                <property name="icon-size">1</property>
+                            </object>
+                        </child>
+                    </object>
+                    <packing>
+                        <property name="pack_type">end</property>
+                    </packing>
                 </child>
             </object>
-            <packing>
-                <property name="pack_type">start</property>
-            </packing>
         </child>
     </template>
 </interface>
-- 
cgit v1.3