Move app menu into window, make conversation details dialog directly accessible, no-CSD option for main window

4 files changed, 84 insertions, 16 deletions

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>
diff --git a/main/data/conversation_list_titlebar_csd.ui b/main/data/conversation_list_titlebar_csd.ui
new file mode 100644
index 00000000..b87cd893
--- /dev/null
+++ b/main/data/conversation_list_titlebar_csd.ui
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <template class="DinoUiConversationListTitlebarCsd" parent="GtkHeaderBar">
+        <property name="hexpand">False</property>
+        <property name="show_close_button">True</property>
+        <property name="visible">True</property>
+        <style>
+            <class name="dino-left"/>
+        </style>
+        <child>
+            <object class="GtkMenuButton" id="add_button">
+                <property name="visible">True</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="valign">center</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>
+    </template>
+</interface>
diff --git a/main/data/menu_app.ui b/main/data/menu_app.ui
index eb862ddb..eadbc81e 100644
--- a/main/data/menu_app.ui
+++ b/main/data/menu_app.ui
@@ -11,11 +11,5 @@
                 <attribute name="label" translatable="yes">Settings</attribute>
             </item>
         </section>
-        <section>
-            <item>
-                <attribute name="action">app.quit</attribute>
-                <attribute name="label" translatable="yes">Quit</attribute>
-            </item>
-        </section>
     </menu>
 </interface>
diff --git a/main/data/theme.css b/main/data/theme.css
index 174ce5b2..1969c80b 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -3,6 +3,14 @@
  * It provides sane defaults for things that are very Dino-specific.
  */
 
+window.dino-main .dino-header-right {
+    background: @theme_base_color;
+}
+
+window.dino-main .dino-header-left {
+    background: @insensitive_bg_color;
+}
+
 window.dino-main headerbar.dino-left label.title {
     opacity: 0;
     font-size: 0;