diff options
author | fiaxh <git@lightrise.org> | 2022-12-25 18:04:26 +0100 |
---|---|---|
committer | Marvin W <git@larma.de> | 2023-01-24 19:20:43 +0100 |
commit | 4b391f3f31c2272be11a24c8301641b045260e99 (patch) | |
tree | 6ded080a20fe7d0feae396d3843f6013e410cbe6 /main/data | |
parent | 92aca5672db723121471e513e83b68742761d1b5 (diff) | |
download | dino-4b391f3f31c2272be11a24c8301641b045260e99.tar.gz dino-4b391f3f31c2272be11a24c8301641b045260e99.zip |
Use Adw.StatusPage instead of custom placeholders
Diffstat (limited to 'main/data')
-rw-r--r-- | main/data/global_search.ui | 82 | ||||
-rw-r--r-- | main/data/theme.css | 4 | ||||
-rw-r--r-- | main/data/unified_main_content.ui | 64 | ||||
-rw-r--r-- | main/data/unified_window_placeholder.ui | 86 |
4 files changed, 61 insertions, 175 deletions
diff --git a/main/data/global_search.ui b/main/data/global_search.ui index a29c48de..610bcace 100644 --- a/main/data/global_search.ui +++ b/main/data/global_search.ui @@ -19,40 +19,13 @@ <object class="GtkStackPage"> <property name="name">empty</property> <property name="child"> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="spacing">10</property> - <property name="valign">center</property> - <child> - <object class="GtkImage"> - <property name="icon-name">system-search-symbolic</property> - <property name="icon-size">large</property> - <property name="pixel-size">72</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">No active search</property> - <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute> - <attribute name="scale" value="1.3"></attribute> - </attributes> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">Type to start a search</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> + <object class="AdwStatusPage"> + <style> + <class name="compact"/> + </style> + <property name="icon-name">system-search-symbolic</property> + <property name="title" translatable="1">No active search</property> + <property name="description" translatable="1">Type to start a search</property> </object> </property> </object> @@ -61,40 +34,13 @@ <object class="GtkStackPage"> <property name="name">no-result</property> <property name="child"> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="spacing">10</property> - <property name="valign">center</property> - <child> - <object class="GtkImage"> - <property name="icon-name">face-uncertain-symbolic</property> - <property name="icon-size">large</property> - <property name="pixel-size">72</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">No matching messages</property> - <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute> - <attribute name="scale" value="1.3"></attribute> - </attributes> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">Check the spelling or try to remove filters</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> + <object class="AdwStatusPage"> + <style> + <class name="compact"/> + </style> + <property name="icon-name">face-uncertain-symbolic</property> + <property name="title" translatable="1">No matching messages</property> + <property name="description" translatable="1">Check the spelling or try to remove filters</property> </object> </property> </object> diff --git a/main/data/theme.css b/main/data/theme.css index 3d24750e..6b93bc8f 100644 --- a/main/data/theme.css +++ b/main/data/theme.css @@ -3,6 +3,10 @@ * It provides sane defaults for things that are very Dino-specific. */ +statuspage { + opacity: 0.5; +} + window.dino-main .dino-header-right { background: @theme_base_color; } diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui index 83cfc942..a66275de 100644 --- a/main/data/unified_main_content.ui +++ b/main/data/unified_main_content.ui @@ -30,37 +30,18 @@ <object class="GtkStackPage"> <property name="name">placeholder</property> <property name="child"> - <object class="GtkBox"> + <object class="AdwStatusPage"> + <style> + <class name="compact"/> + </style> <property name="margin-start">20</property> <property name="margin-end">20</property> <property name="margin-top">20</property> <property name="margin-bottom">20</property> - <property name="spacing">10</property> - <property name="valign">start</property> - <property name="halign">start</property> <property name="width_request">260</property> - <child> - <object class="GtkImage" id="conversation_list_placeholder_image"> - <property name="valign">start</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="wrap">1</property> - <property name="margin-top">70</property> - <property name="margin-end">50</property> - <property name="xalign">0</property> - <property name="valign">end</property> - <property name="max-width-chars">0</property> - <property name="label" translatable="1">Click here to start a conversation or join a channel.</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> + + <property name="title" translatable="True">You have no open chats</property> + <property name="description" translatable="True">Click + to start a conversation or join a channel</property> </object> </property> </object> @@ -89,33 +70,10 @@ <object class="GtkStackPage"> <property name="name">placeholder</property> <property name="child"> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="hexpand">1</property> - <property name="vexpand">1</property> - <property name="halign">center</property> - <property name="valign">center</property> - <child> - <object class="GtkImage"> - <property name="icon-name">im.dino.Dino-symbolic</property> - <property name="pixel-size">144</property> - <property name="margin-bottom">30</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">You have no open chats</property> - <style> - <class name="dim-label"/> - </style> - <attributes> - <attribute name="scale" value="1.2"></attribute> - </attributes> - </object> - </child> + <object class="AdwStatusPage"> + <property name="icon-name">im.dino.Dino-symbolic</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> </property> </object> diff --git a/main/data/unified_window_placeholder.ui b/main/data/unified_window_placeholder.ui index 91958077..123920fe 100644 --- a/main/data/unified_window_placeholder.ui +++ b/main/data/unified_window_placeholder.ui @@ -2,69 +2,47 @@ <interface> <requires lib="gtk" version="4.0"/> <template class="DinoUiMainWindowPlaceholder"> - <property name="valign">fill</property> <child> <object class="GtkBox" id="box"> <property name="orientation">vertical</property> - <property name="valign">fill</property> - <property name="halign">fill</property> - <property name="hexpand">1</property> - <property name="vexpand">1</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> <object class="GtkHeaderBar"> <property name="show-title-buttons">true</property> </object> </child> <child> - <object class="GtkImage"> - <property name="icon-name">im.dino.Dino-symbolic</property> - <property name="pixel-size">144</property> - <property name="margin-start">30</property> - <property name="margin-end">30</property> - <property name="margin-top">30</property> - <property name="margin-bottom">30</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel" id="title_label"> - <property name="visible">0</property> - <style> - <class name="dim-label"/> - </style> - <attributes> - <attribute name="scale" value="1.3"></attribute> - </attributes> - </object> - </child> - <child> - <object class="GtkLabel" id="label"> - <property name="margin-top">5</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkButton" id="primary_button"> - <property name="margin-top">15</property> - <property name="halign">center</property> - <style> - <class name="text-button"/> - <class name="suggested-action"/> - </style> - </object> - </child> - <child> - <object class="GtkButton" id="secondary_button"> - <property name="visible">0</property> - <property name="halign">center</property> -<!-- <property name="no_show_all">True</property>--> - <style> - <class name="text-button"/> - </style> + <object class="GtkBox"> + <property name="orientation">vertical</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <object class="AdwStatusPage" id="status_page"> + <property name="icon-name">im.dino.Dino-symbolic</property> + </object> + </child> + <child> + <object class="GtkButton" id="primary_button"> + <property name="halign">center</property> + <property name="visible">False</property> + <style> + <class name="text-button"/> + <class name="suggested-action"/> + </style> + </object> + </child> + <child> + <object class="GtkButton" id="secondary_button"> + <property name="visible">0</property> + <property name="halign">center</property> + <property name="visible">False</property> + <style> + <class name="text-button"/> + </style> + </object> + </child> </object> </child> </object> |