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 @@
@@ -61,40 +34,13 @@
no-result
-
- vertical
- 10
- center
-
-
- face-uncertain-symbolic
- large
- 72
-
-
-
-
-
- No matching messages
-
-
-
-
-
-
-
-
-
- Check the spelling or try to remove filters
-
-
-
+
+
+ face-uncertain-symbolic
+ No matching messages
+ Check the spelling or try to remove filters
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 @@
placeholder
-
+
+
20
20
20
20
- 10
- start
- start
260
-
-
- start
-
-
-
-
-
- 1
- 70
- 50
- 0
- end
- 0
- Click here to start a conversation or join a channel.
-
-
-
+
+ You have no open chats
+ Click + to start a conversation or join a channel
@@ -89,33 +70,10 @@
placeholder
-
- vertical
- 1
- 1
- center
- center
-
-
- im.dino.Dino-symbolic
- 144
- 30
-
-
-
-
-
- You have no open chats
-
-
-
-
-
-
+
+ im.dino.Dino-symbolic
+ True
+ True
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 @@
- fill
vertical
- fill
- fill
- 1
- 1
+ True
+ True
-
- im.dino.Dino-symbolic
- 144
- 30
- 30
- 30
- 30
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
- 5
-
-
-
-
-
- 15
- center
-
-
-
-
-
- 0
- center
-
-
+
+ vertical
+ center
+ True
+ True
+
+
+ im.dino.Dino-symbolic
+
+
+
+
+ center
+ False
+
+
+
+
+
+ 0
+ center
+ False
+
+
+
diff --git a/main/src/ui/conversation_titlebar/occupants_entry.vala b/main/src/ui/conversation_titlebar/occupants_entry.vala
index a71cf05e..63a35d52 100644
--- a/main/src/ui/conversation_titlebar/occupants_entry.vala
+++ b/main/src/ui/conversation_titlebar/occupants_entry.vala
@@ -11,7 +11,7 @@ class OccupantsEntry : Plugins.ConversationTitlebarEntry, Object {
StreamInteractor stream_interactor;
private Conversation? conversation;
- private MenuButton button = new MenuButton() { icon_name="system-users-symbolic", tooltip_text=Util.string_if_tooltips_active(_("Members")) };
+ private MenuButton button = new MenuButton() { icon_name="system-users-symbolic", tooltip_text=Util.string_if_tooltips_active(_("Members")), visible=false };
private OccupantMenu.View menu = null;
diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala
index 9aeb4217..d892d9ab 100644
--- a/main/src/ui/main_window.vala
+++ b/main/src/ui/main_window.vala
@@ -74,9 +74,6 @@ public class MainWindow : Adw.Window {
Frame search_frame = (Frame) builder.get_object("search_frame");
global_search = new GlobalSearch(stream_interactor);
search_frame.set_child(global_search.get_widget());
-
- Image conversation_list_placeholder_image = (Image) builder.get_object("conversation_list_placeholder_image");
- conversation_list_placeholder_image.set_from_pixbuf(new Pixbuf.from_resource("/im/dino/Dino/dino-conversation-list-placeholder-arrow.svg"));
}
private void setup_headerbar() {
@@ -179,28 +176,24 @@ public class MainWindow : Adw.Window {
public class WelcomePlaceholder : MainWindowPlaceholder {
public WelcomePlaceholder() {
- title_label.label = _("Welcome to Dino!");
- label.label = _("Sign in or create an account to get started.");
+ status_page.title = _("Welcome to Dino!");
+ status_page.description = _("Sign in or create an account to get started.");
primary_button.label = _("Set up account");
- title_label.visible = true;
- secondary_button.visible = false;
+ primary_button.visible = true;
}
}
public class NoAccountsPlaceholder : MainWindowPlaceholder {
public NoAccountsPlaceholder() {
- title_label.label = _("No active accounts");
+ status_page.title = _("No active accounts");
primary_button.label = _("Manage accounts");
- title_label.visible = true;
- label.visible = false;
- secondary_button.visible = false;
+ primary_button.visible = true;
}
}
[GtkTemplate (ui = "/im/dino/Dino/unified_window_placeholder.ui")]
public class MainWindowPlaceholder : Box {
- [GtkChild] public unowned Label title_label;
- [GtkChild] public unowned Label label;
+ [GtkChild] public unowned Adw.StatusPage status_page;
[GtkChild] public unowned Button primary_button;
[GtkChild] public unowned Button secondary_button;
}