M module-apps/CMakeLists.txt => module-apps/CMakeLists.txt +2 -1
@@ 22,12 22,12 @@ add_subdirectory(application-music-player)
add_subdirectory(application-notes)
add_subdirectory(application-phonebook)
add_subdirectory(application-calllog)
+add_subdirectory(application-settings)
add_subdirectory(application-special-input)
add_subdirectory(apps-common)
set(APPLICATIONS
clock
- settings
onboarding
alarm-clock
)
@@ 82,6 82,7 @@ endif()
target_link_libraries(${PROJECT_NAME}
PRIVATE
application-messages
+ application-settings
apps-common
date::date
eventstore
M module-apps/application-onboarding/ApplicationOnBoarding.cpp => module-apps/application-onboarding/ApplicationOnBoarding.cpp +0 -6
@@ 1,8 1,6 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <utility>
-
#include "ApplicationOnBoarding.hpp"
#include "data/OnBoardingMessages.hpp"
@@ 18,12 16,8 @@
#include "windows/OnBoardingDateAndTimeWindow.hpp"
#include "windows/OnBoardingChangeDateAndTimeWindow.hpp"
-#include <service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp>
-#include <application-settings/data/LanguagesData.hpp>
#include <application-settings/windows/system/ChangeTimeZone.hpp>
#include <module-services/service-db/agents/settings/SystemSettings.hpp>
-#include <apps-common/locks/data/PhoneLockMessages.hpp>
-#include <apps-common/locks/data/SimLockMessages.hpp>
#include <service-appmgr/model/ApplicationManager.hpp>
namespace app
M module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp => module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp +0 -1
@@ 4,7 4,6 @@
#pragma once
#include <application-settings/windows/system/ChangeDateAndTimeWindow.hpp>
-#include <application-settings/models/system/DateAndTimeModel.hpp>
namespace app::onBoarding
{
M module-apps/application-settings/ApplicationSettings.cpp => module-apps/application-settings/ApplicationSettings.cpp +52 -52
@@ 1,85 1,85 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "ApplicationSettings.hpp"
-
+#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/data/ApnListData.hpp>
+#include <application-settings/data/AutoLockData.hpp>
+#include <application-settings/data/BluetoothStatusData.hpp>
+#include <application-settings/data/BondedDevicesData.hpp>
+#include <application-settings/data/DeviceData.hpp>
+#include <application-settings/data/LanguagesData.hpp>
+#include <application-settings/data/PINSettingsLockStateData.hpp>
+#include <application-settings/data/PhoneNameData.hpp>
+#include <application-settings/models/system/FactoryData.hpp>
+#include <application-settings/models/system/TechnicalInformationModel.hpp>
#include <application-settings/windows/SettingsMainWindow.hpp>
#include <application-settings/windows/advanced/AdvancedOptionsWindow.hpp>
+#include <application-settings/windows/advanced/ColorTestWindow.hpp>
+#include <application-settings/windows/advanced/EinkModeWindow.hpp>
#include <application-settings/windows/advanced/InformationWindow.hpp>
#include <application-settings/windows/advanced/UITestWindow.hpp>
-#include <application-settings/windows/advanced/EinkModeWindow.hpp>
-#include <application-settings/windows/advanced/ColorTestWindow.hpp>
-#include <application-settings/windows/bluetooth/BluetoothWindow.hpp>
+#include <application-settings/windows/apps/AlarmClockWindow.hpp>
+#include <application-settings/windows/apps/AppsWindow.hpp>
+#include <application-settings/windows/apps/MessagesWindow.hpp>
+#include <application-settings/windows/apps/PhoneWindow.hpp>
+#include <application-settings/windows/apps/SoundSelectWindow.hpp>
#include <application-settings/windows/bluetooth/AddDeviceWindow.hpp>
#include <application-settings/windows/bluetooth/AllDevicesWindow.hpp>
-#include <application-settings/windows/bluetooth/PhoneNameWindow.hpp>
#include <application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp>
-#include <application-settings/windows/network/NetworkWindow.hpp>
-#include <application-settings/windows/network/SimPINSettingsWindow.hpp>
-#include <application-settings/windows/network/SimCardsWindow.hpp>
-#include <application-settings/windows/network/SimContactsImportWindow.hpp>
-#include <application-settings/windows/network/NewApnWindow.hpp>
-#include <application-settings/windows/network/ApnSettingsWindow.hpp>
-#include <application-settings/windows/network/ApnOptionsWindow.hpp>
+#include <application-settings/windows/bluetooth/BluetoothWindow.hpp>
+#include <application-settings/windows/bluetooth/PhoneNameWindow.hpp>
#include <application-settings/windows/display-keypad/DisplayAndKeypadWindow.hpp>
#include <application-settings/windows/display-keypad/DisplayLightWindow.hpp>
-#include <application-settings/windows/display-keypad/FontSizeWindow.hpp>
-#include <application-settings/windows/display-keypad/WallpaperWindow.hpp>
-#include <application-settings/windows/display-keypad/QuotesMainWindow.hpp>
-#include <application-settings/windows/display-keypad/QuotesAddWindow.hpp>
#include <application-settings/windows/display-keypad/EditQuotesWindow.hpp>
+#include <application-settings/windows/display-keypad/FontSizeWindow.hpp>
+#include <application-settings/windows/display-keypad/InputLanguageWindow.hpp>
+#include <application-settings/windows/display-keypad/KeypadLightWindow.hpp>
#include <application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp>
+#include <application-settings/windows/display-keypad/QuotesAddWindow.hpp>
+#include <application-settings/windows/display-keypad/QuotesMainWindow.hpp>
#include <application-settings/windows/display-keypad/QuotesOptionsWindow.hpp>
-#include <application-settings/windows/display-keypad/KeypadLightWindow.hpp>
-#include <application-settings/windows/display-keypad/InputLanguageWindow.hpp>
-#include <application-settings/windows/phone-modes/PhoneModesWindow.hpp>
+#include <application-settings/windows/display-keypad/WallpaperWindow.hpp>
+#include <application-settings/windows/network/ApnOptionsWindow.hpp>
+#include <application-settings/windows/network/ApnSettingsWindow.hpp>
+#include <application-settings/windows/network/NetworkWindow.hpp>
+#include <application-settings/windows/network/NewApnWindow.hpp>
+#include <application-settings/windows/network/SimCardsWindow.hpp>
+#include <application-settings/windows/network/SimContactsImportWindow.hpp>
+#include <application-settings/windows/network/SimPINSettingsWindow.hpp>
+#include <application-settings/windows/phone-modes/ConnectionFrequencyWindow.hpp>
#include <application-settings/windows/phone-modes/DoNotDisturbWindow.hpp>
#include <application-settings/windows/phone-modes/OfflineWindow.hpp>
-#include <application-settings/windows/phone-modes/ConnectionFrequencyWindow.hpp>
-#include <application-settings/windows/apps/AppsWindow.hpp>
-#include <application-settings/windows/apps/PhoneWindow.hpp>
-#include <application-settings/windows/apps/MessagesWindow.hpp>
-#include <application-settings/windows/apps/AlarmClockWindow.hpp>
-#include <application-settings/windows/apps/SoundSelectWindow.hpp>
-#include <application-settings/windows/security/SecurityMainWindow.hpp>
+#include <application-settings/windows/phone-modes/PhoneModesWindow.hpp>
#include <application-settings/windows/security/AutolockWindow.hpp>
-#include <application-settings/windows/system/SystemMainWindow.hpp>
-#include <application-settings/windows/system/LanguagesWindow.hpp>
-#include <application-settings/windows/system/DateAndTimeMainWindow.hpp>
-#include <application-settings/windows/system/ChangeTimeZone.hpp>
-#include <application-settings/windows/system/ChangeDateAndTimeWindow.hpp>
-#include <application-settings/windows/system/TechnicalInformationWindow.hpp>
+#include <application-settings/windows/security/SecurityMainWindow.hpp>
#include <application-settings/windows/system/CertificationWindow.hpp>
+#include <application-settings/windows/system/ChangeDateAndTimeWindow.hpp>
+#include <application-settings/windows/system/ChangeTimeZone.hpp>
+#include <application-settings/windows/system/DateAndTimeMainWindow.hpp>
+#include <application-settings/windows/system/LanguagesWindow.hpp>
#include <application-settings/windows/system/SARInfoWindow.hpp>
-#include <application-settings/data/ApnListData.hpp>
-#include <application-settings/data/BondedDevicesData.hpp>
-#include <application-settings/data/BluetoothStatusData.hpp>
-#include <application-settings/data/DeviceData.hpp>
-#include <application-settings/data/LanguagesData.hpp>
-#include <application-settings/data/PhoneNameData.hpp>
-#include <application-settings/data/PINSettingsLockStateData.hpp>
-#include <application-settings/data/AutoLockData.hpp>
-#include <service-evtmgr/EventManagerServiceAPI.hpp>
+#include <application-settings/windows/system/SystemMainWindow.hpp>
+#include <application-settings/windows/system/TechnicalInformationWindow.hpp>
+
+#include <Dialog.hpp>
+#include <messages/DialogMetadataMessage.hpp>
+#include <service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
#include <service-bluetooth/BluetoothMessage.hpp>
#include <service-bluetooth/Constants.hpp>
-#include <service-bluetooth/messages/Status.hpp>
#include <service-bluetooth/messages/BondedDevices.hpp>
#include <service-bluetooth/messages/Connect.hpp>
#include <service-bluetooth/messages/DeviceName.hpp>
#include <service-bluetooth/messages/InitializationResult.hpp>
#include <service-bluetooth/messages/Passkey.hpp>
#include <service-bluetooth/messages/ResponseVisibleDevices.hpp>
+#include <service-bluetooth/messages/Status.hpp>
#include <service-bluetooth/messages/Unpair.hpp>
-#include <service-db/agents/settings/SystemSettings.hpp>
#include <service-db/Settings.hpp>
-#include <module-services/service-db/agents/settings/SystemSettings.hpp>
-#include <module-services/service-evtmgr/service-evtmgr/ScreenLightControlMessage.hpp>
-#include <module-services/service-evtmgr/service-evtmgr/Constants.hpp>
-#include <module-services/service-evtmgr/service-evtmgr/EVMessages.hpp>
-#include <service-appmgr/messages/Message.hpp>
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include <apps-common/messages/DialogMetadataMessage.hpp>
-#include <apps-common/windows/Dialog.hpp>
+#include <service-db/agents/settings/SystemSettings.hpp>
+#include <service-evtmgr/Constants.hpp>
+#include <service-evtmgr/EventManagerServiceAPI.hpp>
+#include <service-evtmgr/ScreenLightControlMessage.hpp>
#include <i18n/i18n.hpp>
M module-apps/application-settings/CMakeLists.txt => module-apps/application-settings/CMakeLists.txt +95 -79
@@ 1,146 1,162 @@
-
-include_directories( ${CMAKE_PROJECT_NAME}
-
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
-)
-
-include_directories( ${PROJECT_NAME}
+add_library(application-settings STATIC)
+target_include_directories(application-settings
+ PRIVATE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
PUBLIC
- ${CMAKE_CURRENT_LIST_DIR}
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
-target_sources( ${PROJECT_NAME}
-
+target_sources(application-settings
PRIVATE
ApplicationSettings.cpp
models/advanced/ColorTestModel.cpp
+ models/apps/AudioSettingsModel.cpp
+ models/apps/AudioSettingsModel.cpp
+ models/apps/SoundsModel.cpp
+ models/apps/SoundsModel.cpp
models/bluetooth/BluetoothSettingsModel.cpp
+ models/display-keypad/CategoriesModel.cpp
+ models/display-keypad/CategoriesModel.cpp
+ models/display-keypad/QuotesModel.cpp
+ models/display-keypad/QuotesModel.cpp
models/network/ApnSettingsModel.cpp
models/network/NewApnModel.cpp
models/network/SimContactsImportModel.cpp
models/network/SimContactsRepository.cpp
- models/display-keypad/QuotesModel.cpp
- models/display-keypad/CategoriesModel.cpp
- models/apps/AudioSettingsModel.cpp
- models/apps/SoundsModel.cpp
models/system/DateAndTimeModel.cpp
- models/system/SARInfoRepository.cpp
- models/system/TechnicalInformationRepository.cpp
models/system/FactoryData.cpp
+ models/system/SARInfoRepository.cpp
+ models/system/SARInfoRepository.cpp
models/system/TechnicalInformationModel.cpp
+ models/system/TechnicalInformationRepository.cpp
presenter/network/SimContactsImportWindowPresenter.cpp
presenter/system/SARInfoWindowPresenter.cpp
presenter/system/TechnicalWindowPresenter.cpp
- widgets/SpinBoxOptionSettings.cpp
widgets/advanced/ColorTestListItem.cpp
widgets/advanced/ColorTestListView.cpp
+ widgets/SpinBoxOptionSettings.cpp
+ widgets/apps/SettingsSoundItem.cpp
+ widgets/display-keypad/CategoryWidget.cpp
+ widgets/display-keypad/QuoteWidget.cpp
widgets/network/ApnInputWidget.cpp
widgets/network/SimContactImportSelectWidget.cpp
- widgets/display-keypad/QuoteWidget.cpp
- widgets/display-keypad/CategoryWidget.cpp
- widgets/apps/SettingsSoundItem.cpp
widgets/system/SettingsDateItem.cpp
widgets/system/SettingsTimeItem.cpp
widgets/system/TechnicalInformationItem.cpp
- windows/SettingsMainWindow.cpp
windows/BaseSettingsWindow.cpp
windows/OptionsWidgetMaker.cpp
+ windows/SettingsMainWindow.cpp
windows/advanced/AdvancedOptionsWindow.cpp
+ windows/advanced/ColorTestWindow.cpp
+ windows/advanced/EinkModeWindow.cpp
windows/advanced/InformationWindow.cpp
windows/advanced/UITestWindow.cpp
- windows/advanced/EinkModeWindow.cpp
- windows/advanced/ColorTestWindow.cpp
+ windows/apps/AlarmClockWindow.cpp
+ windows/apps/AppsWindow.cpp
+ windows/apps/MessagesWindow.cpp
+ windows/apps/PhoneWindow.cpp
+ windows/apps/SoundSelectWindow.cpp
windows/bluetooth/AddDeviceWindow.cpp
windows/bluetooth/AllDevicesWindow.cpp
+ windows/bluetooth/BluetoothCheckPasskeyWindow.cpp
windows/bluetooth/BluetoothWindow.cpp
windows/bluetooth/PhoneNameWindow.cpp
- windows/bluetooth/BluetoothCheckPasskeyWindow.cpp
- windows/network/NetworkWindow.cpp
- windows/network/SimCardsWindow.cpp
- windows/network/SimPINSettingsWindow.cpp
- windows/network/SimContactsImportWindow.cpp
- windows/network/ApnSettingsWindow.cpp
- windows/network/ApnOptionsWindow.cpp
- windows/network/NewApnWindow.cpp
windows/display-keypad/DisplayAndKeypadWindow.cpp
windows/display-keypad/DisplayLightWindow.cpp
+ windows/display-keypad/EditQuotesWindow.cpp
windows/display-keypad/FontSizeWindow.cpp
- windows/display-keypad/WallpaperWindow.cpp
- windows/display-keypad/QuotesMainWindow.cpp
+ windows/display-keypad/InputLanguageWindow.cpp
+ windows/display-keypad/KeypadLightWindow.cpp
+ windows/display-keypad/QuoteCategoriesWindow.cpp
windows/display-keypad/QuotesAddWindow.cpp
+ windows/display-keypad/QuotesMainWindow.cpp
windows/display-keypad/QuotesOptionsWindow.cpp
- windows/display-keypad/EditQuotesWindow.cpp
- windows/display-keypad/QuoteCategoriesWindow.cpp
- windows/display-keypad/KeypadLightWindow.cpp
- windows/display-keypad/InputLanguageWindow.cpp
- windows/phone-modes/PhoneModesWindow.cpp
+ windows/display-keypad/WallpaperWindow.cpp
+ windows/network/ApnOptionsWindow.cpp
+ windows/network/ApnSettingsWindow.cpp
+ windows/network/NetworkWindow.cpp
+ windows/network/NewApnWindow.cpp
+ windows/network/SimCardsWindow.cpp
+ windows/network/SimContactsImportWindow.cpp
+ windows/network/SimPINSettingsWindow.cpp
+ windows/phone-modes/ConnectionFrequencyWindow.cpp
windows/phone-modes/DoNotDisturbWindow.cpp
windows/phone-modes/OfflineWindow.cpp
- windows/phone-modes/ConnectionFrequencyWindow.cpp
- windows/apps/AppsWindow.cpp
- windows/apps/PhoneWindow.cpp
- windows/apps/MessagesWindow.cpp
- windows/apps/AlarmClockWindow.cpp
- windows/apps/SoundSelectWindow.cpp
- windows/security/SecurityMainWindow.cpp
+ windows/phone-modes/PhoneModesWindow.cpp
windows/security/AutolockWindow.cpp
- windows/system/SystemMainWindow.cpp
- windows/system/LanguagesWindow.cpp
- windows/system/DateAndTimeMainWindow.cpp
- windows/system/ChangeTimeZone.cpp
+ windows/security/SecurityMainWindow.cpp
+ windows/system/CertificationWindow.cpp
windows/system/ChangeDateAndTimeWindow.cpp
+ windows/system/ChangeTimeZone.cpp
+ windows/system/DateAndTimeMainWindow.cpp
+ windows/system/LanguagesWindow.cpp
windows/system/SARInfoWindow.cpp
- windows/system/CertificationWindow.cpp
+ windows/system/SystemMainWindow.cpp
windows/system/TechnicalInformationWindow.cpp
-
- PUBLIC
- ApplicationSettings.hpp
+ PRIVATE
models/advanced/ColorTestModel.hpp
widgets/SettingsStyle.hpp
widgets/advanced/ColorTestListItem.hpp
- widgets/advanced/ColorTestListItem.hpp
widgets/advanced/ColorTestListStyle.hpp
- widgets/network/ApnInputWidget.hpp
+ widgets/advanced/ColorTestListView.hpp
widgets/display-keypad/CategoryWidget.hpp
- windows/SettingsMainWindow.hpp
+ widgets/network/ApnInputWidget.hpp
windows/BaseSettingsWindow.hpp
+ windows/SettingsMainWindow.hpp
windows/WindowNames.hpp
windows/advanced/AdvancedOptionsWindow.hpp
+ windows/advanced/ColorTestWindow.hpp
+ windows/advanced/EinkModeWindow.hpp
windows/advanced/InformationWindow.hpp
windows/advanced/UITestWindow.hpp
- windows/advanced/EinkModeWindow.hpp
- windows/advanced/ColorTestWindow.hpp
- windows/network/SimCardsWindow.hpp
- windows/network/NewApnWindow.hpp
+ windows/apps/AppsWindow.hpp
+ windows/apps/MessagesWindow.hpp
windows/display-keypad/DisplayAndKeypadWindow.hpp
windows/display-keypad/DisplayLightWindow.hpp
- windows/display-keypad/FontSizeWindow.hpp
- windows/display-keypad/WallpaperWindow.hpp
windows/display-keypad/EditQuotesWindow.hpp
- windows/display-keypad/QuoteCategoriesWindow.hpp
- windows/display-keypad/KeypadLightWindow.hpp
+ windows/display-keypad/FontSizeWindow.hpp
windows/display-keypad/InputLanguageWindow.hpp
- windows/apps/AppsWindow.hpp
- windows/apps/MessagesWindow.hpp
+ windows/display-keypad/KeypadLightWindow.hpp
+ windows/display-keypad/QuoteCategoriesWindow.hpp
+ windows/display-keypad/WallpaperWindow.hpp
+ windows/network/NewApnWindow.hpp
+ windows/network/SimCardsWindow.hpp
windows/security/AutolockWindow.hpp
- windows/system/SystemMainWindow.hpp
- windows/system/LanguagesWindow.hpp
- windows/system/DateAndTimeMainWindow.hpp
- windows/system/ChangeDateAndTimeWindow.hpp
windows/system/CertificationWindow.hpp
+ windows/system/ChangeDateAndTimeWindow.hpp
+ windows/system/DateAndTimeMainWindow.hpp
+ windows/system/LanguagesWindow.hpp
+ windows/system/SystemMainWindow.hpp
windows/system/TechnicalInformationWindow.hpp
+ PUBLIC
+ include/application-settings/ApplicationSettings.hpp
)
-add_dependencies(${PROJECT_NAME} version)
-
-target_link_libraries(${PROJECT_NAME}
- PUBLIC
- service-bluetooth
- eventstore
+target_link_libraries(application-settings
PRIVATE
+ apps-common
+ eventstore
+ module-bluetooth
+ module-bsp
+ module-gui
+ module-utils
+ module-vfs
service-appmgr
- service-eink
- service-time-api
+ service-audio
+ service-bluetooth
+ service-cellular
+ service-db
+ service-desktop
+ service-evtmgr
+ service-time
+)
+
+add_dependencies(application-settings version)
+
+option(ENABLE_APP_SETTINGS "Enable application settings" ON)
+
+target_compile_definitions(application-settings
+ INTERFACE
+ $<$<BOOL:${ENABLE_APP_SETTINGS}>:ENABLE_APP_SETTINGS>
)
M module-apps/application-settings/data/ApnListData.hpp => module-apps/application-settings/data/ApnListData.hpp +1 -3
@@ 3,10 3,8 @@
#pragma once
+#include <gui/SwitchData.hpp>
#include <service-cellular/PacketDataTypes.hpp>
-#include <SwitchData.hpp>
-
-#include <vector>
namespace gui
{
M module-apps/application-settings/data/AutoLockData.hpp => module-apps/application-settings/data/AutoLockData.hpp +0 -1
@@ 3,7 3,6 @@
#pragma once
-#include <SwitchData.hpp>
#include <service-appmgr/messages/AutoLockRequests.hpp>
namespace gui
M module-apps/application-settings/data/BluetoothStatusData.hpp => module-apps/application-settings/data/BluetoothStatusData.hpp +1 -1
@@ 3,8 3,8 @@
#pragma once
+#include <gui/SwitchData.hpp>
#include <service-bluetooth/messages/Status.hpp>
-#include <SwitchData.hpp>
namespace gui
{
D module-apps/application-settings/data/ChangePasscodeData.hpp => module-apps/application-settings/data/ChangePasscodeData.hpp +0 -20
@@ 1,20 0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#pragma once
-
-enum class ChangePasscodeAction
-{
- OnlyCheckCurrentPasscode,
- OnlyProvideNewPasscode,
- ChangeCurrentPasscode
-};
-
-class ChangePasscodeData : public gui::SwitchData
-{
- public:
- explicit ChangePasscodeData(ChangePasscodeAction passcodeAction) : changePasscodeAction{passcodeAction}
- {}
-
- const ChangePasscodeAction changePasscodeAction;
-};
M module-apps/application-settings/data/DeviceData.hpp => module-apps/application-settings/data/DeviceData.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <SwitchData.hpp>
+#include <gui/SwitchData.hpp>
namespace gui
{
M module-apps/application-settings/data/LanguagesData.hpp => module-apps/application-settings/data/LanguagesData.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <SwitchData.hpp>
+#include <gui/SwitchData.hpp>
class LanguagesData : public gui::SwitchData
{
M module-apps/application-settings/data/PINSettingsLockStateData.hpp => module-apps/application-settings/data/PINSettingsLockStateData.hpp +1 -2
@@ 3,8 3,7 @@
#pragma once
-#include <string>
-#include <SwitchData.hpp>
+#include <gui/SwitchData.hpp>
namespace gui
{
M module-apps/application-settings/data/PINSettingsSimData.hpp => module-apps/application-settings/data/PINSettingsSimData.hpp +1 -2
@@ 3,8 3,7 @@
#pragma once
-#include <string>
-#include <SwitchData.hpp>
+#include <gui/SwitchData.hpp>
namespace gui
{
M module-apps/application-settings/data/PhoneNameData.hpp => module-apps/application-settings/data/PhoneNameData.hpp +3 -2
@@ 2,8 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <string>
-#include <SwitchData.hpp>
+
+#include <gui/SwitchData.hpp>
+
namespace gui
{
class PhoneNameData : public SwitchData
M module-apps/application-settings/data/QuoteSwitchData.hpp => module-apps/application-settings/data/QuoteSwitchData.hpp +2 -2
@@ 3,8 3,8 @@
#pragma once
-#include <application-settings/models/display-keypad/QuotesModel.hpp>
-#include <SwitchData.hpp>
+#include <gui/SwitchData.hpp>
+#include <service-db/service-db/QuotesMessages.hpp>
namespace Quotes
{
M module-apps/application-settings/data/SettingsInternals.hpp => module-apps/application-settings/data/SettingsInternals.hpp +0 -2
@@ 3,8 3,6 @@
#pragma once
-#include <cstdint>
-
namespace settingsInternals
{
enum class ListItemName
M module-apps/application-settings/data/SettingsItemData.hpp => module-apps/application-settings/data/SettingsItemData.hpp +1 -2
@@ 3,9 3,8 @@
#pragma once
+#include <gui/SwitchData.hpp>
#include <service-cellular/service-cellular/PacketDataTypes.hpp>
-#include <ListItem.hpp>
-#include <SwitchData.hpp>
class ApnItemData : public gui::SwitchData
{
R module-apps/application-settings/ApplicationSettings.hpp => module-apps/application-settings/include/application-settings/ApplicationSettings.hpp +1 -3
@@ 5,11 5,9 @@
#include "Application.hpp"
-#include <application-settings/windows/WindowNames.hpp>
-#include <bsp/common.hpp>
+#include <EventStore.hpp>
#include <bsp/keypad_backlight/keypad_backlight.hpp>
#include <service-evtmgr/screen-light-control/ScreenLightControl.hpp>
-#include <EventStore.hpp>
namespace app
{
M module-apps/application-settings/models/advanced/ColorTestModel.cpp => module-apps/application-settings/models/advanced/ColorTestModel.cpp +1 -0
@@ 2,6 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ColorTestModel.hpp"
+
#include <application-settings/widgets/advanced/ColorTestListStyle.hpp>
namespace gui
M module-apps/application-settings/models/advanced/ColorTestModel.hpp => module-apps/application-settings/models/advanced/ColorTestModel.hpp +1 -3
@@ 3,12 3,10 @@
#pragma once
-#include "application-settings/widgets/advanced/ColorTestListItem.hpp"
+#include <application-settings/widgets/advanced/ColorTestListItem.hpp>
-#include <Application.hpp>
#include <InternalModel.hpp>
#include <ListView.hpp>
-#include <ListItemProvider.hpp>
namespace gui
{
M module-apps/application-settings/models/apps/AbstractSoundsModel.hpp => module-apps/application-settings/models/apps/AbstractSoundsModel.hpp +2 -1
@@ 3,8 3,9 @@
#pragma once
+#include "AudioSettingsModel.hpp"
+
#include <ListItemProvider.hpp>
-#include <application-settings/models/apps/AudioSettingsModel.hpp>
namespace app
{
M module-apps/application-settings/models/apps/AudioSettingsModel.cpp => module-apps/application-settings/models/apps/AudioSettingsModel.cpp +0 -1
@@ 4,7 4,6 @@
#include "AudioSettingsModel.hpp"
#include <service-audio/AudioServiceAPI.hpp>
-#include <log.hpp>
namespace audio_settings
{
M module-apps/application-settings/models/apps/SoundsModel.cpp => module-apps/application-settings/models/apps/SoundsModel.cpp +1 -1
@@ 5,9 5,9 @@
#include <application-settings/widgets/apps/SettingsSoundItem.hpp>
+#include <ListView.hpp>
#include <purefs/filesystem_paths.hpp>
#include <service-audio/AudioServiceAPI.hpp>
-#include <ListView.hpp>
unsigned int SoundsModel::requestRecordsCount()
{
M module-apps/application-settings/models/apps/SoundsModel.hpp => module-apps/application-settings/models/apps/SoundsModel.hpp +0 -2
@@ 6,8 6,6 @@
#include "AbstractSoundsModel.hpp"
#include <InternalModel.hpp>
-#include <Application.hpp>
-#include <Audio/decoder/Decoder.hpp>
/// Simple SoundsModel
class SoundsModel : public app::InternalModel<gui::ListItem *>, public AbstractSoundsModel
M module-apps/application-settings/models/display-keypad/CategoriesModel.cpp => module-apps/application-settings/models/display-keypad/CategoriesModel.cpp +1 -0
@@ 4,6 4,7 @@
#include "CategoriesModel.hpp"
#include <application-settings/widgets/display-keypad/CategoryWidget.hpp>
+
#include <ListView.hpp>
namespace style::quotes::list
M module-apps/application-settings/models/display-keypad/CategoriesModel.hpp => module-apps/application-settings/models/display-keypad/CategoriesModel.hpp +0 -2
@@ 3,9 3,7 @@
#pragma once
-#include <Application.hpp>
#include <DatabaseModel.hpp>
-#include <ListItemProvider.hpp>
#include <service-db/QuotesMessages.hpp>
namespace Quotes
M module-apps/application-settings/models/display-keypad/QuotesModel.cpp => module-apps/application-settings/models/display-keypad/QuotesModel.cpp +1 -1
@@ 3,8 3,8 @@
#include "QuotesModel.hpp"
-#include <application-settings/ApplicationSettings.hpp>
#include <application-settings/widgets/display-keypad/QuoteWidget.hpp>
+#include <application-settings/windows/WindowNames.hpp>
#include <InputEvent.hpp>
#include <ListView.hpp>
M module-apps/application-settings/models/display-keypad/QuotesModel.hpp => module-apps/application-settings/models/display-keypad/QuotesModel.hpp +0 -2
@@ 3,9 3,7 @@
#pragma once
-#include <Application.hpp>
#include <DatabaseModel.hpp>
-#include <ListItemProvider.hpp>
#include <service-db/QuotesMessages.hpp>
namespace gui
M module-apps/application-settings/models/network/ApnSettingsModel.cpp => module-apps/application-settings/models/network/ApnSettingsModel.cpp +1 -0
@@ 2,6 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ApnSettingsModel.hpp"
+
#include <service-cellular/PacketDataCellularMessage.hpp>
#include <service-cellular/ServiceCellular.hpp>
M module-apps/application-settings/models/network/ApnSettingsModel.hpp => module-apps/application-settings/models/network/ApnSettingsModel.hpp +2 -2
@@ 3,9 3,9 @@
#pragma once
-#include <service-cellular/PacketDataTypes.hpp>
-#include <service-cellular/CellularServiceAPI.hpp>
#include <apps-common/Application.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
+#include <service-cellular/PacketDataTypes.hpp>
class ApnSettingsModel
{
M module-apps/application-settings/models/network/NewApnModel.hpp => module-apps/application-settings/models/network/NewApnModel.hpp +1 -2
@@ 5,9 5,8 @@
#include <application-settings/widgets/network/ApnListItem.hpp>
-#include <InternalModel.hpp>
#include <Application.hpp>
-#include <ListItemProvider.hpp>
+#include <InternalModel.hpp>
class NewApnModel : public app::InternalModel<gui::ApnListItem *>, public gui::ListItemProvider
{
M module-apps/application-settings/models/system/DateAndTimeModel.cpp => module-apps/application-settings/models/system/DateAndTimeModel.cpp +2 -1
@@ 5,8 5,9 @@
#include <application-settings/widgets/system/SettingsDateItem.hpp>
#include <application-settings/widgets/system/SettingsTimeItem.hpp>
-#include <widgets/DateAndTimeStyle.hpp>
+
#include <ListView.hpp>
+#include <widgets/DateAndTimeStyle.hpp>
DateAndTimeModel::DateAndTimeModel(app::Application *application) : app(application)
{}
M module-apps/application-settings/models/system/DateAndTimeModel.hpp => module-apps/application-settings/models/system/DateAndTimeModel.hpp +1 -2
@@ 3,10 3,9 @@
#pragma once
-#include <widgets/DateOrTimeListItem.hpp>
#include <Application.hpp>
#include <InternalModel.hpp>
-#include <ListItemProvider.hpp>
+#include <widgets/DateOrTimeListItem.hpp>
namespace gui
{
M module-apps/application-settings/models/system/FactoryData.cpp => module-apps/application-settings/models/system/FactoryData.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "FactoryData.hpp"
-#include <service-db/Settings.hpp>
+
#include <service-db/agents/settings/FactorySettings.hpp>
FactoryData::FactoryData(settings::Settings &settings) : settings(settings)
M module-apps/application-settings/models/system/SARInfoRepository.cpp => module-apps/application-settings/models/system/SARInfoRepository.cpp +1 -0
@@ 4,6 4,7 @@
#include "SARInfoRepository.hpp"
#include <i18n/i18n.hpp>
+
#include <fstream>
SARInfoRepository::SARInfoRepository(std::filesystem::path certificationInfoPath, std::filesystem::path fileName)
M module-apps/application-settings/models/system/SARInfoRepository.hpp => module-apps/application-settings/models/system/SARInfoRepository.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "filesystem"
+#include <filesystem>
class AbstractSARInfoRepository
{
M module-apps/application-settings/models/system/TechnicalInformationModel.cpp => module-apps/application-settings/models/system/TechnicalInformationModel.cpp +2 -1
@@ 5,9 5,10 @@
#include <application-settings/widgets/system/TechnicalInformationItem.hpp>
#include <application-settings/widgets/SettingsStyle.hpp>
+
#include <ListView.hpp>
-#include <source/version.hpp>
#include <i18n/i18n.hpp>
+#include <source/version.hpp>
TechnicalInformationModel::TechnicalInformationModel(std::unique_ptr<AbstractFactoryData> &&factoryData,
std::unique_ptr<AbstractTechnicalInformationRepository> repository)
M module-apps/application-settings/models/system/TechnicalInformationModel.hpp => module-apps/application-settings/models/system/TechnicalInformationModel.hpp +1 -1
@@ 6,9 6,9 @@
#include "FactoryData.hpp"
#include "TechnicalInformationRepository.hpp"
+#include <Application.hpp>
#include <InternalModel.hpp>
#include <ListItemProvider.hpp>
-#include <Application.hpp>
class TechnicalInformationModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
{
M module-apps/application-settings/presenter/system/SARInfoWindowPresenter.hpp => module-apps/application-settings/presenter/system/SARInfoWindowPresenter.hpp +1 -0
@@ 4,6 4,7 @@
#pragma once
#include <application-settings/models/system/SARInfoRepository.hpp>
+
#include <BasePresenter.hpp>
class SARInfoWindowContract
M module-apps/application-settings/widgets/SettingsStyle.hpp => module-apps/application-settings/widgets/SettingsStyle.hpp +1 -1
@@ 2,8 2,8 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+
#include <Style.hpp>
-#include <string>
namespace style
{
M module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp => module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp +1 -3
@@ 1,10 1,8 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <string>
-
-#include "ColorTestListStyle.hpp"
#include "ColorTestListItem.hpp"
+#include "ColorTestListStyle.hpp"
namespace gui
{
M module-apps/application-settings/widgets/advanced/ColorTestListItem.hpp => module-apps/application-settings/widgets/advanced/ColorTestListItem.hpp +0 -2
@@ 4,8 4,6 @@
#pragma once
#include <Application.hpp>
-#include <BoxLayout.hpp>
-#include <Label.hpp>
#include <ListItem.hpp>
#include <InputEvent.hpp>
M module-apps/application-settings/widgets/advanced/ColorTestListView.cpp => module-apps/application-settings/widgets/advanced/ColorTestListView.cpp +1 -0
@@ 2,6 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ColorTestListView.hpp"
+
#include <InputEvent.hpp>
namespace gui
M module-apps/application-settings/widgets/apps/SettingsSoundItem.hpp => module-apps/application-settings/widgets/apps/SettingsSoundItem.hpp +1 -1
@@ 3,9 3,9 @@
#pragma once
-#include <ListItem.hpp>
#include <BoxLayout.hpp>
#include <Image.hpp>
+#include <ListItem.hpp>
namespace gui
{
M module-apps/application-settings/widgets/display-keypad/CategoryWidget.cpp => module-apps/application-settings/widgets/display-keypad/CategoryWidget.cpp +2 -0
@@ 3,6 3,8 @@
#include "CategoryWidget.hpp"
+#include <i18n/i18n.hpp>
+
namespace style::quotes
{
namespace widget
M module-apps/application-settings/widgets/display-keypad/CategoryWidget.hpp => module-apps/application-settings/widgets/display-keypad/CategoryWidget.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "application-settings/data/QuoteSwitchData.hpp"
+#include <application-settings/data/QuoteSwitchData.hpp>
#include <BoxLayout.hpp>
#include <Image.hpp>
M module-apps/application-settings/widgets/display-keypad/QuoteWidget.cpp => module-apps/application-settings/widgets/display-keypad/QuoteWidget.cpp +2 -0
@@ 3,6 3,8 @@
#include "QuoteWidget.hpp"
+#include <i18n/i18n.hpp>
+
namespace style::quotes
{
namespace widget
M module-apps/application-settings/widgets/display-keypad/QuoteWidget.hpp => module-apps/application-settings/widgets/display-keypad/QuoteWidget.hpp +1 -2
@@ 3,9 3,8 @@
#pragma once
-#include "application-settings/data/QuoteSwitchData.hpp"
+#include <application-settings/data/QuoteSwitchData.hpp>
-#include <BoxLayout.hpp>
#include <ImageBox.hpp>
#include <Label.hpp>
#include <ListItem.hpp>
M module-apps/application-settings/widgets/network/ApnInputWidget.cpp => module-apps/application-settings/widgets/network/ApnInputWidget.cpp +1 -0
@@ 4,6 4,7 @@
#include "ApnInputWidget.hpp"
#include <application-settings/widgets/SettingsStyle.hpp>
+
#include <i18n/i18n.hpp>
namespace gui
M module-apps/application-settings/widgets/network/ApnInputWidget.hpp => module-apps/application-settings/widgets/network/ApnInputWidget.hpp +1 -0
@@ 6,6 6,7 @@
#include "ApnListItem.hpp"
#include <application-settings/data/SettingsInternals.hpp>
+
#include <TextFixedSize.hpp>
namespace gui
M module-apps/application-settings/widgets/network/ApnListItem.hpp => module-apps/application-settings/widgets/network/ApnListItem.hpp +2 -0
@@ 5,6 5,8 @@
#include <application-settings/data/SettingsItemData.hpp>
+#include <gui/widgets/ListItem.hpp>
+
namespace gui
{
using ApnListItem = ListItemWithCallbacks<packet_data::APN::Config>;
M module-apps/application-settings/widgets/system/SettingsDateItem.cpp => module-apps/application-settings/widgets/system/SettingsDateItem.cpp +1 -1
@@ 3,9 3,9 @@
#include "SettingsDateItem.hpp"
+#include <InputEvent.hpp>
#include <widgets/DateAndTimeStyle.hpp>
#include <widgets/WidgetsUtils.hpp>
-#include <InputEvent.hpp>
namespace date_and_time = style::window::date_and_time;
M module-apps/application-settings/widgets/system/SettingsDateItem.hpp => module-apps/application-settings/widgets/system/SettingsDateItem.hpp +1 -1
@@ 3,8 3,8 @@
#pragma once
-#include <widgets/DateWidget.hpp>
#include <widgets/DateOrTimeListItem.hpp>
+#include <widgets/DateWidget.hpp>
namespace gui
{
M module-apps/application-settings/widgets/system/TechnicalInformationItem.hpp => module-apps/application-settings/widgets/system/TechnicalInformationItem.hpp +0 -1
@@ 5,7 5,6 @@
#include <ListItem.hpp>
#include <Text.hpp>
-#include <BoxLayout.hpp>
namespace gui
{
M module-apps/application-settings/windows/BaseSettingsWindow.cpp => module-apps/application-settings/windows/BaseSettingsWindow.cpp +0 -1
@@ 2,7 2,6 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "BaseSettingsWindow.hpp"
-#include <i18n/i18n.hpp>
namespace gui
{
M module-apps/application-settings/windows/BaseSettingsWindow.hpp => module-apps/application-settings/windows/BaseSettingsWindow.hpp +1 -3
@@ 3,10 3,8 @@
#pragma once
-#include "Application.hpp"
-#include "windows/AppWindow.hpp"
-#include "windows/OptionWindow.hpp"
#include <service-db/Settings.hpp>
+#include <windows/OptionWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/OptionsWidgetMaker.cpp => module-apps/application-settings/windows/OptionsWidgetMaker.cpp +1 -0
@@ 2,6 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "OptionsWidgetMaker.hpp"
+
#include <OptionSetting.hpp>
namespace gui
M module-apps/application-settings/windows/OptionsWidgetMaker.hpp => module-apps/application-settings/windows/OptionsWidgetMaker.hpp +1 -2
@@ 3,8 3,7 @@
#pragma once
-#include "Option.hpp"
-#include "OptionWindow.hpp"
+#include <OptionWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/SettingsMainWindow.cpp => module-apps/application-settings/windows/SettingsMainWindow.cpp +2 -3
@@ 2,10 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "SettingsMainWindow.hpp"
-#include "application-settings/ApplicationSettings.hpp"
-#include <i18n/i18n.hpp>
-#include <log.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <service-appmgr/Controller.hpp>
std::list<gui::Option> mainWindowOptionsNew(app::Application *app)
M module-apps/application-settings/windows/SettingsMainWindow.hpp => module-apps/application-settings/windows/SettingsMainWindow.hpp +1 -2
@@ 3,7 3,6 @@
#pragma once
-#include "OptionWindow.hpp"
-#include "Application.hpp"
+#include <OptionWindow.hpp>
std::list<gui::Option> mainWindowOptionsNew(app::Application *app);
M module-apps/application-settings/windows/WindowNames.hpp => module-apps/application-settings/windows/WindowNames.hpp +0 -1
@@ 60,7 60,6 @@ namespace gui::window::name
inline constexpr auto date_and_time = "DateAndTime";
inline constexpr auto change_date_and_time = "ChangeDateAndTime";
inline constexpr auto change_time_zone = "ChangeTimeZone";
- inline constexpr auto about_your_pure = "AboutYourPure";
inline constexpr auto technical_information = "TechnicalInformation";
inline constexpr auto certification = "Certification";
inline constexpr auto sar = "Sar";
M module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.hpp => module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.hpp +1 -2
@@ 3,7 3,6 @@
#pragma once
-#include "OptionWindow.hpp"
-#include "Application.hpp"
+#include <OptionWindow.hpp>
std::list<gui::Option> advancedOptions(app::Application *app);
M module-apps/application-settings/windows/advanced/ColorTestWindow.cpp => module-apps/application-settings/windows/advanced/ColorTestWindow.cpp +1 -1
@@ 3,8 3,8 @@
#include "ColorTestWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/widgets/advanced/ColorTestListStyle.hpp>
+#include <application-settings/windows/WindowNames.hpp>
#include <service-gui/Common.hpp>
#include <service-gui/messages/ChangeColorScheme.hpp>
M module-apps/application-settings/windows/advanced/ColorTestWindow.hpp => module-apps/application-settings/windows/advanced/ColorTestWindow.hpp +2 -4
@@ 3,10 3,8 @@
#pragma once
-#include "AppWindow.hpp"
-
-#include "application-settings/models/advanced/ColorTestModel.hpp"
-#include "application-settings/widgets/advanced/ColorTestListView.hpp"
+#include <application-settings/models/advanced/ColorTestModel.hpp>
+#include <application-settings/widgets/advanced/ColorTestListView.hpp>
namespace gui
{
M module-apps/application-settings/windows/advanced/EinkModeWindow.cpp => module-apps/application-settings/windows/advanced/EinkModeWindow.cpp +3 -4
@@ 4,11 4,10 @@
#include "EinkModeWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <messages/EinkModeMessage.hpp>
-#include <service-eink/Common.hpp>
-#include <Application.hpp>
-#include <i18n/i18n.hpp>
+
+#include <apps-common/Application.hpp>
#include <service-eink/Common.hpp>
+#include <service-eink/messages/EinkModeMessage.hpp>
namespace gui
{
M module-apps/application-settings/windows/advanced/EinkModeWindow.hpp => module-apps/application-settings/windows/advanced/EinkModeWindow.hpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "AppWindow.hpp"
+#include <AppWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/advanced/InformationWindow.cpp => module-apps/application-settings/windows/advanced/InformationWindow.cpp +1 -2
@@ 4,10 4,9 @@
#include "InformationWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <service-cellular/CellularServiceAPI.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
#include <source/version.hpp>
-#include <log.hpp>
namespace gui
{
M module-apps/application-settings/windows/advanced/InformationWindow.hpp => module-apps/application-settings/windows/advanced/InformationWindow.hpp +1 -2
@@ 3,8 3,7 @@
#pragma once
-#include "AppWindow.hpp"
-#include <BoxLayout.hpp>
+#include <AppWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/advanced/UITestWindow.cpp => module-apps/application-settings/windows/advanced/UITestWindow.cpp +2 -1
@@ 4,8 4,9 @@
#include "UITestWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <i18n/i18n.hpp>
+
#include <Font.hpp>
+#include <i18n/i18n.hpp>
namespace gui
{
M module-apps/application-settings/windows/advanced/UITestWindow.hpp => module-apps/application-settings/windows/advanced/UITestWindow.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "AppWindow.hpp"
+#include <AppWindow.hpp>
#include <Text.hpp>
namespace gui
M module-apps/application-settings/windows/apps/AlarmClockWindow.cpp => module-apps/application-settings/windows/apps/AlarmClockWindow.cpp +1 -2
@@ 3,9 3,8 @@
#include "AlarmClockWindow.hpp"
-#include <application-settings/ApplicationSettings.hpp>
#include <application-settings/widgets/SpinBoxOptionSettings.hpp>
-#include <i18n/i18n.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/AlarmClockWindow.hpp => module-apps/application-settings/windows/apps/AlarmClockWindow.hpp +1 -1
@@ 3,9 3,9 @@
#pragma once
+#include <application-settings/models/apps/AudioSettingsModel.hpp>
#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/windows/OptionsWidgetMaker.hpp>
-#include <application-settings/models/apps/AudioSettingsModel.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/AppsWindow.cpp => module-apps/application-settings/windows/apps/AppsWindow.cpp +0 -2
@@ 4,8 4,6 @@
#include "AppsWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <i18n/i18n.hpp>
-#include <OptionWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/MessagesWindow.cpp => module-apps/application-settings/windows/apps/MessagesWindow.cpp +1 -3
@@ 4,9 4,7 @@
#include "MessagesWindow.hpp"
#include <application-settings/data/SoundSelectData.hpp>
-#include <application-settings/ApplicationSettings.hpp>
-
-#include <i18n/i18n.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/MessagesWindow.hpp => module-apps/application-settings/windows/apps/MessagesWindow.hpp +1 -1
@@ 3,9 3,9 @@
#pragma once
+#include <application-settings/models/apps/AudioSettingsModel.hpp>
#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/windows/OptionsWidgetMaker.hpp>
-#include <application-settings/models/apps/AudioSettingsModel.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/PhoneWindow.cpp => module-apps/application-settings/windows/apps/PhoneWindow.cpp +2 -4
@@ 2,11 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "PhoneWindow.hpp"
-#include <application-settings/data/SoundSelectData.hpp>
-#include <application-settings/ApplicationSettings.hpp>
-#include <i18n/i18n.hpp>
-#include <OptionWindow.hpp>
+#include <application-settings/data/SoundSelectData.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/PhoneWindow.hpp => module-apps/application-settings/windows/apps/PhoneWindow.hpp +1 -1
@@ 3,9 3,9 @@
#pragma once
+#include <application-settings/models/apps/AudioSettingsModel.hpp>
#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/windows/OptionsWidgetMaker.hpp>
-#include <application-settings/models/apps/AudioSettingsModel.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/SoundSelectWindow.cpp => module-apps/application-settings/windows/apps/SoundSelectWindow.cpp +2 -2
@@ 3,10 3,10 @@
#include "SoundSelectWindow.hpp"
-#include <application-settings/models/apps/SoundsModel.hpp>
#include <application-settings/data/SoundSelectData.hpp>
+#include <application-settings/models/apps/SoundsModel.hpp>
+
#include <ListView.hpp>
-#include <i18n/i18n.hpp>
namespace gui
{
M module-apps/application-settings/windows/apps/SoundSelectWindow.hpp => module-apps/application-settings/windows/apps/SoundSelectWindow.hpp +0 -1
@@ 4,7 4,6 @@
#pragma once
#include <application-settings/models/apps/AbstractSoundsModel.hpp>
-#include <AppWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp => module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp +2 -6
@@ 2,17 2,13 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "AddDeviceWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
+
#include <application-settings/data/DeviceData.hpp>
#include <application-settings/data/PairingDeviceData.hpp>
+#include <application-settings/windows/WindowNames.hpp>
#include <OptionSetting.hpp>
-extern "C"
-{
-#include <module-bluetooth/lib/btstack/src/btstack_util.h>
-}
-
namespace gui
{
M module-apps/application-settings/windows/bluetooth/AddDeviceWindow.hpp => module-apps/application-settings/windows/bluetooth/AddDeviceWindow.hpp +1 -1
@@ 3,8 3,8 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/models/bluetooth/BluetoothSettingsModel.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <Device.hpp>
M module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp => module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp +3 -5
@@ 2,16 2,14 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "AllDevicesWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
+
#include <application-settings/data/BondedDevicesData.hpp>
#include <application-settings/data/PairingDeviceData.hpp>
-#include <application-settings/widgets/SettingsStyle.hpp>
+#include <application-settings/windows/WindowNames.hpp>
#include <DialogMetadataMessage.hpp>
-#include <OptionSetting.hpp>
-
#include <InputEvent.hpp>
-#include <Image.hpp>
+#include <OptionSetting.hpp>
#include <header/AddElementAction.hpp>
namespace gui
M module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp => module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp +3 -2
@@ 2,10 2,11 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "BluetoothCheckPasskeyWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
+
#include <application-settings/widgets/SettingsStyle.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <widgets/Text.hpp>
-#include <Image.hpp>
namespace gui
{
M module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp => module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp +0 -1
@@ 4,7 4,6 @@
#pragma once
#include <application-settings/models/bluetooth/BluetoothSettingsModel.hpp>
-#include <AppWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp => module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp +2 -1
@@ 2,8 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "BluetoothWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
+
#include <application-settings/data/BluetoothStatusData.hpp>
+#include <application-settings/windows/WindowNames.hpp>
#include <OptionSetting.hpp>
M module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp => module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp +3 -3
@@ 2,11 2,11 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "PhoneNameWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
+
#include <application-settings/data/PhoneNameData.hpp>
-#include <widgets/InputBox.hpp>
+#include <application-settings/windows/WindowNames.hpp>
-#include <Utils.hpp>
+#include <widgets/InputBox.hpp>
namespace gui
{
M module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp => module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
#include <application-settings/models/bluetooth/BluetoothSettingsModel.hpp>
-#include <AppWindow.hpp>
+
#include <Text.hpp>
namespace gui
M module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.cpp => module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.cpp +1 -1
@@ 4,8 4,8 @@
#include "DisplayAndKeypadWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp => module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp +0 -4
@@ 5,10 5,6 @@
#include <application-settings/windows/WindowNames.hpp>
-#include <OptionSetting.hpp>
-#include <service-evtmgr/screen-light-control/ScreenLightControl.hpp>
-#include <i18n/i18n.hpp>
-
namespace gui
{
DisplayLightWindow::DisplayLightWindow(app::Application *app, app::settingsInterface::ScreenLightSettings *settings)
M module-apps/application-settings/windows/display-keypad/EditQuotesWindow.cpp => module-apps/application-settings/windows/display-keypad/EditQuotesWindow.cpp +1 -2
@@ 4,9 4,8 @@
#include "EditQuotesWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/FontSizeWindow.cpp => module-apps/application-settings/windows/display-keypad/FontSizeWindow.cpp +0 -2
@@ 5,8 5,6 @@
#include <application-settings/windows/WindowNames.hpp>
-#include <i18n/i18n.hpp>
-
namespace gui
{
M module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp => module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp +2 -3
@@ 4,10 4,9 @@
#include "InputLanguageWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <service-appmgr/Controller.hpp>
-#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
+#include <service-appmgr/Controller.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/InputLanguageWindow.hpp => module-apps/application-settings/windows/display-keypad/InputLanguageWindow.hpp +1 -0
@@ 4,6 4,7 @@
#pragma once
#include <application-settings/windows/BaseSettingsWindow.hpp>
+
#include <Translator.hpp>
namespace gui
M module-apps/application-settings/windows/display-keypad/KeypadLightWindow.cpp => module-apps/application-settings/windows/display-keypad/KeypadLightWindow.cpp +1 -3
@@ 4,10 4,8 @@
#include "KeypadLightWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <OptionSetting.hpp>
-#include <bsp/keypad_backlight/keypad_backlight.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/KeypadLightWindow.hpp => module-apps/application-settings/windows/display-keypad/KeypadLightWindow.hpp +1 -1
@@ 3,8 3,8 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.cpp => module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.cpp +2 -1
@@ 2,8 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "QuoteCategoriesWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
+
#include <application-settings/widgets/SettingsStyle.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp => module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp +1 -2
@@ 3,9 3,8 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/models/display-keypad/CategoriesModel.hpp>
-#include <ListView.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp => module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp +0 -2
@@ 4,9 4,7 @@
#include "QuotesAddWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <application-settings/data/QuoteSwitchData.hpp>
-#include <i18n/i18n.hpp>
#include <widgets/Text.hpp>
namespace style
M module-apps/application-settings/windows/display-keypad/QuotesAddWindow.hpp => module-apps/application-settings/windows/display-keypad/QuotesAddWindow.hpp +2 -2
@@ 3,9 3,9 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
-#include <application-settings/models/display-keypad/QuotesModel.hpp>
#include <application-settings/data/QuoteSwitchData.hpp>
+#include <application-settings/models/display-keypad/QuotesModel.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/QuotesMainWindow.cpp => module-apps/application-settings/windows/display-keypad/QuotesMainWindow.cpp +2 -4
@@ 3,13 3,11 @@
#include "QuotesMainWindow.hpp"
+#include <application-settings/data/QuoteSwitchData.hpp>
#include <application-settings/windows/WindowNames.hpp>
-#include <application-settings/widgets/SettingsStyle.hpp>
-#include <OptionSetting.hpp>
-#include <header/AddElementAction.hpp>
#include <InputEvent.hpp>
-#include <i18n/i18n.hpp>
+#include <header/AddElementAction.hpp>
namespace style::quotes
{
M module-apps/application-settings/windows/display-keypad/QuotesMainWindow.hpp => module-apps/application-settings/windows/display-keypad/QuotesMainWindow.hpp +1 -5
@@ 3,12 3,8 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
-#include <application-settings/widgets/display-keypad/QuoteWidget.hpp>
#include <application-settings/models/display-keypad/QuotesModel.hpp>
-
-#include <ListView.hpp>
-#include <InternalModel.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp => module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp +2 -2
@@ 3,11 3,11 @@
#include "QuotesOptionsWindow.hpp"
+#include <application-settings/models/display-keypad/QuotesModel.hpp>
#include <application-settings/windows/WindowNames.hpp>
-#include <application-settings/widgets/display-keypad/QuoteWidget.hpp>
+
#include <DialogMetadataMessage.hpp>
#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
#include <Text.hpp>
namespace gui
M module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.hpp => module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.hpp +1 -1
@@ 3,8 3,8 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/widgets/display-keypad/QuoteWidget.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/WallpaperWindow.cpp => module-apps/application-settings/windows/display-keypad/WallpaperWindow.cpp +1 -2
@@ 4,9 4,8 @@
#include "WallpaperWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
-#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
namespace gui
{
M module-apps/application-settings/windows/network/ApnOptionsWindow.cpp => module-apps/application-settings/windows/network/ApnOptionsWindow.cpp +2 -1
@@ 3,8 3,9 @@
#include "ApnOptionsWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/data/SettingsItemData.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
namespace gui
M module-apps/application-settings/windows/network/ApnOptionsWindow.hpp => module-apps/application-settings/windows/network/ApnOptionsWindow.hpp +0 -2
@@ 6,8 6,6 @@
#include <application-settings/models/network/ApnSettingsModel.hpp>
#include <application-settings/windows/BaseSettingsWindow.hpp>
-#include <service-cellular/PacketDataTypes.hpp>
-
namespace gui
{
M module-apps/application-settings/windows/network/ApnSettingsWindow.cpp => module-apps/application-settings/windows/network/ApnSettingsWindow.cpp +2 -4
@@ 3,14 3,12 @@
#include "ApnSettingsWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/data/ApnListData.hpp>
-#include <application-settings/widgets/SettingsStyle.hpp>
#include <application-settings/data/SettingsItemData.hpp>
-#include <OptionSetting.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+#include <OptionSetting.hpp>
#include <header/AddElementAction.hpp>
-#include <InputEvent.hpp>
namespace gui
{
M module-apps/application-settings/windows/network/ApnSettingsWindow.hpp => module-apps/application-settings/windows/network/ApnSettingsWindow.hpp +1 -2
@@ 3,11 3,10 @@
#pragma once
-#include <OptionWindow.hpp>
#include <application-settings/models/network/ApnSettingsModel.hpp>
#include <Icon.hpp>
-#include <service-cellular/PacketDataTypes.hpp>
+#include <OptionWindow.hpp>
namespace gui
{
M module-apps/application-settings/windows/network/NetworkWindow.cpp => module-apps/application-settings/windows/network/NetworkWindow.cpp +2 -3
@@ 4,10 4,9 @@
#include "NetworkWindow.hpp"
#include <application-settings/ApplicationSettings.hpp>
-#include <application-settings/data/PINSettingsSimData.hpp>
-#include <OptionSetting.hpp>
+#include <application-settings/windows/WindowNames.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
namespace gui
{
M module-apps/application-settings/windows/network/NewApnWindow.cpp => module-apps/application-settings/windows/network/NewApnWindow.cpp +1 -1
@@ 3,8 3,8 @@
#include "NewApnWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/widgets/SettingsStyle.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/network/NewApnWindow.hpp => module-apps/application-settings/windows/network/NewApnWindow.hpp +0 -1
@@ 6,7 6,6 @@
#include <application-settings/models/network/ApnSettingsModel.hpp>
#include <application-settings/models/network/NewApnModel.hpp>
-#include <AppWindow.hpp>
#include <ListView.hpp>
#include <Text.hpp>
M module-apps/application-settings/windows/network/SimCardsWindow.cpp => module-apps/application-settings/windows/network/SimCardsWindow.cpp +2 -2
@@ 5,9 5,9 @@
#include <application-settings/ApplicationSettings.hpp>
#include <application-settings/data/PINSettingsSimData.hpp>
-#include <OptionSetting.hpp>
+#include <application-settings/windows/WindowNames.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
namespace gui
{
M module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp => module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp +2 -3
@@ 3,13 3,12 @@
#include "SimPINSettingsWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/data/PINSettingsLockStateData.hpp>
#include <application-settings/data/PINSettingsSimData.hpp>
-#include <OptionSetting.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+#include <OptionSetting.hpp>
#include <service-appmgr/Controller.hpp>
-#include <service-cellular-api>
namespace gui
{
M module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.cpp => module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.cpp +2 -1
@@ 4,8 4,9 @@
#include "ConnectionFrequencyWindow.hpp"
#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
namespace gui
{
M module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.cpp => module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.cpp +2 -2
@@ 5,9 5,9 @@
#include <application-settings/ApplicationSettings.hpp>
#include <application-settings/widgets/SettingsStyle.hpp>
-#include <OptionSetting.hpp>
+#include <application-settings/windows/WindowNames.hpp>
-#include <i18n/i18n.hpp>
+#include <OptionSetting.hpp>
namespace gui
{
M module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.hpp => module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.hpp +1 -0
@@ 4,6 4,7 @@
#pragma once
#include <application-settings/windows/BaseSettingsWindow.hpp>
+
#include <Text.hpp>
namespace app::settingsInterface
M module-apps/application-settings/windows/phone-modes/OfflineWindow.cpp => module-apps/application-settings/windows/phone-modes/OfflineWindow.cpp +2 -1
@@ 5,8 5,9 @@
#include <application-settings/ApplicationSettings.hpp>
#include <application-settings/widgets/SettingsStyle.hpp>
-#include <OptionSetting.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+#include <OptionSetting.hpp>
#include <i18n/i18n.hpp>
namespace gui
M module-apps/application-settings/windows/phone-modes/PhoneModesWindow.cpp => module-apps/application-settings/windows/phone-modes/PhoneModesWindow.cpp +2 -1
@@ 4,8 4,9 @@
#include "PhoneModesWindow.hpp"
#include <application-settings/ApplicationSettings.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
-#include <i18n/i18n.hpp>
namespace gui
{
M module-apps/application-settings/windows/security/AutolockWindow.cpp => module-apps/application-settings/windows/security/AutolockWindow.cpp +2 -0
@@ 5,6 5,8 @@
#include <application-settings/ApplicationSettings.hpp>
#include <application-settings/data/AutoLockData.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
#include <i18n/i18n.hpp>
M module-apps/application-settings/windows/security/SecurityMainWindow.cpp => module-apps/application-settings/windows/security/SecurityMainWindow.cpp +1 -0
@@ 4,6 4,7 @@
#include "SecurityMainWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
namespace gui
M module-apps/application-settings/windows/system/CertificationWindow.cpp => module-apps/application-settings/windows/system/CertificationWindow.cpp +2 -2
@@ 3,10 3,10 @@
#include "CertificationWindow.hpp"
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/widgets/SettingsStyle.hpp>
+#include <application-settings/windows/WindowNames.hpp>
+
#include <Text.hpp>
-#include <Image.hpp>
inline constexpr auto certno = "XXXXXXXXXXXXXXXXXXX";
M module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp => module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp +3 -3
@@ 3,11 3,11 @@
#include "ChangeDateAndTimeWindow.hpp"
-#include <widgets/DateAndTimeStyle.hpp>
-#include <service-time/Constants.hpp>
-#include <service-time/service-time/TimeMessage.hpp>
#include <InputEvent.hpp>
#include <ListView.hpp>
+#include <service-time/Constants.hpp>
+#include <service-time/service-time/TimeMessage.hpp>
+#include <widgets/DateAndTimeStyle.hpp>
namespace gui
{
M module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp => module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp +1 -2
@@ 3,9 3,8 @@
#pragma once
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/models/system/DateAndTimeModel.hpp>
-#include <AppWindow.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/system/ChangeTimeZone.cpp => module-apps/application-settings/windows/system/ChangeTimeZone.cpp +3 -2
@@ 4,11 4,12 @@
#include "ChangeTimeZone.hpp"
#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
-#include <time/TimeZone.hpp>
-#include <service-time/service-time/TimeMessage.hpp>
#include <service-time/Constants.hpp>
#include <service-time/api/TimeSettingsApi.hpp>
+#include <service-time/service-time/TimeMessage.hpp>
+#include <time/TimeZone.hpp>
namespace gui
{
M module-apps/application-settings/windows/system/DateAndTimeMainWindow.cpp => module-apps/application-settings/windows/system/DateAndTimeMainWindow.cpp +2 -1
@@ 4,10 4,11 @@
#include "DateAndTimeMainWindow.hpp"
#include <application-settings/windows/WindowNames.hpp>
+
#include <OptionSetting.hpp>
-#include <service-time/service-time/TimeMessage.hpp>
#include <service-time/Constants.hpp>
#include <service-time/api/TimeSettingsApi.hpp>
+#include <service-time/service-time/TimeMessage.hpp>
namespace gui
{
M module-apps/application-settings/windows/system/DateAndTimeMainWindow.hpp => module-apps/application-settings/windows/system/DateAndTimeMainWindow.hpp +1 -0
@@ 4,6 4,7 @@
#pragma once
#include <application-settings/windows/BaseSettingsWindow.hpp>
+
#include <time/time_locale.hpp>
namespace gui
M module-apps/application-settings/windows/system/LanguagesWindow.cpp => module-apps/application-settings/windows/system/LanguagesWindow.cpp +0 -2
@@ 3,8 3,6 @@
#include "LanguagesWindow.hpp"
-#include <application-settings/data/LanguagesData.hpp>
-
#include <OptionSetting.hpp>
#include <service-appmgr/Controller.hpp>
M module-apps/application-settings/windows/system/LanguagesWindow.hpp => module-apps/application-settings/windows/system/LanguagesWindow.hpp +1 -1
@@ 3,8 3,8 @@
#pragma once
-#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/windows/BaseSettingsWindow.hpp>
+#include <application-settings/windows/WindowNames.hpp>
namespace gui
{
M module-apps/application-settings/windows/system/SARInfoWindow.cpp => module-apps/application-settings/windows/system/SARInfoWindow.cpp +1 -0
@@ 5,6 5,7 @@
#include <application-settings/windows/WindowNames.hpp>
#include <application-settings/widgets/SettingsStyle.hpp>
+
#include <i18n/i18n.hpp>
namespace gui
M module-apps/application-settings/windows/system/SARInfoWindow.hpp => module-apps/application-settings/windows/system/SARInfoWindow.hpp +1 -0
@@ 4,6 4,7 @@
#pragma once
#include <application-settings/presenter/system/SARInfoWindowPresenter.hpp>
+
#include <AppWindow.hpp>
#include <Text.hpp>
M module-apps/application-settings/windows/system/SystemMainWindow.cpp => module-apps/application-settings/windows/system/SystemMainWindow.cpp +2 -2
@@ 5,10 5,10 @@
#include <application-settings/windows/WindowNames.hpp>
+#include <DialogMetadataMessage.hpp>
+#include <OptionSetting.hpp>
#include <service-desktop/DesktopMessages.hpp>
#include <service-desktop/ServiceDesktop.hpp>
-#include <OptionSetting.hpp>
-#include <DialogMetadataMessage.hpp>
namespace gui
{
M module-apps/application-settings/windows/system/TechnicalInformationWindow.hpp => module-apps/application-settings/windows/system/TechnicalInformationWindow.hpp +1 -2
@@ 3,9 3,8 @@
#pragma once
-#include <application-settings/windows/BaseSettingsWindow.hpp>
#include <application-settings/presenter/system/TechnicalWindowPresenter.hpp>
-#include <application-settings/models/system/TechnicalInformationModel.hpp>
+#include <application-settings/windows/BaseSettingsWindow.hpp>
namespace gui
{
M module-bluetooth/CMakeLists.txt => module-bluetooth/CMakeLists.txt +1 -0
@@ 69,6 69,7 @@ target_include_directories(
)
target_link_libraries(${PROJECT_NAME}
+ application-settings
${BOARD_DIR_LIBRARIES}
module-audio
module-bsp
M module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp => module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "Constants.hpp"
+#include <service-bluetooth/Constants.hpp>
#include <Service/Common.hpp>
#include <Service/Message.hpp>
#include <Service/Service.hpp>
M products/PurePhone/CMakeLists.txt => products/PurePhone/CMakeLists.txt +1 -0
@@ 60,6 60,7 @@ target_link_libraries(PurePhone
application-music-player
application-notes
application-phonebook
+ application-settings
application-special-input
messagetype
module-apps