From e833690c8fe244bd215ac54667d924db1f012c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jo=C5=84ski?= Date: Tue, 15 Mar 2022 16:54:58 +0100 Subject: [PATCH] [MOS-288] Add community build Add community build Add targets for community fonts --- CMakeLists.txt | 1 + cmake/modules/ProjectConfig.cmake | 5 + doc/ProjectConfig.md | 6 + doc/fonts.md | 43 +++++ doc/quickstart.md | 8 +- image/CMakeLists.txt | 17 +- .../assets/certification_info/Deutsch/sar.txt | 16 +- .../assets/certification_info/English/sar.txt | 16 +- .../assets/certification_info/Espanol/sar.txt | 16 +- .../assets/certification_info/Polski/sar.txt | 16 +- image/assets/lang/Deutsch.json | 24 +-- image/assets/lang/English.json | 24 +-- image/assets/lang/Espanol.json | 24 +-- image/assets/lang/Francais.json | 24 +-- image/assets/lang/Polski.json | 24 +-- image/assets/lang/Svenska.json | 6 +- image/assets/licenses/Deutsch/eula.txt | 2 +- image/assets/licenses/English/eula.txt | 2 +- image/assets/licenses/Espanol/eula.txt | 2 +- image/assets/licenses/Polski/eula.txt | 2 +- .../windows/advanced/UITestWindow.cpp | 2 +- module-gui/gui/core/Font.cpp | 8 +- module-gui/gui/core/Font.hpp | 4 - module-gui/gui/core/FontManager.cpp | 148 +++++++++++++----- module-gui/gui/core/FontManager.hpp | 19 ++- module-gui/gui/widgets/Style.hpp | 42 ++--- module-gui/gui/widgets/status-bar/Style.hpp | 10 +- .../test/test-catch-text/CMakeLists.txt | 21 ++- .../test/test-catch-text/test-gui-Font.cpp | 2 +- .../test/test-catch-text/test-gui-Text.cpp | 11 +- module-utils/log/api/log/debug.hpp | 2 +- products/BellHybrid/CMakeLists.txt | 42 +++-- .../data/BellSettingsStyle.hpp | 6 +- .../assets_common.json} | 0 .../BellHybrid/assets/assets_community.json | 99 ++++++++++++ .../assets_proprietary.json} | 32 ++-- products/BellHybrid/assets/assets_rt1051.json | 11 ++ products/PurePhone/CMakeLists.txt | 43 +++-- .../assets_common.json} | 0 .../PurePhone/assets/assets_community.json | 99 ++++++++++++ .../assets_proprietary.json} | 39 +++-- products/PurePhone/assets/assets_rt1051.json | 11 ++ test/CMakeLists.txt | 32 +++- test/assets/assets_community.json | 99 ++++++++++++ .../assets_proprietary.json} | 37 +++-- 45 files changed, 812 insertions(+), 285 deletions(-) create mode 100644 doc/fonts.md rename products/BellHybrid/{assets_images.json => assets/assets_common.json} (100%) create mode 100644 products/BellHybrid/assets/assets_community.json rename products/BellHybrid/{assets.json => assets/assets_proprietary.json} (64%) create mode 100644 products/BellHybrid/assets/assets_rt1051.json rename products/PurePhone/{assets_images.json => assets/assets_common.json} (100%) create mode 100644 products/PurePhone/assets/assets_community.json rename products/PurePhone/{assets.json => assets/assets_proprietary.json} (59%) create mode 100644 products/PurePhone/assets/assets_rt1051.json create mode 100644 test/assets/assets_community.json rename test/{assets.json => assets/assets_proprietary.json} (50%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1149c0403717b4d08ec12f5f1dd99245c3d3bf6..0a7450eb853cde0ae4541161f044d0ffa13e5a23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,7 @@ message("Selected product: ${PRODUCT}") message("Selected board: ${BOARD}") message("Board revision: ${BOARD_REVISION}") message("PROJECT_TARGET: ${PROJECT_TARGET}") +message("Assets version: ${ASSETS_TYPE}") message("Version: ${OS_VERSION_MAJOR}.${OS_VERSION_MINOR}.${OS_VERSION_PATCH}-${OS_VERSION_LABEL}") string(REPLACE "TARGET_" "" PROJECT_TARGET_NAME ${PROJECT_TARGET}) diff --git a/cmake/modules/ProjectConfig.cmake b/cmake/modules/ProjectConfig.cmake index 641b357a9831b3a2e0aa98094a9a54fb02b2b31b..e3ccd274439632bcfa7a1a7090ead96d6514c2ca 100644 --- a/cmake/modules/ProjectConfig.cmake +++ b/cmake/modules/ProjectConfig.cmake @@ -5,6 +5,11 @@ else() set (LOG_USE_COLOR 1 CACHE INTERNAL "") endif() +set(ASSETS_TYPE "Proprietary" CACHE INTERNAL "") +if (NOT ${ASSETS_TYPE} STREQUAL "Proprietary" AND NOT ${ASSETS_TYPE} STREQUAL "Community") + message(FATAL_ERROR " Unknown ASSETS_TYPE value: ${ASSETS_TYPE} - allowed values: Propertiary, Community") +endif() + # add LOG_SENSITIVE_DATA enable option option(LOG_SENSITIVE_DATA "LOG_SENSITIVE_DATA" ON) if (${LOG_SENSITIVE_DATA} STREQUAL "ON") diff --git a/doc/ProjectConfig.md b/doc/ProjectConfig.md index c588b1e0c405bc68eb4e9b5dfd4a9cf7b9e0aff2..672f408ca0cffe0d5f315515500bbb2c6afe2c3d 100644 --- a/doc/ProjectConfig.md +++ b/doc/ProjectConfig.md @@ -86,3 +86,9 @@ Following configurations are for: [lwext4](third-party/lwext4/) - third party ex - `ENABLE_DEVELOPER_MODE_ENDPOINT_DEFAULT` - `LOG_SENSITIVE_DATA_ENABLED` default: `OFF` + +# Proprietary/Community build +- option `ASSETS_TYPE` default `Proprietary` + +Setting to `Community` disables the download of proprietary files which are unaccessable for the community +and disables tests basing on those files diff --git a/doc/fonts.md b/doc/fonts.md new file mode 100644 index 0000000000000000000000000000000000000000..4ae828cd5a2346bd2d1008154ff472b9b5dc9e6f --- /dev/null +++ b/doc/fonts.md @@ -0,0 +1,43 @@ +# Fonts management + +## Fonts format +MuditaOS uses its own fonts binary format with extension .mpf. +Fonts can be converted from popular formats (ie otf, ttf) to this format via converter tool: https://github.com/mudita/fontbuilder + +Reasons to use specific binary format: +- reduce workload on CPU since it has no GPU unit +- reduce size of fonts both on disk and in RAM +## Fonts source +Fonts are assets which are downloaded from separate repositories using `download_assets.py` script (see more: [download assets documentation](../doc/download_assets.md)). Basing on configuration (Community/Proprietary) fonts will be downloaded from two different repositories. + +## Fonts mapping +Regardless of the source, both assets packages contain file fontmap.json, mapping font files to font types used in MuditaOS code. + +Full example can be found in public assets repo: https://github.com/mudita/MuditaOSPublicAssets/blob/master/image/assets/fonts/fontmap.json + +Short example: +``` +{ + "info" : { + "default_font_name" : "dejavu_sans_bold_27", + "default_font_type_name" : "dejavu_sans" + }, + "style": { + "mediumboldtitle": "dejavu_sans/dejavu_sans_bold_27.mpf", + ... + } +} +``` +There are two values in `info` part: +- `default_font_name` - fallback font in case of inability to load specified font +- `default_font_type_name` - default font family name used in methods which specify only size and weight of a font + + +Every key in `style` part defines font type to be used in fonts list in MuditaOS, which later can be used in `FontManager::getFont` method (ie `getFont("supersizemelight")`) + +## Fonts usage in MuditaOS + +FontManager loads all fonts based on `fontmap.json`. These can be later accessed in GUI methods, specifically via: +- `getFont(std::string fontType)` - returns font as `RawFont*` basing on font type (ie `verysmall`, `supersizemelight`) +- `getFontByName(std::string fontName)` - returns font as `RawFont*` basing on font name from font descriptor (ie. `dejavu_sans_regular_20`, `dejavu_sans_light_90`) + diff --git a/doc/quickstart.md b/doc/quickstart.md index e79ca4e4d744b9ef07c69a51f785124ba727a580..cffa91c661be0889ba246e7c0505c72815452248 100644 --- a/doc/quickstart.md +++ b/doc/quickstart.md @@ -102,13 +102,13 @@ We are using J-Link driver in version J-Link v634f ([Ubuntu download](https://ww #### Add GitHub token -We are storing assets on github pages and these are downloaded automatically before software images are built. Please follow github token configuration here: [download assets documentation](../doc/download_asset.py) #### Project configuration To configure project we have helper script: `./configure.sh` which essentially passes through basic cmake configuration for each product for each platform. We highly advise using `ninja` as it has proven better compilation times over make. +To build MuditaOS with no access to proprietary files, please specify cmake flag: `-DASSETS_TYPE=Community` The script can be run with the following parameters: ``` @@ -138,6 +138,12 @@ __Examples:__ ./configure.sh bell linux debug "-G Ninja" ``` +4. building bell for linux platform with ninja and only community assets + +``` +./configure.sh bell linux debug -DASSETS_TYPE=Community "-G Ninja" +``` + #### Project build Each run of `configure.sh` creates `build-{PRODUCT}-{PLATFORM}-{OPTMALIZAION}` folder, i.e.: `build-PurePhone-rt1051-RelWithDebInfo` diff --git a/image/CMakeLists.txt b/image/CMakeLists.txt index 4e6f4d315ab680ab28f283d710826ebb5a77c681..92bc5f8721aa8fc14bea06bd64d57a76bd47e701 100644 --- a/image/CMakeLists.txt +++ b/image/CMakeLists.txt @@ -4,12 +4,27 @@ include(Utils) set(SYSROOT ${CMAKE_BINARY_DIR}/sysroot) set(ASSETS_DEST_DIR ${SYSROOT}/sys) +set(ASSETS_DEPENDENCIES "json-common-target") + +if (${ASSETS_TYPE} STREQUAL "Proprietary") + list(APPEND ASSETS_DEPENDENCIES "json-proprietary-target") +endif() + +if (${ASSETS_TYPE} STREQUAL "Community") + list(APPEND ASSETS_DEPENDENCIES "json-community-target") +endif() + +if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051") + list(APPEND ASSETS_DEPENDENCIES "json-json-rt1051-target") +endif() + add_assets_target( TARGET assets SOURCE_DIR ${ASSETS_SOURCE_DIR} DEST_DIR ${ASSETS_DEST_DIR} DEVEL ${WITH_DEVELOPMENT_FEATURES} - DEPENDS json-target json-images-target + DEPENDS + ${ASSETS_DEPENDENCIES} ) multicomp_install( diff --git a/image/assets/certification_info/Deutsch/sar.txt b/image/assets/certification_info/Deutsch/sar.txt index 49cbe6cb675573233bcddee0bef6412a4c591ef4..bc04358e44d5b586ebec06c31aaba2a6a857c6aa 100755 --- a/image/assets/certification_info/Deutsch/sar.txt +++ b/image/assets/certification_info/Deutsch/sar.txt @@ -1,19 +1,19 @@ - +

THE EQUIPMENT MEETS INTERNATIONAL REQUIREMENTS FOR EXPOSURE TO RADIO WAVES. The mobile phone is a radio frequency receiver/transmitter.



Mudita Pure has been designed to minimize exposure to radio waves (radio frequency electromagnetic fields) as defined by international guidelines, while maintaining signal integrity. These guidelines have been developed by an independent scientific institution (ICNIRP) and provide a basic safety margin to ensure the safety of all users regardless of age or health.



Exposure to radio waves is expressed in a rate called Specific Absorption Rate (SAR).

-

The maximum SAR value for Mudita Pure:

 -1,6 W/kg (over 1 g) SAR Limit

-

American Standard ANSI C95.1 (ANSI 1992)

 -

Head: 0,08

+

The maximum SAR value for Mudita Pure:

 +1,6 W/kg (over 1 g) SAR Limit

+

American Standard ANSI C95.1 (ANSI 1992)

 +

Head: 0,08

Body: 0,08

-2,0 W/kg (over 10 g) SAR Limit

-

ICNIRP Guidelines 1998 (ICNIRP 1998)

 -

Head: 0,08

+2,0 W/kg (over 10 g) SAR Limit

+

ICNIRP Guidelines 1998 (ICNIRP 1998)

 +

Head: 0,08

Body: 0,08



During use, the actual SAR values for this device are significantly lower than those given above, because the power consumption of the mobile phone is automatically reduced if full power is not required to make a call, due to system performance and minimized network interference. The lower the power consumption of this device, the lower the SAR value.

diff --git a/image/assets/certification_info/English/sar.txt b/image/assets/certification_info/English/sar.txt index 49cbe6cb675573233bcddee0bef6412a4c591ef4..bc04358e44d5b586ebec06c31aaba2a6a857c6aa 100755 --- a/image/assets/certification_info/English/sar.txt +++ b/image/assets/certification_info/English/sar.txt @@ -1,19 +1,19 @@ - +

THE EQUIPMENT MEETS INTERNATIONAL REQUIREMENTS FOR EXPOSURE TO RADIO WAVES. The mobile phone is a radio frequency receiver/transmitter.



Mudita Pure has been designed to minimize exposure to radio waves (radio frequency electromagnetic fields) as defined by international guidelines, while maintaining signal integrity. These guidelines have been developed by an independent scientific institution (ICNIRP) and provide a basic safety margin to ensure the safety of all users regardless of age or health.



Exposure to radio waves is expressed in a rate called Specific Absorption Rate (SAR).

-

The maximum SAR value for Mudita Pure:

 -1,6 W/kg (over 1 g) SAR Limit

-

American Standard ANSI C95.1 (ANSI 1992)

 -

Head: 0,08

+

The maximum SAR value for Mudita Pure:

 +1,6 W/kg (over 1 g) SAR Limit

+

American Standard ANSI C95.1 (ANSI 1992)

 +

Head: 0,08

Body: 0,08

-2,0 W/kg (over 10 g) SAR Limit

-

ICNIRP Guidelines 1998 (ICNIRP 1998)

 -

Head: 0,08

+2,0 W/kg (over 10 g) SAR Limit

+

ICNIRP Guidelines 1998 (ICNIRP 1998)

 +

Head: 0,08

Body: 0,08



During use, the actual SAR values for this device are significantly lower than those given above, because the power consumption of the mobile phone is automatically reduced if full power is not required to make a call, due to system performance and minimized network interference. The lower the power consumption of this device, the lower the SAR value.

diff --git a/image/assets/certification_info/Espanol/sar.txt b/image/assets/certification_info/Espanol/sar.txt index 49cbe6cb675573233bcddee0bef6412a4c591ef4..bc04358e44d5b586ebec06c31aaba2a6a857c6aa 100755 --- a/image/assets/certification_info/Espanol/sar.txt +++ b/image/assets/certification_info/Espanol/sar.txt @@ -1,19 +1,19 @@ - +

THE EQUIPMENT MEETS INTERNATIONAL REQUIREMENTS FOR EXPOSURE TO RADIO WAVES. The mobile phone is a radio frequency receiver/transmitter.



Mudita Pure has been designed to minimize exposure to radio waves (radio frequency electromagnetic fields) as defined by international guidelines, while maintaining signal integrity. These guidelines have been developed by an independent scientific institution (ICNIRP) and provide a basic safety margin to ensure the safety of all users regardless of age or health.



Exposure to radio waves is expressed in a rate called Specific Absorption Rate (SAR).

-

The maximum SAR value for Mudita Pure:

 -1,6 W/kg (over 1 g) SAR Limit

-

American Standard ANSI C95.1 (ANSI 1992)

 -

Head: 0,08

+

The maximum SAR value for Mudita Pure:

 +1,6 W/kg (over 1 g) SAR Limit

+

American Standard ANSI C95.1 (ANSI 1992)

 +

Head: 0,08

Body: 0,08

-2,0 W/kg (over 10 g) SAR Limit

-

ICNIRP Guidelines 1998 (ICNIRP 1998)

 -

Head: 0,08

+2,0 W/kg (over 10 g) SAR Limit

+

ICNIRP Guidelines 1998 (ICNIRP 1998)

 +

Head: 0,08

Body: 0,08



During use, the actual SAR values for this device are significantly lower than those given above, because the power consumption of the mobile phone is automatically reduced if full power is not required to make a call, due to system performance and minimized network interference. The lower the power consumption of this device, the lower the SAR value.

diff --git a/image/assets/certification_info/Polski/sar.txt b/image/assets/certification_info/Polski/sar.txt index 49cbe6cb675573233bcddee0bef6412a4c591ef4..bc04358e44d5b586ebec06c31aaba2a6a857c6aa 100755 --- a/image/assets/certification_info/Polski/sar.txt +++ b/image/assets/certification_info/Polski/sar.txt @@ -1,19 +1,19 @@ - +

THE EQUIPMENT MEETS INTERNATIONAL REQUIREMENTS FOR EXPOSURE TO RADIO WAVES. The mobile phone is a radio frequency receiver/transmitter.



Mudita Pure has been designed to minimize exposure to radio waves (radio frequency electromagnetic fields) as defined by international guidelines, while maintaining signal integrity. These guidelines have been developed by an independent scientific institution (ICNIRP) and provide a basic safety margin to ensure the safety of all users regardless of age or health.



Exposure to radio waves is expressed in a rate called Specific Absorption Rate (SAR).

-

The maximum SAR value for Mudita Pure:

 -1,6 W/kg (over 1 g) SAR Limit

-

American Standard ANSI C95.1 (ANSI 1992)

 -

Head: 0,08

+

The maximum SAR value for Mudita Pure:

 +1,6 W/kg (over 1 g) SAR Limit

+

American Standard ANSI C95.1 (ANSI 1992)

 +

Head: 0,08

Body: 0,08

-2,0 W/kg (over 10 g) SAR Limit

-

ICNIRP Guidelines 1998 (ICNIRP 1998)

 -

Head: 0,08

+2,0 W/kg (over 10 g) SAR Limit

+

ICNIRP Guidelines 1998 (ICNIRP 1998)

 +

Head: 0,08

Body: 0,08



During use, the actual SAR values for this device are significantly lower than those given above, because the power consumption of the mobile phone is automatically reduced if full power is not required to make a call, due to system performance and minimized network interference. The lower the power consumption of this device, the lower the SAR value.

diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json index 23a5c8c0db4ab75bec86b597e6e91a755da6d88d..ff5fbfa8d4a36951c977fb355c7f7d0dde51a27e 100644 --- a/image/assets/lang/Deutsch.json +++ b/image/assets/lang/Deutsch.json @@ -270,8 +270,8 @@ "sim_card_pin_enabled": "PIN für SIM-Karte aktiviert", "sim_card_cant_connect": "Keine Verbindung mit $SIM-Karte möglich.

Bitte Karte einsetzen.", "sim_card_not_ready": "Warten auf Start des Modems.

Dies kann einen Moment dauern.", - "app_desktop_press_to_unlock": "Entsperren drücken und dann #", - "app_desktop_press_to_complete_unlock": "Drücke # zum Entsperren", + "app_desktop_press_to_unlock": "Entsperren drücken und dann #", + "app_desktop_press_to_complete_unlock": "Drücke # zum Entsperren", "app_desktop_unread_messages": "Ungelesene Nachrichten", "app_desktop_missed_calls": "Verpasste Anrufe", "app_desktop_menu_phone": "ANRUFE", @@ -335,7 +335,7 @@ "app_messages_thread_not_sent": "Nicht gesendet: ", "app_messages_thread_you": "Sie: ", "app_onboarding_title": "Einführung", - "app_onboarding_start_configuration": "

Hallo!



Konfigurieren wir gemeinsam Ihr

Mudita Pure.", + "app_onboarding_start_configuration": "

Hallo!



Konfigurieren wir gemeinsam Ihr

Mudita Pure.", "app_onboarding_eula_license": "Lizenzvereinbarung (EULA)", "app_onboarding_select_sim": "Aktive SIM auswählen", "app_onboarding_select_sim_description": "Es kann immer nur eine SIM-Karte aktiv sein.

Sie können diese jetzt auswählen und bei Bedarf

in den Einstellungen wechseln.", @@ -346,7 +346,7 @@ "app_onboarding_skip_confirm": "SIM-Einrichtung ist für die Netzwerkverbindung erforderlich. Einrichtung trotzdem überspringen? ", "app_onboarding_configuration_successful": "Ihr Mudita Pure

ist jetzt einsatzbereit.", "app_onboarding_no_configuration": "Ihr Mudita Pure wurde noch nicht

konfiguriert. Sie können es in den

Einstellungen einrichten.", - "app_onboarding_update_info": "Die aktuelle Version von MuditaOS ist

$VERSION.

Updates mit neuen Funktionen und Fehlerbehebungen erfolgen häufig.

Um Ihr Telefon zu aktualisieren, besuchen Sie bitte:

www.mudita.com/updateos

und folgen Sie den Anweisungen.", + "app_onboarding_update_info": "Die aktuelle Version von MuditaOS ist

$VERSION.

Updates mit neuen Funktionen und Fehlerbehebungen erfolgen häufig.

Um Ihr Telefon zu aktualisieren, besuchen Sie bitte:

www.mudita.com/updateos

und folgen Sie den Anweisungen.", "app_settings_title_main": "Einstellungen", "app_settings_advanced": "Fortgeschritten", "app_settings_bt": "Bluetooth", @@ -357,10 +357,10 @@ "app_settings_bluetooth_phone_name": "Name des Telefons", "app_settings_bluetooth_phone_visibility": "Sichtbarkeit des Telefons", "app_settings_bluetooth_enter_passkey": "Passkey eingeben:", - "app_settings_bluetooth_init_error_message": "Bluetooth-Initialisierungsprozess fehlgeschlagen.", - "app_settings_bluetooth_pairing_error_message": " Kopplungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", - "app_settings_bluetooth_unpairing_error_message": " Entkopplungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", - "app_settings_bluetooth_connecting_error_message": " Verbindungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", + "app_settings_bluetooth_init_error_message": "Bluetooth-Initialisierungsprozess fehlgeschlagen.", + "app_settings_bluetooth_pairing_error_message": " Kopplungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", + "app_settings_bluetooth_unpairing_error_message": " Entkopplungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", + "app_settings_bluetooth_connecting_error_message": " Verbindungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", "app_settings_net": "Netzwerk", "app_settings_disp_key": "Display und Tastenfeld", "app_settings_display_display_light": "Displaylicht", @@ -631,10 +631,10 @@ "app_bell_background_sounds_timer_title": "Timer", "app_bell_background_sounds_timer_off": "AUS", "app_bell_onboarding_welcome_message": "Mudita Harmony
ist ausgeschaltet", - "app_bell_onboarding_info_rotate": "Drehen um auszuwählen", - "app_bell_onboarding_info_light_click": "Leichter Klick um fortzufahren", - "app_bell_onboarding_info_deep_click_warning": "Sie haben tief gedrückt", - "app_bell_onboarding_info_deep_click_correction": "Seien Sie sanfter,

versuchen Sie diesmal leicht klicken", + "app_bell_onboarding_info_rotate": "Drehen um auszuwählen", + "app_bell_onboarding_info_light_click": "Leichter Klick um fortzufahren", + "app_bell_onboarding_info_deep_click_warning": "Sie haben tief gedrückt", + "app_bell_onboarding_info_deep_click_correction": "Seien Sie sanfter,

versuchen Sie diesmal leicht klicken", "app_bell_settings_home_view": "Startansicht", "app_bell_settings_alarm_settings": "Alarmeinstellungen", "app_bell_settings_alarm_settings_title": "Alarmeinstellungen", diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index dcfee929ae1379b9993ee4aba2d6927651429154..1b0fe673df236dbb96bd3be5dbb68ccbdc7bad19 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -236,8 +236,8 @@ "sim_card_pin_enabled": "SIM card pin enabled", "sim_card_cant_connect": "Cannot connect to $SIM card.

Please insert card.", "sim_card_not_ready": "Waiting for Modem to start.

This may take a moment.", - "app_desktop_press_to_unlock": "Press Unlock and then #", - "app_desktop_press_to_complete_unlock": "Press # to unlock", + "app_desktop_press_to_unlock": "Press Unlock and then #", + "app_desktop_press_to_complete_unlock": "Press # to unlock", "app_desktop_unread_messages": "Unread messages", "app_desktop_missed_calls": "Missed calls", "app_desktop_alarm_snooze": "Snooze", @@ -305,7 +305,7 @@ "app_messages_thread_not_sent": "Not sent: ", "app_messages_thread_you": "You: ", "app_onboarding_title": "Onboarding", - "app_onboarding_start_configuration": "

Hello!



Let's configure your Mudita Pure.", + "app_onboarding_start_configuration": "

Hello!



Let's configure your Mudita Pure.", "app_onboarding_eula_license": "License agreement (EULA)", "app_onboarding_select_sim": "Choose active SIM", "app_onboarding_select_sim_description": "Only one SIM can be active at a time.

You can choose it now and switch in

the Settings whenever needed.", @@ -316,7 +316,7 @@ "app_onboarding_skip_confirm": "SIM setup is required for network connection. Skip the setup anyway? ", "app_onboarding_configuration_successful": "Your Mudita Pure

is ready to use.", "app_onboarding_no_configuration": "Your Mudita Pure has not been

configured. You can go to

Settings to set it up.", - "app_onboarding_update_info": "The current version of MuditaOS is

$VERSION

Updates with new features and fixes appear often.

To update your Phone please

visit: www.mudita.com/updateos

and follow the instructions.", + "app_onboarding_update_info": "The current version of MuditaOS is

$VERSION

Updates with new features and fixes appear often.

To update your Phone please

visit: www.mudita.com/updateos

and follow the instructions.", "app_settings_title_main": "Settings", "app_settings_advanced": "Advanced", "app_settings_bt": "Bluetooth", @@ -326,10 +326,10 @@ "app_settings_bluetooth_main": "Bluetooth", "app_settings_bluetooth_phone_name": "Phone name", "app_settings_bluetooth_phone_visibility": "Phone visibility", - "app_settings_bluetooth_init_error_message": "Bluetooth initialization process has failed.", - "app_settings_bluetooth_pairing_error_message": "Pairing process has failed.

Check the device and TRY AGAIN.", - "app_settings_bluetooth_unpairing_error_message": "Unpairing process has failed.

Check the device and TRY AGAIN.", - "app_settings_bluetooth_connecting_error_message": "Connection process has failed.

Check the device and TRY AGAIN.", + "app_settings_bluetooth_init_error_message": "Bluetooth initialization process has failed.", + "app_settings_bluetooth_pairing_error_message": "Pairing process has failed.

Check the device and TRY AGAIN.", + "app_settings_bluetooth_unpairing_error_message": "Unpairing process has failed.

Check the device and TRY AGAIN.", + "app_settings_bluetooth_connecting_error_message": "Connection process has failed.

Check the device and TRY AGAIN.", "app_settings_net": "Network", "app_settings_disp_key": "Display and keypad", "app_settings_display_display_light": "Display light", @@ -617,10 +617,10 @@ "app_bell_meditation_put_down_and_wait": "Put down Mudita Harmony
and wait for the gong", "app_bell_meditation_thank_you_for_session": "Thank you for
the session", "app_bell_onboarding_welcome_message": "Mudita Harmony
is switched OFF", - "app_bell_onboarding_info_rotate": "Rotate to select", - "app_bell_onboarding_info_light_click": "Light click to continue", - "app_bell_onboarding_info_deep_click_warning": "You've deep pressed", - "app_bell_onboarding_info_deep_click_correction": "Be more gentle,

try light click this time", + "app_bell_onboarding_info_rotate": "Rotate to select", + "app_bell_onboarding_info_light_click": "Light click to continue", + "app_bell_onboarding_info_deep_click_warning": "You've deep pressed", + "app_bell_onboarding_info_deep_click_correction": "Be more gentle,

try light click this time", "app_bell_onboarding_welcome": "Welcome", "app_bell_settings_advanced": "Advanced", "app_bell_settings_time_units": "Time", diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json index 28e14da3efc60e37eeb84091c92bb24d997b9cc7..91f537442fb73532f0072a0965e6d2716c5574db 100644 --- a/image/assets/lang/Espanol.json +++ b/image/assets/lang/Espanol.json @@ -270,8 +270,8 @@ "sim_card_pin_enabled": "PIN de la tarjeta SIM activado", "sim_card_cant_connect": "No se puede conectar con la tarjeta $SIM.

Inserta la tarjeta.", "sim_card_not_ready": "Esperando a que el módem se encienda.

Esto puede tardar unos instantes.", - "app_desktop_press_to_unlock": "Pulsa Desbloquear y después #", - "app_desktop_press_to_complete_unlock": "Presione # para desbloquear", + "app_desktop_press_to_unlock": "Pulsa Desbloquear y después #", + "app_desktop_press_to_complete_unlock": "Presione # para desbloquear", "app_desktop_unread_messages": "Mensajes no leídos", "app_desktop_missed_calls": "Llamadas perdidas", "app_desktop_menu_phone": "LLAMADAS", @@ -335,7 +335,7 @@ "app_messages_thread_not_sent": "No enviado: ", "app_messages_thread_you": "Tú: ", "app_onboarding_title": "Primeros pasos", - "app_onboarding_start_configuration": "

¡Hola!



Vamos a configurar tu Mudita Pure.", + "app_onboarding_start_configuration": "

¡Hola!



Vamos a configurar tu Mudita Pure.", "app_onboarding_eula_license": "Acuerdo de licencia (ALUF)", "app_onboarding_select_sim": "Elegir SIM activa", "app_onboarding_select_sim_description": "Solo puede haber una SIM activa a la vez.

Puedes elegirla ahora y cambiarla

en Ajustes siempre que quieras.", @@ -346,7 +346,7 @@ "app_onboarding_skip_confirm": "Es necesario configurar la SIM para conectarse a la red. ¿Omitir la configuración? ", "app_onboarding_configuration_successful": "Tu Mudita Pure

ya está listo.", "app_onboarding_no_configuration": "Tu Mudita Pure no está

configurado. Ve a

Ajustes para configurarlo.", - "app_onboarding_update_info": "La versión actual del SO de Mudita es la$VERSION

Las frecuentes actualizaciones incluyen nuevas funciones y correcciones.

Para actualizar tu teléfono,

visita: www.mudita.com/updateos

y sigue las instrucciones.", + "app_onboarding_update_info": "La versión actual del SO de Mudita es la$VERSION

Las frecuentes actualizaciones incluyen nuevas funciones y correcciones.

Para actualizar tu teléfono,

visita: www.mudita.com/updateos

y sigue las instrucciones.", "app_settings_title_main": "Ajustes", "app_settings_advanced": "Avanzados", "app_settings_bt": "Bluetooth", @@ -357,10 +357,10 @@ "app_settings_bluetooth_phone_name": "Nombre del teléfono", "app_settings_bluetooth_phone_visibility": "Visibilidad del teléfono", "app_settings_bluetooth_enter_passkey": "Introducir clave de paso:", - "app_settings_bluetooth_init_error_message": "Error en el proceso de inicialización de Bluetooth.", - "app_settings_bluetooth_pairing_error_message": "Error en el proceso de emparejamiento.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", - "app_settings_bluetooth_unpairing_error_message": "Error en el proceso de desemparejamiento.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", - "app_settings_bluetooth_connecting_error_message": "Error en el proceso de conexión.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", + "app_settings_bluetooth_init_error_message": "Error en el proceso de inicialización de Bluetooth.", + "app_settings_bluetooth_pairing_error_message": "Error en el proceso de emparejamiento.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", + "app_settings_bluetooth_unpairing_error_message": "Error en el proceso de desemparejamiento.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", + "app_settings_bluetooth_connecting_error_message": "Error en el proceso de conexión.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", "app_settings_net": "Red", "app_settings_disp_key": "Pantalla y teclado numérico", "app_settings_display_display_light": "Luz de pantalla", @@ -620,10 +620,10 @@ "app_bell_settings_time_units_time_message": "Hora", "app_bell_settings_temp_scale": "Escala de temperatura", "app_bell_onboarding_welcome_message": "Mudita Harmony
está apagado", - "app_bell_onboarding_info_rotate": "Girar para seleccionar", - "app_bell_onboarding_info_light_click": "Click ligeramente para continuar", - "app_bell_onboarding_info_deep_click_warning": "Has presionado muy profundo", - "app_bell_onboarding_info_deep_click_correction": "Sé más suave,

intenta presionar ligeramente esta vez", + "app_bell_onboarding_info_rotate": "Girar para seleccionar", + "app_bell_onboarding_info_light_click": "Click ligeramente para continuar", + "app_bell_onboarding_info_deep_click_warning": "Has presionado muy profundo", + "app_bell_onboarding_info_deep_click_correction": "Sé más suave,

intenta presionar ligeramente esta vez", "app_bell_onboarding_welcome": "Bienvenido", "app_bellmain_home_screen_bottom_desc_dp": "Presionar a fondo para activar", "app_bellmain_alarm": "Alarma", diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json index 9d6f988e0d8ef878d2d4fe74caeea19c123cd2d9..af0a200ed2002bf6dcf9881e9ae996c48f373b76 100644 --- a/image/assets/lang/Francais.json +++ b/image/assets/lang/Francais.json @@ -239,8 +239,8 @@ "sim_card_pin_enabled": "SIM card pin enabled", "sim_card_cant_connect": "Cannot connect to $SIM card.

Please insert card.", "sim_card_not_ready": "Waiting for Modem to start.

This may take a moment.", - "app_desktop_press_to_unlock": "Press Unlock and then #", - "app_desktop_press_to_complete_unlock": "Press # to unlock", + "app_desktop_press_to_unlock": "Press Unlock and then #", + "app_desktop_press_to_complete_unlock": "Press # to unlock", "app_desktop_unread_messages": "Messages non lus", "app_desktop_missed_calls": "Appels manqués", "app_desktop_menu_phone": "APPELS", @@ -304,7 +304,7 @@ "app_messages_thread_not_sent": "Pas envoyé: ", "app_messages_thread_you": "Vous: ", "app_onboarding_title": "Onboarding", - "app_onboarding_start_configuration": "

Bonjour !



Configurons votre Mudita Pure.", + "app_onboarding_start_configuration": "

Bonjour !



Configurons votre Mudita Pure.", "app_onboarding_eula_license": "License agreement (EULA)", "app_onboarding_select_sim": "Choisissez la carte SIM active", "app_onboarding_select_sim_description": "Une seule carte SIM peut être active à la fois.

Vous pouvez la choisir maintenant et activer

les paramètres à tout moment.", @@ -315,7 +315,7 @@ "app_onboarding_skip_confirm": "La configuration de la carte SIM est requise pour la connexion réseau. Ignorer la configuration quand même? ", "app_onboarding_configuration_successful": "Vous pouvez maintenant

utiliser votre Mudita Pure.", "app_onboarding_no_configuration": "Votre Mudita Pure n'a pas été

configuré. Vous pouvez le configurer

a partir des Options.", - "app_onboarding_update_info": "La version actuelle de MuditaOS est

$VERSION.

Des mises à jour avec de nouvelles fonctionnalités et correctifs apparaissent souvent. Pour mettre à jour votre téléphone, visite:

www.mudita.com/updateos

et suivez les instructions.", + "app_onboarding_update_info": "La version actuelle de MuditaOS est

$VERSION.

Des mises à jour avec de nouvelles fonctionnalités et correctifs apparaissent souvent. Pour mettre à jour votre téléphone, visite:

www.mudita.com/updateos

et suivez les instructions.", "app_settings_title_main": "Options", "app_settings_advanced": "Avancées", "app_settings_bt": "Bluetooth", @@ -326,10 +326,10 @@ "app_settings_bluetooth_phone_name": "Nom du téléphone", "app_settings_bluetooth_phone_visibility": "Visibilité du téléphone", "app_settings_bluetooth_enter_passkey": "Entrez le code d'accès:", - "app_settings_bluetooth_init_error_message": "Bluetooth initialization process has failed.", - "app_settings_bluetooth_pairing_error_message": "Pairing process has failed.

Check the device and TRY AGAIN.", - "app_settings_bluetooth_unpairing_error_message": "Unpairing process has failed.

Check the device and TRY AGAIN.", - "app_settings_bluetooth_connecting_error_message": "Connection process has failed.

Check the device and TRY AGAIN.", + "app_settings_bluetooth_init_error_message": "Bluetooth initialization process has failed.", + "app_settings_bluetooth_pairing_error_message": "Pairing process has failed.

Check the device and TRY AGAIN.", + "app_settings_bluetooth_unpairing_error_message": "Unpairing process has failed.

Check the device and TRY AGAIN.", + "app_settings_bluetooth_connecting_error_message": "Connection process has failed.

Check the device and TRY AGAIN.", "app_settings_net": "Réseau", "app_settings_disp_key": "Affichage et clavier", "app_settings_display_display_light": "Lumière d'affichage", @@ -594,10 +594,10 @@ "app_bell_settings_time_units_time_message": "Heure", "app_bell_settings_temp_scale": "Échelle de température", "app_bell_onboarding_welcome_message": "Mudita Harmony
est désactivé", - "app_bell_onboarding_info_rotate": "Tourner pour sélectionner", - "app_bell_onboarding_info_light_click": "Cliquer doucement pour continuer", - "app_bell_onboarding_info_deep_click_warning": "Vous avez appuyé fort", - "app_bell_onboarding_info_deep_click_correction": "Soyez plus doux,

essayez de cliquer plus légèrement cette fois", + "app_bell_onboarding_info_rotate": "Tourner pour sélectionner", + "app_bell_onboarding_info_light_click": "Cliquer doucement pour continuer", + "app_bell_onboarding_info_deep_click_warning": "Vous avez appuyé fort", + "app_bell_onboarding_info_deep_click_correction": "Soyez plus doux,

essayez de cliquer plus légèrement cette fois", "app_bell_onboarding_welcome": "Bienvenu", "app_bellmain_home_screen_bottom_desc_dp": "Appuyer fort pour activer", "app_bellmain_alarm": "Alarme", diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index 23d08ba08fe71e55ed6408d5bc8fed25742bef3b..500b2c77aaf44fff3f4d1d3288a8805a796f9a47 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -273,8 +273,8 @@ "sim_card_pin_enabled": "Kod PIN karty SIM włączony", "sim_card_cant_connect": "Nie można połączyć się z kartą $SIM.

Włóż kartę.", "sim_card_not_ready": "Oczekiwanie na uruchomienie modemu.

To może chwilę potrwać.", - "app_desktop_press_to_unlock": "Wciśnij Odblokuj, a następnie #", - "app_desktop_press_to_complete_unlock": "Naciśnij # by odblokować", + "app_desktop_press_to_unlock": "Wciśnij Odblokuj, a następnie #", + "app_desktop_press_to_complete_unlock": "Naciśnij # by odblokować", "app_desktop_unread_messages": "Nowe wiadomości", "app_desktop_missed_calls": "Nieodebrane połączenia", "app_desktop_menu_phone": "POŁĄCZENIA", @@ -338,7 +338,7 @@ "app_messages_thread_not_sent": "Niewysłane: ", "app_messages_thread_you": "Ty: ", "app_onboarding_title": "Wprowadzenie", - "app_onboarding_start_configuration": "

Witaj!



Skonfigurujmy twój telefon

Mudita Pure.", + "app_onboarding_start_configuration": "

Witaj!



Skonfigurujmy twój telefon

Mudita Pure.", "app_onboarding_eula_license": "Umowa licencyjna (EULA)", "app_onboarding_select_sim": "Wybierz aktywną kartę SIM", "app_onboarding_select_sim_description": "Tylko jedna karta SIM może być jednocześnie aktywna.

Możesz ją wybrać teraz i zmienić

w razie potrzeby w Ustawieniach.", @@ -349,7 +349,7 @@ "app_onboarding_skip_confirm": "Do połączenia z siecią konieczna jest konfiguracja karty SIM. Pominąć konfigurację mimo to? ", "app_onboarding_configuration_successful": "Twój telefon Mudita Pure

jest gotowy do użycia.", "app_onboarding_no_configuration": "Twój telefon Mudita Pure nie został

skonfigurowany. Możesz przejść do

Ustawień, by go skonfigurować.", - "app_onboarding_update_info": "Aktualna wersja MuditaOS to

$VERSION.

Aktualizacje z nowymi funkcjami i poprawkami pojawiają się regularnie.

Aby zaktualizować telefon, odwiedź stronę:

www.mudita.com/updateos

i postępuj zgodnie ze wskazówkami.", + "app_onboarding_update_info": "Aktualna wersja MuditaOS to

$VERSION.

Aktualizacje z nowymi funkcjami i poprawkami pojawiają się regularnie.

Aby zaktualizować telefon, odwiedź stronę:

www.mudita.com/updateos

i postępuj zgodnie ze wskazówkami.", "app_settings_title_main": "Ustawienia", "app_settings_advanced": "Zaawansowane", "app_settings_bt": "Bluetooth", @@ -360,10 +360,10 @@ "app_settings_bluetooth_phone_name": "Nazwa telefonu", "app_settings_bluetooth_phone_visibility": "Widoczność telefonu", "app_settings_bluetooth_enter_passkey": "Wprowadź klucz dostępu:", - "app_settings_bluetooth_init_error_message": "Proces inicjalizacji Bluetooth zakończony niepowodzeniem.", - "app_settings_bluetooth_pairing_error_message": "Proces parowania zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", - "app_settings_bluetooth_unpairing_error_message": "Proces odłączania zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", - "app_settings_bluetooth_connecting_error_message": "Proces łączenia zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", + "app_settings_bluetooth_init_error_message": "Proces inicjalizacji Bluetooth zakończony niepowodzeniem.", + "app_settings_bluetooth_pairing_error_message": "Proces parowania zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", + "app_settings_bluetooth_unpairing_error_message": "Proces odłączania zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", + "app_settings_bluetooth_connecting_error_message": "Proces łączenia zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", "app_settings_net": "Sieć", "app_settings_apps_alarm_clock_manual_volume": "Ręczna zmiana głośności", "app_settings_disp_key": "Ekran i klawiatura", @@ -629,10 +629,10 @@ "app_bellmain_settings": "Ustawienia", "app_bellmain_main_window_title": "Mudita Harmony", "app_bell_onboarding_welcome_message": "Mudita Harmony
jest wyłączony", - "app_bell_onboarding_info_rotate": "Obróć, aby wybrać", - "app_bell_onboarding_info_light_click": "Kliknij lekko, aby kontynuować", - "app_bell_onboarding_info_deep_click_warning": "Głęboko wciśnięty", - "app_bell_onboarding_info_deep_click_correction": "Bądź bardziej delikatny,

spróbuj tym razem

lekko kliknąć", + "app_bell_onboarding_info_rotate": "Obróć, aby wybrać", + "app_bell_onboarding_info_light_click": "Kliknij lekko, aby kontynuować", + "app_bell_onboarding_info_deep_click_warning": "Głęboko wciśnięty", + "app_bell_onboarding_info_deep_click_correction": "Bądź bardziej delikatny,

spróbuj tym razem

lekko kliknąć", "app_bell_onboarding_welcome": "Witamy", "app_bell_settings_advanced": "Zaawansowane", "app_bell_settings_time_units": "Czas", diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index cc0fc180e991c01ae76ff23a92da57f61daf7630..a69bfa3544a1fa4e3aecb0a0a54c166a7ecd7b85 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -217,8 +217,8 @@ "sim_setup_wrong_puk": "Fel PUK-kod.

Du har $ATTEMPTS försök kvar.", "sim_setup_wrong_puk_last_attempt": "Fel PUK-kod.

Du har 1 försök kvar.", "sim_setup_wrong_puk_last_attempt_warning": "Om koden är fel den här gången

kommer SIM-kortet låsas och du kommer

behöva kontakta operatören.", - "app_desktop_press_to_unlock": "Tryck Lås upp följt av #", - "app_desktop_press_to_complete_unlock": "Tryck på # för att låsa upp", + "app_desktop_press_to_unlock": "Tryck Lås upp följt av #", + "app_desktop_press_to_complete_unlock": "Tryck på # för att låsa upp", "app_desktop_unread_messages": "Olästa meddelanden", "app_desktop_missed_calls": "Missade samtal", "app_desktop_menu_phone": "SAMTAL", @@ -281,7 +281,7 @@ "app_onboarding_skip_confirm": " SIM-installation krävs för nätverksanslutning. Hoppar du ändå över installationen? ", "app_onboarding_configuration_successful": " Din Mudita Pure

är klar att använda. ", "app_onboarding_no_configuration": " Din Mudita Pure har inte konfigurerats.
Du kan gå till

Inställningar för att konfigurera den. ", - "app_onboarding_update_info": " Den nuvarande versionen av MuditaOS är

$ VERSION . Uppdateringar med nya

funktioner och korrigeringar visas ofta.

För att uppdatera din telefon vänligen

besök: www.mudita.com/updateos

och följ instruktionerna. ", + "app_onboarding_update_info": " Den nuvarande versionen av MuditaOS är

$ VERSION . Uppdateringar med nya

funktioner och korrigeringar visas ofta.

För att uppdatera din telefon vänligen

besök: www.mudita.com/updateos

och följ instruktionerna. ", "app_settings_title_main": "Inställningar", "app_settings_advanced": "Avancerad", "app_settings_bt": "Bluetooth", diff --git a/image/assets/licenses/Deutsch/eula.txt b/image/assets/licenses/Deutsch/eula.txt index 91044187c61440fac0b0c8636348bc9219bfe908..b4beec96185eec119c278f8f2d3f5f4f34ea1c61 100755 --- a/image/assets/licenses/Deutsch/eula.txt +++ b/image/assets/licenses/Deutsch/eula.txt @@ -1 +1 @@ -Mudita Pure Software-Lizenzvereinbarung

ANMERKUNG: DURCH DIE VERWENDUNG VON MUDITA PURE AKZEPTIERT DER BENUTZER DIE FOLGENDE SOFTWARE-LIZENZVEREINBARUNG. DAS GERÄT KANN NUR ORDNUNGSGEMÄSS VERWENDET WERDEN, WENN DIE LIZENZ AKZEPTIERT WIRD.



DAHER SOLLTE DER BENUTZER DIE LIZENZ GRÜNDLICH LESEN, BEVOR ER MUDITA PURE VERWENDET ODER SOFTWARE-UPDATES HERUNTERLÄDT.



WENN DER BENUTZER DEN BEDINGUNGEN DIESER LIZENZ NICHT ZUSTIMMT, DÜRFEN DIE SOFTWARE ODER HERUNTERLADBARE UPDATES NICHT VERWENDET WERDEN.



Begriffsbestimmungen:

Software - Mudita Pure-Systemsoftware, Schnittstellen und deren Inhalt (einschließlich Schriftarten, Sounds, Dokumente und alle anderen auf dem Gerät gespeicherten Voreinstellungen);

Update - jegliche Software-Aktualisierung, einschließlich der Einführung zusätzlicher oder geänderter Funktionen oder anderer Software;

Mudita - Mudita sp. z o.o. [GmbH] mit Sitz in Warschau (Adresse: ul. Jana Czeczota 6, 02-607 Warschau, Polen) eingetragen im polnischen Handelsregister des nationalen Gerichtsregisters unter der KRS-Nummer: 0000467620, Ust.-Id.Nr.: 5252558282, Grundkapital in Höhe von 21.000,00 PLN;

Benutzer - jegliche Person, die rechtmäßig Eigentümer eines Mudita Pure-Geräts geworden ist, um es zu verwenden.



Lizenzbedingungen:

1. Nach Zustimmung des Benutzers zu diesen Lizenzbedingungen gewährt Mudita dem Mudita Pure-Benutzer eine Softwarelizenz. Beim Herunterladen eines Updates wird auch eine Lizenz für ein solches Update erteilt. Unter dieser Lizenz erhält der Benutzer ein nicht-exklusives, territorial uneingeschränktes Recht zur Nutzung der Software oder des Updates auf einem einzelnen MUDITA PURE-Gerät, um:

a) die Software und das Update auf dem Mudita Pure-Gerät zu speichern;

