From 66dc33c59fbf2fd61da0915ad74e03d221010803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 16 Sep 2026 14:14:53 -0700 Subject: [PATCH 1/4] Redesigner headerbar --- data/icons/icons.indicator.gresource.xml | 1 + data/icons/view-monitor-symbolic.svg | 29 ++++++++++++++++++++++++ src/MainWindow.vala | 25 +++++++++++++------- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 data/icons/view-monitor-symbolic.svg diff --git a/data/icons/icons.indicator.gresource.xml b/data/icons/icons.indicator.gresource.xml index a2569a58d..ab448626e 100644 --- a/data/icons/icons.indicator.gresource.xml +++ b/data/icons/icons.indicator.gresource.xml @@ -1,6 +1,7 @@ + view-monitor-symbolic.svg cpu-symbolic.svg gpu-symbolic.svg ram-symbolic.svg diff --git a/data/icons/view-monitor-symbolic.svg b/data/icons/view-monitor-symbolic.svg new file mode 100644 index 000000000..31cbe8069 --- /dev/null +++ b/data/icons/view-monitor-symbolic.svg @@ -0,0 +1,29 @@ + + + + diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 35eef5401..29af27dc7 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -33,9 +33,13 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { var stack = new Gtk.Stack () { transition_type = SLIDE_LEFT_RIGHT }; - stack.add_titled (process_view, "process_view", _("Processes")); - stack.add_titled (log_view, "log_view", _("Logs")); stack.add_titled (system_view, "system_view", _("System")); + stack.add_titled (log_view, "log_view", _("Logs")); + stack.add_titled (process_view, "process_view", _("Processes")); + + stack.get_page (system_view).set_property ("icon-name", "view-monitor-symbolic"); + stack.get_page (log_view).set_property ("icon-name", "media-tape-symbolic"); + stack.get_page (process_view).set_property ("icon-name", "panel-right-symbolic"); var stack_switcher = new Gtk.StackSwitcher () { stack = stack, @@ -49,7 +53,7 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { }; var preferences_button = new Gtk.MenuButton () { - icon_name = "open-menu", + icon_name = "open-menu-symbolic", primary = true, popover = preferences_popover, tooltip_markup = ("%s\n" + Granite.TOOLTIP_SECONDARY_TEXT_MARKUP).printf ( @@ -57,24 +61,28 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { "F10" ) }; - preferences_button.add_css_class (Granite.STYLE_CLASS_LARGE_ICONS); var search_entry = new Gtk.SearchEntry () { + hexpand = true, placeholder_text = _("Search process name or PID"), valign = CENTER }; search_entry.set_key_capture_widget (this); + var search_clamp = new Adw.Clamp () { + child = search_entry + }; + var search_revealer = new Gtk.Revealer () { - child = search_entry, - transition_type = SLIDE_LEFT, + child = search_clamp, + transition_type = CROSSFADE, overflow = VISIBLE }; var headerbar = new Gtk.HeaderBar () { - title_widget = stack_switcher + title_widget = search_revealer }; - headerbar.pack_start (search_revealer); + headerbar.pack_start (stack_switcher); headerbar.pack_end (preferences_button); var statusbar = new Statusbar (); @@ -92,6 +100,7 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { var dbusserver = DBusServer.get_default (); + toolbox.reveal_bottom_bars = stack.visible_child == process_view; search_revealer.reveal_child = stack.visible_child != system_view; stack.notify["visible-child"].connect (() => { toolbox.reveal_bottom_bars = stack.visible_child == process_view; From ed297c4cad090b7190f4bf1a264d1e504ba9e70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 16 Sep 2026 15:27:13 -0700 Subject: [PATCH 2/4] Add logs icon --- data/icons/icons.indicator.gresource.xml | 1 + data/icons/view-log-symbolic.svg | 44 ++++++++++++++++++++++++ src/MainWindow.vala | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 data/icons/view-log-symbolic.svg diff --git a/data/icons/icons.indicator.gresource.xml b/data/icons/icons.indicator.gresource.xml index e97abaef7..170ec04e6 100644 --- a/data/icons/icons.indicator.gresource.xml +++ b/data/icons/icons.indicator.gresource.xml @@ -1,6 +1,7 @@ + view-log-symbolic.svg view-monitor-symbolic.svg bug-symbolic.svg cpu-symbolic.svg diff --git a/data/icons/view-log-symbolic.svg b/data/icons/view-log-symbolic.svg new file mode 100644 index 000000000..204b0f389 --- /dev/null +++ b/data/icons/view-log-symbolic.svg @@ -0,0 +1,44 @@ + + + + + + + + diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 29af27dc7..892cf5d5b 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -38,7 +38,7 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { stack.add_titled (process_view, "process_view", _("Processes")); stack.get_page (system_view).set_property ("icon-name", "view-monitor-symbolic"); - stack.get_page (log_view).set_property ("icon-name", "media-tape-symbolic"); + stack.get_page (log_view).set_property ("icon-name", "view-log-symbolic"); stack.get_page (process_view).set_property ("icon-name", "panel-right-symbolic"); var stack_switcher = new Gtk.StackSwitcher () { From d1f2d6759b888c9d8b02220785f16feb20766eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 16 Sep 2026 16:18:57 -0700 Subject: [PATCH 3/4] Use system-run-symbolic --- src/MainWindow.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 892cf5d5b..6e2417623 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -39,7 +39,7 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { stack.get_page (system_view).set_property ("icon-name", "view-monitor-symbolic"); stack.get_page (log_view).set_property ("icon-name", "view-log-symbolic"); - stack.get_page (process_view).set_property ("icon-name", "panel-right-symbolic"); + stack.get_page (process_view).set_property ("icon-name", "system-run-symbolic"); var stack_switcher = new Gtk.StackSwitcher () { stack = stack, From 7d71260f4eb11c9ba10ad66d13646097c3783ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 16 Sep 2026 16:21:25 -0700 Subject: [PATCH 4/4] Fix menu valign --- src/MainWindow.vala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 6e2417623..757b84dfc 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -59,7 +59,8 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow { tooltip_markup = ("%s\n" + Granite.TOOLTIP_SECONDARY_TEXT_MARKUP).printf ( _("Settings"), "F10" - ) + ), + valign = CENTER }; var search_entry = new Gtk.SearchEntry () {