Skip to content

ProcessInfoHeader: cleanup #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stsdc merged 3 commits into from
Jul 12, 2025
Merged

ProcessInfoHeader: cleanup #448

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
793fdd3
ProcessInfoHeader: code style
danirabbit Jul 11, 2025
2ebf71f
ProcessInfoHeader: replace Fixed with Overlay
danirabbit Jul 11, 2025
6dd065f
ProcessInfoHeader: set gicon
danirabbit Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 25 additions & 41 deletions src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,31 @@ public class Monitor.ProcessInfoHeader : Gtk.Grid {
public LabelRoundy num_threads;
public LabelRoundy username;

private Regex ? regex;

construct {
column_spacing = 12;

/* *INDENT-OFF* */
regex = /(?i:^.*\.(xpm|png)$)/; // vala-lint=space-before-paren,
/* *INDENT-ON* */

icon = new Gtk.Image.from_icon_name ("application-x-executable", Gtk.IconSize.DIALOG);
icon.set_pixel_size (64);
icon.valign = Gtk.Align.END;
icon = new Gtk.Image.from_icon_name ("application-x-executable", Gtk.IconSize.DIALOG) {
pixel_size = 64
};

state = new Gtk.Label ("?");
state.halign = Gtk.Align.START;
state = new Gtk.Label ("?") {
halign = START,
valign = END
};
state.get_style_context ().add_class ("state_badge");

var icon_container = new Gtk.Fixed ();
icon_container.put (icon, 0, 0);
icon_container.put (state, -5, 48);
var icon_container = new Gtk.Overlay () {
child = icon
};
icon_container.add_overlay (state);

application_name = new Gtk.Label (_("N/A"));
application_name.get_style_context ().add_class ("h2");
application_name.ellipsize = Pango.EllipsizeMode.END;
application_name.tooltip_text = _("N/A");
application_name.halign = Gtk.Align.START;
application_name.valign = Gtk.Align.START;
application_name = new Gtk.Label (_("N/A")) {
ellipsize = END,
halign = START,
valign = START,
tooltip_text = _("N/A")
};
application_name.get_style_context ().add_class (Granite.STYLE_CLASS_H2_LABEL);

pid = new LabelRoundy (_("PID"));
nice = new LabelRoundy (_("NI"));
Expand All @@ -54,7 +52,7 @@ public class Monitor.ProcessInfoHeader : Gtk.Grid {
// TODO: tooltip_text UID
username = new LabelRoundy ("");

var wrapper = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
var wrapper = new Gtk.Box (HORIZONTAL, 0);
wrapper.add (pid);
wrapper.add (priority);
wrapper.add (nice);
Expand All @@ -63,11 +61,11 @@ public class Monitor.ProcessInfoHeader : Gtk.Grid {

attach (icon_container, 0, 0, 1, 2);
attach (application_name, 1, 0, 3, 1);
attach (wrapper, 1, 1, 1, 1);
attach (wrapper, 1, 1);
}

public void update (Process process) {
application_name.set_text (process.application_name);
application_name.label = process.application_name;
application_name.tooltip_text = process.command;
pid.set_text (process.stat.pid.to_string ());
nice.set_text (process.stat.nice.to_string ());
Expand All @@ -89,27 +87,13 @@ public class Monitor.ProcessInfoHeader : Gtk.Grid {

username.set_text (process.username);
username.tooltip_text = process.uid.to_string ();

num_threads.set_text (process.stat.num_threads.to_string ());
state.set_text (process.stat.state);
state.tooltip_text = set_state_tooltip ();
num_threads.set_text (process.stat.num_threads.to_string ());
set_icon (process);
}

private void set_icon (Process process) {
// this construction should be somewhere else
var icon_name = process.icon.to_string ();
state.label = process.stat.state;
state.tooltip_text = set_state_tooltip ();

if (!regex.match (icon_name)) {
icon.set_from_icon_name (icon_name, Gtk.IconSize.DIALOG);
} else {
try {
var pixbuf = new Gdk.Pixbuf.from_file_at_size (icon_name, 48, -1);
icon.set_from_pixbuf (pixbuf);
} catch (Error e) {
warning (e.message);
}
}
icon.gicon = process.icon;
}

private string set_state_tooltip () {
Expand Down