diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2011-09-19 08:20:17 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2011-09-20 01:07:28 +0200 |
| commit | 79b1e6cb8080e5c88754484f5af591ce74714ff0 (patch) | |
| tree | 85073adb1081487b38a3233059de1dbadcac98ce | |
| parent | fe7e28146f30ec442c0dd7f71002a1b482d910a9 (diff) | |
systemadm: use colors for id too, remove color from fragment link
| -rw-r--r-- | src/systemadm.vala | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/systemadm.vala b/src/systemadm.vala index 11189995c8..5971ac07e5 100644 --- a/src/systemadm.vala +++ b/src/systemadm.vala @@ -452,7 +452,7 @@ public class MainWindow : Window { unit_cgroup_label.set_text_or_na(); } - public string format_unit_link(string i) { + public string format_unit_link(string i, bool link) { Unit? u = get_unit(i); if(u == null) return "<span color='grey'>" + i + "</span"; @@ -467,7 +467,10 @@ public class MainWindow : Window { string span = "<span underline='none' color='" + color + "'>" + i + "(" + u.sub_state + ")" + "</span>"; - return " <a href='" + i + "'>" + span + "</a>"; + if(link) + return " <a href='" + i + "'>" + span + "</a>"; + else + return span; } @@ -493,7 +496,7 @@ public class MainWindow : Window { first = false; } - r += format_unit_link(i); + r += format_unit_link(i, true); } return r; @@ -502,7 +505,7 @@ public class MainWindow : Window { public void show_unit(Unit unit) { current_unit_id = unit.id; - string id_display = current_unit_id; + string id_display = format_unit_link(current_unit_id, false); bool has_alias = false; foreach (string i in unit.names) { if (i == current_unit_id) @@ -518,7 +521,7 @@ public class MainWindow : Window { if(has_alias) id_display += ")"; - unit_id_label.set_text_or_na(id_display); + unit_id_label.set_markup_or_na(id_display); string[] requires = unit.requires, @@ -564,7 +567,9 @@ public class MainWindow : Window { string fp = unit.fragment_path; if (fp != "") - unit_fragment_path_label.set_markup_or_na("<a href=\"file://" + fp +"\">" + fp + "</a>" ); + unit_fragment_path_label.set_markup_or_na( + "<a href=\"file://" + fp +"\">" + + "<span underline='none' color='black'>" + fp + "</span></a>"); else unit_fragment_path_label.set_text_or_na(); |