M module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp => module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp +1 -0
@@ 4,6 4,7 @@
#include "AlarmTimeItem.hpp"
#include "AlarmClockStyle.hpp"
#include <ListView.hpp>
+#include <Label.hpp>
#include <Style.hpp>
#include <time/time_constants.hpp>
#include <time/time_date_validation.hpp>
M module-apps/application-calculator/data/CalculatorInputProcessorText.cpp => module-apps/application-calculator/data/CalculatorInputProcessorText.cpp +1 -1
@@ 4,7 4,7 @@
#include "CalculatorInputProcessorText.hpp"
#include "CalculatorUtility.hpp"
#include <module-gui/gui/input/InputEvent.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
#include <i18n/i18n.hpp>
#include <gsl/assert>
M module-apps/application-calculator/tests/CalculatorInput_tests.cpp => module-apps/application-calculator/tests/CalculatorInput_tests.cpp +1 -1
@@ 4,7 4,7 @@
#include <data/CalculatorInputProcessorText.hpp>
#include <catch2/catch.hpp>
#include <i18n/i18n.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
#include <cstring>
SCENARIO("Input Processor tests")
M module-apps/application-calculator/windows/CalculatorMainWindow.hpp => module-apps/application-calculator/windows/CalculatorMainWindow.hpp +1 -1
@@ 7,7 7,7 @@
#include <widgets/MathOperationsBox.hpp>
#include <apps-common/ApplicationCommon.hpp>
#include <apps-common/windows/AppWindow.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
namespace gui
{
M module-apps/application-call/windows/CallWindow.cpp => module-apps/application-call/windows/CallWindow.cpp +1 -1
@@ 12,7 12,7 @@
#include <GuiTimer.hpp>
#include <i18n/i18n.hpp>
#include <InputEvent.hpp>
-#include <InputMode.hpp>
+#include <text/modes/InputMode.hpp>
#include <Label.hpp>
#include <log/log.hpp>
#include <magic_enum.hpp>
M module-apps/application-call/windows/EnterNumberWindow.cpp => module-apps/application-call/windows/EnterNumberWindow.cpp +1 -1
@@ 8,7 8,7 @@
#include <ContactRecord.hpp>
#include <country.hpp>
#include <i18n/i18n.hpp>
-#include <InputMode.hpp>
+#include <text/modes/InputMode.hpp>
#include <phonenumbers/asyoutypeformatter.h>
#include <phonenumbers/phonenumberutil.h>
#include <service-appmgr/Controller.hpp>
M module-apps/application-call/windows/NumberWindow.cpp => module-apps/application-call/windows/NumberWindow.cpp +1 -1
@@ 11,7 11,7 @@
#include <gui/widgets/Label.hpp>
#include <gui/widgets/Window.hpp>
#include <i18n/i18n.hpp>
-#include <InputMode.hpp>
+#include <text/modes/InputMode.hpp>
#include <service-appmgr/Controller.hpp>
#include <service-cellular/CellularServiceAPI.hpp>
M module-apps/application-meditation/widgets/MeditationTimer.hpp => module-apps/application-meditation/widgets/MeditationTimer.hpp +1 -1
@@ 7,7 7,7 @@
#include <gui/widgets/BoxLayout.hpp>
#include <gui/widgets/ProgressBar.hpp>
-#include <gui/widgets/Text.hpp>
+#include <gui/widgets/text/Text.hpp>
#include <apps-common/widgets/TimerWithCallbacks.hpp>
namespace app
M module-apps/application-meditation/widgets/TimerProperty.cpp => module-apps/application-meditation/widgets/TimerProperty.cpp +1 -0
@@ 4,6 4,7 @@
#include "Style.hpp"
#include "TimerProperty.hpp"
+#include <InputEvent.hpp>
#include <i18n/i18n.hpp>
#include <Utils.hpp>
M module-apps/application-meditation/widgets/TimerProperty.hpp => module-apps/application-meditation/widgets/TimerProperty.hpp +1 -1
@@ 6,7 6,7 @@
#include <gui/widgets/Circle.hpp>
#include <gui/widgets/Label.hpp>
#include <gui/widgets/Rect.hpp>
-#include <gui/widgets/Text.hpp>
+#include <gui/widgets/BoxLayout.hpp>
#include <chrono>
M module-apps/application-meditation/windows/MeditationTimerWindow.cpp => module-apps/application-meditation/windows/MeditationTimerWindow.cpp +0 -1
@@ 8,7 8,6 @@
#include "Style.hpp"
#include <gui/core/FontManager.hpp>
-#include <gui/widgets/RichTextParser.hpp>
#include <i18n/i18n.hpp>
#include <Timers/TimerFactory.hpp>
M module-apps/application-messages/widgets/SMSInputWidget.cpp => module-apps/application-messages/widgets/SMSInputWidget.cpp +1 -1
@@ 10,7 10,7 @@
#include <service-cellular/service-cellular/MessageConstants.hpp>
#include <SMSInputWidget.hpp>
#include <Style.hpp>
-#include <TextParse.hpp>
+#include <parsers/TextParse.hpp>
#include <algorithm>
#include <utility>
M module-apps/application-messages/windows/NewMessage.hpp => module-apps/application-messages/windows/NewMessage.hpp +1 -1
@@ 9,7 9,7 @@
#include <AsyncTask.hpp>
#include <AppWindow.hpp>
#include <PhoneNumber.hpp>
-#include <widgets/Text.hpp>
+#include <widgets/text/Text.hpp>
#include <module-db/Interface/SMSRecord.hpp>
#include <module-db/Interface/ContactRecord.hpp>
M module-apps/application-notes/widgets/NotesItem.hpp => module-apps/application-notes/widgets/NotesItem.hpp +1 -1
@@ 5,7 5,7 @@
#include <module-gui/gui/widgets/Label.hpp>
#include <module-gui/gui/widgets/ListItem.hpp>
-#include <module-gui/gui/widgets/TextFixedSize.hpp>
+#include <module-gui/gui/widgets/text/TextFixedSize.hpp>
#include <module-db/Interface/NotesRecord.hpp>
M module-apps/application-notes/windows/NoteEditWindow.hpp => module-apps/application-notes/windows/NoteEditWindow.hpp +1 -1
@@ 10,7 10,7 @@
#include <module-db/Interface/NotesRecord.hpp>
#include "gui/widgets/Label.hpp"
-#include "gui/widgets/Text.hpp"
+#include "gui/widgets/text/Text.hpp"
#include "gui/input/InputEvent.hpp"
#include <module-apps/application-notes/presenter/NoteEditWindowPresenter.hpp>
M module-apps/application-notes/windows/NotePreviewWindow.hpp => module-apps/application-notes/windows/NotePreviewWindow.hpp +1 -1
@@ 9,7 9,7 @@
#include <module-apps/application-notes/presenter/NotePreviewWindowPresenter.hpp>
#include <module-gui/gui/widgets/Label.hpp>
-#include <module-gui/gui/widgets/TextFixedSize.hpp>
+#include <module-gui/gui/widgets/text/TextFixedSize.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
namespace app::notes
M module-apps/application-notes/windows/NotesOptions.cpp => module-apps/application-notes/windows/NotesOptions.cpp +1 -1
@@ 11,7 11,7 @@
#include <i18n/i18n.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
namespace app::notes
{
M module-apps/application-notes/windows/SearchEngineWindow.hpp => module-apps/application-notes/windows/SearchEngineWindow.hpp +1 -1
@@ 9,7 9,7 @@
#include <module-apps/application-notes/presenter/SearchEngineWindowPresenter.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
namespace app::notes
{
M module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.hpp => module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.hpp +1 -1
@@ 8,7 8,7 @@
#include <module-apps/application-onboarding/presenter/EULALicenseWindowPresenter.hpp>
#include <module-gui/gui/widgets/Label.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
namespace app::onBoarding
M module-apps/application-onboarding/windows/EULALicenseWindow.hpp => module-apps/application-onboarding/windows/EULALicenseWindow.hpp +1 -1
@@ 8,7 8,7 @@
#include <module-apps/application-onboarding/presenter/EULALicenseWindowPresenter.hpp>
#include <module-gui/gui/widgets/Label.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
namespace app::onBoarding
M module-apps/application-onboarding/windows/NoConfigurationDialogWindow.hpp => module-apps/application-onboarding/windows/NoConfigurationDialogWindow.hpp +1 -1
@@ 8,7 8,7 @@
#include <module-apps/application-onboarding/presenter/EULALicenseWindowPresenter.hpp>
#include <module-gui/gui/widgets/Label.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <module-gui/gui/widgets/text/Text.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
namespace app::onBoarding
M module-apps/application-settings/widgets/network/ApnInputWidget.cpp => module-apps/application-settings/widgets/network/ApnInputWidget.cpp +1 -0
@@ 5,6 5,7 @@
#include <application-settings/widgets/SettingsStyle.hpp>
+#include <Label.hpp>
#include <i18n/i18n.hpp>
namespace gui
M module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp => module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp +1 -1
@@ 6,7 6,7 @@
#include <application-settings/widgets/SettingsStyle.hpp>
#include <application-settings/windows/WindowNames.hpp>
-#include <widgets/Text.hpp>
+#include <widgets/text/Text.hpp>
namespace gui
{
M module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp => module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp +1 -1
@@ 5,7 5,7 @@
#include <application-settings/windows/WindowNames.hpp>
-#include <widgets/Text.hpp>
+#include <widgets/text/Text.hpp>
namespace style
{
M module-apps/apps-common/locks/windows/LockInputWindow.hpp => module-apps/apps-common/locks/windows/LockInputWindow.hpp +0 -1
@@ 6,7 6,6 @@
#include <locks/widgets/LockBox.hpp>
#include <AppWindow.hpp>
-#include <RichTextParser.hpp>
#include <Text.hpp>
#include <ImageBox.hpp>
M module-apps/apps-common/notifications/NotificationListItem.cpp => module-apps/apps-common/notifications/NotificationListItem.cpp +4 -4
@@ 3,10 3,10 @@
#include "NotificationListItem.hpp"
-#include "TextFixedSize.hpp"
-#include "RichTextParser.hpp"
-#include "FontManager.hpp"
-#include "Image.hpp"
+#include <TextFixedSize.hpp>
+#include <parsers/RichTextParser.hpp>
+#include <FontManager.hpp>
+#include <Image.hpp>
#include <widgets/Style.hpp>
#include <map>
M module-apps/apps-common/notifications/NotificationListItem.hpp => module-apps/apps-common/notifications/NotificationListItem.hpp +0 -1
@@ 6,7 6,6 @@
#include <ListItem.hpp>
#include <BoxLayout.hpp>
#include <Text.hpp>
-#include <RichTextParser.hpp>
#include <widgets/ButtonOnOff.hpp>
#include "NotificationData.hpp"
M module-apps/apps-common/widgets/AlarmSetSpinner.hpp => module-apps/apps-common/widgets/AlarmSetSpinner.hpp +1 -1
@@ 5,7 5,7 @@
#include <gui/widgets/BoxLayout.hpp>
#include <gui/widgets/Style.hpp>
-#include <gui/widgets/TextConstants.hpp>
+#include <gui/widgets/text/TextConstants.hpp>
#include <time/time_locale.hpp>
#include <string>
M module-apps/apps-common/widgets/InputBox.cpp => module-apps/apps-common/widgets/InputBox.cpp +1 -0
@@ 4,6 4,7 @@
#include "InputBox.hpp"
#include <BoxLayout.hpp>
+#include <Label.hpp>
#include <Image.hpp>
namespace gui
M module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp => module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include <gui/widgets/BoxLayout.hpp>
-#include <gui/widgets/TextConstants.hpp>
+#include <gui/widgets/text/TextConstants.hpp>
#include <time/time_locale.hpp>
#include <widgets/spinners/Spinners.hpp>
#include "TimeSetSpinner.hpp"
M module-apps/apps-common/widgets/TimeSetSpinner.hpp => module-apps/apps-common/widgets/TimeSetSpinner.hpp +1 -1
@@ 5,7 5,7 @@
#include <widgets/spinners/Spinners.hpp>
#include <gui/widgets/Style.hpp>
-#include <gui/widgets/TextConstants.hpp>
+#include <gui/widgets/text/TextConstants.hpp>
#include <string>
M module-apps/apps-common/widgets/spinners/GenericSpinner.hpp => module-apps/apps-common/widgets/spinners/GenericSpinner.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include "SpinnerPolicies.hpp"
-#include <widgets/TextFixedSize.hpp>
+#include <widgets/text/TextFixedSize.hpp>
namespace gui
{
M module-db/Interface/ContactRecord.hpp => module-db/Interface/ContactRecord.hpp +1 -1
@@ 14,7 14,7 @@
#include <PhoneNumber.hpp>
#include <NumberHolderMatcher.hpp>
-#include "module-gui/gui/widgets/TextConstants.hpp"
+#include "module-gui/gui/widgets/text/TextConstants.hpp"
#include <module-apps/application-phonebook/data/ContactsMap.hpp>
#include <memory>
M module-gui/CMakeLists.txt => module-gui/CMakeLists.txt +1 -4
@@ 7,6 7,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
include(gui/CMakeLists.txt)
include(gui/core/CMakeLists.txt)
include(gui/widgets/CMakeLists.txt)
+include(gui/widgets/text/CMakeLists.txt)
include(gui/input/CMakeLists.txt)
include(gui/dom/CMakeLists.txt)
@@ 15,19 16,15 @@ include_directories( ../module-utils )
target_link_libraries(${PROJECT_NAME}
PUBLIC
${TARGET_LIBRARIES}
- module-bsp
- eventstore
utils-math
module-utils
sys-phonemodes
sys-service
- sys-watchdog
service-bluetooth
utf8
PRIVATE
i18n
json::json
- Microsoft.GSL::GSL
pugixml::pugixml
utils-time
)
M module-gui/README.md => module-gui/README.md +1 -1
@@ 190,4 190,4 @@ in a sequence flow analogous to the one presented above. Please find an exemplar
## Widgets
- [Window](WINDOW.md)
-- [Text](./gui/widgets/text/HowDoesTextWork.md)
+- [Text](gui/widgets/text/doc/HowDoesTextWork.md)
D module-gui/assets/images/alarm_left.mpi => module-gui/assets/images/alarm_left.mpi +0 -0
D module-gui/assets/images/alarm_right.mpi => module-gui/assets/images/alarm_right.mpi +0 -0
D module-gui/assets/images/all-songs-player.vpi => module-gui/assets/images/all-songs-player.vpi +0 -0
D module-gui/assets/images/all-songs.vpi => module-gui/assets/images/all-songs.vpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_100.mpi => module-gui/assets/images/batt_gray_status_bar_100.mpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_20.mpi => module-gui/assets/images/batt_gray_status_bar_20.mpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_40.mpi => module-gui/assets/images/batt_gray_status_bar_40.mpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_60.mpi => module-gui/assets/images/batt_gray_status_bar_60.mpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_80.mpi => module-gui/assets/images/batt_gray_status_bar_80.mpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_charging.mpi => module-gui/assets/images/batt_gray_status_bar_charging.mpi +0 -0
D module-gui/assets/images/batt_gray_status_bar_empty.mpi => module-gui/assets/images/batt_gray_status_bar_empty.mpi +0 -0
D module-gui/assets/images/bt_32.mpi => module-gui/assets/images/bt_32.mpi +0 -0
D module-gui/assets/images/bt_paired_icon.mpi => module-gui/assets/images/bt_paired_icon.mpi +0 -0
D module-gui/assets/images/bt_scanning_placeholder_icon.mpi => module-gui/assets/images/bt_scanning_placeholder_icon.mpi +0 -0
D module-gui/assets/images/call_add_contact.mpi => module-gui/assets/images/call_add_contact.mpi +0 -0
D module-gui/assets/images/call_circle_bot.mpi => module-gui/assets/images/call_circle_bot.mpi +0 -0
D module-gui/assets/images/call_circle_top.mpi => module-gui/assets/images/call_circle_top.mpi +0 -0
D module-gui/assets/images/call_in_progress_circle.mpi => module-gui/assets/images/call_in_progress_circle.mpi +0 -1
@@ 1,1 0,0 @@
-� >
\ No newline at end of file
D module-gui/assets/images/calling_phone.mpi => module-gui/assets/images/calling_phone.mpi +0 -0
D module-gui/assets/images/cellular_network_scanning_placeholder.mpi => module-gui/assets/images/cellular_network_scanning_placeholder.mpi +0 -0
D module-gui/assets/images/clock_circle.vpi => module-gui/assets/images/clock_circle.vpi +0 -0
D module-gui/assets/images/cross_black.mpi => module-gui/assets/images/cross_black.mpi +0 -0
D module-gui/assets/images/cross_bw.mpi => module-gui/assets/images/cross_bw.mpi +0 -0
D module-gui/assets/images/desktop_logo.mpi => module-gui/assets/images/desktop_logo.mpi +0 -0
D module-gui/assets/images/earspeaker.mpi => module-gui/assets/images/earspeaker.mpi +0 -0
D module-gui/assets/images/earspeaker_selected.mpi => module-gui/assets/images/earspeaker_selected.mpi +0 -0
D module-gui/assets/images/gear.mpi => module-gui/assets/images/gear.mpi +0 -0
D module-gui/assets/images/incomming_send_msg.mpi => module-gui/assets/images/incomming_send_msg.mpi +0 -0
D module-gui/assets/images/loudspeaker.mpi => module-gui/assets/images/loudspeaker.mpi +0 -0
D module-gui/assets/images/loudspeaker_selected.mpi => module-gui/assets/images/loudspeaker_selected.mpi +0 -0
D module-gui/assets/images/meditation-timer-countdown.vpi => module-gui/assets/images/meditation-timer-countdown.vpi +0 -0
D => +0 -0
D => +0 -0
D => +0 -0
D => +0 -0
D => +0 -0
D => +0 -0
D => +0 -0
D module-gui/assets/images/menu_phone_handle.mpi => module-gui/assets/images/menu_phone_handle.mpi +0 -0
D => +0 -0
D module-gui/assets/images/messages-conversation.vpi => module-gui/assets/images/messages-conversation.vpi +0 -0
D module-gui/assets/images/mountain.mpi => module-gui/assets/images/mountain.mpi +0 -4105
D module-gui/assets/images/mountains.mpi => module-gui/assets/images/mountains.mpi +0 -0
D module-gui/assets/images/msg_cross.mpi => module-gui/assets/images/msg_cross.mpi +0 -0
D module-gui/assets/images/msg_cross_w.mpi => module-gui/assets/images/msg_cross_w.mpi +0 -0
D module-gui/assets/images/msg_new_msg.mpi => module-gui/assets/images/msg_new_msg.mpi +0 -0
D module-gui/assets/images/msg_reply.mpi => module-gui/assets/images/msg_reply.mpi +0 -0
D module-gui/assets/images/msg_search.mpi => module-gui/assets/images/msg_search.mpi +0 -0
D module-gui/assets/images/msg_thread_dot.mpi => module-gui/assets/images/msg_thread_dot.mpi +0 -0
D module-gui/assets/images/msg_trash.mpi => module-gui/assets/images/msg_trash.mpi +0 -0
D module-gui/assets/images/msg_triangle_left.mpi => module-gui/assets/images/msg_triangle_left.mpi +0 -0
D module-gui/assets/images/msg_triangle_right.mpi => module-gui/assets/images/msg_triangle_right.mpi +0 -0
D module-gui/assets/images/mute.mpi => module-gui/assets/images/mute.mpi +0 -0
D module-gui/assets/images/mute.vpi => module-gui/assets/images/mute.vpi +0 -0
D module-gui/assets/images/mute_selected.mpi => module-gui/assets/images/mute_selected.mpi +0 -0
D module-gui/assets/images/next_song.mpi => module-gui/assets/images/next_song.mpi +0 -0
D module-gui/assets/images/notes_cross.mpi => module-gui/assets/images/notes_cross.mpi +0 -0
D module-gui/assets/images/notes_triangle_left.mpi => module-gui/assets/images/notes_triangle_left.mpi +0 -0
D module-gui/assets/images/ongoing-call.vpi => module-gui/assets/images/ongoing-call.vpi +0 -0
D module-gui/assets/images/onoff.mpi => module-gui/assets/images/onoff.mpi +0 -0
D module-gui/assets/images/option_list_arrow.mpi => module-gui/assets/images/option_list_arrow.mpi +0 -0
D module-gui/assets/images/pause.mpi => module-gui/assets/images/pause.mpi +0 -0
D module-gui/assets/images/phonebook_arrow_den.mpi => module-gui/assets/images/phonebook_arrow_den.mpi +0 -0
D module-gui/assets/images/phonebook_arrow_in.mpi => module-gui/assets/images/phonebook_arrow_in.mpi +0 -0
D module-gui/assets/images/phonebook_arrow_out.mpi => module-gui/assets/images/phonebook_arrow_out.mpi +0 -0
D module-gui/assets/images/phonebook_fav.mpi => module-gui/assets/images/phonebook_fav.mpi +0 -0
D module-gui/assets/images/phonebook_shield.mpi => module-gui/assets/images/phonebook_shield.mpi +0 -0
D module-gui/assets/images/phonebook_speed.mpi => module-gui/assets/images/phonebook_speed.mpi +0 -0
D module-gui/assets/images/phonebook_tick.mpi => module-gui/assets/images/phonebook_tick.mpi +0 -0
D module-gui/assets/images/play.mpi => module-gui/assets/images/play.mpi +0 -0
D module-gui/assets/images/player_note.mpi => module-gui/assets/images/player_note.mpi +0 -0
D module-gui/assets/images/player_pause.mpi => module-gui/assets/images/player_pause.mpi +0 -0
D module-gui/assets/images/player_play.mpi => module-gui/assets/images/player_play.mpi +0 -0
D module-gui/assets/images/player_play_small.mpi => module-gui/assets/images/player_play_small.mpi +0 -0
D module-gui/assets/images/player_song_left.mpi => module-gui/assets/images/player_song_left.mpi +0 -0
D module-gui/assets/images/player_song_right.mpi => module-gui/assets/images/player_song_right.mpi +0 -0
D module-gui/assets/images/prev_song.mpi => module-gui/assets/images/prev_song.mpi +0 -0
D module-gui/assets/images/quote.mpi => module-gui/assets/images/quote.mpi +0 -0
D module-gui/assets/images/receive-call.vpi => module-gui/assets/images/receive-call.vpi +0 -0
D module-gui/assets/images/sar_gray_status_bar_00.mpi => module-gui/assets/images/sar_gray_status_bar_00.mpi +0 -0
D module-gui/assets/images/sar_gray_status_bar_100.mpi => module-gui/assets/images/sar_gray_status_bar_100.mpi +0 -0
D module-gui/assets/images/sar_gray_status_bar_33.mpi => module-gui/assets/images/sar_gray_status_bar_33.mpi +0 -0
D module-gui/assets/images/sar_gray_status_bar_66.mpi => module-gui/assets/images/sar_gray_status_bar_66.mpi +0 -0
D module-gui/assets/images/screen1.vpi => module-gui/assets/images/screen1.vpi +0 -0
D module-gui/assets/images/screen2.vpi => module-gui/assets/images/screen2.vpi +0 -0
D module-gui/assets/images/screen3.vpi => module-gui/assets/images/screen3.vpi +0 -0
D module-gui/assets/images/search_bw.mpi => module-gui/assets/images/search_bw.mpi +0 -0
D module-gui/assets/images/signal_strength_gray_status_bar_00.mpi => module-gui/assets/images/signal_strength_gray_status_bar_00.mpi +0 -0
D module-gui/assets/images/signal_strength_gray_status_bar_100.mpi => module-gui/assets/images/signal_strength_gray_status_bar_100.mpi +0 -0
D module-gui/assets/images/signal_strength_gray_status_bar_25.mpi => module-gui/assets/images/signal_strength_gray_status_bar_25.mpi +0 -0
D module-gui/assets/images/signal_strength_gray_status_bar_50.mpi => module-gui/assets/images/signal_strength_gray_status_bar_50.mpi +0 -0
D module-gui/assets/images/signal_strength_gray_status_bar_75.mpi => module-gui/assets/images/signal_strength_gray_status_bar_75.mpi +0 -0
D module-gui/assets/images/sim.mpi => module-gui/assets/images/sim.mpi +0 -0
D module-gui/assets/images/speaker.vpi => module-gui/assets/images/speaker.vpi +0 -0
D module-gui/assets/images/triangle_arrow_left.mpi => module-gui/assets/images/triangle_arrow_left.mpi +0 -0
D module-gui/assets/images/triangle_arrow_right.mpi => module-gui/assets/images/triangle_arrow_right.mpi +0 -0
D module-gui/assets/images/unmute.mpi => module-gui/assets/images/unmute.mpi +0 -0
D module-gui/assets/images/unmute_selected.mpi => module-gui/assets/images/unmute_selected.mpi +0 -0
M module-gui/gui/CMakeLists.txt => module-gui/gui/CMakeLists.txt +2 -0
@@ 4,6 4,7 @@ include_directories( ${PROJECT_NAME}
"${CMAKE_CURRENT_LIST_DIR}"
"${CMAKE_CURRENT_LIST_DIR}/core"
"${CMAKE_CURRENT_LIST_DIR}/widgets"
+ "${CMAKE_CURRENT_LIST_DIR}/widgets/text"
"${CMAKE_CURRENT_LIST_DIR}/input"
"${CMAKE_CURRENT_LIST_DIR}/dom"
)
@@ 14,6 15,7 @@ target_include_directories( ${PROJECT_NAME}
"${CMAKE_CURRENT_LIST_DIR}"
"${CMAKE_CURRENT_LIST_DIR}/core"
"${CMAKE_CURRENT_LIST_DIR}/widgets"
+ "${CMAKE_CURRENT_LIST_DIR}/widgets/text"
"${CMAKE_CURRENT_LIST_DIR}/input"
"${CMAKE_CURRENT_LIST_DIR}/dom"
)
M module-gui/gui/widgets/CMakeLists.txt => module-gui/gui/widgets/CMakeLists.txt +0 -19
@@ 44,23 44,8 @@ target_sources( ${PROJECT_NAME}
"${CMAKE_CURRENT_LIST_DIR}/status-bar/PhoneMode.cpp"
"${CMAKE_CURRENT_LIST_DIR}/status-bar/Time.cpp"
"${CMAKE_CURRENT_LIST_DIR}/status-bar/Lock.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/Text.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextBlock.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextDocument.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextCursor.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextParse.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextLine.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextBlockCursor.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextBubble.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextFixedSize.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Style.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/InputMode.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GridLayout.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/Lines.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextLineCursor.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/RawText.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/RichTextParser.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextFormat.cpp"
"${CMAKE_CURRENT_LIST_DIR}/CheckBoxWithLabel.cpp"
"${CMAKE_CURRENT_LIST_DIR}/visitor/DepthFirstItemTree.cpp"
PUBLIC
@@ 71,7 56,6 @@ target_sources( ${PROJECT_NAME}
"${CMAKE_CURRENT_LIST_DIR}/Image.hpp"
"${CMAKE_CURRENT_LIST_DIR}/ImageBox.hpp"
"${CMAKE_CURRENT_LIST_DIR}/ImageBoxWithText.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextFixedSize.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Item.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Label.hpp"
"${CMAKE_CURRENT_LIST_DIR}/ListItem.hpp"
@@ 90,15 74,12 @@ target_sources( ${PROJECT_NAME}
"${CMAKE_CURRENT_LIST_DIR}/Layout.hpp"
"${CMAKE_CURRENT_LIST_DIR}/SideListView.hpp"
"${CMAKE_CURRENT_LIST_DIR}/StatusBar.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/Text.hpp"
"${CMAKE_CURRENT_LIST_DIR}/header/Header.hpp"
"${CMAKE_CURRENT_LIST_DIR}/header/IceAction.hpp"
"${CMAKE_CURRENT_LIST_DIR}/header/AddElementAction.hpp"
"${CMAKE_CURRENT_LIST_DIR}/header/SearchAction.hpp"
"${CMAKE_CURRENT_LIST_DIR}/CheckBoxWithLabel.hpp"
"${CMAKE_CURRENT_LIST_DIR}/CheckBoxWithLabel.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/Lines.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/TextLineCursor.hpp"
"${CMAKE_CURRENT_LIST_DIR}/visitor/GuiVisitor.hpp"
"${CMAKE_CURRENT_LIST_DIR}/visitor/ItemNode.hpp"
"${CMAKE_CURRENT_LIST_DIR}/visitor/ItemTree.hpp"
M module-gui/gui/widgets/Icon.cpp => module-gui/gui/widgets/Icon.cpp +0 -2
@@ 2,8 2,6 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "Icon.hpp"
-#include "TextParse.hpp"
-#include <i18n/i18n.hpp>
#include <Style.hpp>
#include <Font.hpp>
A module-gui/gui/widgets/text/CMakeLists.txt => module-gui/gui/widgets/text/CMakeLists.txt +22 -0
@@ 0,0 1,22 @@
+target_sources( ${PROJECT_NAME}
+ PRIVATE
+ "${CMAKE_CURRENT_LIST_DIR}/core/cursors/TextBlockCursor.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/cursors/TextCursor.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/cursors/TextLineCursor.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/lines/Lines.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/lines/TextLine.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/RawText.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/TextBlock.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/TextDocument.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/core/TextFormat.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/modes/InputMode.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/parsers/RichTextParser.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/parsers/TextParse.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/Text.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/TextBubble.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/TextFixedSize.cpp"
+
+ PUBLIC
+ "${CMAKE_CURRENT_LIST_DIR}/Text.hpp"
+ "${CMAKE_CURRENT_LIST_DIR}/TextFixedSize.hpp"
+)
R module-gui/gui/widgets/Text.cpp => module-gui/gui/widgets/text/Text.cpp +5 -21
@@ 1,29 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 <iterator>
-
-#include "Common.hpp"
-#include "Ellipsis.hpp"
-#include "InputEvent.hpp"
-#include "InputMode.hpp"
-#include "Item.hpp"
#include "Text.hpp"
-#include "TextBlock.hpp"
-#include "TextConstants.hpp"
-#include "TextCursor.hpp"
-#include "TextDocument.hpp"
-#include "TextLine.hpp"
-#include "TextParse.hpp"
-#include <log/log.hpp>
-#include "utf8/UTF8.hpp"
-#include <Style.hpp>
-#include <cassert>
+
+#include <parsers/TextParse.hpp>
#include <FontManager.hpp>
-#include <RawFont.hpp>
-#include <RichTextParser.hpp>
-#include "Lines.hpp"
-#include <DrawCommand.hpp>
+
+#include <Common.hpp>
+#include <log/log.hpp>
#if DEBUG_GUI_TEXT == 1
#define debug_text(...) LOG_DEBUG(__VA_ARGS__)
R module-gui/gui/widgets/Text.hpp => module-gui/gui/widgets/text/Text.hpp +10 -14
@@ 6,23 6,19 @@
#include <memory>
#include <vector>
-#include "Alignment.hpp"
-#include "InputEvent.hpp"
#include "TextConstants.hpp"
#include "utf8/UTF8.hpp"
-#include "BoxLayout.hpp"
-#include "InputMode.hpp"
-#include "Label.hpp"
-#include "Rect.hpp"
-#include "Style.hpp"
-#include "Lines.hpp"
-#include "TextCursor.hpp"
-#include "TextDocument.hpp"
-#include "TextLine.hpp"
-#include "Translator.hpp"
-#include "TextLineCursor.hpp"
-#include "RichTextParser.hpp"
+#include <core/cursors/TextCursor.hpp>
+#include <core/cursors/TextLineCursor.hpp>
+#include <core/lines/Lines.hpp>
+#include <modes/InputMode.hpp>
+#include <core/TextDocument.hpp>
+#include <parsers/RichTextParser.hpp>
+
+#include <Translator.hpp>
+#include <InputEvent.hpp>
+#include <Rect.hpp>
namespace gui
{
R module-gui/gui/widgets/TextBubble.cpp => module-gui/gui/widgets/text/TextBubble.cpp +0 -0
R module-gui/gui/widgets/TextBubble.hpp => module-gui/gui/widgets/text/TextBubble.hpp +0 -0
R module-gui/gui/widgets/TextConstants.hpp => module-gui/gui/widgets/text/TextConstants.hpp +0 -0
R module-gui/gui/widgets/TextFixedSize.cpp => module-gui/gui/widgets/text/TextFixedSize.cpp +0 -1
@@ 2,7 2,6 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <module-gui/gui/core/RawFont.hpp>
#include "TextFixedSize.hpp"
namespace gui
R module-gui/gui/widgets/TextFixedSize.hpp => module-gui/gui/widgets/text/TextFixedSize.hpp +0 -0
R module-gui/gui/widgets/RawText.cpp => module-gui/gui/widgets/text/core/RawText.cpp +0 -0
R module-gui/gui/widgets/RawText.hpp => module-gui/gui/widgets/text/core/RawText.hpp +0 -0
R module-gui/gui/widgets/TextBlock.cpp => module-gui/gui/widgets/text/core/TextBlock.cpp +3 -4
@@ 2,12 2,11 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextBlock.hpp"
-#include "TextConstants.hpp"
-#include <log/log.hpp>
-#include <cassert>
-#include <TextFormat.hpp>
+#include <TextConstants.hpp>
#include <RawFont.hpp>
+#include <log/log.hpp>
+
namespace gui
{
R module-gui/gui/widgets/TextBlock.hpp => module-gui/gui/widgets/text/core/TextBlock.hpp +3 -5
@@ 3,11 3,9 @@
#pragma once
-#include "Color.hpp"
-#include "TextConstants.hpp"
-#include "utf8/UTF8.hpp"
-#include <TextFormat.hpp>
-#include <memory>
+#include <TextConstants.hpp>
+#include <core/TextFormat.hpp>
+#include <utf8/UTF8.hpp>
namespace gui
{
R module-gui/gui/widgets/TextDocument.cpp => module-gui/gui/widgets/text/core/TextDocument.cpp +1 -2
@@ 2,9 2,8 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextDocument.hpp"
+
#include <cassert>
-#include <utility>
-#include <TextFormat.hpp>
namespace gui
{
R module-gui/gui/widgets/TextDocument.hpp => module-gui/gui/widgets/text/core/TextDocument.hpp +3 -3
@@ 3,10 3,10 @@
#pragma once
-#include <list>
-#include <utility>
#include "TextBlock.hpp"
-#include "TextBlockCursor.hpp"
+#include <core/cursors/TextBlockCursor.hpp>
+
+#include <list>
namespace gui
{
R module-gui/gui/widgets/TextFormat.cpp => module-gui/gui/widgets/text/core/TextFormat.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextFormat.hpp"
-#include "RawFont.hpp"
+#include <RawFont.hpp>
namespace gui
{
R module-gui/gui/widgets/TextFormat.hpp => module-gui/gui/widgets/text/core/TextFormat.hpp +2 -2
@@ 3,7 3,7 @@
#pragma once
-#include "Alignment.hpp"
+#include <Alignment.hpp>
#include <Color.hpp>
#include <functional>
#include <string>
@@ 16,7 16,7 @@ namespace gui
{
private:
mutable RawFont *font = nullptr;
- Color color = ColorFullBlack;
+ Color color = ColorFullBlack;
Alignment alignment = Alignment(Alignment::Horizontal::Left);
static constexpr auto setter = [](auto &local, auto &next) {
R module-gui/gui/widgets/TextBlockCursor.cpp => module-gui/gui/widgets/text/core/cursors/TextBlockCursor.cpp +2 -4
@@ 2,11 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextBlockCursor.hpp"
-#include "TextBlock.hpp"
-#include "TextDocument.hpp"
-#include "TextParse.hpp"
+#include <core/TextBlock.hpp>
+#include <core/TextDocument.hpp>
#include <log/log.hpp>
-#include <cassert>
static const int last_char_inclusive = 0; // if then -1 / else 0
R module-gui/gui/widgets/TextBlockCursor.hpp => module-gui/gui/widgets/text/core/cursors/TextBlockCursor.hpp +3 -6
@@ 3,12 3,9 @@
#pragma once
-#include "utf8/UTF8.hpp"
-#include "TextConstants.hpp"
-#include "TextBlock.hpp"
-#include <cstdio>
-#include <stdint.h>
-#include <string>
+#include <TextConstants.hpp>
+#include <core/TextBlock.hpp>
+
#include <list>
namespace gui
R module-gui/gui/widgets/TextCursor.cpp => module-gui/gui/widgets/text/core/cursors/TextCursor.cpp +2 -7
@@ 2,14 2,9 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextCursor.hpp"
-#include "Common.hpp"
-#include "Text.hpp"
-#include "TextBlockCursor.hpp"
-#include "TextDocument.hpp"
+#include <Text.hpp>
+
#include <log/log.hpp>
-#include "TextLine.hpp"
-#include <cassert>
-#include <RawFont.hpp>
#define debug_text_cursor(...)
// #define debug_text_cursor(...) LOG_DEBUG(__VA_ARGS__)
R module-gui/gui/widgets/TextCursor.hpp => module-gui/gui/widgets/text/core/cursors/TextCursor.hpp +5 -5
@@ 3,11 3,11 @@
#pragma once
-#include "Common.hpp"
-#include "Rect.hpp"
-#include "TextConstants.hpp"
-#include "TextDocument.hpp"
-#include <memory>
+#include <TextConstants.hpp>
+#include <core/TextDocument.hpp>
+
+#include <Common.hpp>
+#include <Rect.hpp>
namespace gui
{
R module-gui/gui/widgets/TextLineCursor.cpp => module-gui/gui/widgets/text/core/cursors/TextLineCursor.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextLineCursor.hpp"
-#include "Text.hpp"
+#include <Text.hpp>
#include <log/log.hpp>
#define debug_text_cursor(...)
R module-gui/gui/widgets/TextLineCursor.hpp => module-gui/gui/widgets/text/core/cursors/TextLineCursor.hpp +0 -0
R module-gui/gui/widgets/Lines.cpp => module-gui/gui/widgets/text/core/lines/Lines.cpp +2 -4
@@ 2,9 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "Lines.hpp"
-#include "TextLineCursor.hpp"
-#include "Text.hpp"
-#include "RawFont.hpp"
+#include <text/Text.hpp>
#if DEBUG_GUI_TEXT_LINES == 1
#define debug_text_lines(...) LOG_DEBUG(__VA_ARGS__)
@@ 77,7 75,7 @@ namespace gui
unsigned int linesCount) -> void
{
Position initialTopPadding = lineYPosition;
- Length initHeight = text->getTextFormat().getFont()->info.line_height;
+ Length initHeight = text->getTextFormat().getFont()->info.line_height;
while (true) {
auto textLine = gui::TextLine(drawCursor, w, initHeight, underLineProperties);
R module-gui/gui/widgets/Lines.hpp => module-gui/gui/widgets/text/core/lines/Lines.hpp +1 -11
@@ 3,18 3,8 @@
#pragma once
-#include <memory>
-#include <vector>
-#include <numeric>
-
-#include "Alignment.hpp"
-#include "InputEvent.hpp"
-#include "TextConstants.hpp"
-#include "utf8/UTF8.hpp"
-
-#include "InputMode.hpp"
#include "TextLine.hpp"
-#include "Translator.hpp"
+#include <text/TextConstants.hpp>
namespace gui
{
R module-gui/gui/widgets/TextLine.cpp => module-gui/gui/widgets/text/core/lines/TextLine.cpp +0 -6
@@ 2,12 2,6 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "TextLine.hpp"
-#include "Common.hpp"
-#include "TextBlock.hpp"
-#include "TextDocument.hpp"
-#include "TextCursor.hpp"
-#include <RawFont.hpp>
-#include <numeric>
namespace gui
{
R module-gui/gui/widgets/TextLine.hpp => module-gui/gui/widgets/text/core/lines/TextLine.hpp +6 -5
@@ 3,13 3,14 @@
#pragma once
+#include <core/cursors/TextBlockCursor.hpp>
+#include <core/RawText.hpp>
+
+#include <BoxLayout.hpp>
+#include <Common.hpp>
+
#include <numeric>
#include <list>
-#include "Common.hpp"
-#include "RawText.hpp"
-#include "TextDocument.hpp"
-#include "BoxLayout.hpp"
-#include "TextLineCursor.hpp"
namespace gui
{
R module-gui/gui/widgets/text/HowDoesTextWork.md => module-gui/gui/widgets/text/doc/HowDoesTextWork.md +5 -5
@@ 22,7 22,7 @@ To do so we've decomposed gui::Text item to possibly single responsibility objec
## Visual relationship between classes "on screen"
-
+
## TextCursor movement - how it works?
@@ 43,11 43,11 @@ When changing how removing / adding are seen on screen and react to key presses
#### key handling cases
-
+
#### text movement, addition and remove in action
-
+
## special character input
@@ 56,7 56,7 @@ One of these keys is newline.
### special char selection - how it works example
-
+
## digit input in textual mode
@@ 64,4 64,4 @@ User can input digits while in textual mode with long press of selected digit ke
### Digit long press - how it works example
-
+
R module-gui/gui/widgets/text/digit_long_press.gif => module-gui/gui/widgets/text/doc/digit_long_press.gif +0 -0
R module-gui/gui/widgets/text/document-block-relation.svg => module-gui/gui/widgets/text/doc/document-block-relation.svg +0 -0
R module-gui/gui/widgets/text/how_to_special_char.gif => module-gui/gui/widgets/text/doc/how_to_special_char.gif +0 -0
R module-gui/gui/widgets/text/text-cursor-corner-cases.svg => module-gui/gui/widgets/text/doc/text-cursor-corner-cases.svg +0 -0
R module-gui/gui/widgets/text/text_move_add_remove.gif => module-gui/gui/widgets/text/doc/text_move_add_remove.gif +0 -0
R module-gui/gui/widgets/InputMode.cpp => module-gui/gui/widgets/text/modes/InputMode.cpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <InputMode.hpp>
+#include "InputMode.hpp"
#include <i18n/i18n.hpp>
#include <map>
#include <log/log.hpp>
R module-gui/gui/widgets/InputMode.hpp => module-gui/gui/widgets/text/modes/InputMode.hpp +0 -0
R module-gui/gui/widgets/RichTextParser.cpp => module-gui/gui/widgets/text/parsers/RichTextParser.cpp +8 -10
@@ 2,19 2,17 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "RichTextParser.hpp"
-#include "Color.hpp"
-#include "Font.hpp"
-#include "TextBlock.hpp"
-#include "TextDocument.hpp"
-#include <sstream>
-#include <string>
-#include <map>
-#include <log/log.hpp>
-#include "TextFormat.hpp"
-#include <pugixml.hpp>
+#include <core/TextBlock.hpp>
+#include <core/TextDocument.hpp>
+
+#include <Font.hpp>
#include <Utils.hpp>
#include <utility>
+#include <log/log.hpp>
+
+#include <pugixml.hpp>
+#include <list>
#ifdef DEBUG_RTP
const std::string node_types[] = {"null", "document", "element", "pcdata ", "cdata", "comment", "pi", "declaration"};
R module-gui/gui/widgets/RichTextParser.hpp => module-gui/gui/widgets/text/parsers/RichTextParser.hpp +0 -2
@@ 3,10 3,8 @@
#pragma once
-#include <memory>
#include <map>
#include <utf8/UTF8.hpp>
-#include <string>
#include <variant>
namespace gui
R module-gui/gui/widgets/TextParse.cpp => module-gui/gui/widgets/text/parsers/TextParse.cpp +0 -0
R module-gui/gui/widgets/TextParse.hpp => module-gui/gui/widgets/text/parsers/TextParse.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "TextBlock.hpp"
+#include <core/TextBlock.hpp>
#include <list>
namespace gui
D module-gui/png/mail.png => module-gui/png/mail.png +0 -0
D module-gui/png/phone.png => module-gui/png/phone.png +0 -0
D module-gui/png/pi_lock_info.png => module-gui/png/pi_lock_info.png +0 -0
D module-gui/png/pin_lock.png => module-gui/png/pin_lock.png +0 -0
D module-gui/png/pin_lock_info.png => module-gui/png/pin_lock_info.png +0 -0
D module-gui/svg/battery.svg => module-gui/svg/battery.svg +0 -149
@@ 1,149 0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="44"
- height="24"
- viewBox="0 0 11.641667 6.3500002"
- version="1.1"
- id="svg1545"
- sodipodi:docname="battery.svg"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery5.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <defs
- id="defs1539" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="-33.947557"
- inkscape:cy="-12.073774"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- units="px"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:measure-start="1.8309,22.0971"
- inkscape:measure-end="36.0498,22.0971"
- inkscape:window-width="1853"
- inkscape:window-height="1025"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1">
- <sodipodi:guide
- position="0.48442602,3.2406431"
- orientation="1,0"
- id="guide2115"
- inkscape:locked="false" />
- <sodipodi:guide
- position="9.5381813,4.877669"
- orientation="1,0"
- id="guide2117"
- inkscape:locked="false" />
- <sodipodi:guide
- position="2.0880432,5.8465211"
- orientation="0,1"
- id="guide2119"
- inkscape:locked="false" />
- </sodipodi:namedview>
- <metadata
- id="metadata1542">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-290.64999)">
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51699585;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2184"
- width="11.641667"
- height="6.3500004"
- x="0"
- y="290.64999" />
- <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5301941;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2109"
- width="10.05314"
- height="5.8198643"
- x="0.26506779"
- y="290.91504" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25372639;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2111"
- width="1.0691903"
- height="2.9212737"
- x="10.445614"
- y="292.36435" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06877911;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113"
- width="1.0583334"
- height="4.2333336"
- x="1.0583334"
- y="291.70831"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery0.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06877923;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3"
- width="1.0583334"
- height="4.2333336"
- x="2.9104166"
- y="291.70831"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery1.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06877923;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3-6"
- width="1.0583334"
- height="4.2333336"
- x="4.7625003"
- y="291.70831" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06877923;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3-7"
- width="1.0583334"
- height="4.2333336"
- x="6.6145835"
- y="291.70831"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery3.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06877923;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3-5"
- width="1.0583334"
- height="4.2333336"
- x="8.4666672"
- y="291.70831"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery4.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- </g>
-</svg>
D module-gui/svg/battery0.png => module-gui/svg/battery0.png +0 -0
D module-gui/svg/battery1.png => module-gui/svg/battery1.png +0 -0
D module-gui/svg/battery2.png => module-gui/svg/battery2.png +0 -0
D module-gui/svg/battery3.png => module-gui/svg/battery3.png +0 -0
D module-gui/svg/battery4.png => module-gui/svg/battery4.png +0 -0
D module-gui/svg/battery5.png => module-gui/svg/battery5.png +0 -0
D module-gui/svg/lock.png => module-gui/svg/lock.png +0 -0
D module-gui/svg/mail.svg => module-gui/svg/mail.svg +0 -85
@@ 1,85 0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="34"
- height="31"
- viewBox="0 0 8.9958331 8.2020836"
- version="1.1"
- id="svg921"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="mail.svg"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/mail.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96">
- <defs
- id="defs915" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="-11.418751"
- inkscape:cy="-4.6892651"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- units="px"
- inkscape:window-width="1853"
- inkscape:window-height="1145"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata918">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-288.79791)">
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect1500"
- width="8.9958334"
- height="8.2020836"
- x="0"
- y="288.79791"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/phone.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <g
- id="g913"
- transform="matrix(0.99928034,0,0,1.0000302,10.855773,198.69212)">
- <path
- inkscape:connector-curvature="0"
- id="path907"
- d="m -9.8491391,91.228777 h 7.2983019 l 0.500864,0.500864 v 5.175594 l -0.393536,0.393536 h -7.6679868 l -0.411424,-0.411424 v -5.205408 l 0.432293,-0.432292 z"
- style="fill:none;stroke:#000000;stroke-width:0.5291667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- inkscape:connector-curvature="0"
- id="path909"
- d="m -2.5508372,91.228777 -3.7457373,3.076736 -3.7940525,-3.055866"
- style="fill:none;stroke:#000000;stroke-width:0.5291667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </g>
-</svg>
D module-gui/svg/mountains.png => module-gui/svg/mountains.png +0 -0
D module-gui/svg/phone.svg => module-gui/svg/phone.svg +0 -76
@@ 1,76 0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="31"
- height="31"
- viewBox="0 0 8.2020831 8.2020836"
- version="1.1"
- id="svg921"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="phone.svg">
- <defs
- id="defs915" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="-11.418751"
- inkscape:cy="-4.6892651"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- units="px"
- inkscape:window-width="1853"
- inkscape:window-height="1145"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata918">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-288.79791)">
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect1500"
- width="8.2020836"
- height="8.2020836"
- x="0"
- y="288.79791"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/phone.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
- d="m 1.88362,289.21361 1.450387,1.38293 -0.573409,0.64086 -0.371029,0.40476 0.10119,0.53968 0.3035689,0.77579 0.4047601,0.53968 0.505949,0.43849 0.7420581,0.47222 0.843248,0.30357 0.4384889,-0.0337 0.4722191,-0.43849 0.337299,-0.26984 h 0.2698398 l 1.3154671,1.14682 -0.03373,0.23611 -0.43849,0.64087 -0.472218,0.50594 -0.37103,0.13492 -0.3710281,0.10119 -0.5396799,-0.0337 -0.7757872,-0.16865 -1.1130888,-0.60714 -1.2817361,-0.94443 -1.079359,-1.14682 -0.87697802,-1.24801 -0.505949,-1.31547 0.06746,-0.67459 0.26984002,-0.57341 0.674599,-0.53968 z"
- id="path880-3"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/phone.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- </g>
-</svg>
D module-gui/svg/pin_lock.svg => module-gui/svg/pin_lock.svg +0 -132
@@ 1,132 0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="133"
- height="133"
- viewBox="0 0 35.189584 35.189584"
- version="1.1"
- id="svg941"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/pin_lock.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="pin_lock.svg">
- <defs
- id="defs935" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.49497475"
- inkscape:cx="-540.94748"
- inkscape:cy="-133.65193"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- units="px"
- inkscape:window-width="1853"
- inkscape:window-height="1025"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata938">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-261.81042)"
- sodipodi:insensitive="true">
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91563809;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect1518"
- width="35.189583"
- height="35.189583"
- x="0"
- y="261.81039" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="Layer 2"
- sodipodi:insensitive="true"
- style="display:inline">
- <circle
- transform="translate(0,-261.81042)"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="path831"
- cx="17.594791"
- cy="279.40521"
- r="17.197916" />
- <g
- style="opacity:1"
- id="g916"
- transform="translate(-46.13332,-34.347741)">
- <path
- sodipodi:nodetypes="cssc"
- inkscape:connector-curvature="0"
- id="path833"
- d="m 58.90575,52.91802 c 0,-0.73822 -9.8e-5,-1.16175 -9.6e-5,-1.90951 3e-6,-0.74776 0.606179,-1.35393 1.353935,-1.35393 0.747756,0 1.407207,-0.002 2.114992,-0.002"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5291667;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
- <path
- sodipodi:nodetypes="cssc"
- inkscape:connector-curvature="0"
- id="path833-3"
- d="m 65.851045,49.65258 c 0.73822,0 1.161751,-9.8e-5 1.909511,-9.6e-5 0.74776,3e-6 1.35393,0.606179 1.35393,1.353935 0,0.747756 0.002,1.407207 0.002,2.114992"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5291667;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
- <path
- sodipodi:nodetypes="cssc"
- inkscape:connector-curvature="0"
- id="path884"
- d="m 60.622377,49.367362 c 0,0 0.0051,0.792784 0.0051,-1.016112 0,-1.808897 1.4664,-3.275298 3.275297,-3.275298 1.042206,0 1.970719,0.48678 2.570583,1.245383"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.59315485;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
- <path
- inkscape:connector-curvature="0"
- id="path881"
- d="m 62.374581,187.90257 h 3.476463"
- style="opacity:1;fill:#000000;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- transform="translate(0,-138.24999)" />
- <path
- sodipodi:nodetypes="cccssc"
- inkscape:connector-curvature="0"
- id="path894"
- d="m 58.915754,53.921185 c 0,-2.805689 -0.01,-0.681244 -0.01,-1.655396 M 69.11649,51.430082 c 0,1.691329 -0.04043,-0.01124 -0.04043,2.491101 0,2.805688 -2.27446,5.080148 -5.080149,5.080148 -2.805689,0 -5.080149,-2.27446 -5.080149,-5.080148"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.55532819;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
- <ellipse
- ry="0.66730356"
- rx="0.67268509"
- cy="52.853222"
- cx="63.991184"
- id="path904"
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.71223438;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
- <rect
- y="53.411247"
- x="63.876511"
- height="2.0805652"
- width="0.21857303"
- id="rect907"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.31062084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
- </g>
- </g>
-</svg>
D module-gui/svg/pin_lock_info.svg => module-gui/svg/pin_lock_info.svg +0 -96
@@ 1,96 0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="133"
- height="133"
- viewBox="0 0 35.189584 35.189584"
- version="1.1"
- id="svg941"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/pin_lock.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="pin_lock_info.svg">
- <defs
- id="defs935" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="3.959798"
- inkscape:cx="68.737773"
- inkscape:cy="66.072175"
- inkscape:document-units="px"
- inkscape:current-layer="layer3"
- showgrid="false"
- units="px"
- inkscape:window-width="1853"
- inkscape:window-height="1025"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata938">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-261.81042)"
- sodipodi:insensitive="true">
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91563809;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect1518"
- width="35.189583"
- height="35.189583"
- x="0"
- y="261.81039" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="Layer 2"
- style="display:inline">
- <circle
- transform="translate(0,-261.81042)"
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="path831"
- cx="17.594791"
- cy="279.40521"
- r="17.197916"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/png/pin_lock_info.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.11111164px;line-height:1.25;font-family:'Tlwg Typist';-inkscape-font-specification:'Tlwg Typist';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458335"
- x="17.238886"
- y="23.028822"
- id="text2193"><tspan
- sodipodi:role="line"
- id="tspan2191"
- x="17.238886"
- y="23.028822"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'Century Schoolbook L';-inkscape-font-specification:'Century Schoolbook L';stroke-width:0.26458335">i</tspan></text>
- </g>
-</svg>
D module-gui/svg/signal.svg => module-gui/svg/signal.svg +0 -138
@@ 1,138 0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="37"
- height="24"
- viewBox="0 0 9.7895836 6.3500002"
- version="1.1"
- id="svg1545"
- sodipodi:docname="signal.svg"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery5.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <defs
- id="defs1539" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="10.068944"
- inkscape:cy="14.515741"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- units="px"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:measure-start="1.8309,22.0971"
- inkscape:measure-end="36.0498,22.0971"
- inkscape:window-width="1853"
- inkscape:window-height="1025"
- inkscape:window-x="67"
- inkscape:window-y="27"
- inkscape:window-maximized="1">
- <sodipodi:guide
- position="0.48442602,3.2406431"
- orientation="1,0"
- id="guide2115"
- inkscape:locked="false" />
- <sodipodi:guide
- position="9.5381813,4.877669"
- orientation="1,0"
- id="guide2117"
- inkscape:locked="false" />
- <sodipodi:guide
- position="2.0880432,5.8465211"
- orientation="0,1"
- id="guide2119"
- inkscape:locked="false" />
- </sodipodi:namedview>
- <metadata
- id="metadata1542">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-290.64999)">
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.47409084;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2184"
- width="9.7895832"
- height="6.3500004"
- x="9.5367432e-07"
- y="290.64999" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.42247203;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113"
- width="1.3229167"
- height="0.5291667"
- x="0"
- y="296.47083"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery0.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.73174304;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3"
- width="1.3229167"
- height="1.5875001"
- x="2.1166668"
- y="295.41251"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery0.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03484094;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3-6"
- width="1.3229167"
- height="3.1750002"
- x="4.2333336"
- y="293.82498"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery0.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.26741612;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3-7"
- width="1.3229167"
- height="4.7625003"
- x="6.3500004"
- y="292.23749"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery0.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <rect
- style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.46348608;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
- id="rect2113-3-5"
- width="1.3229167"
- height="6.3500004"
- x="8.4666672"
- y="290.64999"
- inkscape:export-filename="/home/robert/git/PurePhone/module-gui/svg/battery0.png"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- </g>
-</svg>
D module-gui/svg/signal0.png => module-gui/svg/signal0.png +0 -0
D module-gui/svg/signal1.png => module-gui/svg/signal1.png +0 -0
D module-gui/svg/signal2.png => module-gui/svg/signal2.png +0 -0
D module-gui/svg/signal3.png => module-gui/svg/signal3.png +0 -0
D module-gui/svg/signal4.png => module-gui/svg/signal4.png +0 -0
D module-gui/svg/signal5.png => module-gui/svg/signal5.png +0 -0
M module-gui/test/mock/BlockFactory.hpp => module-gui/test/mock/BlockFactory.hpp +3 -3
@@ 3,9 3,9 @@
#pragma once
-#include "mock/InitializedFontManager.hpp"
-#include <module-gui/gui/widgets/TextBlock.hpp>
-#include <list>
+#include <widgets/text/core/TextBlock.hpp>
+
+#include <mock/InitializedFontManager.hpp>
#include <map>
namespace mockup
M module-gui/test/mock/buildTextDocument.cpp => module-gui/test/mock/buildTextDocument.cpp +3 -3
@@ 2,10 2,10 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "buildTextDocument.hpp"
-#include "TextDocument.hpp"
-#include "multi-line-string.hpp"
-#include <module-gui/gui/widgets/TextParse.hpp>
#include "InitializedFontManager.hpp"
+#include "multi-line-string.hpp"
+
+#include <widgets/text/parsers/TextParse.hpp>
namespace mockup
{
M module-gui/test/mock/buildTextDocument.hpp => module-gui/test/mock/buildTextDocument.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include "TextDocument.hpp"
+#include <widgets/text/core/TextDocument.hpp>
namespace mockup
{
M module-gui/test/test-catch-text/test-gui-Text.cpp => module-gui/test/test-catch-text/test-gui-Text.cpp +9 -15
@@ 1,24 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 "BoundingBox.hpp"
-#include "BoxLayout.hpp"
-#include "Common.hpp"
#include "InitializedFontManager.hpp"
-#include "TextParse.hpp"
-#include <i18n/i18n.hpp>
-#include "mock/InitializedFontManager.hpp"
-#include <catch2/catch.hpp>
-#include <limits>
-#include <module-gui/gui/widgets/Text.hpp>
+#include <widgets/text/parsers/TextParse.hpp>
+#include <widgets/text/parsers/RichTextParser.hpp>
+#include <widgets/text/Text.hpp>
+#include <widgets/text/TextFixedSize.hpp>
+
#include <mock/multi-line-string.hpp>
-#include <algorithm>
-#include <mock/BlockFactory.hpp>
-#include <RawFont.hpp>
-#include "Font.hpp"
-#include "RichTextParser.hpp"
-#include "TextFixedSize.hpp"
+#include <i18n/i18n.hpp>
+#include <Font.hpp>
+
+#include <catch2/catch.hpp>
TEST_CASE("Text ctor")
{
M module-gui/test/test-catch-text/test-gui-TextBlock.cpp => module-gui/test/test-catch-text/test-gui-TextBlock.cpp +3 -3
@@ 1,10 1,10 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <catch2/catch.hpp>
-#include <limits>
-#include <module-gui/gui/widgets/TextBlock.hpp>
#include "InitializedFontManager.hpp"
+#include <widgets/text/core/TextBlock.hpp>
+
+#include <catch2/catch.hpp>
TEST_CASE("TextBlock Ctor/Dtor ")
{
M module-gui/test/test-catch-text/test-gui-TextBlockCursor.cpp => module-gui/test/test-catch-text/test-gui-TextBlockCursor.cpp +3 -3
@@ 1,11 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 <catch2/catch.hpp>
-#include <limits>
-#include <module-gui/gui/widgets/TextBlock.hpp>
+#include <widgets/text/core/TextBlock.hpp>
#include <mock/buildTextDocument.hpp>
+#include <catch2/catch.hpp>
+
TEST_CASE("Text BlockCursor Ctor/Dtor ")
{
using namespace gui;
M module-gui/test/test-catch-text/test-gui-TextDocument.cpp => module-gui/test/test-catch-text/test-gui-TextDocument.cpp +5 -5
@@ 1,14 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 "TextParse.hpp"
-#include <catch2/catch.hpp>
-#include <limits>
-#include <module-gui/gui/widgets/TextDocument.hpp>
-#include <sstream>
+#include <widgets/text/parsers/TextParse.hpp>
+#include <widgets/text/core/TextDocument.hpp>
+
#include <mock/multi-line-string.hpp>
#include <mock/buildTextDocument.hpp>
+#include <catch2/catch.hpp>
+
TEST_CASE("TextDocument ctor")
{
using namespace gui;
M module-gui/test/test-catch-text/test-gui-TextFixedSize.cpp => module-gui/test/test-catch-text/test-gui-TextFixedSize.cpp +3 -3
@@ 1,11 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 <catch2/catch.hpp>
-
-#include <module-gui/gui/widgets/TextFixedSize.hpp>
+#include <widgets/text/TextFixedSize.hpp>
#include <module-gui/test/mock/InitializedFontManager.hpp>
+#include <catch2/catch.hpp>
+
namespace gui
{
class TestTextFixedSize : public TextFixedSize
M module-gui/test/test-catch-text/test-gui-TextLine.cpp => module-gui/test/test-catch-text/test-gui-TextLine.cpp +5 -8
@@ 2,18 2,15 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "InitializedFontManager.hpp"
-#include <catch2/catch.hpp>
-#include <limits>
-#include <memory>
-#include <sstream>
-#include <limits>
-#include <module-gui/gui/widgets/TextLine.hpp>
+
+#include <widgets/text/Text.hpp>
+#include <widgets/text/core/lines/TextLine.hpp>
#include <mock/buildTextDocument.hpp>
#include <mock/multi-line-string.hpp>
#include <mock/BlockFactory.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
-#include <Text.hpp>
+
+#include <catch2/catch.hpp>
const auto maxWidth = std::numeric_limits<unsigned int>().max();
M module-gui/test/test-catch-text/test-gui-TextLineCursor.cpp => module-gui/test/test-catch-text/test-gui-TextLineCursor.cpp +4 -4
@@ 1,15 1,15 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <catch2/catch.hpp>
-#include <limits>
-#include <module-gui/gui/widgets/TextBlock.hpp>
+#include <widgets/text/Text.hpp>
+#include <widgets/text/core/TextBlock.hpp>
#include <mock/buildTextDocument.hpp>
-#include <module-gui/gui/widgets/Text.hpp>
#include <mock/multi-line-string.hpp>
#include "Font.hpp"
#include "InitializedFontManager.hpp"
+#include <catch2/catch.hpp>
+
namespace gui
{
class TestText : public Text
M module-gui/test/test-catch-text/test-gui-TextParse.cpp => module-gui/test/test-catch-text/test-gui-TextParse.cpp +3 -4
@@ 1,12 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 <catch2/catch.hpp>
-#include <limits>
-#include <module-gui/gui/widgets/TextParse.hpp>
-#include <sstream>
+#include <widgets/text/parsers/TextParse.hpp>
#include <mock/multi-line-string.hpp>
+#include <catch2/catch.hpp>
+
TEST_CASE("TextParse")
{
using namespace gui;
M products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp => products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp +1 -1
@@ 9,7 9,7 @@
#include <data/BellAlarmStyle.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
-#include <module-gui/gui/widgets/TextFixedSize.hpp>
+#include <module-gui/gui/widgets/text/TextFixedSize.hpp>
#include <module-gui/gui/widgets/ThreeBox.hpp>
#include <common/windows/BellFinishedWindow.hpp>
M products/BellHybrid/apps/application-bell-bedtime/windows/BellBedtimeWindow.cpp => products/BellHybrid/apps/application-bell-bedtime/windows/BellBedtimeWindow.cpp +1 -1
@@ 9,7 9,7 @@
#include <data/BellBedtimeStyle.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
-#include <module-gui/gui/widgets/TextFixedSize.hpp>
+#include <module-gui/gui/widgets/text/TextFixedSize.hpp>
#include <module-gui/gui/widgets/ThreeBox.hpp>
#include <module-gui/gui/widgets/Image.hpp>
M products/BellHybrid/apps/application-bell-main/widgets/BellBattery.hpp => products/BellHybrid/apps/application-bell-main/widgets/BellBattery.hpp +1 -1
@@ 6,7 6,7 @@
#include "BoxLayout.hpp"
#include <EventStore.hpp>
#include <gui/widgets/Image.hpp>
-#include <gui/widgets/TextFixedSize.hpp>
+#include <gui/widgets/text/TextFixedSize.hpp>
namespace gui
{
M products/BellHybrid/apps/application-bell-main/widgets/SnoozeTimer.hpp => products/BellHybrid/apps/application-bell-main/widgets/SnoozeTimer.hpp +2 -2
@@ 5,8 5,8 @@
#include <gui/widgets/BoxLayout.hpp>
#include <gui/widgets/Style.hpp>
-#include <gui/widgets/TextFixedSize.hpp>
-#include <gui/widgets/TextConstants.hpp>
+#include <gui/widgets/text/TextFixedSize.hpp>
+#include <gui/widgets/text/TextConstants.hpp>
#include <time/time_locale.hpp>
#include <string>
M products/BellHybrid/apps/application-bell-main/windows/BellBatteryStatusWindow.cpp => products/BellHybrid/apps/application-bell-main/windows/BellBatteryStatusWindow.cpp +1 -1
@@ 4,7 4,7 @@
#include "BellBatteryStatusWindow.hpp"
#include "data/BatteryUtils.hpp"
-#include <gui/widgets/TextFixedSize.hpp>
+#include <gui/widgets/text/TextFixedSize.hpp>
#include <gui/widgets/ImageBox.hpp>
#include <gui/input/InputEvent.hpp>
#include <Application.hpp>
M products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp => products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp +1 -1
@@ 10,7 10,7 @@
#include <apps-common/widgets/BellBaseLayout.hpp>
#include <apps-common/actions/AlarmRingingData.hpp>
#include <gui/input/InputEvent.hpp>
-#include <gui/widgets/TextFixedSize.hpp>
+#include <gui/widgets/text/TextFixedSize.hpp>
#include <gui/widgets/Style.hpp>
#include <i18n/i18n.hpp>
#include <service-db/DBNotificationMessage.hpp>
M products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp => products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp +1 -1
@@ 8,7 8,7 @@
#include <gui/widgets/ListViewEngine.hpp>
#include <gui/widgets/Style.hpp>
-#include <gui/widgets/Text.hpp>
+#include <gui/widgets/text/Text.hpp>
#include <service-time/Constants.hpp>
#include <service-time/api/TimeSettingsApi.hpp>
#include <service-time/service-time/TimeMessage.hpp>
M products/BellHybrid/apps/application-bell-settings/widgets/advanced/AboutYourBellListItem.hpp => products/BellHybrid/apps/application-bell-settings/widgets/advanced/AboutYourBellListItem.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include <ListItem.hpp>
-#include <module-gui/gui/widgets/RichTextParser.hpp>
+#include <module-gui/gui/widgets/text/parsers/RichTextParser.hpp>
namespace gui
{
M products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp => products/BellHybrid/apps/common/src/windows/BellWelcomeWindow.cpp +1 -1
@@ 6,7 6,7 @@
#include <apps-common/widgets/BellBaseLayout.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
-#include <module-gui/gui/widgets/TextFixedSize.hpp>
+#include <module-gui/gui/widgets/text/TextFixedSize.hpp>
#include <i18n/i18n.hpp>
namespace gui
