From 7fbaf735ed99f5b0d26adb686cfa6ed2bb4267d5 Mon Sep 17 00:00:00 2001
From: Przemyslaw Brudny <przemyslaw.brudny@mudita.com>
Date: Thu, 21 Oct 2021 19:11:15 +0200
Subject: [PATCH] [EGD-7813] Option Window titles localizations fix

Option Window titles localizations fix.
---
 .../ApplicationAlarmClock.cpp                     |  7 +++----
 .../models/AlarmsModel.cpp                        |  3 ++-
 .../application-calllog/ApplicationCallLog.cpp    |  7 +++----
 .../windows/CallLogDetailsWindow.cpp              |  2 +-
 .../application-messages/ApplicationMessages.cpp  |  9 ++++-----
 .../application-messages/models/ThreadsModel.cpp  |  2 +-
 .../widgets/SMSOutputWidget.cpp                   |  2 +-
 .../application-notes/ApplicationNotes.cpp        |  7 +++----
 .../application-notes/model/NotesListModel.cpp    |  4 ++--
 .../application-notes/windows/NoteEditWindow.cpp  |  3 ++-
 .../windows/NotePreviewWindow.cpp                 |  3 ++-
 .../application-settings/ApplicationSettings.cpp  |  4 ++--
 .../windows/bluetooth/AddDeviceWindow.cpp         |  1 +
 .../windows/bluetooth/BluetoothWindow.cpp         |  2 ++
 .../windows/network/NetworkWindow.cpp             |  4 +++-
 .../windows/security/SecurityMainWindow.cpp       |  4 +++-
 .../windows/system/SystemMainWindow.cpp           |  4 +++-
 .../apps-common/options/OptionWindowName.hpp      | 12 ++++++++++++
 module-apps/apps-common/windows/OptionWindow.cpp  | 15 +++++++++------
 module-apps/apps-common/windows/OptionWindow.hpp  | 11 +++++++++--
 20 files changed, 68 insertions(+), 38 deletions(-)
 create mode 100644 module-apps/apps-common/options/OptionWindowName.hpp

diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
index 11ab4199982091f12cc6552895580c7cb697270f..b878ce3c11d1debf5a734dc3bf8f5667bd3bd33a 100644
--- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
+++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
@@ -102,10 +102,9 @@ namespace app
                                       std::make_unique<alarmClock::CustomRepeatWindowPresenter>(alarmsProvider);
                                   return std::make_unique<alarmClock::CustomRepeatWindow>(app, std::move(presenter));
                               });
