aboutsummaryrefslogtreecommitdiff
path: root/main/data
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-09-30 02:11:23 +0200
committerfiaxh <git@lightrise.org>2019-10-01 17:03:24 +0200
commitdf3716622a37cded9e3754da77497ca6d2f2baeb (patch)
tree079e18e51ea54723c5b1209173f8d3f75b54d102 /main/data
parent5d65f047d0fd1a1ed4a3bbe076d5cb4df76e7d5f (diff)
downloaddino-df3716622a37cded9e3754da77497ca6d2f2baeb.tar.gz
dino-df3716622a37cded9e3754da77497ca6d2f2baeb.zip
Rework no-open-conversation placeholder
Diffstat (limited to 'main/data')
-rw-r--r--main/data/icons/dino-conversation-list-placeholder-arrow.svg11
-rw-r--r--main/data/unified_main_content.ui151
-rw-r--r--main/data/unified_window_placeholder.ui3
3 files changed, 132 insertions, 33 deletions
diff --git a/main/data/icons/dino-conversation-list-placeholder-arrow.svg b/main/data/icons/dino-conversation-list-placeholder-arrow.svg
new file mode 100644
index 00000000..1de38347
--- /dev/null
+++ b/main/data/icons/dino-conversation-list-placeholder-arrow.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14.423mm" height="25.742mm" version="1.1" viewBox="0 0 14.422716 25.741774" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+ <marker id="a" overflow="visible" orient="auto">
+ <path transform="scale(.6)" d="m8.7186 4.0337-10.926-4.0177 10.926-4.0177c-1.7455 2.3721-1.7354 5.6175-6e-7 8.0354z" fill-rule="evenodd" stroke="#000" stroke-linejoin="round" stroke-width=".625"/>
+ </marker>
+ </defs>
+ <g transform="translate(-76.236 -40.41)">
+ <path d="m77.066 41.011c1.1174 11.205 6.3598 21.407 13.389 24.939" fill="none" marker-start="url(#a)" stroke="#000" stroke-linecap="round" stroke-width=".4"/>
+ </g>
+</svg>
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index 9e660b50..587fb706 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -5,14 +5,56 @@
<property name="orientation">horizontal</property>
<property name="visible">True</property>
<child>
- <object class="GtkScrolledWindow" id="scrolled">
- <property name="expand">True</property>
- <property name="hscrollbar_policy">never</property>
+ <object class="GtkStack" id="left_stack">
<property name="visible">True</property>
<child>
- <object class="DinoUiConversationSelector" id="conversation_list">
+ <object class="GtkScrolledWindow" id="scrolled">
+ <property name="expand">True</property>
+ <property name="hscrollbar_policy">never</property>
<property name="visible">True</property>
+ <child>
+ <object class="DinoUiConversationSelector" id="conversation_list">
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="name">content</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="margin">20</property>
+ <property name="spacing">10</property>
+ <property name="valign">start</property>
+ <property name="halign">start</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="conversation_list_placeholder_image">
+ <property name="visible">True</property>
+ <property name="valign">start</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="wrap">True</property>
+ <property name="margin-top">70</property>
+ <property name="margin-right">50</property>
+ <property name="visible">True</property>
+ <property name="valign">end</property>
+ <property name="label">Click here to start a conversation or join a channel</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="name">placeholder</property>
+ </packing>
</child>
</object>
<packing>
@@ -24,54 +66,99 @@
<object class="GtkOverlay">
<property name="visible">True</property>
<child>
- <object class="GtkOverlay">
+ <object class="GtkStack" id="right_stack">
<property name="visible">True</property>
<child>
- <object class="GtkBox">
- <property name="orientation">vertical</property>
+ <object class="GtkOverlay">
<property name="visible">True</property>
- <style>
- <class name="dino-conversation"/>
- </style>
<child>
- <object class="DinoUiConversationSummaryConversationView" id="conversation_frame">
+ <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>
- <object class="DinoUiChatInputView" id="chat_input">
+ <child type="overlay">
+ <object class="GtkRevealer" id="goto_end_revealer">
+ <property name="halign">end</property>
+ <property name="valign">end</property>
+ <property name="transition-type">crossfade</property>
<property name="visible">True</property>
+ <property name="margin-end">30</property>
+ <property name="margin-bottom">70</property>
+ <child>
+ <object class="GtkButton" id="goto_end_button">
+ <property name="vexpand">False</property>
+ <property name="halign">end</property>
+ <property name="valign">end</property>
+ <property name="visible">True</property>
+ <style>
+ <class name="circular"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="icon-name">go-down-symbolic</property>
+ <property name="icon-size">1</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="name">content</property>
+ </packing>
</child>
- <child type="overlay">
- <object class="GtkRevealer" id="goto_end_revealer">
- <property name="halign">end</property>
- <property name="valign">end</property>
- <property name="transition-type">crossfade</property>
+ <child>
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="expand">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property name="visible">True</property>
- <property name="margin-end">30</property>
- <property name="margin-bottom">70</property>
<child>
- <object class="GtkButton" id="goto_end_button">
- <property name="vexpand">False</property>
- <property name="halign">end</property>
- <property name="valign">end</property>
+ <object class="GtkImage">
+ <property name="icon-name">im.dino.Dino-symbolic</property>
+ <property name="pixel-size">144</property>
+ <property name="margin-bottom">30</property>
<property name="visible">True</property>
<style>
- <class name="circular"/>
+ <class name="dim-label"/>
</style>
- <child>
- <object class="GtkImage">
- <property name="icon-name">go-down-symbolic</property>
- <property name="icon-size">1</property>
- <property name="visible">True</property>
- </object>
- </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label">You have no open chats</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="scale" value="1.2"/>
+ </attributes>
</object>
</child>
</object>
+ <packing>
+ <property name="name">placeholder</property>
+ </packing>
</child>
</object>
</child>
diff --git a/main/data/unified_window_placeholder.ui b/main/data/unified_window_placeholder.ui
index a16d98d4..cfabd132 100644
--- a/main/data/unified_window_placeholder.ui
+++ b/main/data/unified_window_placeholder.ui
@@ -6,7 +6,6 @@
<child>
<object class="GtkBox" id="box">
<property name="orientation">vertical</property>
- <property name="spacing">10</property>
<property name="valign">center</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
@@ -38,6 +37,7 @@
<object class="GtkLabel" id="label">
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
+ <property name="margin-top">5</property>
<property name="visible">True</property>
<style>
<class name="dim-label"/>
@@ -46,6 +46,7 @@
</child>
<child>
<object class="GtkButton" id="primary_button">
+ <property name="margin-top">15</property>
<property name="halign">center</property>
<property name="visible">True</property>
<style>