From 604c45fa18722f2c729b8f029fecccdb424b5b9a Mon Sep 17 00:00:00 2001 From: Ulisse Perusin Date: Sun, 3 Oct 2021 19:11:58 +0200 Subject: [PATCH] Vola o Rosica - versione personalizzata --- Data/graphics/launcher.svg | 316 ++++++++-------------- Data/graphics/launcher_red.svg | 366 +++++++++----------------- Data/graphics/logo.svg | 97 ++++--- Data/graphics/logo_red.svg | 96 ++++--- Data/graphics/title.svg | 41 +-- Data/graphics/title_red.svg | 40 +-- Data/icons/map_thermal_source.svg | 7 - build/python/build/meson.py | 2 +- ide/docker/bin/xcsoar-compile | 4 +- src/Dialogs/SimulatorPromptWindow.cpp | 2 +- src/Kobo/KoboMenu.cpp | 10 +- src/Kobo/NetworkDialog.cpp | 12 +- src/Kobo/PowerOff.cpp | 4 +- src/Kobo/SystemDialog.cpp | 26 +- src/Kobo/ToolsDialog.cpp | 4 +- src/Kobo/WifiDialog.cpp | 24 +- src/Look/TrailLook.cpp | 2 +- src/MapSettings.hpp | 1 + 18 files changed, 431 insertions(+), 623 deletions(-) delete mode 100644 Data/icons/map_thermal_source.svg diff --git a/Data/graphics/launcher.svg b/Data/graphics/launcher.svg index b1ab11aeed9..b5be961c607 100644 --- a/Data/graphics/launcher.svg +++ b/Data/graphics/launcher.svg @@ -2,14 +2,6 @@ image/svg+xml + inkscape:zoom="3.6758793" + inkscape:cx="334.20575" + inkscape:cy="56.313056" + inkscape:window-x="822" + inkscape:window-y="704" + inkscape:window-maximized="0" + inkscape:current-layer="layer6" + inkscape:pagecheckerboard="0" /> VOLAROSICA \ No newline at end of file + d="m 26.78125,1.25 c -8.25014,7.9274389 -7.333075,15.429783 -6.3125,18.78125 -1.490567,0.281536 -2.676664,0.717505 -3.375,1.25 -0.01091,0.0083 -0.02058,0.02289 -0.03125,0.03125 -0.01963,0.0194 -0.05798,0.04051 -0.15625,0.125 -0.359675,0.309232 -1.191738,0.9375 -2.0625,0.9375 0.870762,0 1.702825,0.627988 2.0625,0.9375 0.0591,0.05366 0.11864,0.104276 0.1875,0.15625 0.763715,0.576437 2.110858,1.034246 3.78125,1.3125 -0.956212,2.406443 -3.246022,10.774708 6.3125,19.96875 0,0 -1.62044,-5.853329 -1.78125,-7 C 25.24544,36.603329 24.318923,30.792071 25,28.3125 c 0.277371,-1.010762 1.022321,-2.699204 1.3125,-3.34375 1.435001,-0.128937 2.69528,-0.39544 3.6875,-0.75 1.48643,0.323743 3.324803,0.53125 5.375,0.53125 1.84508,0 3.562287,-0.169828 4.96875,-0.4375 C 35.936667,24.218144 32.5,23.391559 32.5,22.375 c 0,-1.017056 3.436667,-1.842151 7.84375,-1.9375 C 38.937287,20.170324 37.22008,20 35.375,20 c -2.064162,0 -3.915165,0.203493 -5.40625,0.53125 -1.12247,-0.394046 -2.583466,-0.6795 -4.25,-0.78125 -0.322064,-0.7458 -0.654236,-1.550579 -0.8125,-2.09375 C 24.179868,15.163768 24.985598,9.362938 25.125,8.21875 25.265895,7.0750586 26.78125,1.25 26.78125,1.25 Z" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> diff --git a/Data/graphics/launcher_red.svg b/Data/graphics/launcher_red.svg index 27552a84e9f..b60d783c9dd 100644 --- a/Data/graphics/launcher_red.svg +++ b/Data/graphics/launcher_red.svg @@ -2,14 +2,6 @@ image/svg+xml + inkscape:zoom="3.6758793" + inkscape:cx="334.20575" + inkscape:cy="56.313056" + inkscape:window-x="822" + inkscape:window-y="704" + inkscape:window-maximized="0" + inkscape:current-layer="layer6" + inkscape:pagecheckerboard="0" /> VOLAROSICA \ No newline at end of file + d="m 26.78125,1.25 c -8.25014,7.9274389 -7.333075,15.429783 -6.3125,18.78125 -1.490567,0.281536 -2.676664,0.717505 -3.375,1.25 -0.01091,0.0083 -0.02058,0.02289 -0.03125,0.03125 -0.01963,0.0194 -0.05798,0.04051 -0.15625,0.125 -0.359675,0.309232 -1.191738,0.9375 -2.0625,0.9375 0.870762,0 1.702825,0.627988 2.0625,0.9375 0.0591,0.05366 0.11864,0.104276 0.1875,0.15625 0.763715,0.576437 2.110858,1.034246 3.78125,1.3125 -0.956212,2.406443 -3.246022,10.774708 6.3125,19.96875 0,0 -1.62044,-5.853329 -1.78125,-7 C 25.24544,36.603329 24.318923,30.792071 25,28.3125 c 0.277371,-1.010762 1.022321,-2.699204 1.3125,-3.34375 1.435001,-0.128937 2.69528,-0.39544 3.6875,-0.75 1.48643,0.323743 3.324803,0.53125 5.375,0.53125 1.84508,0 3.562287,-0.169828 4.96875,-0.4375 C 35.936667,24.218144 32.5,23.391559 32.5,22.375 c 0,-1.017056 3.436667,-1.842151 7.84375,-1.9375 C 38.937287,20.170324 37.22008,20 35.375,20 c -2.064162,0 -3.915165,0.203493 -5.40625,0.53125 -1.12247,-0.394046 -2.583466,-0.6795 -4.25,-0.78125 -0.322064,-0.7458 -0.654236,-1.550579 -0.8125,-2.09375 C 24.179868,15.163768 24.985598,9.362938 25.125,8.21875 25.265895,7.0750586 26.78125,1.25 26.78125,1.25 Z" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> diff --git a/Data/graphics/logo.svg b/Data/graphics/logo.svg index a465122a381..71d4dec1fe6 100644 --- a/Data/graphics/logo.svg +++ b/Data/graphics/logo.svg @@ -2,25 +2,25 @@ + viewBox="0 -14.8 272 272" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB" + x="0" + y="0" + width="1" + height="1"> + style="color-interpolation-filters:sRGB" + x="-3.4961682" + y="-2.7833745" + width="4.5219949" + height="3.8216857"> + id="filter3909" + x="-0.026708872" + y="-0.026708872" + width="1.0534177" + height="1.0534177"> + id="filter3913" + x="-0.056359878" + y="-0.058108493" + width="1.1127198" + height="1.116217"> + id="filter3917" + x="-0.033679255" + y="-0.038311092" + width="1.0673585" + height="1.0766222"> + viewbox-height="270" + inkscape:pagecheckerboard="0" /> @@ -267,7 +288,7 @@ image/svg+xml - + @@ -275,8 +296,9 @@ inkscape:groupmode="layer" id="layer4" inkscape:label="Shadow" - style="display:inline;opacity:0.6;filter:url(#filter3884)" - transform="translate(2.9999921,-13.687489)"> + style="display:none;opacity:0.6;filter:url(#filter3884)" + transform="translate(2.9999921,-13.687489)" + sodipodi:insensitive="true"> + transform="translate(2.9999921,194.31251)"> + transform="translate(2.9999921,-13.687489)"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccsccscccscscsccccc" /> + viewBox="0 -14.8 272 272" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + style="color-interpolation-filters:sRGB" + x="0" + y="0" + width="1" + height="1"> + style="color-interpolation-filters:sRGB" + x="-3.4961682" + y="-2.7833745" + width="4.5219949" + height="3.8216857"> + id="filter3909" + x="-0.026708872" + y="-0.026708872" + width="1.0534177" + height="1.0534177"> + id="filter3913" + x="-0.056359878" + y="-0.058108493" + width="1.1127198" + height="1.116217"> + id="filter3917" + x="-0.033679255" + y="-0.038311092" + width="1.0673585" + height="1.0766222"> + viewbox-height="270" + inkscape:pagecheckerboard="0" /> @@ -267,7 +288,6 @@ image/svg+xml - @@ -275,8 +295,9 @@ inkscape:groupmode="layer" id="layer4" inkscape:label="Shadow" - style="display:inline;opacity:0.6;filter:url(#filter3884)" - transform="translate(2.9999921,-13.687489)"> + style="display:none;opacity:0.6;filter:url(#filter3884)" + transform="translate(2.9999921,-13.687489)" + sodipodi:insensitive="true"> + transform="translate(2.9999921,194.31251)"> + transform="translate(2.9999921,-13.687489)"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccsccscccscscsccccc" /> + inkscape:version="1.1-rc (1:1.1+rc+202105232055+f4db50c7c1)" + sodipodi:docname="title.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:window-width="1927" + inkscape:window-height="1405" + inkscape:window-x="288" + inkscape:window-y="398" + inkscape:window-maximized="0" + inkscape:pagecheckerboard="0" /> @@ -66,7 +67,7 @@ id="tspan9395-4-7" x="0.15871964" y="1051.1925" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.93197632px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#3f76a8;fill-opacity:1">XCSoar @@ -77,7 +78,7 @@ transform="translate(0,1)"> 7 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.932px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:none;fill-opacity:1;stroke:#000000">7 diff --git a/Data/graphics/title_red.svg b/Data/graphics/title_red.svg index d6554049cf8..2fd51147ab5 100644 --- a/Data/graphics/title_red.svg +++ b/Data/graphics/title_red.svg @@ -2,19 +2,19 @@ + inkscape:version="1.1-rc (1:1.1+rc+202105232055+f4db50c7c1)" + sodipodi:docname="title_red.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:window-width="1927" + inkscape:window-height="1405" + inkscape:window-x="605" + inkscape:window-y="422" + inkscape:window-maximized="0" + inkscape:pagecheckerboard="0" /> @@ -43,7 +44,6 @@ image/svg+xml - @@ -66,7 +66,7 @@ id="tspan9395-4-7" x="0.15871964" y="1051.1925" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.93197632px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#3f76a8;fill-opacity:1">XCSoar @@ -77,7 +77,7 @@ transform="translate(0,1)"> 7 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.932px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:none;fill-opacity:1;stroke:#000000">7 diff --git a/Data/icons/map_thermal_source.svg b/Data/icons/map_thermal_source.svg deleted file mode 100644 index 0539094b419..00000000000 --- a/Data/icons/map_thermal_source.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/build/python/build/meson.py b/build/python/build/meson.py index 799c48fb5b9..1fa1e27b46a 100644 --- a/build/python/build/meson.py +++ b/build/python/build/meson.py @@ -9,7 +9,7 @@ def __no_ccache(cmd: str) -> str: if cmd.startswith('ccache '): cmd = cmd[7:] - return cmd + return str.strip(cmd) def make_cross_file(toolchain: Toolchain) -> str: if toolchain.is_windows: diff --git a/ide/docker/bin/xcsoar-compile b/ide/docker/bin/xcsoar-compile index b8a4b231553..d73e01900b6 100755 --- a/ide/docker/bin/xcsoar-compile +++ b/ide/docker/bin/xcsoar-compile @@ -17,8 +17,8 @@ case "${TARGET}" in ;; "KOBO") make TARGET="${TARGET}" -j"${CPUS}" libs - make TARGET="${TARGET}" -j"${CPUS}" ${ARGS[@]} - make TARGET="${TARGET}" -j"${CPUS}" output/KOBO/KoboRoot.tgz + make TARGET="${TARGET}" -j"${CPUS}" DEBUG=n ${ARGS[@]} + make TARGET="${TARGET}" -j"${CPUS}" DEBUG=n output/KOBO/KoboRoot.tgz ;; "UNIX") make TARGET="${TARGET}" -j"${CPUS}" ${ARGS[@]} diff --git a/src/Dialogs/SimulatorPromptWindow.cpp b/src/Dialogs/SimulatorPromptWindow.cpp index 7d8ddd6a355..b98c556a5ae 100644 --- a/src/Dialogs/SimulatorPromptWindow.cpp +++ b/src/Dialogs/SimulatorPromptWindow.cpp @@ -87,7 +87,7 @@ SimulatorPromptWindow::OnPaint(Canvas &canvas) noexcept canvas.Select(look.text_font); canvas.SetTextColor(COLOR_BLACK); canvas.SetBackgroundTransparent(); - canvas.DrawText(label_position, _("What do you want to do?")); + canvas.DrawText(label_position, _("Cosa vuoi fare?")); ContainerWindow::OnPaint(canvas); } diff --git a/src/Kobo/KoboMenu.cpp b/src/Kobo/KoboMenu.cpp index 93f2ecfd730..f86cbe4631d 100644 --- a/src/Kobo/KoboMenu.cpp +++ b/src/Kobo/KoboMenu.cpp @@ -73,12 +73,12 @@ class KoboMenuWidget final : public WindowWidget { void KoboMenuWidget::CreateButtons(WidgetDialog &buttons) { - buttons.AddButton(("Nickel"), dialog.MakeModalResultCallback(LAUNCH_NICKEL)) + buttons.AddButton(("Libri"), dialog.MakeModalResultCallback(LAUNCH_NICKEL)) ->SetEnabled(!IsKoboCustomKernel()); - buttons.AddButton(("Tools"), [](){ ShowToolsDialog(); }); - buttons.AddButton(_("Network"), [](){ ShowNetworkDialog(); }); - buttons.AddButton("System", [](){ ShowSystemDialog(); }); - buttons.AddButton(("Poweroff"), dialog.MakeModalResultCallback(POWEROFF)); + buttons.AddButton(("Strumenti"), [](){ ShowToolsDialog(); }); + buttons.AddButton(_("Rete"), [](){ ShowNetworkDialog(); }); + buttons.AddButton("Sistema", [](){ ShowSystemDialog(); }); + buttons.AddButton(("Spegni"), dialog.MakeModalResultCallback(POWEROFF)); } void diff --git a/src/Kobo/NetworkDialog.cpp b/src/Kobo/NetworkDialog.cpp index 556787ab94d..b7d5c32dd6a 100644 --- a/src/Kobo/NetworkDialog.cpp +++ b/src/Kobo/NetworkDialog.cpp @@ -15,7 +15,7 @@ static const TCHAR * GetWifiToggleCaption() { - return IsKoboWifiOn() ? _T("Wifi OFF") : _T("Wifi ON"); + return IsKoboWifiOn() ? _T("Spegni Wifi") : _T("Accendi Wifi"); } class NetworkWidget final @@ -56,11 +56,11 @@ NetworkWidget::Prepare([[maybe_unused]] ContainerWindow &parent, [[maybe_unused] toggle_wifi_button = AddButton(GetWifiToggleCaption(), [this](){ ToggleWifi(); }); - wifi_button = AddButton(_("Wifi"), [](){ ShowWifiDialog(); }); + wifi_button = AddButton(_("Reti"), [](){ ShowWifiDialog(); }); - AddButton(_T("Telnet server"), [](){ KoboRunTelnetd(); }); + AddButton(_T("Server Telnet"), [](){ KoboRunTelnetd(); }); - AddButton(_T("Ftp server"), [](){ KoboRunFtpd(); }); + AddButton(_T("Server Ftp"), [](){ KoboRunFtpd(); }); UpdateButtons(); } @@ -83,8 +83,8 @@ ShowNetworkDialog() const DialogLook &look = UIGlobals::GetDialogLook(); TWidgetDialog dialog(WidgetDialog::Full{}, UIGlobals::GetMainWindow(), - look, _("Network")); - dialog.AddButton(_("Close"), mrOK); + look, _("Rete")); + dialog.AddButton(_("Chiudi"), mrOK); dialog.SetWidget(look); dialog.ShowModal(); } diff --git a/src/Kobo/PowerOff.cpp b/src/Kobo/PowerOff.cpp index 1cfbdc3326d..9c19df105c0 100644 --- a/src/Kobo/PowerOff.cpp +++ b/src/Kobo/PowerOff.cpp @@ -70,10 +70,10 @@ DrawBanner(Canvas &canvas, PixelRect &rc) canvas.DrawText({x, rc.top + int(banner_height - normal_font.GetHeight()) / 2}, website); - TCHAR comment[30] = _T("powered off"); + TCHAR comment[30] = _T("spento"); const auto power_info = Power::GetInfo(); if (power_info.battery.remaining_percent) { - snprintf ( comment+strlen(comment), 30-strlen(comment), _T(" - battery %d%%"), *power_info.battery.remaining_percent); + snprintf ( comment+strlen(comment), 30-strlen(comment), _T(" - batteria %d%%"), *power_info.battery.remaining_percent); } canvas.DrawText({rc.right - (int)canvas.CalcTextWidth(comment) - padding, rc.top + padding}, diff --git a/src/Kobo/SystemDialog.cpp b/src/Kobo/SystemDialog.cpp index a5719dfa92b..2203a7e9639 100644 --- a/src/Kobo/SystemDialog.cpp +++ b/src/Kobo/SystemDialog.cpp @@ -60,15 +60,15 @@ class SystemWidget final void SystemWidget::Prepare([[maybe_unused]] ContainerWindow &parent, [[maybe_unused]] const PixelRect &rc) noexcept { - AddButton("Reboot", [](){ KoboReboot(); }); - switch_otg_mode = AddButton(IsKoboOTGHostMode() ? "Disable USB-OTG" : "Enable USB-OTG", + AddButton("Riavvia", [](){ KoboReboot(); }); + switch_otg_mode = AddButton(IsKoboOTGHostMode() ? "Disabilita USB-OTG" : "Abilita USB-OTG", [this](){ SwitchOTGMode(); }); - usb_storage = AddButton("Export USB storage", [this](){ ExportUSBStorage(); }); + usb_storage = AddButton("Esporta memoria USB", [this](){ ExportUSBStorage(); }); SetRowEnabled(USB_STORAGE, !IsKoboOTGHostMode()); if(KoboCanChangeBacklightBrightness()) { - increase_backlight_brightness = AddButton("Increase Backlight Brightness", [this]() { IncreaseBacklightBrightness(); }); - decrease_backlight_brightness = AddButton("Decrease Backlight Brightness", [this]() { DecreaseBacklightBrightness(); }); + increase_backlight_brightness = AddButton("Aumenta retroilluminazione", [this]() { IncreaseBacklightBrightness(); }); + decrease_backlight_brightness = AddButton("Diminuisci retroilluminazione", [this]() { DecreaseBacklightBrightness(); }); int current_brightness = KoboGetBacklightBrightness(); UpdateBacklightBrightnessButtons(current_brightness); if(KoboCanChangeBacklightColour()) { @@ -138,7 +138,7 @@ SystemWidget::SwitchKernel() model != KoboModel::TOUCH2 && model != KoboModel::GLO_HD && model != KoboModel::AURA2 && - ShowMessageBox(_T("This feature was designed for the Kobo Mini, Touch 2.0, Glo HD and Aura 2, but this is not one. Use at your own risk. Continue?"), + ShowMessageBox(_T("Funzione pensata per Kobo Mini, Touch 2.0, Glo HD e Aura 2, ma questo non e' uno di quelli. Procedi a tuo rischio. Continuare?"), _T("USB-OTG"), MB_YESNO) != IDYES) return; @@ -166,7 +166,7 @@ SystemWidget::SwitchKernel() : otg_kernel_image; if (!KoboInstallKernel(kernel_image)) { - ShowMessageBox(_T("Failed to activate kernel."), _("Error"), MB_OK); + ShowMessageBox(_T("Impossibile attivare il kernel."), _("Errore"), MB_OK); return; } @@ -178,20 +178,20 @@ inline void SystemWidget::ExportUSBStorage() { if (!KoboUmountData()) { - ShowMessageBox(_T("Failed to unmount data partition."), _("Error"), + ShowMessageBox(_T("Impossibile smontare la partizione dati."), _("Errore"), MB_OK); return; } if (!KoboExportUSBStorage()) { - ShowMessageBox(_T("Failed to export data partition."), _("Error"), + ShowMessageBox(_T("Impossibile esportare la partizione dati."), _("Errore"), MB_OK); KoboMountData(); return; } - ShowMessageBox(_T("Your PC has now access to the data partition until you close this dialog."), - _T("Export USB storage"), + ShowMessageBox(_T("Il tuo PC avra' accesso alla memoria del Kobo finche' questa finestra di dialogo rimarra' aperta."), + _T("Esporta memoria USB"), MB_OK); KoboUnexportUSBStorage(); @@ -262,8 +262,8 @@ ShowSystemDialog() { const DialogLook &look = UIGlobals::GetDialogLook(); TWidgetDialog - dialog(WidgetDialog::Full{}, UIGlobals::GetMainWindow(), look, "System"); - dialog.AddButton(_("Close"), mrOK); + dialog(WidgetDialog::Full{}, UIGlobals::GetMainWindow(), look, "Sistema"); + dialog.AddButton(_("Chiudi"), mrOK); dialog.SetWidget(look); dialog.ShowModal(); } diff --git a/src/Kobo/ToolsDialog.cpp b/src/Kobo/ToolsDialog.cpp index 9e12d2f1983..8f20247abc9 100644 --- a/src/Kobo/ToolsDialog.cpp +++ b/src/Kobo/ToolsDialog.cpp @@ -77,8 +77,8 @@ ShowToolsDialog() { const DialogLook &look = UIGlobals::GetDialogLook(); TWidgetDialog - dialog(WidgetDialog::Full{}, UIGlobals::GetMainWindow(), look, _("Tools")); - dialog.AddButton(_("Close"), mrOK); + dialog(WidgetDialog::Full{}, UIGlobals::GetMainWindow(), look, _("Strumenti")); + dialog.AddButton(_("Chiudi"), mrOK); dialog.SetWidget(look); dialog.ShowModal(); } diff --git a/src/Kobo/WifiDialog.cpp b/src/Kobo/WifiDialog.cpp index 04f1da20a1c..2e423272e68 100644 --- a/src/Kobo/WifiDialog.cpp +++ b/src/Kobo/WifiDialog.cpp @@ -72,15 +72,15 @@ class WifiListWidget final wpa_supplicant.Scan(); UpdateList(); } catch (...) { - ShowError(std::current_exception(), _("Error")); + ShowError(std::current_exception(), _("Errore")); } }); - connect_button = dialog.AddButton(_("Connect"), [this](){ + connect_button = dialog.AddButton(_("Connetti"), [this](){ try { Connect(); } catch (...) { - ShowError(std::current_exception(), _("Error")); + ShowError(std::current_exception(), _("Errore")); } }); } @@ -149,10 +149,10 @@ WifiListWidget::UpdateButtons() const auto &info = networks[cursor]; if (info.id >= 0) { - connect_button->SetCaption(_("Remove")); + connect_button->SetCaption(_("Rimuovi")); connect_button->SetEnabled(true); } else if (info.signal_detected) { - connect_button->SetCaption(_("Connect")); + connect_button->SetCaption(_("Connetti")); connect_button->SetEnabled(true); } } else { @@ -180,7 +180,7 @@ WifiListWidget::OnPaintItem(Canvas &canvas, const PixelRect rc, /* found the currently connected wifi network? */ if (StringIsEqual(info.bssid, status.bssid)) { - state = _("Connected"); + state = _("Connesso"); /* look up ip address for wlan0 or eth0 */ const auto addr = IPv4Address::GetDeviceAddress(GetKoboWifiInterface()); @@ -194,10 +194,10 @@ WifiListWidget::OnPaintItem(Canvas &canvas, const PixelRect rc, } else if (info.id >= 0) state = info.signal_detected - ? _("Saved and visible") - : _("Saved, but not visible"); + ? _("Salvata e visibile") + : _("Salvata ma non visibile"); else if (info.signal_detected) - state = _("Visible"); + state = _("Visibile"); if (state != nullptr) row_renderer.DrawRightFirstRow(canvas, rc, state); @@ -250,7 +250,7 @@ WifiConnect(enum WifiSecurity security, WPASupplicant &wpa_supplicant, const cha } else if (security == OPEN_SECURITY){ wpa_supplicant.SetNetworkID(id, "key_mgmt", "NONE"); } else - throw std::runtime_error{"Unsupported Wifi security type"}; + throw std::runtime_error{"Tipo di sicurezza Wifi non supportato"}; wpa_supplicant.EnableNetwork(id); wpa_supplicant.SaveConfig(); @@ -270,7 +270,7 @@ WifiListWidget::Connect() const auto ssid = info.ssid; StaticString<256> caption; - caption.Format(_("Passphrase of network '%s'"), ssid.c_str()); + caption.Format(_("Passphrase della rete '%s'"), ssid.c_str()); StaticString<32> passphrase; passphrase.clear(); @@ -477,7 +477,7 @@ ShowWifiDialog() TWidgetDialog dialog(WidgetDialog::Full{}, UIGlobals::GetMainWindow(), look, _("Wifi")); - dialog.AddButton(_("Close"), mrOK); + dialog.AddButton(_("Chiudi"), mrOK); dialog.SetWidget(); dialog.GetWidget().CreateButtons(dialog); dialog.ShowModal(); diff --git a/src/Look/TrailLook.cpp b/src/Look/TrailLook.cpp index 4bffa11876f..023a01088b2 100644 --- a/src/Look/TrailLook.cpp +++ b/src/Look/TrailLook.cpp @@ -100,7 +100,7 @@ TrailLook::Initialise(const TrailSettings &settings) else iwidth = std::max(minwidth, (i - NUMSNAILCOLORS / 2) * - Layout::ScalePenWidth(16u) / NUMSNAILCOLORS); + Layout::ScalePenWidth(8u) / NUMSNAILCOLORS); trail_widths[i] = iwidth; trail_brushes[i].Create(color); diff --git a/src/MapSettings.hpp b/src/MapSettings.hpp index 4d9fe73f1dd..f8a18bbab4c 100644 --- a/src/MapSettings.hpp +++ b/src/MapSettings.hpp @@ -77,6 +77,7 @@ struct TrailSettings { enum class Type: uint8_t { VARIO_1, VARIO_2, + VARIO_3, ALTITUDE, VARIO_1_DOTS, VARIO_2_DOTS,