-        windowsFactory.attach(utils::translate("common_options_title"),
-                              [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::OptionWindow>(app, name);
-                              });
+        windowsFactory.attach(window::name::option_window, [](ApplicationCommon *app, const std::string &name) {
+            return std::make_unique<gui::OptionWindow>(app, name);
+        });
 
         windowsFactory.attach(style::alarmClock::window::name::dialogYesNo,
                               [](ApplicationCommon *app, const std::string &name) {
diff --git a/module-apps/application-alarm-clock/models/AlarmsModel.cpp b/module-apps/application-alarm-clock/models/AlarmsModel.cpp
index 48563dc79f9eef2e3da77c765e6929ac927a1526..1badc68d4b71a08718855711e2ea50412231f77a 100644
--- a/module-apps/application-alarm-clock/models/AlarmsModel.cpp
+++ b/module-apps/application-alarm-clock/models/AlarmsModel.cpp
@@ -6,6 +6,7 @@
 #include "application-alarm-clock/widgets/AlarmClockStyle.hpp"
 #include "application-alarm-clock/windows/AlarmClockOptions.hpp"
 #include "messages/OptionsWindow.hpp"
+#include <OptionWindowName.hpp>
 #include <ListView.hpp>
 #include <InputEvent.hpp>
 
@@ -52,7 +53,7 @@ namespace app::alarmClock
         };
         item->inputCallback = [this, record = record.get()](gui::Item &, const gui::InputEvent &event) {
             if (event.isShortRelease(gui::KeyCode::KEY_LF)) {
-                application->switchWindow(utils::translate("common_options_title"),
+                application->switchWindow(window::name::option_window,
                                           std::make_unique<gui::OptionsWindowOptions>(
                                               alarmsListOptions(application, *record, *alarmsRepository)));
             }
diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp
index c4b6bcee59963ff35ce7db6c97afa94fbb802c43..6d4e538e0ff4f97c095e5fa21bf0fd804ad63396 100644
--- a/module-apps/application-calllog/ApplicationCallLog.cpp
+++ b/module-apps/application-calllog/ApplicationCallLog.cpp
@@ -89,10 +89,9 @@ namespace app
         windowsFactory.attach(calllog::settings::DetailsWindowStr, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CallLogDetailsWindow>(app);
         });
-        windowsFactory.attach(utils::translate("common_options_title"),
-                              [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::OptionWindow>(app, name);
-                              });
+        windowsFactory.attach(window::name::option_window, [](ApplicationCommon *app, const std::string &name) {
+            return std::make_unique<gui::OptionWindow>(app, name);
+        });
         windowsFactory.attach(calllog::settings::DialogYesNoStr, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogYesNo>(app, name);
         });
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
index 431c724317fcd58ed06c989f4f63a01425cf1be8..26d1f581318891bbe163ca9a21dd61cc71480581 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
@@ -225,7 +225,7 @@ namespace gui
         if (inputEvent.isShortRelease(KeyCode::KEY_LF)) {
             auto app = dynamic_cast<app::ApplicationCallLog *>(application);
             assert(app != nullptr);
-            app->switchWindow(utils::translate("common_options_title"),
+            app->switchWindow(window::name::option_window,
                               std::make_unique<gui::OptionsWindowOptions>(calllogWindowOptions(app, record)));
 
             return true;
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index 443e2ee0312190d2cc7959a65121d73b7aaf2371..a58be631d94bfca3bb560d76a11e9b513c5a967b 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -126,10 +126,9 @@ namespace app
         windowsFactory.attach(gui::name::window::new_sms, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::NewMessageWindow>(app);
         });
-        windowsFactory.attach(utils::translate("common_options_title"),
-                              [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::OptionWindow>(app, name);
-                              });
+        windowsFactory.attach(window::name::option_window, [](ApplicationCommon *app, const std::string &name) {
+            return std::make_unique<gui::OptionWindow>(app, name);
+        });
         windowsFactory.attach(gui::name::window::dialog, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::Dialog>(app, name);
         });
@@ -408,7 +407,7 @@ namespace app
     {
         LOG_INFO("New message options for %s", requestingWindow.c_str());
         auto opts = std::make_unique<gui::OptionsWindowOptions>(newMessageWindowOptions(this, requestingWindow, text));
-        switchWindow(utils::translate("common_options_title"), std::move(opts));
+        switchWindow(window::name::option_window, std::move(opts));
         return true;
     }
 
diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp
index 0f138f7af56c3a4588a8eb68be4a570b0e33a1ad..ed2df245bb758ff2ed1d3f74a95d81f1baefadd6 100644
--- a/module-apps/application-messages/models/ThreadsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsModel.cpp
@@ -56,7 +56,7 @@ auto ThreadsModel::getItem(gui::Order order) -> gui::ListItem *
         }
         if (event.is(gui::KeyCode::KEY_LF)) {
             application->switchWindow(
-                utils::translate("common_options_title"),
+                window::name::option_window,
                 std::make_unique<gui::OptionsWindowOptions>(threadWindowOptions(app, item->getThreadItem().get())));
         }
         return false;
diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
index 59bb9ed0f18d4460e8d53b89ef5476d77e25bccb..34c0d4b36bec52140eaba4d4c573b52c9966c6af 100644
--- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
@@ -87,7 +87,7 @@ namespace gui
                 LOG_INFO("Message activated!");
                 auto app = dynamic_cast<app::ApplicationMessages *>(application);
                 assert(app != nullptr);
-                app->switchWindow(utils::translate("common_options_title"),
+                app->switchWindow(window::name::option_window,
                                   std::make_unique<gui::OptionsWindowOptions>(smsWindowOptions(app, *record)));
                 return true;
             }
diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp
index c0d845d31c23d8b48eccd60f44663b7f4120b5cb..2aace363a5374be5a9e7dc378d88001b43f306fa 100644
--- a/module-apps/application-notes/ApplicationNotes.cpp
+++ b/module-apps/application-notes/ApplicationNotes.cpp
@@ -122,10 +122,9 @@ namespace app
                               [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<gui::DialogYesNo>(app, name);
                               });
-        windowsFactory.attach(utils::translate("common_options_title"),
-                              [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::OptionWindow>(app, name);
-                              });
+        windowsFactory.attach(window::name::option_window, [](ApplicationCommon *app, const std::string &name) {
+            return std::make_unique<gui::OptionWindow>(app, name);
+        });
 
         attachPopups({gui::popup::ID::Volume,
                       gui::popup::ID::Tethering,
diff --git a/module-apps/application-notes/model/NotesListModel.cpp b/module-apps/application-notes/model/NotesListModel.cpp
index e1106b77255a8ecbb682b8846ad8d18592efe81f..7ff458517c70da323e67b642f1dc83a36573ccd9 100644
--- a/module-apps/application-notes/model/NotesListModel.cpp
+++ b/module-apps/application-notes/model/NotesListModel.cpp
@@ -8,7 +8,7 @@
 #include "module-apps/application-notes/windows/NotesOptions.hpp"
 #include "module-apps/application-notes/data/NoteSwitchData.hpp"
 #include <apps-common/messages/OptionsWindow.hpp>
-
+#include <apps-common/options/OptionWindowName.hpp>
 #include <module-gui/gui/widgets/ListView.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>
 
@@ -54,7 +54,7 @@ namespace app::notes
         item->inputCallback = [this, note = note.get()](gui::Item &, const gui::InputEvent &event) {
             if (event.isShortRelease(gui::KeyCode::KEY_LF)) {
                 application->switchWindow(
-                    utils::translate("common_options_title"),
+                    window::name::option_window,
                     std::make_unique<gui::OptionsWindowOptions>(noteListOptions(application, *note, *notesRepository)));
             }
             return false;
diff --git a/module-apps/application-notes/windows/NoteEditWindow.cpp b/module-apps/application-notes/windows/NoteEditWindow.cpp
index 185b6c90d77e4af43b61b98a5fca6b9eb2136d31..205f3dd80418d56309c622ea93269fb22c04984c 100644
--- a/module-apps/application-notes/windows/NoteEditWindow.cpp
+++ b/module-apps/application-notes/windows/NoteEditWindow.cpp
@@ -12,6 +12,7 @@
 #include <module-apps/application-notes/data/NoteSwitchData.hpp>
 #include <module-apps/application-notes/style/NoteEditStyle.hpp>
 #include <apps-common/messages/OptionsWindow.hpp>
+#include <apps-common/options/OptionWindowName.hpp>
 
 #include <i18n/i18n.hpp>
 
@@ -149,7 +150,7 @@ namespace app::notes
             }
             if (inputEvent.is(gui::KeyCode::KEY_LF)) {
                 application->switchWindow(
-                    utils::translate("common_options_title"),
+                    window::name::option_window,
                     std::make_unique<gui::OptionsWindowOptions>(noteEditOptions(application, *notesRecord, edit)));
             }
         }
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp
index 45adc9a63ad8b35ed8bf4b2fa618435e88c9a7bb..0efc21739a1ef54dc44ac9cfb04a0ccc250d9a03 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.cpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp
@@ -8,6 +8,7 @@
 #include <module-apps/application-notes/style/NotePreviewStyle.hpp>
 #include <module-apps/application-notes/windows/NotesOptions.hpp>
 #include <apps-common/messages/OptionsWindow.hpp>
+#include <apps-common/options/OptionWindowName.hpp>
 
 #include <i18n/i18n.hpp>
 #include <time/time_conversion_factory.hpp>
@@ -131,7 +132,7 @@ namespace app::notes
                 application->switchWindow(gui::name::window::note_edit, std::make_unique<NoteSwitchData>(notesRecord));
             }
             else if (inputEvent.is(gui::KeyCode::KEY_LF)) {
-                application->switchWindow(utils::translate("common_options_title"),
+                application->switchWindow(window::name::option_window,
                                           std::make_unique<gui::OptionsWindowOptions>(notePreviewOptions(
                                               application, *notesRecord, presenter->getRepository(), note)));
             }
diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp
index 0984ea49d54e69f3f8981c0fda3d843f7f0a44b9..965c10f1d0f40a2ac63c14a4ad607ffba2895036 100644
--- a/module-apps/application-settings/ApplicationSettings.cpp
+++ b/module-apps/application-settings/ApplicationSettings.cpp
@@ -360,13 +360,13 @@ namespace app
     {
         windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::OptionWindow>(
-                app, utils::translate("app_settings_title_main"), mainWindowOptionsNew(app));
+                app, name, mainWindowOptionsNew(app), utils::translate("app_settings_title_main"));
         });
 
         // Advanced
         windowsFactory.attach(gui::window::name::advanced, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::OptionWindow>(
-                app, utils::translate("app_settings_advanced"), advancedOptions(app));
+                app, name, advancedOptions(app), utils::translate("app_settings_advanced"));
         });
         windowsFactory.attach(gui::window::name::information, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::InformationWindow>(app);
diff --git a/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp b/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
index 974b6a780bcc460288e01edda3f449543e71a1b5..c568ba018b94bfedfa917cf3237a66cd703e97a6 100644
--- a/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
@@ -16,6 +16,7 @@ namespace gui
                                      std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel)
         : BaseSettingsWindow(app, window::name::add_device), bluetoothSettingsModel(bluetoothSettingsModel)
     {
+        setTitle(utils::translate("app_settings_bluetooth_add_device"));
     }
 
     void AddDeviceWindow::onBeforeShow(ShowMode /*mode*/, SwitchData *data)
diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp b/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
index e1e59201adc5250bb186bc11f3b1f6ee49e04c87..277654b774792e3ace1d5edecc159f003d32269d 100644
--- a/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
@@ -13,6 +13,8 @@ namespace gui
 
     BluetoothWindow::BluetoothWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::bluetooth)
     {
+        setTitle(utils::translate("app_settings_bluetooth_main"));
+
         bluetoothSettingsModel = std::make_unique<BluetoothSettingsModel>(application);
         bluetoothSettingsModel->requestStatus();
     }
diff --git a/module-apps/application-settings/windows/network/NetworkWindow.cpp b/module-apps/application-settings/windows/network/NetworkWindow.cpp
index 149871da7b8dd2515322ba87ca5643c8ecaa2c93..a51e053140c19c39ef6f279a45e2ecc7812a3b02 100644
--- a/module-apps/application-settings/windows/network/NetworkWindow.cpp
+++ b/module-apps/application-settings/windows/network/NetworkWindow.cpp
@@ -13,7 +13,9 @@ namespace gui
     NetworkWindow::NetworkWindow(app::ApplicationCommon *app,
                                  app::settingsInterface::OperatorsSettings *operatorsSettings)
         : BaseSettingsWindow(app, gui::window::name::network), operatorsSettings(operatorsSettings)
-    {}
+    {
+        setTitle(utils::translate("app_settings_net"));
+    }
 
     void NetworkWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