b) eine einzelne Kopie der Software und des Updates außerhalb des Mudita Pure-Geräts zu speichern;

c) die Software oder das Update auf dem Mudita Pure-Gerät zu starten, anzuzeigen und zu verwenden.

2. Jedes Mudita Pure-Gerät, das dem Benutzer rechtmäßig gehört, gewährt dem Benutzer eine Software-/Update-Lizenz, die ausschließlich für das individuelle Gerät aktiviert ist. Somit erhält der Benutzer mit jedem Mudita Pure-Gerät eine weitere separate Lizenz.

3. Mudita genehmigt weder, dass die in dieser Lizenz enthaltene(n) Software und Updates gleichzeitig auf mehr als einem Mudita Pure-Gerät installiert werden, noch dass die Software und Updates über das Internet verteilt oder geteilt werden, um sie auf mehreren Geräten gleichzeitig zu nutzen, mit Ausnahme der in dieser Lizenz angegebenen Fälle.

4. Die Lizenz gewährt dem Benutzer kein Recht, die Software und das Update für einen anderen Zweck als die Verwendung des Mudita Pure-Geräts gemäß den im Handbuch beschriebenen vorgesehenen Zwecken zu verwenden.

5. Die Lizenz gilt für die Dauer des Besitzes des Mudita Pure-Geräts durch den Benutzer und läuft vorzeitig ab, falls der Benutzer gegen deren Nutzungsbedingungen verstößt. +Mudita Pure Software-Lizenzvereinbarung

