From 050d658980c10a6d7ea5132db1fa03554ca33df7 Mon Sep 17 00:00:00 2001 From: Mateusz Grzegorzek Date: Mon, 18 Jan 2021 16:36:41 +0100 Subject: [PATCH] [EGD-5288] Add Main system window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In settings add “System” window with all main menu items (items are just menu positions not connected to actual windows) --- image/assets/lang/English.json | 3 ++ .../ApplicationSettings.cpp | 4 ++ .../ApplicationSettings.hpp | 6 +++ .../application-settings-new/CMakeLists.txt | 2 + .../windows/SystemMainWindow.cpp | 37 +++++++++++++++++++ .../windows/SystemMainWindow.hpp | 18 +++++++++ 6 files changed, 70 insertions(+) create mode 100644 module-apps/application-settings-new/windows/SystemMainWindow.cpp create mode 100644 module-apps/application-settings-new/windows/SystemMainWindow.hpp diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index 7c61dea6416bdad5a36d85a1b63cb1b164a2f6b7..eeb68661074112dce3efaf5e31e62006f74d325d 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -333,6 +333,9 @@ "app_settings_phone_modes": "Phone Modes", "app_settings_security": "Security", "app_settings_language": "Language", + "app_settings_factory_reset": "Factory reset", + "app_settings_about_your_pure": "About your Pure", + "app_settings_certification": "Certification", "app_settings_about": "About Mudita Pure", "app_settings_title_languages": "Language Selection", "app_settings_language_english": "English", diff --git a/module-apps/application-settings-new/ApplicationSettings.cpp b/module-apps/application-settings-new/ApplicationSettings.cpp index e119f269e5c120454eb782d4904a84d8fe6b77db..a0104201fbc65aaf6c785bc5935962468d4565bc 100644 --- a/module-apps/application-settings-new/ApplicationSettings.cpp +++ b/module-apps/application-settings-new/ApplicationSettings.cpp @@ -27,6 +27,7 @@ #include "windows/SecurityMainWindow.hpp" #include "windows/QuotesOptionsWindow.hpp" #include "windows/ChangePasscodeWindow.hpp" +#include "windows/SystemMainWindow.hpp" #include "Dialog.hpp" @@ -232,6 +233,9 @@ namespace app windowsFactory.attach(gui::window::name::security, [](Application *app, const std::string &name) { return std::make_unique(app); }); + windowsFactory.attach(gui::window::name::system, [](Application *app, const std::string &name) { + return std::make_unique(app); + }); } void ApplicationSettingsNew::destroyUserInterface() diff --git a/module-apps/application-settings-new/ApplicationSettings.hpp b/module-apps/application-settings-new/ApplicationSettings.hpp index 734f0b0f9bc65e538545027b5767e38282ffce4f..28edc2c3a66e50c589a09c08ab9306015c63aef7 100644 --- a/module-apps/application-settings-new/ApplicationSettings.hpp +++ b/module-apps/application-settings-new/ApplicationSettings.hpp @@ -49,6 +49,12 @@ namespace gui::window::name inline constexpr auto dialog_settings = "DialogSettings"; inline constexpr auto change_passcode = "ChangePasscode"; + inline constexpr auto language = "Language"; + inline constexpr auto date_and_time = "DateAndTime"; + inline constexpr auto factory_reset = "FactoryReset"; + inline constexpr auto about_your_pure = "AboutYourPure"; + inline constexpr auto certification = "Certification"; + } // namespace gui::window::name namespace app diff --git a/module-apps/application-settings-new/CMakeLists.txt b/module-apps/application-settings-new/CMakeLists.txt index 4ec1ada36f8f4d37715a28c86a7f3f10531b22d8..d29668f3ad5450ec541134be2136155ac1cb9315 100644 --- a/module-apps/application-settings-new/CMakeLists.txt +++ b/module-apps/application-settings-new/CMakeLists.txt @@ -44,6 +44,7 @@ target_sources( ${PROJECT_NAME} windows/ChangePasscodeWindow.cpp widgets/SpinBox.cpp widgets/SpinBoxOptionSetting.cpp + windows/SystemMainWindow.cpp PUBLIC ApplicationSettings.hpp @@ -60,6 +61,7 @@ target_sources( ${PROJECT_NAME} widgets/SettingsStyle.hpp windows/AutolockWindow.hpp windows/WallpaperWindow.hpp + windows/SystemMainWindow.hpp ) add_dependencies(${PROJECT_NAME} version) diff --git a/module-apps/application-settings-new/windows/SystemMainWindow.cpp b/module-apps/application-settings-new/windows/SystemMainWindow.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a71fd5c0c2220f6663f0a0dcad9ab1ac79330c9e --- /dev/null +++ b/module-apps/application-settings-new/windows/SystemMainWindow.cpp @@ -0,0 +1,37 @@ +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. +// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md + +#include "application-settings-new/ApplicationSettings.hpp" +#include "OptionSetting.hpp" +#include "SystemMainWindow.hpp" + +namespace gui +{ + SystemMainWindow::SystemMainWindow(app::Application *app) : BaseSettingsWindow(app, window::name::system) + {} + + auto SystemMainWindow::buildOptionsList() -> std::list