Move encryption menu into ChatInput, PGP support for MUCs

5 files changed, 61 insertions, 18 deletions

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>
diff --git a/main/data/conversation_summary/message_item.ui b/main/data/conversation_summary/message_item.ui
index 8d53a691..a6937d10 100644
--- a/main/data/conversation_summary/message_item.ui
+++ b/main/data/conversation_summary/message_item.ui
@@ -38,7 +38,7 @@
             </packing>
         </child>
         <child>
-            <object class="GtkImage" id="encryption_image">
+            <object class="GtkImage" id="received_image">
                 <property name="visible">False</property>
                 <property name="xalign">1</property>
                 <property name="valign">start</property>
@@ -54,7 +54,7 @@
             </packing>
         </child>
         <child>
-            <object class="GtkImage" id="received_image">
+            <object class="GtkImage" id="encryption_image">
                 <property name="visible">False</property>
                 <property name="xalign">1</property>
                 <property name="valign">start</property>
diff --git a/main/data/menu_encryption.ui b/main/data/menu_encryption.ui
index 7aae53ee..9e63b17d 100644
--- a/main/data/menu_encryption.ui
+++ b/main/data/menu_encryption.ui
@@ -30,4 +30,4 @@
             </packing>
         </child>
     </object>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/main/data/pre_theme.css b/main/data/pre_theme.css
deleted file mode 100644
index 392e603f..00000000
--- a/main/data/pre_theme.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This theme file is applied before the operating system theme and any user configuration.
- * It provides sane defaults for things that are very Dino-specific.
- */
-
-window.dino-main headerbar.dino-left label.title {
-    opacity: 0;
-    font-size: 0;
-    color: transparent;
-}
\ No newline at end of file
diff --git a/main/data/theme.css b/main/data/theme.css
new file mode 100644
index 00000000..d2723d54
--- /dev/null
+++ b/main/data/theme.css
@@ -0,0 +1,45 @@
+/**
+ * This theme file is applied after the operating system theme
+ * It provides sane defaults for things that are very Dino-specific.
+ */
+
+window.dino-main headerbar.dino-left label.title {
+    opacity: 0;
+    font-size: 0;
+    color: transparent;
+}
+
+window.dino-main .dino-chatinput frame box {
+    background: @theme_base_color;
+}
+
+window.dino-main .dino-chatinput frame box:backdrop {
+    background: @theme_unfocused_base_color;
+}
+
+window.dino-main button.dino-chatinput-button {
+    border: none;
+    background: transparent;
+    box-shadow: none;
+    min-height: 0;
+    padding: 7px 5px;
+    color: alpha(@theme_fg_color, 0.6);
+    outline: none;
+}
+
+window.dino-main button.dino-chatinput-button:hover {
+    color: @theme_selected_bg_color;
+}
+
+window.dino-main button.dino-chatinput-button:backdrop {
+    color: alpha(@theme_unfocused_fg_color, 0.6);
+}
+
+window.dino-main button.dino-chatinput-button:active,
+window.dino-main button.dino-chatinput-button:checked {
+    color: alpha(@theme_selected_bg_color, 0.8);
+}
+
+window.dino-main button.dino-chatinput-button:checked:backdrop {
+    color: alpha(@theme_unfocused_selected_bg_color, 0.8);
+}