M module-apps/CMakeLists.txt => module-apps/CMakeLists.txt +2 -1
@@ 11,6 11,7 @@ add_library(${PROJECT_NAME} STATIC)
add_subdirectory(application-antenna)
add_subdirectory(application-bell-main)
add_subdirectory(application-calculator)
+add_subdirectory(application-desktop)
add_subdirectory(application-messages)
add_subdirectory(application-music-player)
add_subdirectory(application-phonebook)
@@ 19,7 20,6 @@ add_subdirectory(apps-common)
set(APPLICATIONS
clock
calendar
- desktop
settings
call
notes
@@ 93,6 93,7 @@ target_link_libraries(${PROJECT_NAME}
service-db
service-evtmgr
time
+ utils-bootconfig
PUBLIC
module-audio
module-bsp
M module-apps/application-desktop/ApplicationDesktop.cpp => module-apps/application-desktop/ApplicationDesktop.cpp +27 -27
@@ 2,41 2,41 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ApplicationDesktop.hpp"
-#include "Dialog.hpp"
-#include "MessageType.hpp"
-#include "windows/DesktopMainWindow.hpp"
-#include "windows/MenuWindow.hpp"
-#include "windows/DeadBatteryWindow.hpp"
-#include "windows/LogoWindow.hpp"
-#include "windows/ChargingBatteryWindow.hpp"
-#include "windows/Reboot.hpp"
-#include "windows/Update.hpp"
-#include "windows/UpdateProgress.hpp"
-#include "windows/PostUpdateWindow.hpp"
-#include "windows/MmiPullWindow.hpp"
-#include "windows/MmiPushWindow.hpp"
-#include "windows/MmiInternalMsgWindow.hpp"
+#include "ChargingBatteryWindow.hpp"
+#include "DeadBatteryWindow.hpp"
+#include "DesktopData.hpp"
+#include "DesktopMainWindow.hpp"
+#include "LogoWindow.hpp"
+#include "MenuWindow.hpp"
+#include "MmiInternalMsgWindow.hpp"
+#include "MmiPullWindow.hpp"
+#include "MmiPushWindow.hpp"
+#include "PostUpdateWindow.hpp"
+#include "Reboot.hpp"
+#include "Update.hpp"
+#include "UpdateProgress.hpp"
+
+#include <apps-common/messages/AppMessage.hpp>
+#include <AppWindow.hpp>
+#include <Dialog.hpp>
+#include <magic_enum.hpp>
+#include <messages/DialogMetadataMessage.hpp>
+#include <MessageType.hpp>
+#include <module-gui/gui/widgets/status-bar/SIM.hpp>
+#include <module-services/service-db/agents/settings/SystemSettings.hpp>
+#include <module-services/service-desktop/service-desktop/Constants.hpp>
#include <popups/presenter/PowerOffPresenter.hpp>
#include <popups/TetheringOffPopup.hpp>
-#include <windows/Dialog.hpp>
-#include <windows/DialogMetadata.hpp>
-#include <messages/DialogMetadataMessage.hpp>
-
-#include "AppWindow.hpp"
-#include "data/DesktopData.hpp"
-
#include <service-appmgr/Controller.hpp>
#include <service-cellular-api>
+#include <service-db/DBNotificationMessage.hpp>
#include <service-db/QueryMessage.hpp>
-#include <module-services/service-db/agents/settings/SystemSettings.hpp>
-#include <magic_enum.hpp>
-#include <module-services/service-desktop/service-desktop/Constants.hpp>
-#include <apps-common/messages/AppMessage.hpp>
#include <SystemManager/messages/SystemManagerMessage.hpp>
-#include <module-gui/gui/widgets/status-bar/SIM.hpp>
-#include <service-db/DBNotificationMessage.hpp>
+#include <windows/Dialog.hpp>
+#include <windows/DialogMetadata.hpp>
#include <cassert>
+
namespace app
{
ApplicationDesktop::ApplicationDesktop(std::string name,
M module-apps/application-desktop/CMakeLists.txt => module-apps/application-desktop/CMakeLists.txt +79 -52
@@ 1,62 1,89 @@
-
-include_directories( ${CMAKE_PROJECT_NAME}
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
-)
+add_library(application-desktop STATIC)
-include_directories( ${PROJECT_NAME}
+target_include_directories(application-desktop
+ PRIVATE
+ $<BUILD_INTERFACE:
+ ${CMAKE_CURRENT_SOURCE_DIR}/data
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/application-desktop
+ ${CMAKE_CURRENT_SOURCE_DIR}/models
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets
+ ${CMAKE_CURRENT_SOURCE_DIR}/windows
+ >
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+target_sources(application-desktop
+ PRIVATE
+ ApplicationDesktop.cpp
+ data/DesktopData.hpp
+ data/DesktopStyle.hpp
+ data/Mmi.hpp
+ models/ActiveNotificationsModel.cpp
+ models/ActiveNotificationsModel.hpp
+ widgets/DBNotificationsHandler.cpp
+ widgets/DesktopInputWidget.cpp
+ widgets/DesktopInputWidget.hpp
+ windows/ChargingBatteryWindow.cpp
+ windows/ChargingBatteryWindow.hpp
+ windows/DeadBatteryWindow.cpp
+ windows/DeadBatteryWindow.hpp
+ windows/DesktopMainWindow.cpp
+ windows/DesktopMainWindow.hpp
+ windows/LogoWindow.cpp
+ windows/LogoWindow.hpp
+ windows/MenuWindow.cpp
+ windows/MenuWindow.hpp
+ windows/MmiInternalMsgWindow.cpp
+ windows/MmiInternalMsgWindow.hpp
+ windows/MmiPullWindow.cpp
+ windows/MmiPullWindow.hpp
+ windows/MmiPushWindow.cpp
+ windows/MmiPushWindow.hpp
+ windows/PostUpdateWindow.cpp
+ windows/PostUpdateWindow.hpp
+ windows/Reboot.cpp
+ windows/Reboot.hpp
+ windows/Update.cpp
+ windows/Update.hpp
+ windows/UpdateProgress.cpp
+ windows/UpdateProgress.hpp
PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
+ include/application-desktop/ApplicationDesktop.hpp
+ include/application-desktop/Constants.hpp
+ include/application-desktop/DBNotificationsHandler.hpp
+ include/application-desktop/Names.hpp
)
-target_sources( ${PROJECT_NAME}
+option(ENABLE_APP_DESKTOP "Enable application desktop" ON)
- PRIVATE
- "${CMAKE_CURRENT_LIST_DIR}/ApplicationDesktop.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/widgets/DesktopInputWidget.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/widgets/DBNotificationsHandler.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/DesktopMainWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MenuWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/DeadBatteryWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/LogoWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/ChargingBatteryWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/Reboot.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/Update.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/UpdateProgress.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/PostUpdateWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MmiPullWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MmiPushWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MmiInternalMsgWindow.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/models/ActiveNotificationsModel.cpp"
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}/ApplicationDesktop.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/Constants.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/data/DesktopData.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/data/DesktopStyle.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/data/Mmi.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/widgets/DesktopInputWidget.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/widgets/DBNotificationsHandler.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/DesktopMainWindow.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MenuWindow.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/Reboot.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/Update.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/UpdateProgress.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/PostUpdateWindow.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/Names.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MmiPullWindow.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MmiPushWindow.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/windows/MmiInternalMsgWindow.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/models/ActiveNotificationsModel.hpp"
+target_compile_definitions(application-desktop
+ INTERFACE
+ $<$<BOOL:${ENABLE_APP_DESKTOP}>:ENABLE_APP_DESKTOP>
)
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(application-desktop
PRIVATE
- service-cellular
- service-db
- service-desktop
- service-time
- service-appmgr
- utils-bootconfig
- )
+ application-messages
+ i18n
+ log
+ magic_enum::magic_enum
+ Microsoft.GSL::GSL
+ module-db
+ module-gui
+ module-sys
+ service-appmgr
+ service-cellular
+ service-db
+ service-time
+ time
+ utf8
+ utils-bootconfig
+ PUBLIC
+ apps-common
+ module-sys
+ service-desktop
+)
M module-apps/application-desktop/data/DesktopData.hpp => module-apps/application-desktop/data/DesktopData.hpp +2 -1
@@ 3,8 3,9 @@
#pragma once
-#include "gui/SwitchData.hpp"
+#include <gui/SwitchData.hpp>
#include <service-desktop/DesktopMessages.hpp>
+
#include <filesystem>
#include <utility>
M module-apps/application-desktop/data/DesktopStyle.hpp => module-apps/application-desktop/data/DesktopStyle.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "Style.hpp"
+#include <Style.hpp>
namespace style::desktop
{
M module-apps/application-desktop/data/Mmi.hpp => module-apps/application-desktop/data/Mmi.hpp +4 -0
@@ 3,7 3,11 @@
#pragma once
+#include <i18n/i18n.hpp>
#include <service-appmgr/data/MmiActionsParams.hpp>
+#include <utf8/UTF8.hpp>
+
+#include <map>
namespace mmi
{
R module-apps/application-desktop/ApplicationDesktop.hpp => module-apps/application-desktop/include/application-desktop/ApplicationDesktop.hpp +4 -3
@@ 3,12 3,13 @@
#pragma once
-#include "windows/Names.hpp"
-#include "widgets/DBNotificationsHandler.hpp"
#include "Constants.hpp"
+#include "DBNotificationsHandler.hpp"
+#include "Names.hpp"
+
#include <Application.hpp>
-#include <Service/Message.hpp>
#include <service-desktop/DesktopMessages.hpp>
+#include <Service/Message.hpp>
namespace cellular::msg::notification
{
R module-apps/application-desktop/Constants.hpp => module-apps/application-desktop/include/application-desktop/Constants.hpp +0 -0
R module-apps/application-desktop/widgets/DBNotificationsHandler.hpp => module-apps/application-desktop/include/application-desktop/DBNotificationsHandler.hpp +0 -0
R module-apps/application-desktop/windows/Names.hpp => module-apps/application-desktop/include/application-desktop/Names.hpp +1 -0
@@ 2,6 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+
#include <AppWindow.hpp>
namespace app::window::name
M module-apps/application-desktop/models/ActiveNotificationsModel.cpp => module-apps/application-desktop/models/ActiveNotificationsModel.cpp +7 -7
@@ 2,16 2,16 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ActiveNotificationsModel.hpp"
-#include <application-desktop/ApplicationDesktop.hpp>
-#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
-#include <service-appmgr/Controller.hpp>
+#include "ApplicationDesktop.hpp"
+
#include <application-call/data/CallSwitchData.hpp>
-#include <queries/messages/threads/QueryThreadGetByNumber.hpp>
-#include <application-messages/data/SMSdata.hpp>
#include <application-messages/Constants.hpp>
-#include <service-appmgr/messages/SwitchRequest.hpp>
-
+#include <application-messages/data/SMSdata.hpp>
#include <gsl/assert>
+#include <module-db/queries/notifications/QueryNotificationsClear.hpp>
+#include <queries/messages/threads/QueryThreadGetByNumber.hpp>
+#include <service-appmgr/Controller.hpp>
+#include <service-appmgr/messages/SwitchRequest.hpp>
using namespace gui;
M module-apps/application-desktop/widgets/DesktopInputWidget.cpp => module-apps/application-desktop/widgets/DesktopInputWidget.cpp +4 -3
@@ 2,11 2,12 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DesktopInputWidget.hpp"
-#include "AppWindow.hpp"
-#include <service-cellular/CellularServiceAPI.hpp>
-#include <Style.hpp>
+#include <AppWindow.hpp>
#include <Font.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
+#include <Style.hpp>
+
#include <algorithm>
namespace style::desktop
M module-apps/application-desktop/widgets/DesktopInputWidget.hpp => module-apps/application-desktop/widgets/DesktopInputWidget.hpp +4 -4
@@ 4,12 4,12 @@
#pragma once
#include "Application.hpp"
-#include <AppWindow.hpp>
-#include "Text.hpp"
-#include "Image.hpp"
-#include "ListItem.hpp"
+#include <AppWindow.hpp>
#include <BoxLayout.hpp>
+#include <Image.hpp>
+#include <ListItem.hpp>
+#include <Text.hpp>
namespace gui
{
M module-apps/application-desktop/windows/ChargingBatteryWindow.cpp => module-apps/application-desktop/windows/ChargingBatteryWindow.cpp +4 -3
@@ 3,11 3,12 @@
#include "ChargingBatteryWindow.hpp"
#include "InputEvent.hpp"
-#include "gui/widgets/Image.hpp"
+#include "Names.hpp"
+
+#include <gui/widgets/Image.hpp>
#include <log.hpp>
-#include <application-desktop/windows/Names.hpp>
-#include <service-appmgr/model/ApplicationManager.hpp>
#include <service-appmgr/Controller.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
namespace gui
{
M module-apps/application-desktop/windows/ChargingBatteryWindow.hpp => module-apps/application-desktop/windows/ChargingBatteryWindow.hpp +2 -1
@@ 3,8 3,9 @@
#pragma once
+#include <AppWindow.hpp>
+
#include <vector>
-#include "AppWindow.hpp"
namespace gui
{
M module-apps/application-desktop/windows/DeadBatteryWindow.cpp => module-apps/application-desktop/windows/DeadBatteryWindow.cpp +6 -5
@@ 2,13 2,14 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DeadBatteryWindow.hpp"
-#include "InputEvent.hpp"
-#include "gui/widgets/Image.hpp"
+#include "Names.hpp"
+
+#include <gui/widgets/Image.hpp>
+#include <Image.hpp>
+#include <InputEvent.hpp>
#include <log.hpp>
-#include <application-desktop/windows/Names.hpp>
-#include <service-appmgr/model/ApplicationManager.hpp>
#include <service-appmgr/Controller.hpp>
-#include <Image.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
namespace gui
{
M module-apps/application-desktop/windows/DeadBatteryWindow.hpp => module-apps/application-desktop/windows/DeadBatteryWindow.hpp +2 -1
@@ 3,8 3,9 @@
#pragma once
+#include <AppWindow.hpp>
+
#include <vector>
-#include "AppWindow.hpp"
namespace gui
{
M module-apps/application-desktop/windows/DesktopMainWindow.cpp => module-apps/application-desktop/windows/DesktopMainWindow.cpp +9 -10
@@ 1,24 1,23 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <memory>
-
+#include "ApplicationDesktop.hpp"
+#include "DesktopData.hpp"
#include "DesktopMainWindow.hpp"
-#include <application-desktop/ApplicationDesktop.hpp>
-#include <application-desktop/data/DesktopStyle.hpp>
-#include <application-desktop/data/DesktopData.hpp>
-#include <application-call/data/CallSwitchData.hpp>
+#include "DesktopStyle.hpp"
+#include <application-call/data/CallSwitchData.hpp>
+#include <log.hpp>
+#include <messages/DialogMetadataMessage.hpp>
+#include <notifications/NotificationsModel.hpp>
#include <service-appmgr/Controller.hpp>
#include <service-time/ServiceTime.hpp>
#include <service-time/TimeMessage.hpp>
-#include <notifications/NotificationsModel.hpp>
+#include <time/time_conversion_factory.hpp>
#include <windows/Dialog.hpp>
#include <windows/DialogMetadata.hpp>
-#include <messages/DialogMetadataMessage.hpp>
-#include <time/time_conversion_factory.hpp>
-#include <log.hpp>
+#include <memory>
namespace gui
{
M module-apps/application-desktop/windows/DesktopMainWindow.hpp => module-apps/application-desktop/windows/DesktopMainWindow.hpp +2 -2
@@ 3,12 3,12 @@
#pragma once
-#include <application-desktop/models/ActiveNotificationsModel.hpp>
+#include "ActiveNotificationsModel.hpp"
#include <AppWindow.hpp>
#include <gui/widgets/Label.hpp>
-#include <Translator.hpp>
#include <ListView.hpp>
+#include <Translator.hpp>
namespace app
{
D module-apps/application-desktop/windows/LockedInfoWindow.cpp => module-apps/application-desktop/windows/LockedInfoWindow.cpp +0 -0
M module-apps/application-desktop/windows/LogoWindow.cpp => module-apps/application-desktop/windows/LogoWindow.cpp +3 -2
@@ 2,9 2,10 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "LogoWindow.hpp"
-#include "gui/widgets/Image.hpp"
+#include "Names.hpp"
+
+#include <gui/widgets/Image.hpp>
#include <log.hpp>
-#include <application-desktop/windows/Names.hpp>
namespace gui
{
M module-apps/application-desktop/windows/LogoWindow.hpp => module-apps/application-desktop/windows/LogoWindow.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "AppWindow.hpp"
+#include <AppWindow.hpp>
namespace gui
{
M => +7 -7
@@ 1,18 1,18 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DBNotificationsHandler.hpp"
#include "MenuWindow.hpp"
#include "InputEvent.hpp"
#include "Item.hpp"
#include "Navigation.hpp"
#include "service-appmgr/Controller.hpp"
#include <application-desktop/widgets/DBNotificationsHandler.hpp>
#include "Names.hpp"
#include <tools/Common.hpp>
#include <Style.hpp>
#include <i18n/i18n.hpp>
#include <Image.hpp>
#include <InputEvent.hpp>
#include <Item.hpp>
#include <Navigation.hpp>
#include <service-appmgr/Controller.hpp>
#include <Style.hpp>
#include <tools/Common.hpp>
namespace style::design
{
M => +3 -3
@@ 3,12 3,12 @@
#pragma once
#include <vector>
#include <AppWindow.hpp>
#include <GridLayout.hpp>
#include <widgets/Rect.hpp>
#include <utf8/UTF8.hpp>
#include <widgets/Rect.hpp>
#include <vector>
namespace app
{
M module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp => module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp +5 -4
@@ 1,12 1,13 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "MmiPushWindow.hpp"
+#include "Mmi.hpp"
#include "MmiInternalMsgWindow.hpp"
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include <service-appmgr/data/MmiActionsParams.hpp>
-#include <application-desktop/data/Mmi.hpp>
+#include "MmiPushWindow.hpp"
+
#include <i18n/i18n.hpp>
+#include <service-appmgr/data/MmiActionsParams.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
using namespace gui;
M module-apps/application-desktop/windows/MmiInternalMsgWindow.hpp => module-apps/application-desktop/windows/MmiInternalMsgWindow.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 6,9 6,9 @@
#include "MmiPushWindow.hpp"
#include <AppWindow.hpp>
-#include <Text.hpp>
#include <DialogMetadata.hpp>
#include <service-appmgr/data/MmiActionsParams.hpp>
+#include <Text.hpp>
#include <functional>
#include <map>
M module-apps/application-desktop/windows/MmiPullWindow.cpp => module-apps/application-desktop/windows/MmiPullWindow.cpp +5 -4
@@ 1,13 1,14 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "DesktopInputWidget.hpp"
+#include "Mmi.hpp"
#include "MmiPullWindow.hpp"
-#include <application-desktop/widgets/DesktopInputWidget.hpp>
-#include <application-desktop/data/Mmi.hpp>
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include <service-appmgr/data/MmiActionsParams.hpp>
#include <i18n/i18n.hpp>
+#include <service-appmgr/data/MmiActionsParams.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
+
#include <string>
using namespace gui;
M module-apps/application-desktop/windows/MmiPullWindow.hpp => module-apps/application-desktop/windows/MmiPullWindow.hpp +4 -3
@@ 1,14 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "application-desktop/widgets/DesktopInputWidget.hpp"
+#include "DesktopInputWidget.hpp"
#include <AppWindow.hpp>
+#include <DialogMetadata.hpp>
#include <Text.hpp>
+
#include <functional>
-#include <DialogMetadata.hpp>
namespace gui
{
M module-apps/application-desktop/windows/MmiPushWindow.cpp => module-apps/application-desktop/windows/MmiPushWindow.cpp +4 -3
@@ 1,12 1,13 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "Mmi.hpp"
#include "MmiPushWindow.hpp"
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include <service-appmgr/data/MmiActionsParams.hpp>
-#include <application-desktop/data/Mmi.hpp>
+
#include <i18n/i18n.hpp>
#include <Image.hpp>
+#include <service-appmgr/data/MmiActionsParams.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
using namespace gui;
M module-apps/application-desktop/windows/MmiPushWindow.hpp => module-apps/application-desktop/windows/MmiPushWindow.hpp +3 -2
@@ 1,12 1,13 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
#include <AppWindow.hpp>
+#include <DialogMetadata.hpp>
#include <Text.hpp>
+
#include <functional>
-#include <DialogMetadata.hpp>
namespace gui
{
M module-apps/application-desktop/windows/PostUpdateWindow.cpp => module-apps/application-desktop/windows/PostUpdateWindow.cpp +3 -4
@@ 1,13 1,12 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "DesktopData.hpp"
+#include "Names.hpp"
#include "PostUpdateWindow.hpp"
-#include <locks/data/LockStyle.hpp>
-#include <application-desktop/data/DesktopData.hpp>
-#include <application-desktop/windows/Names.hpp>
-
#include <i18n/i18n.hpp>
+#include <locks/data/LockStyle.hpp>
using namespace gui;
M module-apps/application-desktop/windows/PostUpdateWindow.hpp => module-apps/application-desktop/windows/PostUpdateWindow.hpp +1 -1
@@ 4,8 4,8 @@
#pragma once
#include <apps-common/windows/AppWindow.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
#include <module-gui/gui/widgets/Icon.hpp>
+#include <module-gui/gui/widgets/Text.hpp>
namespace gui
{
M module-apps/application-desktop/windows/Reboot.cpp => module-apps/application-desktop/windows/Reboot.cpp +3 -2
@@ 1,10 1,11 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "ApplicationDesktop.hpp"
#include "Reboot.hpp"
-#include "../ApplicationDesktop.hpp"
-#include <Style.hpp>
+
#include <i18n/i18n.hpp>
+#include <Style.hpp>
namespace gui
{
M module-apps/application-desktop/windows/Reboot.hpp => module-apps/application-desktop/windows/Reboot.hpp +1 -1
@@ 4,8 4,8 @@
#pragma once
#include <AppWindow.hpp>
-#include <Text.hpp>
#include <popups/presenter/PowerOffPresenter.hpp>
+#include <Text.hpp>
#include <vector>
M module-apps/application-desktop/windows/Update.cpp => module-apps/application-desktop/windows/Update.cpp +10 -13
@@ 1,22 1,19 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log.hpp>
-#include "application-desktop/data/DesktopData.hpp"
-#include <source/version.hpp>
-
-// module-utils
-#include "i18n/i18n.hpp"
-
+#include "ApplicationDesktop.hpp"
+#include "Constants.hpp"
+#include "DesktopData.hpp"
#include "Update.hpp"
-#include "../ApplicationDesktop.hpp"
-// services
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include "service-cellular/ServiceCellular.hpp"
-#include <service-desktop/service-desktop/Constants.hpp>
-#include <Style.hpp>
#include <boot/bootconfig.hpp>
+#include <i18n/i18n.hpp>
+#include <log.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
+#include <service-cellular/ServiceCellular.hpp>
+#include <service-desktop/Constants.hpp>
+#include <source/version.hpp>
+#include <Style.hpp>
namespace gui
{
M module-apps/application-desktop/windows/Update.hpp => module-apps/application-desktop/windows/Update.hpp +7 -6
@@ 1,14 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+#include <AppWindow.hpp>
+#include <gui/widgets/BottomBar.hpp>
+#include <gui/widgets/Image.hpp>
+#include <gui/widgets/Label.hpp>
+#include <gui/widgets/TextFixedSize.hpp>
+
#include <vector>
-#include "AppWindow.hpp"
-#include "gui/widgets/Label.hpp"
-#include "gui/widgets/TextFixedSize.hpp"
-#include "gui/widgets/Image.hpp"
-#include "gui/widgets/BottomBar.hpp"
namespace gui
{
M module-apps/application-desktop/windows/UpdateProgress.cpp => module-apps/application-desktop/windows/UpdateProgress.cpp +8 -13
@@ 1,23 1,18 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <log.hpp>
-#include <source/version.hpp>
-#include <boot/bootconfig.hpp>
+#include "ApplicationDesktop.hpp"
+#include "DesktopData.hpp"
+#include "DesktopStyle.hpp"
+#include "UpdateProgress.hpp"
-// module-utils
+#include <boot/bootconfig.hpp>
+#include <DialogMetadataMessage.hpp>
#include <i18n/i18n.hpp>
-
-#include <application-desktop/ApplicationDesktop.hpp>
-#include <application-desktop/data/DesktopStyle.hpp>
-#include <application-desktop/data/DesktopData.hpp>
-
-// services
+#include <log.hpp>
#include <service-appmgr/model/ApplicationManager.hpp>
-
+#include <source/version.hpp>
#include <Style.hpp>
-#include <DialogMetadataMessage.hpp>
-#include "UpdateProgress.hpp"
namespace gui
{
M module-apps/application-desktop/windows/UpdateProgress.hpp => module-apps/application-desktop/windows/UpdateProgress.hpp +5 -4
@@ 3,14 3,15 @@
#pragma once
-#include <vector>
+#include <apps-common/widgets/BarGraph.hpp>
#include <apps-common/windows/AppWindow.hpp>
#include <apps-common/windows/Dialog.hpp>
+#include <module-gui/gui/widgets/BottomBar.hpp>
+#include <module-gui/gui/widgets/Image.hpp>
#include <module-gui/gui/widgets/Label.hpp>
#include <module-gui/gui/widgets/TextFixedSize.hpp>
-#include <module-gui/gui/widgets/Image.hpp>
-#include <module-gui/gui/widgets/BottomBar.hpp>
-#include <apps-common/widgets/BarGraph.hpp>
+
+#include <vector>
namespace gui
{
M module-apps/application-settings/ApplicationSettings.cpp => module-apps/application-settings/ApplicationSettings.cpp +0 -1
@@ 80,7 80,6 @@
#include <module-services/service-evtmgr/service-evtmgr/EVMessages.hpp>
#include <module-services/service-appmgr/service-appmgr/messages/Message.hpp>
#include <module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp>
-#include <module-apps/application-desktop/windows/Names.hpp>
#include <apps-common/messages/DialogMetadataMessage.hpp>
#include <apps-common/windows/Dialog.hpp>
M module-apps/application-settings/windows/DateAndTimeMainWindow.cpp => module-apps/application-settings/windows/DateAndTimeMainWindow.cpp +0 -1
@@ 3,7 3,6 @@
#include "application-settings/ApplicationSettings.hpp"
#include "DateAndTimeMainWindow.hpp"
-#include "module-apps/application-desktop/windows/Names.hpp"
#include "OptionSetting.hpp"
#include <service-time/service-time/TimeMessage.hpp>
#include <service-time/Constants.hpp>
M module-apps/application-settings/windows/SecurityMainWindow.cpp => module-apps/application-settings/windows/SecurityMainWindow.cpp +0 -1
@@ 5,7 5,6 @@
#include <locks/data/LockData.hpp>
#include "application-settings/ApplicationSettings.hpp"
#include "application-settings/data/ChangePasscodeData.hpp"
-#include "module-apps/application-desktop/windows/Names.hpp"
#include "OptionSetting.hpp"
#include "SecurityMainWindow.hpp"
M => +2 -1
@@ 2,7 2,8 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TetheringNotificationPopup.hpp"
#include <module-apps/application-desktop/ApplicationDesktop.hpp>
#include <Application.hpp>
namespace gui
{
M => +0 -1
@@ 5,7 5,6 @@
#include <locks/input/PhoneLockedKeysWhitelist.hpp>
#include <service-appmgr/Controller.hpp>
#include <application-desktop/data/DesktopStyle.hpp>
#include <i18n/i18n.hpp>
M => +0 -1
@@ 4,7 4,6 @@
#include "SimNotReadyWindow.hpp"
#include <service-appmgr/Controller.hpp>
#include <application-desktop/data/DesktopStyle.hpp>
#include <i18n/i18n.hpp>
M module-services/service-appmgr/CMakeLists.txt => module-services/service-appmgr/CMakeLists.txt +1 -0
@@ 36,6 36,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
target_link_libraries(${PROJECT_NAME}
PRIVATE
+ application-desktop
json::json
module-audio
service-cellular
M module-services/service-desktop/CMakeLists.txt => module-services/service-desktop/CMakeLists.txt +1 -0
@@ 56,6 56,7 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PRIVATE
+ application-desktop
microtar
module-utils
service-cellular
M module-services/service-desktop/ServiceDesktop.cpp => module-services/service-desktop/ServiceDesktop.cpp +1 -1
@@ 15,7 15,7 @@
#include <Service/Worker.hpp>
#include <json11.hpp>
#include <log.hpp>
-#include <module-apps/application-desktop/ApplicationDesktop.hpp>
+#include <application-desktop/Constants.hpp>
#include <service-db/service-db/Settings.hpp>
#include <service-db/QueryMessage.hpp>
#include <purefs/filesystem_paths.hpp>
M products/BellHybrid/BellHybridMain.cpp => products/BellHybrid/BellHybridMain.cpp +0 -1
@@ 5,7 5,6 @@
// applications
#include <application-calllog/ApplicationCallLog.hpp>
-#include <application-desktop/ApplicationDesktop.hpp>
#include <application-settings/ApplicationSettings.hpp>
#include <application-special-input/ApplicationSpecialInput.hpp>
#include <application-calendar/ApplicationCalendar.hpp>
M products/PurePhone/CMakeLists.txt => products/PurePhone/CMakeLists.txt +1 -0
@@ 51,6 51,7 @@ target_link_libraries(PurePhone
application-antenna
application-calculator
application-call
+ application-desktop
application-messages
application-music-player
application-notes