From 8b23ddad2d33a1504cd28c0df583dfe50cadccda Mon Sep 17 00:00:00 2001
From: bobufa <bobufa@users.noreply.github.com>
Date: Wed, 4 Jul 2018 23:38:28 +0200
Subject: ui: search sidebar initial

---
 main/data/conversation_list_titlebar.ui | 15 -------
 main/data/conversation_selector/view.ui | 15 -------
 main/data/menu_add.ui                   |  1 +
 main/data/menu_app.ui                   |  1 +
 main/data/menu_conversation.ui          |  1 +
 main/data/theme.css                     | 10 +++++
 main/data/unified_main_content.ui       | 75 +++++++++++++++++++++++++++++++++
 7 files changed, 88 insertions(+), 30 deletions(-)
 create mode 100644 main/data/unified_main_content.ui

(limited to 'main/data')

diff --git a/main/data/conversation_list_titlebar.ui b/main/data/conversation_list_titlebar.ui
index f8fabedc..6c5d2d0a 100644
--- a/main/data/conversation_list_titlebar.ui
+++ b/main/data/conversation_list_titlebar.ui
@@ -22,20 +22,5 @@
                 <property name="pack_type">start</property>
             </packing>
         </child>
-        <child>
-            <object class="GtkToggleButton" id="search_button">
-                <property name="visible">True</property>
-                <child>
-                    <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon-name">system-search-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/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
index 365957a8..c5560ad1 100644
--- a/main/data/conversation_selector/view.ui
+++ b/main/data/conversation_selector/view.ui
@@ -4,21 +4,6 @@
         <property name="can_focus">True</property>
         <property name="expand">True</property>
         <property name="orientation">vertical</property>
-        <child>
-            <object class="GtkRevealer" id="search_revealer">
-                <property name="hexpand">True</property>
-                <property name="visible">True</property>
-                <child>
-                    <object class="GtkSearchEntry" id="search_entry">
-                        <property name="primary_icon_name">edit-find-symbolic</property>
-                        <property name="placeholder_text" translatable="yes">Search</property>
-                        <property name="margin">10px</property>
-                        <property name="hexpand">True</property>
-                        <property name="visible">True</property>
-                    </object>
-                </child>
-            </object>
-        </child>
         <child>
             <object class="GtkScrolledWindow" id="scrolled">
                 <property name="expand">True</property>
diff --git a/main/data/menu_add.ui b/main/data/menu_add.ui
index d8fd691b..fdf01352 100644
--- a/main/data/menu_add.ui
+++ b/main/data/menu_add.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <menu id="menu_add">
         <section>
diff --git a/main/data/menu_app.ui b/main/data/menu_app.ui
index beb81f3f..eb862ddb 100644
--- a/main/data/menu_app.ui
+++ b/main/data/menu_app.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <menu id="menu_app">
         <section>
diff --git a/main/data/menu_conversation.ui b/main/data/menu_conversation.ui
index 42b580be..a65522c3 100644
--- a/main/data/menu_conversation.ui
+++ b/main/data/menu_conversation.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <menu id="menu_conversation">
         <section>
diff --git a/main/data/theme.css b/main/data/theme.css
index e7d58ffb..52ca1af7 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -17,6 +17,16 @@ window.dino-main .dino-conversation undershoot {
     background: none;
 }
 
+window.dino-main .dino-sidebar frame {
+    background: @insensitive_bg_color;
+    border-left: 1px solid @borders;
+}
+
+window.dino-main .dino-sidebar frame.collapsed {
+    border-bottom: 1px solid @borders;
+}
+
+
 window.dino-main .dino-chatinput frame box {
     background: @theme_base_color;
 }
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
new file mode 100644
index 00000000..9b396b34
--- /dev/null
+++ b/main/data/unified_main_content.ui
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <object class="GtkPaned" id="paned">
+        <property name="position">300</property>
+        <property name="orientation">horizontal</property>
+        <property name="visible">True</property>
+        <child>
+            <object class="DinoUiConversationSelectorView" id="conversation_list">
+                <property name="visible">True</property>
+            </object>
+            <packing>
+                <property name="resize">False</property>
+                <property name="shrink">False</property>
+            </packing>
+        </child>
+        <child>
+            <object class="GtkOverlay">
+                <property name="visible">True</property>
+                <child>
+                    <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <property name="visible">True</property>
+                        <style>
+                            <class name="dino-conversation"/>
+                        </style>
+                        <child>
+                            <object class="DinoUiConversationSummaryConversationView" id="conversation_frame">
+                                <property name="visible">True</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="DinoUiChatInputView" id="chat_input">
+                                <property name="visible">True</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child type="overlay">
+                    <object class="GtkRevealer" id="search_revealer">
+                        <property name="visible">True</property>
+                        <property name="halign">end</property>
+                        <property name="transition-type">slide-left</property>
+                        <style>
+                            <class name="dino-sidebar"/>
+                        </style>
+                        <child>
+                            <object class="GtkFrame">
+                                <property name="visible">True</property>
+                                <property name="width-request">400</property>
+                                <property name="shadow-type">none</property>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkSearchEntry" id="search_entry">
+                                                <property name="visible">True</property>
+                                                <property name="margin">12</property>
+                                            </object>
+                                        </child>
+                                        <child><placeholder/></child>
+                                    </object>
+                                </child>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+            </object>
+            <packing>
+                <property name="resize">True</property>
+                <property name="shrink">False</property>
+            </packing>
+        </child>
+    </object>
+</interface>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf