Skip to content

Commit 13773d3

Browse files
sppmacdawesomekling
authored andcommitted
SystemMonitor: Display connection status icons in Network tab
1 parent c42f5a9 commit 13773d3

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <LibGUI/JsonArrayModel.h>
1111
#include <LibGUI/SortingProxyModel.h>
1212
#include <LibGUI/TableView.h>
13+
#include <LibGfx/Painter.h>
1314

1415
NetworkStatisticsWidget::NetworkStatisticsWidget()
1516
{
@@ -18,6 +19,17 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
1819
layout()->set_margins({ 4, 4, 4, 4 });
1920
set_fill_with_background_color(true);
2021

22+
m_network_connected_bitmap = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network-connected.png");
23+
m_network_disconnected_bitmap = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network-disconnected.png");
24+
25+
m_network_link_down_bitmap = Gfx::Bitmap::try_create(m_network_connected_bitmap->format(), m_network_connected_bitmap->size());
26+
{
27+
Gfx::Painter painter(*m_network_link_down_bitmap);
28+
painter.blit_filtered({}, *m_network_connected_bitmap, m_network_connected_bitmap->rect(), [](Color color) {
29+
return color.to_grayscale();
30+
});
31+
}
32+
2133
auto& adapters_group_box = add<GUI::GroupBox>("Adapters");
2234
adapters_group_box.set_layout<GUI::VerticalBoxLayout>();
2335
adapters_group_box.layout()->set_margins({ 6, 16, 6, 6 });
@@ -26,6 +38,13 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
2638
m_adapter_table_view = adapters_group_box.add<GUI::TableView>();
2739

2840
Vector<GUI::JsonArrayModel::FieldSpec> net_adapters_fields;
41+
net_adapters_fields.empend("", Gfx::TextAlignment::CenterLeft,
42+
[this](JsonObject const& object) -> GUI::Variant {
43+
if (!object.get("link_up").as_bool())
44+
return *m_network_link_down_bitmap;
45+
else
46+
return object.get("ipv4_address").as_string_or("").is_empty() ? *m_network_disconnected_bitmap : *m_network_connected_bitmap;
47+
});
2948
net_adapters_fields.empend("name", "Name", Gfx::TextAlignment::CenterLeft);
3049
net_adapters_fields.empend("class_name", "Class", Gfx::TextAlignment::CenterLeft);
3150
net_adapters_fields.empend("mac_address", "MAC", Gfx::TextAlignment::CenterLeft);

Userland/Applications/SystemMonitor/NetworkStatisticsWidget.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ class NetworkStatisticsWidget final : public GUI::LazyWidget {
2525
RefPtr<GUI::JsonArrayModel> m_tcp_socket_model;
2626
RefPtr<GUI::JsonArrayModel> m_udp_socket_model;
2727
RefPtr<Core::Timer> m_update_timer;
28+
RefPtr<Gfx::Bitmap> m_network_connected_bitmap;
29+
RefPtr<Gfx::Bitmap> m_network_disconnected_bitmap;
30+
RefPtr<Gfx::Bitmap> m_network_link_down_bitmap;
2831
};

0 commit comments

Comments
 (0)