From 8944029128e3d0f9e32b61e00e880d92fceabb31 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Tue, 5 Sep 2017 23:53:18 +0200
Subject: Move encryption menu into ChatInput, PGP support for MUCs

---
 main/data/chat_input.ui | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

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

diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui
index 2436ff82..9a8cf424 100644
--- a/main/data/chat_input.ui
+++ b/main/data/chat_input.ui
@@ -6,6 +6,9 @@
         <property name="orientation">horizontal</property>
         <property name="margin">5</property>
         <property name="visible">True</property>
+        <style>
+            <class name="dino-chatinput"/>
+        </style>
         <child>
             <object class="GtkScrolledWindow" id="scrolled">
                 <property name="max_content_height">300</property>
@@ -15,12 +18,17 @@
                     <object class="GtkFrame">
                         <property name="visible">True</property>
                         <child>
-                            <object class="GtkTextView" id="text_input">
-                                <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property>
-                                <property name="border-width">5</property>
-                                <property name="can_focus">True</property>
-                                <property name="hexpand">True</property>
+                            <object class="GtkBox" id="box">
                                 <property name="visible">True</property>
+                                <child>
+                                    <object class="GtkTextView" id="text_input">
+                                        <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property>
+                                        <property name="border-width">5</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="visible">True</property>
+                                    </object>
+                                </child>
                             </object>
                         </child>
                     </object>
-- 
cgit v1.2.3-54-g00ecf