aboutsummaryrefslogtreecommitdiff
path: root/main/data
diff options
context:
space:
mode:
Diffstat (limited to 'main/data')
-rw-r--r--main/data/chat_input.ui14
-rw-r--r--main/data/conversation_content_view/view.ui6
-rw-r--r--main/data/message_item_widget_edit_mode.ui70
-rw-r--r--main/data/theme.css12
4 files changed, 84 insertions, 18 deletions
diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui
index e47dd4ba..fb004fec 100644
--- a/main/data/chat_input.ui
+++ b/main/data/chat_input.ui
@@ -45,20 +45,8 @@
</object>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolled">
- <property name="max_content_height">300</property>
- <property name="propagate_natural_height">true</property>
+ <object class="DinoUiChatTextView" id="chat_text_view">
<property name="visible">True</property>
- <child>
- <object class="GtkTextView" id="text_input">
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="margin">8</property>
- <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property>
- <property name="valign">center</property>
- <property name="visible">True</property>
- </object>
- </child>
</object>
</child>
</object>
diff --git a/main/data/conversation_content_view/view.ui b/main/data/conversation_content_view/view.ui
index af05d285..17f753f5 100644
--- a/main/data/conversation_content_view/view.ui
+++ b/main/data/conversation_content_view/view.ui
@@ -46,14 +46,12 @@
<property name="halign">end</property>
<property name="valign">start</property>
<child>
- <object class="GtkMenuButton" id="emoji_button">
+ <object class="GtkButton" id="button1">
<property name="vexpand">False</property>
<property name="halign">end</property>
<property name="valign">end</property>
- <property name="visible">True</property>
<child>
- <object class="GtkImage">
- <property name="icon-name">dino-emoticon-add-symbolic</property>
+ <object class="GtkImage" id="button1_icon">
<property name="icon-size">1</property>
<property name="visible">True</property>
</object>
diff --git a/main/data/message_item_widget_edit_mode.ui b/main/data/message_item_widget_edit_mode.ui
new file mode 100644
index 00000000..8a4faca2
--- /dev/null
+++ b/main/data/message_item_widget_edit_mode.ui
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="3.22"/>
+ <template class="DinoUiConversationSummaryMessageItemEditMode" parent="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame">
+ <property name="visible">True</property>
+ <style>
+ <class name="dino-chatinput"/>
+ </style>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <child>
+ <object class="DinoUiChatTextView" id="chat_text_view">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuButton" id="emoji_button">
+ <property name="relief">none</property>
+ <property name="margin-top">3</property>
+ <property name="valign">start</property>
+ <property name="visible">True</property>
+ <style>
+ <class name="dino-chatinput-button"/>
+ <class name="flat"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="icon-name">dino-emoticon-symbolic</property>
+ <property name="icon-size">1</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">5</property>
+ <property name="halign">end</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">Cancel</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="send_button">
+ <property name="label">Update message</property>
+ <property name="visible">True</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+ </template>
+</interface>
diff --git a/main/data/theme.css b/main/data/theme.css
index f72a20d2..44b4b890 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -52,6 +52,14 @@ window.dino-main .dino-sidebar > frame {
transition: background .05s ease;
}
+window.dino-main .dino-conversation .message-box.edit-mode {
+ background: alpha(@theme_selected_bg_color, 0.1);
+}
+
+window.dino-main .dino-conversation .message-box.edit-mode:hover {
+ background: alpha(@theme_selected_bg_color, 0.12);
+}
+
window.dino-main .dino-conversation .file-box-outer {
background: @theme_base_color;
border-radius: 3px;
@@ -110,7 +118,9 @@ window.dino-main button.dino-chatinput-button:checked:backdrop {
}
-.dino-chatinput textview, .dino-chatinput textview text {
+.dino-chatinput,
+.dino-chatinput textview,
+.dino-chatinput textview text {
background-color: @theme_base_color;
}