shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

systemadm: coalesce id and decription fields

Browse Source 
This is just in interest of saving space (e.g. 5 lines for multi-user.target).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2011-09-18 17:00:12 +02:00
parent 734b60d796
commit 8f38d5a4c6
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/systemadm.vala
View File

@ -96,7 +96,6 @@ public class MainWindow : Window {
private Manager manager; private Manager manager;
private RightLabel unit_id_label; private RightLabel unit_id_label;
private RightLabel unit_aliases_label;
private RightLabel unit_dependency_label; private RightLabel unit_dependency_label;
private RightLabel unit_description_label; private RightLabel unit_description_label;
private RightLabel unit_load_state_label; private RightLabel unit_load_state_label;
@ -220,7 +219,6 @@ public class MainWindow : Window {
job_vbox.pack_start(scroll, true, true, 0); job_vbox.pack_start(scroll, true, true, 0);
unit_id_label = new RightLabel(); unit_id_label = new RightLabel();
unit_aliases_label = new RightLabel();
unit_dependency_label = new RightLabel(); unit_dependency_label = new RightLabel();
unit_description_label = new RightLabel(); unit_description_label = new RightLabel();
unit_load_state_label = new RightLabel(); unit_load_state_label = new RightLabel();
@ -255,8 +253,6 @@ public class MainWindow : Window {
unit_table.attach(new LeftLabel("Id:"), 0, 1, 0, 1, AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(new LeftLabel("Id:"), 0, 1, 0, 1, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
unit_table.attach(unit_id_label, 1, 6, 0, 1, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(unit_id_label, 1, 6, 0, 1, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
unit_table.attach(new LeftLabel("Aliases:"), 0, 1, 1, 2, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
unit_table.attach(unit_aliases_label, 1, 6, 1, 2, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
unit_table.attach(new LeftLabel("Description:"), 0, 1, 2, 3, AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(new LeftLabel("Description:"), 0, 1, 2, 3, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
unit_table.attach(unit_description_label, 1, 6, 2, 3, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(unit_description_label, 1, 6, 2, 3, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
unit_table.attach(new LeftLabel("Dependencies:"), 0, 1, 3, 4, AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(new LeftLabel("Dependencies:"), 0, 1, 3, 4, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
@ -443,7 +439,6 @@ public class MainWindow : Window {
restart_button.set_sensitive(false); restart_button.set_sensitive(false);
unit_id_label.set_text_or_na(); unit_id_label.set_text_or_na();
unit_aliases_label.set_text_or_na();
unit_description_label.set_text_or_na(); unit_description_label.set_text_or_na();
unit_description_label.set_text_or_na(); unit_description_label.set_text_or_na();
unit_load_state_label.set_text_or_na(); unit_load_state_label.set_text_or_na();
@ -507,20 +502,23 @@ public class MainWindow : Window {
public void show_unit(Unit unit) { public void show_unit(Unit unit) {
current_unit_id = unit.id; current_unit_id = unit.id;
unit_id_label.set_text_or_na(current_unit_id); string id_display = current_unit_id;
bool has_alias = false;
string a = "";
foreach (string i in unit.names) { foreach (string i in unit.names) {
if (i == current_unit_id) if (i == current_unit_id)
continue; continue;
if (a == "") if (!has_alias) {
a = i; id_display += " (aliases:";
else has_alias = true;
a += "\n" + i; }
}
unit_aliases_label.set_text_or_na(a); id_display += " " + i;
}
if(has_alias)
id_display += ")";
unit_id_label.set_text_or_na(id_display);
string[] string[]
requires = unit.requires, requires = unit.requires,