diff --git a/module-apps/application-settings/windows/security/SecurityMainWindow.cpp b/module-apps/application-settings/windows/security/SecurityMainWindow.cpp
index a1ee3e116c75e663f9bf493e5836081752b11e3a..83999909728ec7478280356fe45a886a220d7a26 100644
--- a/module-apps/application-settings/windows/security/SecurityMainWindow.cpp
+++ b/module-apps/application-settings/windows/security/SecurityMainWindow.cpp
@@ -11,7 +11,9 @@ namespace gui
 {
     SecurityMainWindow::SecurityMainWindow(app::ApplicationCommon *app)
         : BaseSettingsWindow(app, window::name::security)
-    {}
+    {
+        setTitle(utils::translate("app_settings_security"));
+    }
 
     void SecurityMainWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
diff --git a/module-apps/application-settings/windows/system/SystemMainWindow.cpp b/module-apps/application-settings/windows/system/SystemMainWindow.cpp
index 4d7d288168c5762816ac23123def5a466e8192a8..a78b098de06c7ab13774cf3e2741bd51ca28c2c3 100644
--- a/module-apps/application-settings/windows/system/SystemMainWindow.cpp
+++ b/module-apps/application-settings/windows/system/SystemMainWindow.cpp
@@ -13,7 +13,9 @@
 namespace gui
 {
     SystemMainWindow::SystemMainWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::system)
-    {}
+    {
+        setTitle(utils::translate("app_settings_system"));
+    }
 
     auto SystemMainWindow::buildOptionsList() -> std::list<Option>
     {
diff --git a/module-apps/apps-common/options/OptionWindowName.hpp b/module-apps/apps-common/options/OptionWindowName.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..84a1a670fa08cf86824b3b9cc2d4336f948388c3
--- /dev/null
+++ b/module-apps/apps-common/options/OptionWindowName.hpp
@@ -0,0 +1,12 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+namespace window
+{
+    namespace name
+    {
+        inline constexpr auto option_window = "OptionWindow";
+    } // namespace name
+} // namespace window
diff --git a/module-apps/apps-common/windows/OptionWindow.cpp b/module-apps/apps-common/windows/OptionWindow.cpp
index 15b6e7470e1a3d01142a0b48330acf7d9995a25a..884d6f110d220df9fab6be1d009dbebfceae3abc 100644
--- a/module-apps/apps-common/windows/OptionWindow.cpp
+++ b/module-apps/apps-common/windows/OptionWindow.cpp
@@ -6,14 +6,18 @@
 
 namespace gui
 {
-    OptionWindow::OptionWindow(app::ApplicationCommon *app, const std::string &name)
-        : AppWindow(app, name), OptionsList(std::make_shared<OptionsModel>(app))
+    OptionWindow::OptionWindow(app::ApplicationCommon *app, const std::string &name, const std::string &windowTitle)
+        : AppWindow(app, name), OptionsList(std::make_shared<OptionsModel>(app)), windowTitle(windowTitle)
     {
         buildInterface();
     }
 
-    OptionWindow::OptionWindow(app::ApplicationCommon *app, const std::string &name, std::list<Option> options)
-        : AppWindow(app, name), OptionsList(std::make_shared<OptionsModel>(app), std::move(options))
+    OptionWindow::OptionWindow(app::ApplicationCommon *app,
+                               const std::string &name,
+                               std::list<Option> options,
+                               const std::string &windowTitle)
+        : AppWindow(app, name), OptionsList(std::make_shared<OptionsModel>(app), std::move(options)),
+          windowTitle(windowTitle)
     {
         buildInterface();
     }
@@ -30,8 +34,7 @@ namespace gui
         bottomBar->setActive(BottomBar::Side::RIGHT, true);
         bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select));
         bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back));
-
-        setTitle(name);
+        setTitle(windowTitle.empty() ? utils::translate("common_options_title") : windowTitle);
 
         optionsList = new gui::ListView(this,
                                         option::window::optionsListX,
diff --git a/module-apps/apps-common/windows/OptionWindow.hpp b/module-apps/apps-common/windows/OptionWindow.hpp
index f2230575a88720d4fb360ece183024857c0a2731..3e850103b670301602f038bda63f5d9382ca720b 100644
--- a/module-apps/apps-common/windows/OptionWindow.hpp
+++ b/module-apps/apps-common/windows/OptionWindow.hpp
@@ -6,6 +6,7 @@
 #include "ApplicationCommon.hpp"
 #include "AppWindow.hpp"
 #include "OptionsList.hpp"
+#include "OptionWindowName.hpp"
 
 namespace gui
 {
@@ -16,9 +17,15 @@ namespace gui
 
     class OptionWindow : public AppWindow, protected OptionsList<ListView>
     {
+      private:
+        const std::string windowTitle;
+
       public:
-        OptionWindow(app::ApplicationCommon *app, const std::string &name);
-        OptionWindow(app::ApplicationCommon *app, const std::string &name, std::list<Option> options);
+        OptionWindow(app::ApplicationCommon *app, const std::string &name, const std::string &windowTitle = "");
+        OptionWindow(app::ApplicationCommon *app,
+                     const std::string &name,
+                     std::list<Option> options,
+                     const std::string &windowTitle = "");
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void onClose(CloseReason reason) override;