From: Maximiliano Sandoval R <m.sandoval@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer v3] fix #4869: Show state in management interface ComboBox
Date: Thu, 19 Oct 2023 10:35:31 +0200 [thread overview]
Message-ID: <20231019083531.28056-1-m.sandoval@proxmox.com> (raw)
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
This is a continuation of
https://lists.proxmox.com/pipermail/pve-devel/2023-August/058639.html.
Signed-off-by: Maximiliano Sandoval R <m.sandoval@proxmox.com>
---
v3 was tested only with `make check-pve`. v2 was properly tested by Filip
Schauer <f.schauer@proxmox.com> in a VM.
Differences from v2:
- Use a escaped utf8 character instead of using `use uft-8;`
Differences from v1:
- Instead of adding a `- UP` or `- DOWN` to the interface label, we display a
green BLACK CIRCLE ● similar to what systemd does. To achieve this we
separate the GtkWidget in the dropdown in two, and set the color of the new
one to green. It was discussed off-list that adding a character for
interfaces that were down introduced too much visual noise.
proxinstall | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/proxinstall b/proxinstall
index d5b2565..11e537b 100755
--- a/proxinstall
+++ b/proxinstall
@@ -341,10 +341,20 @@ sub create_ipconf_view {
my ($cidr_box, $ipconf_entry_addr, $ipconf_entry_mask) = create_cidr_inputs($cidr);
- my $device_cb = Gtk3::ComboBoxText->new();
+ my $device_model = Gtk3::ListStore->new('Glib::String', 'Glib::String');
+ my $device_cb = Gtk3::ComboBox->new_with_model($device_model);
$device_cb->set_active(0);
$device_cb->set_visible(1);
+ my $icon_cell = Gtk3::CellRendererText->new();
+ $device_cb->pack_start($icon_cell, 0);
+ $device_cb->add_attribute($icon_cell, 'text', 0);
+ $icon_cell->set_property('foreground', 'green');
+
+ my $cell = Gtk3::CellRendererText->new();
+ $device_cb->pack_start($cell, 0);
+ $device_cb->add_attribute($cell, 'text', 1);
+
my $get_device_desc = sub {
my $iface = shift;
return "$iface->{name} - $iface->{mac} ($iface->{driver})";
@@ -374,7 +384,12 @@ sub create_ipconf_view {
my $i = 0;
for my $index (sort keys $ipconf->{ifaces}->%*) {
my $iface = $ipconf->{ifaces}->{$index};
- $device_cb->append_text($get_device_desc->($iface));
+ my $iter = $device_model->append();
+ my $symbol = "$iface->{state}" eq "UP" ? "\x{25CF}" : ' ';
+ $device_model->set($iter,
+ 0 => $symbol,
+ 1 => $get_device_desc->($iface),
+ );
$device_active_map->{$i} = $index;
$device_active_reverse_map->{$iface->{name}} = $i;
if ($ipconf_first_view && $index == $ipconf->{default}) {
--
2.39.2
next reply other threads:[~2023-10-19 8:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 8:35 Maximiliano Sandoval R [this message]
2023-10-19 12:20 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231019083531.28056-1-m.sandoval@proxmox.com \
--to=m.sandoval@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox