Skip to content

Commit aeb4b16

Browse files
committed
improve column for data representation in Overview page
1 parent 49ef9c1 commit aeb4b16

4 files changed

Lines changed: 29 additions & 32 deletions

File tree

‎src/gui/pages/notifications_page.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn data_notification_log<'a>(
160160
.size(80)
161161
.line_height(LineHeight::Relative(1.0));
162162
let threshold_str = format!(
163-
"{}: {data_string} {}",
163+
"{}: {data_string} ({})",
164164
threshold_translation(language),
165165
per_second_translation(language)
166166
);

‎src/gui/pages/overview_page.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ use crate::translations::translations::{
2727
active_filters_translation, incoming_translation, network_adapter_translation,
2828
outgoing_translation, per_second_translation, traffic_rate_translation,
2929
};
30-
use crate::translations::translations_2::{
31-
data_representation_translation, dropped_translation, only_top_30_items_translation,
32-
};
30+
use crate::translations::translations_2::{dropped_translation, only_top_30_items_translation};
3331
use crate::translations::translations_3::export_capture_translation;
3432
use crate::translations::translations_5::no_favorites_saved_translation;
3533
use crate::translations::translations_6::ipfix_exporter_translation;
@@ -443,10 +441,7 @@ fn col_data_representation<'a>(
443441
language: Language,
444442
data_repr: DataRepr,
445443
) -> Column<'a, Message, StyleType> {
446-
let mut ret_val = Column::new().spacing(5).push(
447-
Text::new(format!("{}:", data_representation_translation(language)))
448-
.class(TextType::Subtitle),
449-
);
444+
let mut ret_val = Column::new().align_x(Horizontal::Center);
450445

451446
let [bits, bytes, packets] = DataUnit::ALL.map(|option| {
452447
let is_active = data_repr.data_unit.eq(&option);
@@ -473,7 +468,9 @@ fn col_data_representation<'a>(
473468

474469
ret_val = ret_val
475470
.push(Row::new().spacing(5).push(bits).push(bytes))
471+
.push(Space::new().height(5))
476472
.push(packets)
473+
.push(Space::new().height(15))
477474
.push(checkbox);
478475

479476
ret_val

‎src/gui/pages/settings_notifications_page.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ fn input_group_bytes<'a>(
293293
.width(100),
294294
)
295295
.push(
296-
Text::new(per_second_translation(language))
296+
Text::new(format!("({})", per_second_translation(language)))
297297
.align_y(Alignment::Center)
298298
.size(FONT_SIZE_FOOTER),
299299
);

‎src/translations/translations.rs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,29 +1906,29 @@ pub fn overview_translation(language: Language) -> &'static str {
19061906

19071907
pub fn per_second_translation(language: Language) -> &'static str {
19081908
match language {
1909-
Language::EN => "(per second)",
1910-
Language::CS => "(za sekundu)",
1911-
Language::IT => "(al secondo)",
1912-
Language::FR => "(par seconde)",
1913-
Language::ES | Language::PT => "(por segundo)",
1914-
Language::PL => "(na sekundę)",
1915-
Language::DE => "(pro Sekunde)",
1916-
Language::UK => "(на секунду)",
1917-
Language::ZH | Language::JA | Language::ZH_TW => "(每秒)",
1918-
Language::RO => "(pe secundă)",
1919-
Language::KO => "(초당)",
1920-
Language::TR => "(her saniye)",
1921-
Language::RU => "(в секунду)",
1922-
Language::EL => "(ανά δευτερόλεπτο)",
1923-
// Language::FA => "(در ثانیه)",
1924-
Language::SV => "(per sekund)",
1925-
Language::FI => "(sekunnissa)",
1926-
Language::UZ => "(soniyasiga)",
1927-
Language::VI => "(trên giây)",
1928-
Language::ID => "(per detik)",
1929-
Language::NL => "(per seconde)",
1930-
Language::HU => "(másodpercenként)",
1931-
Language::SI => "(තත්පරයකට)",
1909+
Language::EN => "per second",
1910+
Language::CS => "za sekundu",
1911+
Language::IT => "al secondo",
1912+
Language::FR => "par seconde",
1913+
Language::ES | Language::PT => "por segundo",
1914+
Language::PL => "na sekundę",
1915+
Language::DE => "pro Sekunde",
1916+
Language::UK => "на секунду",
1917+
Language::ZH | Language::JA | Language::ZH_TW => "每秒",
1918+
Language::RO => "pe secundă",
1919+
Language::KO => "초당",
1920+
Language::TR => "her saniye",
1921+
Language::RU => "в секунду",
1922+
Language::EL => "ανά δευτερόλεπτο",
1923+
// Language::FA => "در ثانیه",
1924+
Language::SV => "per sekund",
1925+
Language::FI => "sekunnissa",
1926+
Language::UZ => "soniyasiga",
1927+
Language::VI => "trên giây",
1928+
Language::ID => "per detik",
1929+
Language::NL => "per seconde",
1930+
Language::HU => "másodpercenként",
1931+
Language::SI => "තත්පරයකට",
19321932
}
19331933
}
19341934

0 commit comments

Comments
 (0)