20 files changed, 68 insertions(+), 38 deletions(-)

M module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
M module-apps/application-alarm-clock/models/AlarmsModel.cpp
M module-apps/application-calllog/ApplicationCallLog.cpp
M module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
M module-apps/application-messages/ApplicationMessages.cpp
M module-apps/application-messages/models/ThreadsModel.cpp
M module-apps/application-messages/widgets/SMSOutputWidget.cpp
M module-apps/application-notes/ApplicationNotes.cpp
M module-apps/application-notes/model/NotesListModel.cpp
M module-apps/application-notes/windows/NoteEditWindow.cpp
M module-apps/application-notes/windows/NotePreviewWindow.cpp
M module-apps/application-settings/ApplicationSettings.cpp
M module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
M module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
M module-apps/application-settings/windows/network/NetworkWindow.cpp
M module-apps/application-settings/windows/security/SecurityMainWindow.cpp
M module-apps/application-settings/windows/system/SystemMainWindow.cpp
A module-apps/apps-common/options/OptionWindowName.hpp
M module-apps/apps-common/windows/OptionWindow.cpp
M module-apps/apps-common/windows/OptionWindow.hpp

@@ 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) {

@@ 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)));
             }

@@ 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);
         });

@@ 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;

@@ 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;
     }
 

@@ 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;

@@ 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;
             }

@@ 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,

@@ 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;

@@ 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)));
             }
         }

@@ 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)));
             }

@@ 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);

@@ 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)

@@ 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();
     }

@@ 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)
     {

@@ 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)
     {

@@ 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>
     {

@@ 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

@@ 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,

@@ 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;