ANMERKUNG: DURCH DIE VERWENDUNG VON MUDITA PURE AKZEPTIERT DER BENUTZER DIE FOLGENDE SOFTWARE-LIZENZVEREINBARUNG. DAS GERÄT KANN NUR ORDNUNGSGEMÄSS VERWENDET WERDEN, WENN DIE LIZENZ AKZEPTIERT WIRD.



DAHER SOLLTE DER BENUTZER DIE LIZENZ GRÜNDLICH LESEN, BEVOR ER MUDITA PURE VERWENDET ODER SOFTWARE-UPDATES HERUNTERLÄDT.



WENN DER BENUTZER DEN BEDINGUNGEN DIESER LIZENZ NICHT ZUSTIMMT, DÜRFEN DIE SOFTWARE ODER HERUNTERLADBARE UPDATES NICHT VERWENDET WERDEN.



Begriffsbestimmungen:

Software - Mudita Pure-Systemsoftware, Schnittstellen und deren Inhalt (einschließlich Schriftarten, Sounds, Dokumente und alle anderen auf dem Gerät gespeicherten Voreinstellungen);

Update - jegliche Software-Aktualisierung, einschließlich der Einführung zusätzlicher oder geänderter Funktionen oder anderer Software;

Mudita - Mudita sp. z o.o. [GmbH] mit Sitz in Warschau (Adresse: ul. Jana Czeczota 6, 02-607 Warschau, Polen) eingetragen im polnischen Handelsregister des nationalen Gerichtsregisters unter der KRS-Nummer: 0000467620, Ust.-Id.Nr.: 5252558282, Grundkapital in Höhe von 21.000,00 PLN;

Benutzer - jegliche Person, die rechtmäßig Eigentümer eines Mudita Pure-Geräts geworden ist, um es zu verwenden.



Lizenzbedingungen:

1. Nach Zustimmung des Benutzers zu diesen Lizenzbedingungen gewährt Mudita dem Mudita Pure-Benutzer eine Softwarelizenz. Beim Herunterladen eines Updates wird auch eine Lizenz für ein solches Update erteilt. Unter dieser Lizenz erhält der Benutzer ein nicht-exklusives, territorial uneingeschränktes Recht zur Nutzung der Software oder des Updates auf einem einzelnen MUDITA PURE-Gerät, um:

a) die Software und das Update auf dem Mudita Pure-Gerät zu speichern;

b) eine einzelne Kopie der Software und des Updates außerhalb des Mudita Pure-Geräts zu speichern;

c) die Software oder das Update auf dem Mudita Pure-Gerät zu starten, anzuzeigen und zu verwenden.

2. Jedes Mudita Pure-Gerät, das dem Benutzer rechtmäßig gehört, gewährt dem Benutzer eine Software-/Update-Lizenz, die ausschließlich für das individuelle Gerät aktiviert ist. Somit erhält der Benutzer mit jedem Mudita Pure-Gerät eine weitere separate Lizenz.

3. Mudita genehmigt weder, dass die in dieser Lizenz enthaltene(n) Software und Updates gleichzeitig auf mehr als einem Mudita Pure-Gerät installiert werden, noch dass die Software und Updates über das Internet verteilt oder geteilt werden, um sie auf mehreren Geräten gleichzeitig zu nutzen, mit Ausnahme der in dieser Lizenz angegebenen Fälle.

4. Die Lizenz gewährt dem Benutzer kein Recht, die Software und das Update für einen anderen Zweck als die Verwendung des Mudita Pure-Geräts gemäß den im Handbuch beschriebenen vorgesehenen Zwecken zu verwenden.

5. Die Lizenz gilt für die Dauer des Besitzes des Mudita Pure-Geräts durch den Benutzer und läuft vorzeitig ab, falls der Benutzer gegen deren Nutzungsbedingungen verstößt. diff --git a/image/assets/licenses/English/eula.txt b/image/assets/licenses/English/eula.txt index a78d62daf0468dd79355929ebacc1ff0bd9c6be0..d0de6209751331817b44738cb3e08329bec719f7 100755 --- a/image/assets/licenses/English/eula.txt +++ b/image/assets/licenses/English/eula.txt @@ -1 +1 @@ -Mudita Pure software licence agreement

NOTE: BY USING MUDITA PURE, THE USER ACCEPTS THE FOLLOWING SOFTWARE LICENCE AGREEMENT. THE DEVICE CANNOT BE USED PROPERLY UNLESS THE LICENCE IS ACCEPTED.



THEREFORE, BEFORE USING MUDITA PURE OR DOWNLOADING ANY SOFTWARE UPDATES, THE USER SHOULD READ THE LICENCE THOROUGHLY.



IF THE USER DOES NOT AGREE TO THE TERMS OF THIS LICENCE, THE SOFTWARE OR ANY DOWNLOADABLE UPDATES CANNOT BE USED.



Definitions:

Software - Mudita Pure system software, interfaces, and its contents (including fonts, sounds, documents, and all the other default data saved on the device);

Update - any update of the Software, including the introduction of any additional or changed features or other software;

Mudita - Mudita sp. z o.o. based in Warsaw (address: ul. Jana Czeczota 6, 02-607 Warsaw, Poland) registered in the Polish Register of Entrepreneurs of the National Court Register under KRS number: 0000467620, tax ID number: 5252558282, share capital of PLN 21,000.00;

User - any person who has lawfully become the owner of a Mudita Pure device in order to use it.



Licence terms and conditions:

1. Upon the User's agreement to the terms and conditions of this licence, Mudita grants the Mudita Pure User a Software licence. Upon downloading an Update, a licence for such Update is granted as well. Under such licence, the User receives a non-exclusive, territorially unrestricted right to use the Software or the Update on a single MUDITA PURE device to:

a) store the Software and the Update on the Mudita Pure device;

b) store a single copy of the Software and the Update outside the Mudita Pure device;

c) boot up, display, and use the Software or the Update on the Mudita Pure device.

2. Every Mudita Pure device lawfully owned by the User grants the User a Software/Update licence coupled solely with the particular device. Thus, with every Mudita Pure owned, the User gains another separate licence.

3. Mudita does not allow Software and Updates covered by this licence to be installed on more than one Mudita Pure device at the same time, nor does it allow distributing or sharing the Software and Updates over the internet to be used on multiple devices at the same time, except for the cases specified in this licence.

4. The licence does not grant the User any right to use the Software and the Update for any other purpose than to use the Mudita Pure device in line with its intended functions detailed in the manual.

5. The licence is valid for the duration of the User's possession of the Mudita Pure device and expires earlier if the User violates its terms and conditions. +Mudita Pure software licence agreement

NOTE: BY USING MUDITA PURE, THE USER ACCEPTS THE FOLLOWING SOFTWARE LICENCE AGREEMENT. THE DEVICE CANNOT BE USED PROPERLY UNLESS THE LICENCE IS ACCEPTED.



THEREFORE, BEFORE USING MUDITA PURE OR DOWNLOADING ANY SOFTWARE UPDATES, THE USER SHOULD READ THE LICENCE THOROUGHLY.



