fix: missing chars, language page structure, Swedish code

GyulyVGC · May 24, 2023 · 4791963 · 4791963
1 parent 9e76db3
commit 4791963
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 172 deletions.
diff --git a/resources/fonts/full/subset_characters.txt b/resources/fonts/full/subset_characters.txt
@@ -1,4 +1,4 @@
-
+ 
 !
 "
 #
@@ -94,18 +94,17 @@ z
 }
 ¡
 ¿
+Ä
 Ê
 Î
-Å
-Ä
 Ö
 Ü
 à
 á
 â
 ã
-å
 ä
+å
 ç
 è
 é

diff --git a/resources/fonts/subset/sarasa-mono-sc-bold.subset.ttf b/resources/fonts/subset/sarasa-mono-sc-bold.subset.ttf
diff --git a/resources/fonts/subset/sarasa-mono-sc-regular.subset.ttf b/resources/fonts/subset/sarasa-mono-sc-regular.subset.ttf
diff --git a/src/gui/components/radio.rs b/src/gui/components/radio.rs
@@ -13,7 +13,7 @@ use crate::notifications::types::sound::Sound;
 use crate::translations::translations::{
     ip_version_translation, sound_translation, transport_protocol_translation,
 };
-use crate::utils::countries::get_flag_from_language_code;
+use crate::utils::countries::get_flag_from_language;
 use crate::{ChartType, IpVersion, Language, StyleType, TransProtocol};
 
 pub fn ip_version_radios(
@@ -83,29 +83,33 @@ pub fn language_radios(
     collection: &[Language],
     font: Font,
     style: StyleType,
-) -> Column<'static, Message> {
-    let mut ret_val = Column::new().spacing(10);
+) -> Row<'static, Message> {
+    let mut ret_val = Row::new().spacing(10);
     for option in collection {
         ret_val = ret_val.push(
-            Row::new()
-                .align_items(Alignment::Center)
-                .push(
-                    Radio::new(
-                        format!("{} ({:?})", option.get_radio_label(), option),
-                        *option,
-                        Some(active),
-                        Message::LanguageSelection,
+            Row::new().align_items(Alignment::Center).push(
+                Row::new()
+                    .width(Length::Fixed(180.0))
+                    .push(
+                        Radio::new(
+                            format!("{} ({:?})", option.get_radio_label(), option),
+                            *option,
+                            Some(active),
+                            Message::LanguageSelection,
+                        )
+                        .spacing(7)
+                        .font(font)
+                        .size(15)
+                        .style(
+                            <StyleTuple as Into<iced::theme::Radio>>::into(StyleTuple(
+                                style,
+                                ElementType::Standard,
+                            )),
+                        ),
                     )
-                    .spacing(7)
-                    .font(font)
-                    .size(15)
-                    .style(<StyleTuple as Into<iced::theme::Radio>>::into(StyleTuple(
-                        style,
-                        ElementType::Standard,
-                    ))),
-                )
-                .push(horizontal_space(Length::Fixed(8.0)))
-                .push(get_flag_from_language_code(&format!("{option:?}"))),
+                    .push(horizontal_space(Length::Fixed(8.0)))
+                    .push(get_flag_from_language(*option)),
+            ),
         );
     }
     ret_val

diff --git a/src/gui/pages/settings_language_page.rs b/src/gui/pages/settings_language_page.rs
@@ -1,4 +1,4 @@
-use iced::widget::{Column, Container, Row, Text};
+use iced::widget::{Column, Container, Text};
 use iced::Length::Fixed;
 use iced::{Alignment, Length};
 use iced_native::widget::vertical_space;
@@ -18,17 +18,20 @@ pub fn settings_language_page(sniffer: &Sniffer) -> Container<Message> {
     let font = get_font(sniffer.style);
 
     let language_active = sniffer.language;
-    let col_language_radio_1 =
-        language_radios(language_active, &Language::COL1, font, sniffer.style);
-    let col_language_radio_2 =
-        language_radios(language_active, &Language::COL2, font, sniffer.style);
-    let col_language_radio_3 =
-        language_radios(language_active, &Language::COL3, font, sniffer.style);
-    let row_language_radio = Row::new()
-        .spacing(50)
-        .push(col_language_radio_1)
-        .push(col_language_radio_2)
-        .push(col_language_radio_3);
+    let row_language_radio_1 =
+        language_radios(language_active, &Language::ROW1, font, sniffer.style);
+    let row_language_radio_2 =
+        language_radios(language_active, &Language::ROW2, font, sniffer.style);
+    let row_language_radio_3 =
+        language_radios(language_active, &Language::ROW3, font, sniffer.style);
+    let row_language_radio_4 =
+        language_radios(language_active, &Language::ROW4, font, sniffer.style);
+    let col_language_radio_all = Column::new()
+        .spacing(20)
+        .push(row_language_radio_1)
+        .push(row_language_radio_2)
+        .push(row_language_radio_3)
+        .push(row_language_radio_4);
 
     let mut content = Column::new()
         .align_items(Alignment::Center)
@@ -58,7 +61,7 @@ pub fn settings_language_page(sniffer: &Sniffer) -> Container<Message> {
         )
         .push(vertical_space(Fixed(20.0)));
 
-    if ![Language::EN, Language::IT].contains(&sniffer.language) {
+    if ![Language::EN, Language::IT, Language::SV].contains(&sniffer.language) {
         content = content
             .push(
                 Container::new(
@@ -73,7 +76,7 @@ pub fn settings_language_page(sniffer: &Sniffer) -> Container<Message> {
             .push(vertical_space(Fixed(20.0)));
     }
 
-    content = content.push(row_language_radio);
+    content = content.push(col_language_radio_all);
 
     Container::new(content)
         .height(Fixed(400.0))
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
     !
     "
     #
@@ Expand Down Expand Up / @@ -94,18 +94,17 @@ z @@
     }
     ¡
     ¿
+    Ä
     Ê
     Î
-    Å
-    Ä
     Ö
     Ü
     à
     á
     â
     ã
-    å
     ä
+    å
     ç
     è
     é
@@ Expand Down @@