Upgrade inspect table

CHANGELOG.md

@@ -7,6 +7,7 @@ All Sniffnet releases with the relative changes are documented in this file.
 - Introduced new filtering capabilities to allow users specify custom values of ports and IP addresses ([#414](https://github.com/GyulyVGC/sniffnet/pull/414))
 - The size of text and widgets can now be customised by setting a proper zoom value (fixes [#202](https://github.com/GyulyVGC/sniffnet/issues/202) and [#344](https://github.com/GyulyVGC/sniffnet/issues/344))
 - Added possibility to totally customize the app's theme via styles defined in TOML files ([#286](https://github.com/GyulyVGC/sniffnet/pull/286) and [#419](https://github.com/GyulyVGC/sniffnet/pull/419))
+- Upgraded inspect page table: multiple new search filters, additional sorting options, and always keep a correct fields alignment ([#442](https://github.com/GyulyVGC/sniffnet/pull/442) — fixes [#63](https://github.com/GyulyVGC/sniffnet/issues/63))
 - Added support for more link types in addition to Ethernet: raw IP packets and null/loopback packets are now correctly parsed ([#421](https://github.com/GyulyVGC/sniffnet/pull/421))
 - IP addresses can now be copied to clipboard from the popup related to a given entry of the connections table, and a new search parameter has been introduced in Inspect page to allow users filter their connections based on IP address values ([#409](https://github.com/GyulyVGC/sniffnet/pull/409))
 - Added Japanese translation 🇯🇵 ([#343](https://github.com/GyulyVGC/sniffnet/pull/343))
@@ -25,6 +26,7 @@ All Sniffnet releases with the relative changes are documented in this file.
 - Fixed bug causing the application's icon not to be visible in some Linux environments
 - Fixed a build failure on `powerpc64` ([#356](https://github.com/GyulyVGC/sniffnet/pull/356) — fixes [#353](https://github.com/GyulyVGC/sniffnet/issues/353))
 - Fixed a typo in Russian translation ([#389](https://github.com/GyulyVGC/sniffnet/pull/389))
+- Fixed icon inconsistency in case of directed broadcast traffic
 
 ## [1.2.2] - 2023-08-08
 - Added option to set different shades of color gradients for each of the available themes

resources/fonts/full/subset_characters.txt

@@ -2,6 +2,7 @@
 !
 "
 #
+$
 %
 &
 '
@@ -191,6 +192,7 @@ z
 ώ
 І
 А
+Б
 В
 Г
 Д
@@ -287,6 +289,7 @@ z
 ۰
 ۳
 •
+…
 ↗
 ⏎
 ✔

src/chart/types/traffic_chart.rs

@@ -8,6 +8,7 @@ use iced::{Element, Renderer};
 use plotters::prelude::*;
 use plotters_iced::{Chart, ChartBuilder, ChartWidget, DrawingBackend};
 
+use crate::gui::app::FONT_FAMILY_NAME;
 use crate::gui::styles::style_constants::CHARTS_LINE_BORDER;
 use crate::gui::styles::types::palette::to_rgb_color;
 use crate::gui::types::message::Message;
@@ -136,15 +137,15 @@ impl Chart<Message> for TrafficChart {
  .y_max_light_lines(1)
  .y_labels(7)
  .label_style(
- ("Sarasa Mono SC", 12)
+ (FONT_FAMILY_NAME, 12.5)
  .into_font()
  .style(font_weight)
  .color(&color_font),
  )
  .y_label_formatter(if self.chart_type.eq(&ChartType::Packets) {
  &|packets| packets.abs().to_string()
  } else {
- &|bytes| get_formatted_bytes_string_with_b(u128::from(bytes.unsigned_abs()))
+ &|bytes| get_formatted_bytes_string_with_b(u128::from(bytes.unsigned_abs()), 0)
  })
  .draw()
  .unwrap();
@@ -196,7 +197,7 @@ impl Chart<Message> for TrafficChart {
  .background_style(buttons_color.mix(0.6))
  .border_style(buttons_color.stroke_width(CHARTS_LINE_BORDER * 2))
  .label_font(
- ("Sarasa Mono SC", 13.5)
+ (FONT_FAMILY_NAME, 13.5)
  .into_font()
  .style(font_weight)
  .color(&color_font),

src/countries/country_utils.rs

@@ -290,10 +290,6 @@ fn get_flag_from_country(
  tooltip = your_network_adapter_translation(language);
  svg_style = SvgType::AdaptColor;
  COMPUTER
- } else if is_local {
- tooltip = local_translation(language);
- svg_style = SvgType::AdaptColor;
- HOME
  } else if traffic_type.eq(&TrafficType::Multicast) {
  tooltip = "Multicast".to_string();
  svg_style = SvgType::AdaptColor;
@@ -302,6 +298,10 @@ fn get_flag_from_country(
  tooltip = "Broadcast".to_string();
  svg_style = SvgType::AdaptColor;
  BROADCAST
+ } else if is_local {
+ tooltip = local_translation(language);
+ svg_style = SvgType::AdaptColor;
+ HOME
  } else {
  tooltip = unknown_translation(language);
  svg_style = SvgType::AdaptColor;
@@ -357,9 +357,9 @@ pub fn get_computer_tooltip(
  let content = Svg::new(Handle::from_memory(Vec::from(
  match (is_my_address, is_local, traffic_type) {
  (true, _, _) => COMPUTER,
+ (false, _, TrafficType::Multicast) => MULTICAST,
+ (false, _, TrafficType::Broadcast) => BROADCAST,
  (false, true, _) => HOME,
- (false, false, TrafficType::Multicast) => MULTICAST,
- (false, false, TrafficType::Broadcast) => BROADCAST,
  (false, false, TrafficType::Unicast) => UNKNOWN,
  },
  )))
@@ -369,9 +369,9 @@ pub fn get_computer_tooltip(
 
  let tooltip = match (is_my_address, is_local, traffic_type) {
  (true, _, _) => your_network_adapter_translation(language),
+ (false, _, TrafficType::Multicast) => "Multicast".to_string(),
+ (false, _, TrafficType::Broadcast) => "Broadcast".to_string(),
  (false, true, _) => local_translation(language),
- (false, false, TrafficType::Multicast) => "Multicast".to_string(),
- (false, false, TrafficType::Broadcast) => "Broadcast".to_string(),
  (false, false, TrafficType::Unicast) => unknown_translation(language),
  };
 

src/gui/app.rs

@@ -33,6 +33,9 @@ use crate::{ConfigSettings, StyleType, SNIFFNET_TITLECASE};
 /// Update period (milliseconds)
 pub const PERIOD_TICK: u64 = 1000;
 
+pub const FONT_FAMILY_NAME: &str = "Sarasa Mono SC for Sniffnet";
+pub const ICON_FONT_FAMILY_NAME: &str = "Icons for Sniffnet";
+
 impl Application for Sniffer {
  type Executor = executor::Default;
  type Message = Message;

src/gui/components/footer.rs

@@ -93,6 +93,7 @@ fn get_button_github(font: Font) -> Tooltip<'static, Message, Renderer<StyleType
 fn get_button_sponsor(font: Font) -> Tooltip<'static, Message, Renderer<StyleType>> {
  let content = button(
  Text::new('❤'.to_string())
+ .font(font)
  .size(23)
  .style(TextType::Sponsor)
  .horizontal_alignment(Horizontal::Center)

src/gui/pages/connection_details_page.rs

@@ -29,7 +29,6 @@ use crate::networking::types::traffic_direction::TrafficDirection;
 use crate::translations::translations::{
  address_translation, application_protocol_translation, incoming_translation,
  outgoing_translation, packets_translation, protocol_translation,
- transport_protocol_translation,
 };
 use crate::translations::translations_2::{
  administrative_entity_translation, connection_details_translation, destination_translation,
@@ -189,11 +188,6 @@ fn col_info(
  language: Language,
 ) -> Column<'static, Message, Renderer<StyleType>> {
  let is_icmp = key.protocol.eq(&Protocol::ICMP);
- let protocol_caption = if is_icmp {
- protocol_translation(language)
- } else {
- transport_protocol_translation(language)
- };
 
  let mut ret_val = Column::new()
  .spacing(10)
@@ -211,7 +205,7 @@ fn col_info(
  ),
  )
  .push(TextType::highlighted_subtitle_with_desc(
- protocol_caption,
+ protocol_translation(language),
  &key.protocol.to_string(),
  font,
  ));
@@ -236,7 +230,7 @@ fn col_info(
  ),
  &format!(
  "{}\n {} {}",
- get_formatted_bytes_string_with_b(val.transmitted_bytes),
+ get_formatted_bytes_string_with_b(val.transmitted_bytes, 1),
  val.transmitted_packets,
  packets_translation(language)
  ),

src/gui/pages/initial_page.rs

@@ -6,7 +6,6 @@ use std::collections::HashSet;
 
 use iced::alignment::{Horizontal, Vertical};
 use iced::widget::scrollable::Direction;
-use iced::widget::text::Shaping;
 use iced::widget::tooltip::Position;
 use iced::widget::{
  button, horizontal_space, vertical_space, Button, Column, Container, Row, Rule, Scrollable,
@@ -119,7 +118,6 @@ fn col_ip_buttons(
  buttons_row = buttons_row.push(
  Button::new(
  Text::new(format!("{option} {check_symbol}"))
- .shaping(Shaping::Advanced)
  .horizontal_alignment(Horizontal::Center)
  .vertical_alignment(Vertical::Center)
  .font(font),
@@ -160,7 +158,6 @@ fn col_protocol_buttons(
  Button::new(
  Text::new(format!("{option} {check_symbol}"))
  .width(Length::Fill)
- .shaping(Shaping::Advanced)
  .horizontal_alignment(Horizontal::Center)
  .vertical_alignment(Vertical::Center)
  .font(font),