IF THE USER DOES NOT AGREE TO THE TERMS OF THIS LICENCE, THE SOFTWARE OR ANY DOWNLOADABLE UPDATES CANNOT BE USED.



Definitions:

Software - Mudita Pure system software, interfaces, and its contents (including fonts, sounds, documents, and all the other default data saved on the device);

Update - any update of the Software, including the introduction of any additional or changed features or other software;

Mudita - Mudita sp. z o.o. based in Warsaw (address: ul. Jana Czeczota 6, 02-607 Warsaw, Poland) registered in the Polish Register of Entrepreneurs of the National Court Register under KRS number: 0000467620, tax ID number: 5252558282, share capital of PLN 21,000.00;

User - any person who has lawfully become the owner of a Mudita Pure device in order to use it.



Licence terms and conditions:

1. Upon the User's agreement to the terms and conditions of this licence, Mudita grants the Mudita Pure User a Software licence. Upon downloading an Update, a licence for such Update is granted as well. Under such licence, the User receives a non-exclusive, territorially unrestricted right to use the Software or the Update on a single MUDITA PURE device to:

a) store the Software and the Update on the Mudita Pure device;

b) store a single copy of the Software and the Update outside the Mudita Pure device;

c) boot up, display, and use the Software or the Update on the Mudita Pure device.

2. Every Mudita Pure device lawfully owned by the User grants the User a Software/Update licence coupled solely with the particular device. Thus, with every Mudita Pure owned, the User gains another separate licence.

3. Mudita does not allow Software and Updates covered by this licence to be installed on more than one Mudita Pure device at the same time, nor does it allow distributing or sharing the Software and Updates over the internet to be used on multiple devices at the same time, except for the cases specified in this licence.

4. The licence does not grant the User any right to use the Software and the Update for any other purpose than to use the Mudita Pure device in line with its intended functions detailed in the manual.

5. The licence is valid for the duration of the User's possession of the Mudita Pure device and expires earlier if the User violates its terms and conditions. diff --git a/image/assets/licenses/Espanol/eula.txt b/image/assets/licenses/Espanol/eula.txt index 9ac4649288141fd357aef12456113fc5f655b7a6..bae49aa1c41ff9eec2773983ca7adfbf221b0ebc 100755 --- a/image/assets/licenses/Espanol/eula.txt +++ b/image/assets/licenses/Espanol/eula.txt @@ -1 +1 @@ -Acuerdo de licencia de software de Mudita Pure

NOTA: AL USAR MUDITA PURE, EL USUARIO ACEPTA EL SIGUIENTE ACUERDO DE LICENCIA DE SOFTWARE. EL DISPOSITIVO NO PUEDE USARSE ADECUADAMENTE A MENOS QUE SE ACEPTE EL ACUERDO.



POR LO TANTO, ANTES DE UTILIZAR MUDITA PURE O DESCARGAR CUALQUIER ACTUALIZACIÓN DE SOFTWARE, EL USUARIO DEBE LEER EL ACUERDO DETENIDAMENTE.



SI EL USUARIO NO ESTÁ DE ACUERDO CON LAS CONDICIONES DE ESTE CONTRATO, NO PODRÁ USAR EL SOFTWARE NI CUALQUIER ACTUALIZACIÓN DESCARGABLE.



Conceptos:

Software: el sistema de software de Mudita Pure, su interfaz y su contenido (que incluye fuentes, sonidos, documentos y el resto de datos guardados en el dispositivo por defecto).

Actualización: cualquier actualización del Software, incluyendo la introducción de cualquier característica adicional o modificada, así como otro software.

Mudita: Mudita sp. z o.o. con sede en Varsovia (dirección: ul. Jana Czeczota 6, 02-607 Warszawa, Polonia) que figura en el Registro Judicial Nacional de Emprendedores polaco con el número KRS: 0000467620, número de identificación del contribuyente: 5252558282, capital social de 21 000,00 PLN;

Usuario: cualquier persona que sea propietario legítimo de un dispositivo Mudita Pure con intención de usarlo.



Términos y condiciones del acuerdo:

1. Previo acuerdo del Usuario con los términos y condiciones de este contrato, Mudita otorga al usuario de Mudita Pure permiso para utilizar su Software. Al descargar una Actualización, también se otorga el permiso de la misma. Con dicha licencia, el Usuario recibe el derecho no exclusivo y sin restricciones territoriales para utilizar el Software o sus Actualizaciones en un solo dispositivo MUDITA PURE para:

a) almacenar el Software y la Actualización en el dispositivo Mudita Pure;

b) almacenar una sola copia del Software y de la Actualización fuera del dispositivo Mudita Pure;

c) iniciar, mostrar y utilizar el Software y la Actualización en el dispositivo Mudita Pure.

2. Cada dispositivo Mudita Pure que sea propiedad legal de un Usuario, otorga al Usuario el permiso para usar el Software/Actualizaciones únicamente desde un dispositivo particular. Por lo tanto, con cada dispositivo Mudita Pure en propiedad, el Usuario obtiene una licencia por separado.

3. Mudita no permite que el Software y las Actualizaciones cubiertas por dicho permiso se usen en más de un dispositivo Mudita Pure a la vez; tampoco permite distribuir o compartir el Software y las Actualizaciones a través de internet para ser usadas en varios dispositivos a la vez, a excepción de los casos que se indican en este acuerdo.

4. La licencia no otorga al Usuario el derecho de usar el Software o las Actualizaciones para cualquier otro fin que no sea el dispositivo Mudita Pure y de acuerdo a las funciones designadas que se detallan en este manual.

5. La licencia será válida mientras el Usuario posea el dispositivo Mudita Pure y expirará si el Usuario infringe los términos y condiciones. +Acuerdo de licencia de software de Mudita Pure

NOTA: AL USAR MUDITA PURE, EL USUARIO ACEPTA EL SIGUIENTE ACUERDO DE LICENCIA DE SOFTWARE. EL DISPOSITIVO NO PUEDE USARSE ADECUADAMENTE A MENOS QUE SE ACEPTE EL ACUERDO.



POR LO TANTO, ANTES DE UTILIZAR MUDITA PURE O DESCARGAR CUALQUIER ACTUALIZACIÓN DE SOFTWARE, EL USUARIO DEBE LEER EL ACUERDO DETENIDAMENTE.



SI EL USUARIO NO ESTÁ DE ACUERDO CON LAS CONDICIONES DE ESTE CONTRATO, NO PODRÁ USAR EL SOFTWARE NI CUALQUIER ACTUALIZACIÓN DESCARGABLE.



Conceptos:

Software: el sistema de software de Mudita Pure, su interfaz y su contenido (que incluye fuentes, sonidos, documentos y el resto de datos guardados en el dispositivo por defecto).

Actualización: cualquier actualización del Software, incluyendo la introducción de cualquier característica adicional o modificada, así como otro software.

Mudita: Mudita sp. z o.o. con sede en Varsovia (dirección: ul. Jana Czeczota 6, 02-607 Warszawa, Polonia) que figura en el Registro Judicial Nacional de Emprendedores polaco con el número KRS: 0000467620, número de identificación del contribuyente: 5252558282, capital social de 21 000,00 PLN;

Usuario: cualquier persona que sea propietario legítimo de un dispositivo Mudita Pure con intención de usarlo.



Términos y condiciones del acuerdo:

1. Previo acuerdo del Usuario con los términos y condiciones de este contrato, Mudita otorga al usuario de Mudita Pure permiso para utilizar su Software. Al descargar una Actualización, también se otorga el permiso de la misma. Con dicha licencia, el Usuario recibe el derecho no exclusivo y sin restricciones territoriales para utilizar el Software o sus Actualizaciones en un solo dispositivo MUDITA PURE para:

a) almacenar el Software y la Actualización en el dispositivo Mudita Pure;

b) almacenar una sola copia del Software y de la Actualización fuera del dispositivo Mudita Pure;

c) iniciar, mostrar y utilizar el Software y la Actualización en el dispositivo Mudita Pure.

2. Cada dispositivo Mudita Pure que sea propiedad legal de un Usuario, otorga al Usuario el permiso para usar el Software/Actualizaciones únicamente desde un dispositivo particular. Por lo tanto, con cada dispositivo Mudita Pure en propiedad, el Usuario obtiene una licencia por separado.

3. Mudita no permite que el Software y las Actualizaciones cubiertas por dicho permiso se usen en más de un dispositivo Mudita Pure a la vez; tampoco permite distribuir o compartir el Software y las Actualizaciones a través de internet para ser usadas en varios dispositivos a la vez, a excepción de los casos que se indican en este acuerdo.

4. La licencia no otorga al Usuario el derecho de usar el Software o las Actualizaciones para cualquier otro fin que no sea el dispositivo Mudita Pure y de acuerdo a las funciones designadas que se detallan en este manual.

5. La licencia será válida mientras el Usuario posea el dispositivo Mudita Pure y expirará si el Usuario infringe los términos y condiciones. diff --git a/image/assets/licenses/Polski/eula.txt b/image/assets/licenses/Polski/eula.txt index 096dc92a74156f06521161e1eb6bc97d60d77322..94fd9bc8c0fdd78bbfa9a9d3eb8ddd6ac92720b3 100755 --- a/image/assets/licenses/Polski/eula.txt +++ b/image/assets/licenses/Polski/eula.txt @@ -1 +1 @@ -Umowa licencyjna na oprogramowanie Mudita Pure

WAŻNE: UŻYWAJĄC URZĄDZENIA MUDITA PURE, UŻYTKOWNIK AKCEPTUJE TREŚĆ PONIŻSZEJ UMOWY LICENCYJNEJ NA JEGO OPROGRAMOWANIE. BEZ JEJ AKCEPTACJI NIEMOŻLIWE JEST PRAWIDŁOWE KORZYSTANIE Z URZĄDZENIA.



W ZWIĄZKU Z TYM, PRZED UŻYCIEM MUDITA PURE LUB POBRANIEM UAKTUALNIENIA JEGO OPROGRAMOWANIA NALEŻY DOKŁADNIE PRZECZYTAĆ TEKST LICENCJI.



JEŻELI UŻYTKOWNIK NIE ZGADZA SIĘ Z POSTANOWIENIAMI NINIEJSZEJ LICENCJI, NIE MOŻE UŻYWAĆ OPROGRAMOWANIA, ANI POBIERAĆ I UŻYWAĆ AKTUALIZACJI.



Definicje:

Oprogramowanie - należy przez to rozumieć oprogramowanie systemowe Mudita Pure, interfejsy oraz jego zawartość (w tym czcionki, dźwięki, dokumentację i inne dane zapisane w pamięci urządzenia w wersji fabrycznej).

Aktualizacja - należy przez to rozumieć uaktualnianie Oprogramowania, w tym dodanie/zmianę funkcji lub zastąpienie Oprogramowania nowym oprogramowaniem.

Mudita - Mudita sp. z o.o. z siedzibą w Warszawie (adres: ul. Jana Czeczota 6 02-607 Warszawa, Polska), wpisana do rejestru przedsiębiorców Krajowego Rejestru Sądowego pod numerem KRS: 0000467620, NIP: 5252558282, kapitał zakładowy 21.100,00 PLN

Użytkownik - osoba, która zgodnie z prawem stała się posiadaczem urządzenia Mudita Pure w celu korzystania z niego.



Warunki licencji:

1. Z chwilą akceptacji przez Użytkownika warunków niniejszej licencji, Mudita udziela Użytkownikowi urządzenia Mudita Pure licencji na Oprogramowanie, zaś z chwilą pobrania przez Użytkownika Aktualizacji, także licencji do takiej Aktualizacji, w ramach której Użytkownik otrzymuje niewyłączne, nieograniczone terytorialnie, prawo do korzystania z nich na jednym urządzeniu MUDITA PURE w zakresie:

a) przechowywania Oprogramowania i/lub Aktualizacji w pamięci urządzenia Mudita Pure,

b) przechowywania jednej kopii Oprogramowania i/lub Aktualizacji poza pamięcią urządzenia Mudita Pure,

c) uruchamiania, wyświetlania i korzystania z Oprogramowania lub/i Aktualizacji na urządzeniu Mudita Pure.

2. Każdy jeden egzemplarz urządzenia Mudita Pure, który w sposób zgodny z prawem, znalazł się w posiadaniu Użytkownika, uprawnia go do licencji na Oprogramowania lub/i Aktualizacje związane wyłącznie z tym egzemplarzem, w związku czym w zakresie każdego kolejnego egzemplarza urządzenia Mudita Pure, uzyskuje on odrębną licencję.

3. Poza przypadkami określonymi w niniejszej licencji, Mudita nie zezwala na to aby Oprogramowanie lub/i Aktualizacje objęte niniejszą licencją zainstalowane były w tym samym czasie na więcej niż jednym urządzeniu Mudita Pure, a także nie zezwala na dystrybuowanie lub udostępnianie Oprogramowania lub/i Aktualizacji przez sieć w celu używania na wielu urządzeniach w tym samym czasie.

4. Niniejsza licencja nie przyznaje Użytkownikowi żadnych praw do używania Oprogramowania lub/i Aktualizacji w celach innych niż korzystanie z urządzenia Mudita Pure zgodnie z jego funkcjami opisanymi w instrukcji obsługi.

5. Niniejsza licencja obowiązuje przez czas, w jakim Użytkownik będzie posiadał urządzenie Mudita Pure, przy czym wygasa ona wcześniej, z chwilą naruszenia przez Użytkownika jej postanowień. +Umowa licencyjna na oprogramowanie Mudita Pure

WAŻNE: UŻYWAJĄC URZĄDZENIA MUDITA PURE, UŻYTKOWNIK AKCEPTUJE TREŚĆ PONIŻSZEJ UMOWY LICENCYJNEJ NA JEGO OPROGRAMOWANIE. BEZ JEJ AKCEPTACJI NIEMOŻLIWE JEST PRAWIDŁOWE KORZYSTANIE Z URZĄDZENIA.



W ZWIĄZKU Z TYM, PRZED UŻYCIEM MUDITA PURE LUB POBRANIEM UAKTUALNIENIA JEGO OPROGRAMOWANIA NALEŻY DOKŁADNIE PRZECZYTAĆ TEKST LICENCJI.



JEŻELI UŻYTKOWNIK NIE ZGADZA SIĘ Z POSTANOWIENIAMI NINIEJSZEJ LICENCJI, NIE MOŻE UŻYWAĆ OPROGRAMOWANIA, ANI POBIERAĆ I UŻYWAĆ AKTUALIZACJI.



