diff options
Diffstat (limited to 'main/data')
| -rw-r--r-- | main/data/chat_input.ui | 28 | ||||
| -rw-r--r-- | main/data/file_default_widget.ui | 5 | ||||
| -rw-r--r-- | main/data/file_input_widget.ui | 60 | ||||
| -rw-r--r-- | main/data/gresource.xml | 2 | ||||
| -rw-r--r-- | main/data/icons/scalable/actions/dino-paper-plane-symbolic.svg | 2 | ||||
| -rw-r--r-- | main/data/style.css | 18 |
6 files changed, 111 insertions, 4 deletions
diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui index d0d99729..c440d815 100644 --- a/main/data/chat_input.ui +++ b/main/data/chat_input.ui @@ -70,6 +70,22 @@ <property name="margin_start">7</property> </object> </child> + <child> + <object class="GtkScrolledWindow"> + <property name="vscrollbar-policy">never</property> + <style> + <class name="undershoot-start" /> + <class name="undershoot-end" /> + </style> + <child> + <object class="GtkBox" id="file_box"> + <property name="halign">start</property> + <property name="orientation">horizontal</property> + <property name="margin_start">7</property> + </object> + </child> + </object> + </child> </object> </child> <child> @@ -96,6 +112,18 @@ </style> </object> </child> + <child> + <object class="GtkButton" id="send_button"> + <property name="icon-name">dino-paper-plane-symbolic</property> + <property name="has-frame">False</property> + <property name="valign">start</property> + <style> + <class name="flat"/> + <class name="dino-chatinput-button"/> + <class name="image-button"/> + </style> + </object> + </child> </object> </child> <child> diff --git a/main/data/file_default_widget.ui b/main/data/file_default_widget.ui index d789991c..aee36d21 100644 --- a/main/data/file_default_widget.ui +++ b/main/data/file_default_widget.ui @@ -29,7 +29,7 @@ <property name="child"> <object class="GtkImage"> <property name="icon-name">dino-file-download-symbolic</property> - <property name="pixel-size">30</property> + <property name="pixel-size">36</property> <property name="opacity">0.7</property> </object> </property> @@ -40,7 +40,7 @@ <property name="name">content_type_image</property> <property name="child"> <object class="GtkImage" id="content_type_image"> - <property name="pixel-size">30</property> + <property name="pixel-size">36</property> <property name="opacity">0.7</property> </object> </property> @@ -59,6 +59,7 @@ <child> <object class="GtkBox"> <property name="orientation">vertical</property> + <property name="valign">center</property> <property name="hexpand">1</property> <child> <object class="GtkLabel" id="name_label"> diff --git a/main/data/file_input_widget.ui b/main/data/file_input_widget.ui new file mode 100644 index 00000000..1aef0e15 --- /dev/null +++ b/main/data/file_input_widget.ui @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk" version="4.0"/> + <template class="DinoUiFileInputWidget"> + <property name="halign">start</property> + <style> + <class name="file-box-outer"/> + </style> + <child> + <object class="DinoUiSizingBin"> + <property name="target-width">200</property> + <property name="max-width">200</property> + <property name="width-request">200</property> + <property name="target-height">64</property> + <property name="max-height">64</property> + <property name="height-request">64</property> + <child> + <object class="GtkBox"> + <property name="hexpand">True</property> + <property name="spacing">8</property> + <child> + <object class="GtkImage" id="content_type_image"> + <property name="valign">center</property> + <property name="pixel-size">40</property> + <property name="opacity">0.7</property> + <property name="margin-start">8</property> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="orientation">vertical</property> + <property name="margin-end">8</property> + <property name="hexpand">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <child> + <object class="GtkLabel" id="name_label"> + <property name="ellipsize">middle</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + </child> + <child> + <object class="GtkLabel" id="mime_label"> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <property name="yalign">1</property> + <attributes> + <attribute name="scale" value="0.8"></attribute> + </attributes> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + </child> + </template> +</interface> diff --git a/main/data/gresource.xml b/main/data/gresource.xml index db9e5caf..2e38153b 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -18,6 +18,7 @@ <file>conversation_view.ui</file> <file>dino-conversation-list-placeholder-arrow.svg</file> <file>file_default_widget.ui</file> + <file>file_input_widget.ui</file> <file>file_send_overlay.ui</file> <file>global_search.ui</file> <file>gtk/help-overlay.ui</file> @@ -38,6 +39,7 @@ <file>icons/scalable/actions/dino-notification-symbolic.svg</file> <file>icons/scalable/actions/dino-open-menu-symbolic.svg</file> <file>icons/scalable/actions/dino-pan-down-symbolic.svg</file> + <file>icons/scalable/actions/dino-paper-plane-symbolic.svg</file> <file>icons/scalable/actions/dino-qr-code-symbolic.svg</file> <file>icons/scalable/actions/dino-small-x-symbolic.svg</file> <file>icons/scalable/actions/dino-user-trash-symbolic.svg</file> diff --git a/main/data/icons/scalable/actions/dino-paper-plane-symbolic.svg b/main/data/icons/scalable/actions/dino-paper-plane-symbolic.svg new file mode 100644 index 00000000..6423688e --- /dev/null +++ b/main/data/icons/scalable/actions/dino-paper-plane-symbolic.svg @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 15 7.992188 l -14 -7 v 6 l 8 1 l -8 1 v 6 z m 0 0" fill="#222222"/></svg> diff --git a/main/data/style.css b/main/data/style.css index 29665ba7..db9f07c5 100644 --- a/main/data/style.css +++ b/main/data/style.css @@ -137,8 +137,8 @@ picture.avatar { window.dino-main .file-box-outer, window.dino-main .call-box-outer { background: @theme_base_color; - border-radius: 3px; - border: 1px solid alpha(@theme_fg_color, 0.1); + border-radius: 8px; + border: 1px solid var(--border-color); } window.dino-main .file-box, @@ -265,6 +265,20 @@ window.dino-main box.dino-chatinput.activatable:focus-within { background-color: @theme_selected_bg_color; } +window.dino-main .image-round-corners picture { + border-radius: 8px; +} + +window.dino-main .file-remove-button { + min-height: 24px; + min-width: 24px; + opacity: 0; +} + +window.dino-main .file-share-wrap *:hover + .file-remove-button, window.dino-main .file-remove-button:hover { + opacity: 1; +} + /*Chat input warning*/ box.dino-input-warning frame border { |