Definicje:

Oprogramowanie - należy przez to rozumieć oprogramowanie systemowe Mudita Pure, interfejsy oraz jego zawartość (w tym czcionki, dźwięki, dokumentację i inne dane zapisane w pamięci urządzenia w wersji fabrycznej).

Aktualizacja - należy przez to rozumieć uaktualnianie Oprogramowania, w tym dodanie/zmianę funkcji lub zastąpienie Oprogramowania nowym oprogramowaniem.

Mudita - Mudita sp. z o.o. z siedzibą w Warszawie (adres: ul. Jana Czeczota 6 02-607 Warszawa, Polska), wpisana do rejestru przedsiębiorców Krajowego Rejestru Sądowego pod numerem KRS: 0000467620, NIP: 5252558282, kapitał zakładowy 21.100,00 PLN

Użytkownik - osoba, która zgodnie z prawem stała się posiadaczem urządzenia Mudita Pure w celu korzystania z niego.



Warunki licencji:

1. Z chwilą akceptacji przez Użytkownika warunków niniejszej licencji, Mudita udziela Użytkownikowi urządzenia Mudita Pure licencji na Oprogramowanie, zaś z chwilą pobrania przez Użytkownika Aktualizacji, także licencji do takiej Aktualizacji, w ramach której Użytkownik otrzymuje niewyłączne, nieograniczone terytorialnie, prawo do korzystania z nich na jednym urządzeniu MUDITA PURE w zakresie:

a) przechowywania Oprogramowania i/lub Aktualizacji w pamięci urządzenia Mudita Pure,

b) przechowywania jednej kopii Oprogramowania i/lub Aktualizacji poza pamięcią urządzenia Mudita Pure,

c) uruchamiania, wyświetlania i korzystania z Oprogramowania lub/i Aktualizacji na urządzeniu Mudita Pure.

2. Każdy jeden egzemplarz urządzenia Mudita Pure, który w sposób zgodny z prawem, znalazł się w posiadaniu Użytkownika, uprawnia go do licencji na Oprogramowania lub/i Aktualizacje związane wyłącznie z tym egzemplarzem, w związku czym w zakresie każdego kolejnego egzemplarza urządzenia Mudita Pure, uzyskuje on odrębną licencję.

3. Poza przypadkami określonymi w niniejszej licencji, Mudita nie zezwala na to aby Oprogramowanie lub/i Aktualizacje objęte niniejszą licencją zainstalowane były w tym samym czasie na więcej niż jednym urządzeniu Mudita Pure, a także nie zezwala na dystrybuowanie lub udostępnianie Oprogramowania lub/i Aktualizacji przez sieć w celu używania na wielu urządzeniach w tym samym czasie.

4. Niniejsza licencja nie przyznaje Użytkownikowi żadnych praw do używania Oprogramowania lub/i Aktualizacji w celach innych niż korzystanie z urządzenia Mudita Pure zgodnie z jego funkcjami opisanymi w instrukcji obsługi.

5. Niniejsza licencja obowiązuje przez czas, w jakim Użytkownik będzie posiadał urządzenie Mudita Pure, przy czym wygasa ona wcześniej, z chwilą naruszenia przez Użytkownika jej postanowień. diff --git a/module-apps/application-settings/windows/advanced/UITestWindow.cpp b/module-apps/application-settings/windows/advanced/UITestWindow.cpp index cf6ad2335050cd8c1668b9900a4040caf8996f4a..dfcf8c06f573e96c11ac2a3e2913d883fcf1140a 100644 --- a/module-apps/application-settings/windows/advanced/UITestWindow.cpp +++ b/module-apps/application-settings/windows/advanced/UITestWindow.cpp @@ -30,7 +30,7 @@ namespace gui text->setFont(style::window::font::medium); LOG_DEBUG( "----------------------------------------------------------------------------------------------------"); - text->addRichText("

This
TextaddRichText("

This
Text is rich example

"); LOG_DEBUG( "----------------------------------------------------------------------------------------------------"); diff --git a/module-gui/gui/core/Font.cpp b/module-gui/gui/core/Font.cpp index e44570bc205f532df1e720a14ff0e9ef049e25c4..a8b2c05453eb7f32baad5d6202f2159d3a74a5a0 100644 --- a/module-gui/gui/core/Font.cpp +++ b/module-gui/gui/core/Font.cpp @@ -18,7 +18,8 @@ namespace gui setFont(name, size, weight); } - Font::Font(unsigned int size, Weight weight) : Font(font_default_type, size, weight) + Font::Font(unsigned int size, Weight weight) + : Font(FontManager::getInstance().getDefaultFontTypeName(), size, weight) {} Font::Font(RawFont *rawfont) @@ -41,7 +42,6 @@ namespace gui setFont(name, size, weight); } - void Font::setFont(std::string new_name, unsigned int new_size, Weight new_weight) { bool update = false; @@ -56,13 +56,13 @@ namespace gui set(weight, new_weight); if (update) { std::string raw_font_name = new_name + "_" + c_str(new_weight) + "_" + std::to_string(new_size); - font = FontManager::getInstance().getFont(raw_font_name); + font = FontManager::getInstance().getFontByName(raw_font_name); } } void Font::setFont(unsigned int size, Weight weight) { - setFont((font_default_type), size, weight); + setFont((FontManager::getInstance().getDefaultFontTypeName()), size, weight); } void Font::setSize(unsigned int new_size) diff --git a/module-gui/gui/core/Font.hpp b/module-gui/gui/core/Font.hpp index 847662ef4db29abd2f1d5cf87b7700fe105f2b8a..0465818fe967d87d27fd83873d9137e7d08b8425 100644 --- a/module-gui/gui/core/Font.hpp +++ b/module-gui/gui/core/Font.hpp @@ -7,9 +7,6 @@ namespace gui { - - inline const char *font_default_type = "gt_pressura"; - class RawFont; /// simple font interface for FontManager && RawFont @@ -34,7 +31,6 @@ namespace gui Font(unsigned int size, Weight weight = Weight::Regular); Font(RawFont *font); void setFont(std::string name, unsigned int size, Weight weight = Weight::Regular); - /// just for gt_pressura - we have it as default void setFont(unsigned int size, Weight weight = Weight::Regular); void setSize(unsigned int size); void setWeight(Weight weight); diff --git a/module-gui/gui/core/FontManager.cpp b/module-gui/gui/core/FontManager.cpp index 1ba34eada71a4eb90f7cacaf1e451cda7fad0b3e..c6503ca7258ad8947f90b9b32e2e26a0ce8794d6 100644 --- a/module-gui/gui/core/FontManager.cpp +++ b/module-gui/gui/core/FontManager.cpp @@ -7,14 +7,11 @@ #include "RawFont.hpp" // for RawFont #include // for LOG_ERROR, LOG_INFO, LOG_WARN #include +#include #include +#include #include -namespace style::window::font -{ - inline constexpr auto default_fallback_font = "dejavu_sans_bold_27"; -} - namespace gui { @@ -33,57 +30,63 @@ namespace gui void FontManager::loadFonts(std::string baseDirectory) { - fontFolder = baseDirectory + "/fonts"; - std::vector fontFiles = getFontsList(); + fontFolder = baseDirectory + "/fonts"; + fontMapFile = fontFolder + "/fontmap.json"; + auto fontFiles = getFontsList(); - for (std::string fontName : fontFiles) { - loadFont(fontName); + for (const auto &font : fontFiles) { + loadFont(font.first, font.second); } } - RawFont *FontManager::loadFont(std::string filename) + RawFont *FontManager::loadFont(const std::string &fontType, const std::string &path) { - auto file = std::fopen(filename.c_str(), "rb"); + auto file = std::fopen(path.c_str(), "rb"); if (file == nullptr) { + LOG_ERROR("Failed to open file: %s", path.c_str()); return nullptr; } - auto fileSize = std::filesystem::file_size(filename); - std::rewind(file); + const auto fileSize = std::filesystem::file_size(path); + + std::vector fontData(fileSize, 0); + + std::ifstream input(path, std::ios::in | std::ifstream::binary); + if (not input.is_open()) { + return nullptr; + } - char *fontData = new char[fileSize]; - if (fontData == nullptr) { + if (not input.read(reinterpret_cast(&fontData[0]), fontData.size())) { std::fclose(file); - LOG_ERROR(" Failed to allocate temporary font buffer"); return nullptr; } - // read data to buffer - auto bytesRead = std::fread(fontData, 1, fileSize, file); + const auto bytesRead = input.gcount(); // close file std::fclose(file); if (static_cast(bytesRead) != fileSize) { LOG_ERROR("Failed to read all file"); - delete[] fontData; return nullptr; } // allocate memory for new font - RawFont *font = new RawFont(); - if (font->load(reinterpret_cast(fontData)) != gui::Status::GUI_SUCCESS) { - delete font; - delete[] fontData; + RawFont *rawfont = new RawFont(); + if (!rawfont) { + return nullptr; + } + if (rawfont->load(&fontData[0]) != gui::Status::GUI_SUCCESS) { + delete rawfont; return nullptr; } else { // set id and push it to vector - font->id = fonts.size(); - fonts.push_back(font); + rawfont->id = fonts.size(); + fonts.push_back(rawfont); + fontMap.insert({fontType, rawfont->getName()}); } - delete[] fontData; - return font; + return rawfont; } bool hasEnding(std::string const &fullString, std::string const &ending) @@ -96,28 +99,60 @@ namespace gui } } - std::vector FontManager::getFontsList() + std::map FontManager::getFontsList() { - - std::vector fontFiles; - - LOG_INFO("Scanning fonts folder: %s", fontFolder.c_str()); - - for (const auto &entry : std::filesystem::directory_iterator(fontFolder)) { - if (!std::filesystem::is_directory(entry) && entry.path().extension() == ".mpf") { - fontFiles.push_back(entry.path().string()); + auto fd = std::fopen(fontMapFile.c_str(), "r"); + if (fd == nullptr) { + LOG_FATAL("Error during opening file %s", fontMapFile.c_str()); + return {}; + } + + uint32_t fsize = std::filesystem::file_size(fontMapFile); + auto fontmapString = std::make_unique(fsize + 1); + memset(fontmapString.get(), 0, fsize + 1); + std::fread(fontmapString.get(), 1, fsize, fd); + std::fclose(fd); + + json11::Json fontmapJson; + std::string err; + fontmapJson = json11::Json::parse(fontmapString.get(), err); + if (!err.empty()) { + LOG_ERROR("Failed parsing device string!"); + throw std::invalid_argument("Can't parse the file!"); + } + + auto fontmapObjects = fontmapJson.object_items(); + const auto infoJson = fontmapObjects["info"]; + defaultFontName = infoJson["default_font_name"].string_value(); + defaultFontTypeName = infoJson["default_font_type_name"].string_value(); + + const auto styleJson = fontmapObjects["style"]; + std::map fontFiles; + + for (const auto &entry : styleJson.object_items()) { + auto fontName = entry.second.string_value(); + if (!std::filesystem::is_regular_file(fontFolder + "/" + fontName)) { + LOG_ERROR("Could not find font: %s", fontName.c_str()); + } + else { + LOG_INFO("Add font to list: %s - %s", entry.first.c_str(), fontName.c_str()); + fontFiles.insert({entry.first, fontFolder + "/" + fontName}); } } - LOG_INFO("Total number of fonts: %u", static_cast(fontFiles.size())); return fontFiles; } + auto FontManager::getFontName(const std::string &fontType) const -> std::string + { + return getFont(fontType)->getName(); + } + bool FontManager::init(std::string baseDirectory) { loadFonts(baseDirectory); - auto fallback_font = find(style::window::font::default_fallback_font); + auto fallback_font = find(getFontName(defaultFontName)); if (fallback_font != nullptr) { for (auto font : fonts) { font->setFallbackFont(fallback_font); @@ -137,11 +172,11 @@ namespace gui return instance; } - [[nodiscard]] auto FontManager::getFont(std::string_view name) const -> RawFont * + [[nodiscard]] auto FontManager::getFontByName(std::string_view name) const -> RawFont * { auto font = find(name); // default return first font - if (font == nullptr && fonts.size() > 0) { + if (font == nullptr && not fonts.empty()) { #if DEBUG_MISSING_ASSETS == 1 LOG_ERROR("=> font not found: %s using default", name.data()); #endif @@ -161,6 +196,38 @@ namespace gui return fonts[num]; } + [[nodiscard]] auto FontManager::getFont(const std::string &fontType) const -> RawFont * + { + auto fontPath = fontMap.find(fontType); + if (fontPath != fontMap.end()) { + auto rawFont = find(fontPath->second); + if (rawFont) { + return rawFont; + } + } + if (not fonts.empty()) { +#if DEBUG_MISSING_ASSETS == 1 + LOG_ERROR("=> font not found: %s using default", fontType.c_str()); +#endif + return fonts[0]; + } + return nullptr; + } + + [[nodiscard]] auto FontManager::getFont() const -> RawFont * + { + return getFont(defaultFontName); + } + + auto FontManager::getDefaultFontName() const -> std::string + { + return defaultFontName; + } + auto FontManager::getDefaultFontTypeName() const -> std::string + { + return defaultFontTypeName; + } + auto FontManager::find(std::string_view name) const -> RawFont * { for (const auto &font : fonts) { @@ -170,4 +237,5 @@ namespace gui } return nullptr; } + }; // namespace gui diff --git a/module-gui/gui/core/FontManager.hpp b/module-gui/gui/core/FontManager.hpp index 7dadffb850685d1314573cc0f99ea92200b4aa0b..5dbb23a444a077e81aa4dc91811d1461e8244c9e 100644 --- a/module-gui/gui/core/FontManager.hpp +++ b/module-gui/gui/core/FontManager.hpp @@ -4,6 +4,7 @@ #pragma once #include // for uint32_t +#include // for map #include // for string #include // for vector @@ -24,10 +25,12 @@ namespace gui protected: std::string fontFolder; + std::string fontMapFile; std::vector fonts; - std::vector getFontsList(); + std::map fontMap{}; + std::map getFontsList(); - RawFont *loadFont(std::string filename); + RawFont *loadFont(const std::string &font, const std::string &path); void loadFonts(std::string baseDirectory); FontManager() = default; @@ -42,16 +45,22 @@ namespace gui virtual ~FontManager(); - [[nodiscard]] auto getFont(std::string_view name = defaultFontName) const -> RawFont *; + [[nodiscard]] auto getFont() const -> RawFont *; + [[nodiscard]] auto getFont(const std::string &fontType) const -> RawFont *; [[nodiscard]] auto getFont(uint32_t num) const -> RawFont *; + [[nodiscard]] auto getFontByName(std::string_view name) const -> RawFont *; [[nodiscard]] auto isInitialized() const { return initialized; } - - static constexpr auto defaultFontName{"gt_pressura_regular_27"}; + [[nodiscard]] auto getFontName(const std::string &font) const -> std::string; + [[nodiscard]] auto getDefaultFontName() const -> std::string; + [[nodiscard]] auto getDefaultFontTypeName() const -> std::string; private: + std::string defaultFontName{}; + std::string defaultFontTypeName{}; + [[nodiscard]] auto find(std::string_view name) const -> RawFont *; }; }; // namespace gui diff --git a/module-gui/gui/widgets/Style.hpp b/module-gui/gui/widgets/Style.hpp index ab6d52c6beeda9482584a10fa1d63fd463cef05b..a3ed3404ac414ce26e33ea0192e945a495158e25 100644 --- a/module-gui/gui/widgets/Style.hpp +++ b/module-gui/gui/widgets/Style.hpp @@ -40,7 +40,7 @@ namespace style namespace font { - inline constexpr auto title = "gt_pressura_bold_30"; + inline constexpr auto title = "bigbold"; } // namespace font } // namespace header @@ -58,24 +58,24 @@ namespace style inline constexpr auto default_rect_yaps = 10U; namespace font { - inline constexpr auto huge = "gt_pressura_regular_190"; - inline constexpr auto supersizeme = "gt_pressura_regular_90"; - inline constexpr auto supersizemelight = "gt_pressura_light_90"; - inline constexpr auto largelight = "gt_pressura_light_46"; - inline constexpr auto large = "gt_pressura_regular_46"; - inline constexpr auto verybiglight = "gt_pressura_light_38"; - inline constexpr auto verybig = "gt_pressura_regular_38"; - inline constexpr auto mediumbigbold = "gt_pressura_bold_32"; - inline constexpr auto bigbold = "gt_pressura_bold_30"; - inline constexpr auto big = "gt_pressura_regular_30"; - inline constexpr auto biglight = "gt_pressura_light_30"; - inline constexpr auto mediumbold = "gt_pressura_bold_27"; - inline constexpr auto medium = "gt_pressura_regular_27"; - inline constexpr auto mediumlight = "gt_pressura_light_27"; - inline constexpr auto smallbold = "gt_pressura_bold_24"; - inline constexpr auto small = "gt_pressura_regular_24"; - inline constexpr auto verysmallbold = "gt_pressura_bold_20"; - inline constexpr auto verysmall = "gt_pressura_regular_20"; + inline constexpr auto huge = "huge"; + inline constexpr auto supersizeme = "supersizeme"; + inline constexpr auto supersizemelight = "supersizemelight"; + inline constexpr auto largelight = "largelight"; + inline constexpr auto large = "large"; + inline constexpr auto verybiglight = "verybiglight"; + inline constexpr auto verybig = "verybig"; + inline constexpr auto mediumbigbold = "mediumbigbold"; + inline constexpr auto bigbold = "bigbold"; + inline constexpr auto big = "big"; + inline constexpr auto biglight = "biglight"; + inline constexpr auto mediumbold = "mediumbold"; + inline constexpr auto medium = "medium"; + inline constexpr auto mediumlight = "mediumlight"; + inline constexpr auto smallbold = "smallbold"; + inline constexpr auto small = "small"; + inline constexpr auto verysmallbold = "verysmallbold"; + inline constexpr auto verysmall = "verysmall"; }; // namespace font inline constexpr auto list_offset_default = 12U; @@ -115,8 +115,8 @@ namespace style namespace font { - inline constexpr auto bold = "gt_pressura_bold_24"; - inline constexpr auto medium = "gt_pressura_regular_24"; + inline constexpr auto bold = "mediumbold"; + inline constexpr auto medium = "medium"; }; // namespace font } // namespace nav_bar diff --git a/module-gui/gui/widgets/status-bar/Style.hpp b/module-gui/gui/widgets/status-bar/Style.hpp index 109a9110d12de63e97c5b485ebe6825fba4fced5..1da96077b5e4b600444e287bd88854e8cb9279b8 100644 --- a/module-gui/gui/widgets/status-bar/Style.hpp +++ b/module-gui/gui/widgets/status-bar/Style.hpp @@ -21,28 +21,28 @@ namespace style::status_bar }; // namespace margins namespace time { - inline constexpr auto font = "gt_pressura_regular_24"; + inline constexpr auto font = style::window::font::small; inline constexpr auto maxX = 100u; inline constexpr auto bottomPadding = 5u; }; // namespace time namespace nat { inline constexpr auto maxX = 35u; - inline constexpr auto font = "gt_pressura_regular_20"; + inline constexpr auto font = style::window::font::verysmall; }; // namespace nat namespace phonemode { inline constexpr auto maxX = 157u; - inline constexpr auto font = "gt_pressura_regular_20"; + inline constexpr auto font = style::window::font::verysmall; }; // namespace phonemode namespace signal { - inline constexpr auto font = "gt_pressura_regular_20"; + inline constexpr auto font = style::window::font::verysmall; inline constexpr auto maxX = 80u; }; // namespace signal namespace battery { - inline constexpr auto font = "gt_pressura_regular_20"; + inline constexpr auto font = style::window::font::verysmall; inline constexpr auto maxX = 70U; }; // namespace battery namespace boxes diff --git a/module-gui/test/test-catch-text/CMakeLists.txt b/module-gui/test/test-catch-text/CMakeLists.txt index a06bbb3a500e3542355d638b588abb5713f6637f..daa8f0cc4d5f47eb1c01f3eba33df009b8a15f2f 100644 --- a/module-gui/test/test-catch-text/CMakeLists.txt +++ b/module-gui/test/test-catch-text/CMakeLists.txt @@ -1,4 +1,16 @@ # gui tests + +set(PROPRIETARY_SOURCES "") +if (${ASSETS_TYPE} STREQUAL "Propertiary") + list(APPEND PROPRIETARY_SOURCES + test-gui-Text.cpp + test-gui-TextFixedSize.cpp + test-gui-Font.cpp + test-gui-TextLinesCursor.cpp + test-gui-TextInLineCursor.cpp + ) +endif() + add_catch2_executable( NAME gui-text @@ -6,17 +18,14 @@ add_catch2_executable( ../mock/buildTextDocument.cpp ../mock/multi-line-string.cpp ../mock/InitializedFontManager.cpp - test-gui-Text.cpp - test-gui-TextFixedSize.cpp test-gui-TextBlock.cpp test-gui-TextBlockCursor.cpp test-gui-TextDocument.cpp test-gui-MultiTextLine.cpp test-gui-TextParse.cpp - test-gui-Font.cpp - test-gui-TextLinesCursor.cpp - test-gui-TextInLineCursor.cpp - INCLUDE + ${PROPRIETARY_SOURCES} + + INCLUDE .. ../mock/ LIBS diff --git a/module-gui/test/test-catch-text/test-gui-Font.cpp b/module-gui/test/test-catch-text/test-gui-Font.cpp index 6f9702fbc2c5a4cec72b845720423d2600b9a548..33fbd65ec8cb03b2b658b3c867b5e6339d83f7e6 100644 --- a/module-gui/test/test-catch-text/test-gui-Font.cpp +++ b/module-gui/test/test-catch-text/test-gui-Font.cpp @@ -16,7 +16,7 @@ TEST_CASE("Testo Font") { auto f = Font(27); auto raw_font = fm.getFont(style::window::font::medium); - REQUIRE(fm.getFont("gt_pressura_regular_27") == raw_font); /// check that style is ok + REQUIRE(fm.getFontByName("gt_pressura_regular_27") == raw_font); /// check that style is ok REQUIRE(f.raw() == raw_font); /// check that Font() works ok f.setWeight(Font::Weight::Bold); REQUIRE(f.raw() == fm.getFont(style::window::font::mediumbold)); // check for changed weight diff --git a/module-gui/test/test-catch-text/test-gui-Text.cpp b/module-gui/test/test-catch-text/test-gui-Text.cpp index 4d3c380ca4a12e2498bb2e8f4396ba22d9d4527b..ab16adfa5489d1f7d63284fb9a05c621d82f6dfe 100644 --- a/module-gui/test/test-catch-text/test-gui-Text.cpp +++ b/module-gui/test/test-catch-text/test-gui-Text.cpp @@ -609,9 +609,8 @@ TEST_CASE("Text addition bounds - text sings count restricted") std::string testStringOneLine = "Test String 1"; std::string testStringTwoLines = "Test String 1\n Test String 2"; - std::string richTextTwoLines = - "TestString1

Test String 2"; + std::string richTextTwoLines = "TestString1

Test String 2"; SECTION("Adding text to max signs count set to 0") { @@ -741,7 +740,7 @@ TEST_CASE("Text addition bounds - text widget size restricted") std::string testStringSecondLine = "Test String 2"; std::string richTextTwoLines = - "Test String Test String 1

Test String 2"; SECTION("Adding text to 0 size text and no parent to grant size") @@ -985,7 +984,7 @@ TEST_CASE("Text addition bounds - text widget line size restricted") std::string testStringSecondLine = "Test String 2"; std::string richTextTwoLines = - "Test String Test String 1

Test String 2"; SECTION("Adding text to 0 line size text") @@ -1126,7 +1125,7 @@ TEST_CASE("Text addition bounds - multiple limits tests") std::string testStringTwoLines = "Test String 1\nTest String 2"; std::string richTextTwoLines = - "Test String Test String 1

Test String 2"; SECTION("Adding text to lower limit set to signs count and size and lines on higher limit") diff --git a/module-utils/log/api/log/debug.hpp b/module-utils/log/api/log/debug.hpp index 598c78005faa5dbf9ee22b3b3c502fc23daeef1a..e49ca695ef73dedf0fde30bddbfeaa59c77f02b2 100644 --- a/module-utils/log/api/log/debug.hpp +++ b/module-utils/log/api/log/debug.hpp @@ -19,4 +19,4 @@ #define DEBUG_TIMER 0 /// debug timers system utility #define DEBUG_SETTINGS_DB 0 /// show extensive settings logs for all applications #define DEBUG_SERVICE_CELLULAR 0 /// show various logs in cellular service -#define DEBUG_MISSING_ASSETS 1 /// show debug concerning missing assets +#define DEBUG_MISSING_ASSETS 0 /// show debug concerning missing assets diff --git a/products/BellHybrid/CMakeLists.txt b/products/BellHybrid/CMakeLists.txt index 763421a4f447253725327dd993c1039ea8ad22ef..5159efa461e834ee5d9ecca476eaac4dfeebda36 100644 --- a/products/BellHybrid/CMakeLists.txt +++ b/products/BellHybrid/CMakeLists.txt @@ -82,7 +82,8 @@ add_boot_bin(BellHybrid) add_image( PRODUCT BellHybrid SYSROOT sysroot - LUTS Luts.bin + "$<$:LUTS Luts.bin>" + "$<$:LUTS \"\">" DEPENDS assets updater.bin-target ecoboot.bin-target BellHybrid-boot.bin BellHybrid-version.json-target ) @@ -92,20 +93,33 @@ add_hex_target(BellHybrid) include(BinaryAssetsVersions.cmake) include(DownloadAsset) # copy all assets required to build catalog under current folder as in json recipe -download_asset_json( json-target - ${CMAKE_CURRENT_SOURCE_DIR}/assets.json - ${CMAKE_BINARY_DIR}/sysroot/sys/current/ - MuditaOSAssets - ${MUDITA_CACHE_DIR} +download_asset_json(json-proprietary-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_proprietary.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSAssets + ${MUDITA_CACHE_DIR} + ) +download_asset_release_json(json-common-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSPublicAssets + 0.0.4 + ${MUDITA_CACHE_DIR} + ) +download_asset_release_json(json-community-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSPublicAssets + 0.0.4 + ${MUDITA_CACHE_DIR} + ) +download_asset_release_json(json-rt1051-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_rt1051.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSPublicAssets + 0.0.4 + ${MUDITA_CACHE_DIR} ) -# copy all assets required to build catalog under current folder as in json recipe -download_asset_release_json( json-images-target - ${CMAKE_CURRENT_SOURCE_DIR}/assets_images.json - ${CMAKE_BINARY_DIR}/sysroot/sys/current/ - MuditaOSPublicAssets - 0.0.2 - ${MUDITA_CACHE_DIR} - ) download_asset_release(PureUpdater_RT.bin updater.bin PureUpdater ${UPDATER_BIN_VERSION} ${MUDITA_CACHE_DIR}) download_asset_release(ecoboot.bin ecoboot.bin ecoboot ${ECOBOOT_BIN_VERSION} ${MUDITA_CACHE_DIR}) diff --git a/products/BellHybrid/apps/application-bell-settings/data/BellSettingsStyle.hpp b/products/BellHybrid/apps/application-bell-settings/data/BellSettingsStyle.hpp index c3a6c1d355df87f386ed9f6b416b6dc9ed4f3f99..2d03492b46b1f34d2b53732a1401f6224e564894 100644 --- a/products/BellHybrid/apps/application-bell-settings/data/BellSettingsStyle.hpp +++ b/products/BellHybrid/apps/application-bell-settings/data/BellSettingsStyle.hpp @@ -24,7 +24,7 @@ namespace gui namespace top_text { - inline constexpr auto font = "gt_pressura_light_46"; + inline constexpr auto font = style::window::font::largelight; } namespace alarm_settings_window { @@ -34,7 +34,7 @@ namespace gui } // namespace alarm_settings_window namespace alarm_settings_chime_tone { - inline constexpr auto font_center = "gt_pressura_light_46"; + inline constexpr auto font_center = style::window::font::largelight; } namespace about_your_bell_window @@ -57,7 +57,7 @@ namespace gui } // namespace bedtime_settings_window namespace bedtime_settings_chime_tone { - inline constexpr auto font_center = "gt_pressura_light_46"; + inline constexpr auto font_center = style::window::font::largelight; } } // namespace bell_settings_style } // namespace gui diff --git a/products/BellHybrid/assets_images.json b/products/BellHybrid/assets/assets_common.json similarity index 100% rename from products/BellHybrid/assets_images.json rename to products/BellHybrid/assets/assets_common.json diff --git a/products/BellHybrid/assets/assets_community.json b/products/BellHybrid/assets/assets_community.json new file mode 100644 index 0000000000000000000000000000000000000000..8a869a1529f10bca4381d4210b4aa86e0337af33 --- /dev/null +++ b/products/BellHybrid/assets/assets_community.json @@ -0,0 +1,99 @@ +{ + "assets": [ + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/fontmap.json", + "output": "assets/fonts/fontmap.json" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_140.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_140.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_90.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_90.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_46.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_46.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_46.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_46.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_38.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_38.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_38.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_38.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_32.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_32.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_24.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_24.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_24.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_24.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_20.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_20.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_20.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_20.mpf" + } + ] +} diff --git a/products/BellHybrid/assets.json b/products/BellHybrid/assets/assets_proprietary.json similarity index 64% rename from products/BellHybrid/assets.json rename to products/BellHybrid/assets/assets_proprietary.json index a832815fa683d52ba380b4e6a220d55fa3273ba2..3341ced29c207dd7669e356c674875d6d3a03d74 100644 --- a/products/BellHybrid/assets.json +++ b/products/BellHybrid/assets/assets_proprietary.json @@ -1,65 +1,63 @@ { "comment": "This is kiss structure - asset path & sha", "assets": [ + { + "name": "./fonts/fontmap.json", + "output": "assets/fonts/fontmap.json" + }, { "name": "./fonts/pure/dejavu_sans_bold_27.mpf", - "output":"assets/fonts/dejavu_sans_bold_27.mpf" + "output": "assets/fonts/dejavu_sans_bold_27.mpf" }, { "name": "./fonts/bell/gt_pressura_regular_38.mpf", - "output": "assets/fonts/gt_pressura_regular_38.mpf", + "output": "assets/fonts/gt_pressura/gt_pressura_regular_38.mpf", "ref": "fd168040c5d1216d457e6cf223e8ea9bb76bf7b" }, { "name": "./fonts/bell/gt_pressura_light_38.mpf", - "output": "assets/fonts/gt_pressura_light_38.mpf", + "output": "assets/fonts/gt_pressura/gt_pressura_light_38.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a" }, { "name": "./fonts/bell/gt_pressura_regular_90.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_90.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_90.mpf" }, { "name": "./fonts/bell/gt_pressura_regular_190.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_190.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_190.mpf" }, { "name": "./fonts/common/gt_pressura_light_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_30.mpf" }, { "name": "./fonts/common/gt_pressura_bold_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_bold_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_bold_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_46.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_46.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_90.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_90.mpf" - }, - { - "name": "image/Luts.bin.tgz", - "tarfile": "Luts.bin", - "output": "Luts.bin", - "unpack": true + "output": "assets/fonts/gt_pressura/gt_pressura_light_90.mpf" } ] } diff --git a/products/BellHybrid/assets/assets_rt1051.json b/products/BellHybrid/assets/assets_rt1051.json new file mode 100644 index 0000000000000000000000000000000000000000..969983017516fca8c771ddbf62bbb3ca0ddeaf2a --- /dev/null +++ b/products/BellHybrid/assets/assets_rt1051.json @@ -0,0 +1,11 @@ +{ + "comment": "This is kiss structure - asset path & sha", + "assets": [ + { + "name": "image/Luts.bin.tgz", + "tarfile": "Luts.bin", + "output": "Luts.bin", + "unpack": true + } + ] +} diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt index 9ed18634e693e4f2a10a9f1d504f6cd4dbbf0f59..f122c3d4e19efdaa99998c697f32c4123e363f17 100644 --- a/products/PurePhone/CMakeLists.txt +++ b/products/PurePhone/CMakeLists.txt @@ -107,7 +107,8 @@ add_boot_bin(PurePhone) add_image( PRODUCT PurePhone SYSROOT sysroot - LUTS Luts.bin + "$<$:LUTS Luts.bin>" + "$<$:LUTS \"\">" DEPENDS assets updater.bin-target ecoboot.bin-target PurePhone-boot.bin PurePhone-version.json-target ) @@ -117,19 +118,33 @@ add_hex_target(PurePhone) include(BinaryAssetsVersions.cmake) include(DownloadAsset) -download_asset_json( json-target - ${CMAKE_CURRENT_SOURCE_DIR}/assets.json - ${CMAKE_BINARY_DIR}/sysroot/sys/current/ - MuditaOSAssets - ${MUDITA_CACHE_DIR} - ) -download_asset_release_json( json-images-target - ${CMAKE_CURRENT_SOURCE_DIR}/assets_images.json - ${CMAKE_BINARY_DIR}/sysroot/sys/current/ - MuditaOSPublicAssets - 0.0.4 - ${MUDITA_CACHE_DIR} - ) +download_asset_json(json-proprietary-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_proprietary.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSAssets + ${MUDITA_CACHE_DIR} + ) +download_asset_release_json(json-common-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSPublicAssets + 0.0.5 + ${MUDITA_CACHE_DIR} + ) +download_asset_release_json(json-community-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSPublicAssets + 0.0.5 + ${MUDITA_CACHE_DIR} + ) +download_asset_release_json(json-rt1051-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_rt1051.json + ${CMAKE_BINARY_DIR}/sysroot/sys/current/ + MuditaOSPublicAssets + 0.0.5 + ${MUDITA_CACHE_DIR} + ) download_asset_release(PureUpdater_RT.bin updater.bin PureUpdater ${UPDATER_BIN_VERSION} ${MUDITA_CACHE_DIR}) download_asset_release(ecoboot.bin ecoboot.bin ecoboot ${ECOBOOT_BIN_VERSION} ${MUDITA_CACHE_DIR}) diff --git a/products/PurePhone/assets_images.json b/products/PurePhone/assets/assets_common.json similarity index 100% rename from products/PurePhone/assets_images.json rename to products/PurePhone/assets/assets_common.json diff --git a/products/PurePhone/assets/assets_community.json b/products/PurePhone/assets/assets_community.json new file mode 100644 index 0000000000000000000000000000000000000000..8a869a1529f10bca4381d4210b4aa86e0337af33 --- /dev/null +++ b/products/PurePhone/assets/assets_community.json @@ -0,0 +1,99 @@ +{ + "assets": [ + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/fontmap.json", + "output": "assets/fonts/fontmap.json" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_140.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_140.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_90.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_90.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_46.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_46.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_46.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_46.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_38.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_38.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_38.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_38.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_32.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_32.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_24.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_24.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_24.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_24.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_20.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_20.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_20.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_20.mpf" + } + ] +} diff --git a/products/PurePhone/assets.json b/products/PurePhone/assets/assets_proprietary.json similarity index 59% rename from products/PurePhone/assets.json rename to products/PurePhone/assets/assets_proprietary.json index 84ce2c0d02dafe1221e5511f27e559bd2237a0db..096ca637f5b2a2ae0b6ad999dd0d1445e54cde74 100644 --- a/products/PurePhone/assets.json +++ b/products/PurePhone/assets/assets_proprietary.json @@ -1,76 +1,75 @@ { + "comment": "This is kiss structure - asset path & sha", "assets": [ + { + "name": "./fonts/fontmap.json", + "output": "assets/fonts/fontmap.json" + }, { "name": "./fonts/pure/dejavu_sans_bold_27.mpf", "output":"assets/fonts/dejavu_sans_bold_27.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_20.mpf", - "output":"assets/fonts/gt_pressura_regular_20.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_20.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_20.mpf", - "output":"assets/fonts/gt_pressura_bold_20.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_20.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_24.mpf", - "output":"assets/fonts/gt_pressura_regular_24.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_24.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_24.mpf", - "output":"assets/fonts/gt_pressura_bold_24.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_24.mpf" }, { "name": "./fonts/pure/gt_pressura_light_27.mpf", - "output":"assets/fonts/gt_pressura_light_27.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_light_27.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_27.mpf", - "output":"assets/fonts/gt_pressura_regular_27.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_27.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_27.mpf", - "output":"assets/fonts/gt_pressura_bold_27.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_27.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_32.mpf", - "output":"assets/fonts/gt_pressura_bold_32.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_32.mpf" }, { "name": "./fonts/common/gt_pressura_light_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_30.mpf" }, { "name": "./fonts/common/gt_pressura_bold_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_bold_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_bold_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_46.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_46.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_90.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_90.mpf" - }, - { - "name": "image/Luts.bin.tgz", - "tarfile" : "Luts.bin", - "output": "Luts.bin", - "unpack": true + "output": "assets/fonts/gt_pressura/gt_pressura_light_90.mpf" } ] } diff --git a/products/PurePhone/assets/assets_rt1051.json b/products/PurePhone/assets/assets_rt1051.json new file mode 100644 index 0000000000000000000000000000000000000000..969983017516fca8c771ddbf62bbb3ca0ddeaf2a --- /dev/null +++ b/products/PurePhone/assets/assets_rt1051.json @@ -0,0 +1,11 @@ +{ + "comment": "This is kiss structure - asset path & sha", + "assets": [ + { + "name": "image/Luts.bin.tgz", + "tarfile": "Luts.bin", + "output": "Luts.bin", + "unpack": true + } + ] +} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ae50380bd9ffe86c2e54b88acf21540bc42cb5b7..26ce52fbc1958c1b95759291b86c89d8875381a2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -25,19 +25,39 @@ set(TEST_ASSETS_DEST_DIR ${CMAKE_BINARY_DIR}/test-sysroot/sys) set(TEST_ASSETS_DEST_DIR ${TEST_ASSETS_DEST_DIR} PARENT_SCOPE) include(DownloadAsset) -download_asset_json( json-test-target - ${CMAKE_CURRENT_SOURCE_DIR}/assets.json - ${TEST_ASSETS_DEST_DIR}/current/ - MuditaOSAssets - ${MUDITA_CACHE_DIR} + +download_asset_release_json(json-test-community-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json + ${TEST_ASSETS_DEST_DIR}/current/ + MuditaOSPublicAssets + 0.0.4 + ${MUDITA_CACHE_DIR} + ) + +download_asset_json(json-test-proprietary-target + ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_proprietary.json + ${TEST_ASSETS_DEST_DIR}/current/ + MuditaOSAssets + ${MUDITA_CACHE_DIR} ) +set(ASSETS_DEPENDENCIES "") + +if (${ASSETS_TYPE} STREQUAL "Proprietary") + list(APPEND ASSETS_DEPENDENCIES "json-test-proprietary-target") +endif() + +if (${ASSETS_TYPE} STREQUAL "Community") + list(APPEND ASSETS_DEPENDENCIES "json-test-community-target") +endif() + add_assets_target( TARGET test-assets SOURCE_DIR ${ASSETS_SOURCE_DIR} DEST_DIR ${TEST_ASSETS_DEST_DIR} DEVEL ON - DEPENDS json-test-target + DEPENDS + ${ASSETS_DEPENDENCIES} ) add_image( diff --git a/test/assets/assets_community.json b/test/assets/assets_community.json new file mode 100644 index 0000000000000000000000000000000000000000..8a869a1529f10bca4381d4210b4aa86e0337af33 --- /dev/null +++ b/test/assets/assets_community.json @@ -0,0 +1,99 @@ +{ + "assets": [ + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/fontmap.json", + "output": "assets/fonts/fontmap.json" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_140.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_140.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_90.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_90.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_46.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_46.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_46.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_46.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_38.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_38.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_38.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_38.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_32.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_32.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_30.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_30.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_27.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_light_27.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_24.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_24.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_24.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_24.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_bold_20.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_bold_20.mpf" + }, + { + "name": "release.tgz", + "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_20.mpf", + "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_20.mpf" + } + ] +} diff --git a/test/assets.json b/test/assets/assets_proprietary.json similarity index 50% rename from test/assets.json rename to test/assets/assets_proprietary.json index ed7a6c3feb375b761107030ca5d806058fa63dda..7799ac4ac42f6fb0895d66865f323c328322e7ec 100644 --- a/test/assets.json +++ b/test/assets/assets_proprietary.json @@ -1,68 +1,73 @@ { + "comment": "This is kiss structure - asset path & sha", "assets": [ + { + "name": "./fonts/fontmap.json", + "output": "assets/fonts/fontmap.json" + }, { "name" : "./fonts/pure/gt_pressura_regular_38.mpf", - "output":"assets/fonts/gt_pressura_regular_38.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_38.mpf" }, { "name": "./fonts/pure/dejavu_sans_bold_27.mpf", - "output":"assets/fonts/dejavu_sans_bold_27.mpf" + "output":"assets/fonts/gt_pressura/dejavu_sans_bold_27.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_20.mpf", - "output":"assets/fonts/gt_pressura_regular_20.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_20.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_20.mpf", - "output":"assets/fonts/gt_pressura_bold_20.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_20.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_24.mpf", - "output":"assets/fonts/gt_pressura_regular_24.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_24.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_24.mpf", - "output":"assets/fonts/gt_pressura_bold_24.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_24.mpf" }, { "name": "./fonts/pure/gt_pressura_light_27.mpf", - "output":"assets/fonts/gt_pressura_light_27.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_light_27.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_27.mpf", - "output":"assets/fonts/gt_pressura_regular_27.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_regular_27.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_27.mpf", - "output":"assets/fonts/gt_pressura_bold_27.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_27.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_32.mpf", - "output":"assets/fonts/gt_pressura_bold_32.mpf" + "output":"assets/fonts/gt_pressura/gt_pressura_bold_32.mpf" }, { "name": "./fonts/common/gt_pressura_light_30.mpf", - "output": "assets/fonts/gt_pressura_light_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_30.mpf", - "output": "assets/fonts/gt_pressura_regular_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_30.mpf" }, { "name": "./fonts/common/gt_pressura_bold_30.mpf", - "output": "assets/fonts/gt_pressura_bold_30.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_bold_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_46.mpf", - "output": "assets/fonts/gt_pressura_regular_46.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_regular_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_46.mpf", - "output": "assets/fonts/gt_pressura_light_46.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_90.mpf", - "output": "assets/fonts/gt_pressura_light_90.mpf" + "output": "assets/fonts/gt_pressura/gt_pressura_light_90.mpf" } ] }