diff --git a/CMakeLists.txt b/CMakeLists.txt index ea3786b0b..2f3381237 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) -project(WatchFlower VERSION 6.0 LANGUAGES CXX) +project(RYLO-SmartCare VERSION 6.0 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -118,8 +118,8 @@ qt_add_executable(${CMAKE_PROJECT_NAME} ) qt_add_qml_module(${CMAKE_PROJECT_NAME} - URI ${CMAKE_PROJECT_NAME} - RESOURCE_PREFIX "/WatchFlower" + URI "SmartCare" + RESOURCE_PREFIX "/SmartCare" QML_FILES qml/MobileApplication.qml qml/MobileHeader.qml @@ -287,7 +287,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") MACOSX_BUNDLE ON MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/assets/macos/Info.plist" # New Xcode attributes (???) - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "io.emeric.watchflower" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.rylo.smartcare" XCODE_ATTRIBUTE_PRODUCT_NAME ${CMAKE_PROJECT_NAME} XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${CMAKE_PROJECT_VERSION} XCODE_ATTRIBUTE_MARKETING_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} @@ -307,7 +307,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS") # Qt QT_IOS_LAUNCH_SCREEN "${CMAKE_SOURCE_DIR}/assets/ios/LaunchScreen.storyboard" # New Xcode attributes (???) - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "io.emeric.watchflower" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.rylo.smartcare" XCODE_ATTRIBUTE_PRODUCT_NAME ${CMAKE_PROJECT_NAME} XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${CMAKE_PROJECT_VERSION} XCODE_ATTRIBUTE_MARKETING_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} diff --git a/assets/android/AndroidManifest.xml b/assets/android/AndroidManifest.xml index c9ef2536c..d4a0c9827 100644 --- a/assets/android/AndroidManifest.xml +++ b/assets/android/AndroidManifest.xml @@ -1,79 +1,64 @@ - + - + - - - - + + + + - - + + - - + + - + - - - + + + - + - - + - - + + - - - - - - - + + + + + + - - + + - + - - - + + + diff --git a/assets/android/res/drawable-hdpi/ic_stat_logo.png b/assets/android/res/drawable-hdpi/ic_stat_logo.png deleted file mode 100644 index 12581eb26..000000000 Binary files a/assets/android/res/drawable-hdpi/ic_stat_logo.png and /dev/null differ diff --git a/assets/android/res/drawable-hdpi/icon.png b/assets/android/res/drawable-hdpi/icon.png new file mode 100644 index 000000000..5e5d2e3dc Binary files /dev/null and b/assets/android/res/drawable-hdpi/icon.png differ diff --git a/assets/android/res/drawable-hdpi/logo.png b/assets/android/res/drawable-hdpi/logo.png new file mode 100644 index 000000000..25b9a9f0b Binary files /dev/null and b/assets/android/res/drawable-hdpi/logo.png differ diff --git a/assets/android/res/drawable-hdpi/splashicon.png b/assets/android/res/drawable-hdpi/splashicon.png deleted file mode 100644 index eefc9329b..000000000 Binary files a/assets/android/res/drawable-hdpi/splashicon.png and /dev/null differ diff --git a/assets/android/res/drawable-ldpi/icon.png b/assets/android/res/drawable-ldpi/icon.png new file mode 100644 index 000000000..560888fc3 Binary files /dev/null and b/assets/android/res/drawable-ldpi/icon.png differ diff --git a/assets/android/res/drawable-ldpi/logo.png b/assets/android/res/drawable-ldpi/logo.png new file mode 100644 index 000000000..5704b7888 Binary files /dev/null and b/assets/android/res/drawable-ldpi/logo.png differ diff --git a/assets/android/res/drawable-mdpi/icon.png b/assets/android/res/drawable-mdpi/icon.png new file mode 100644 index 000000000..8af5a4474 Binary files /dev/null and b/assets/android/res/drawable-mdpi/icon.png differ diff --git a/assets/android/res/drawable-mdpi/logo.png b/assets/android/res/drawable-mdpi/logo.png new file mode 100644 index 000000000..d440e730c Binary files /dev/null and b/assets/android/res/drawable-mdpi/logo.png differ diff --git a/assets/android/res/drawable-mdpi/splashicon.png b/assets/android/res/drawable-mdpi/splashicon.png deleted file mode 100644 index 715fdd355..000000000 Binary files a/assets/android/res/drawable-mdpi/splashicon.png and /dev/null differ diff --git a/assets/android/res/drawable-xhdpi/ic_stat_logo.png b/assets/android/res/drawable-xhdpi/ic_stat_logo.png deleted file mode 100644 index 0a6f0310e..000000000 Binary files a/assets/android/res/drawable-xhdpi/ic_stat_logo.png and /dev/null differ diff --git a/assets/android/res/drawable-xhdpi/icon.png b/assets/android/res/drawable-xhdpi/icon.png new file mode 100644 index 000000000..fc2b02b67 Binary files /dev/null and b/assets/android/res/drawable-xhdpi/icon.png differ diff --git a/assets/android/res/drawable-xhdpi/logo.png b/assets/android/res/drawable-xhdpi/logo.png new file mode 100644 index 000000000..fc6605c8c Binary files /dev/null and b/assets/android/res/drawable-xhdpi/logo.png differ diff --git a/assets/android/res/drawable-xhdpi/splashicon.png b/assets/android/res/drawable-xhdpi/splashicon.png deleted file mode 100644 index fff4117fe..000000000 Binary files a/assets/android/res/drawable-xhdpi/splashicon.png and /dev/null differ diff --git a/assets/android/res/drawable-xxhdpi/ic_stat_logo.png b/assets/android/res/drawable-xxhdpi/ic_stat_logo.png deleted file mode 100644 index e6a27ca10..000000000 Binary files a/assets/android/res/drawable-xxhdpi/ic_stat_logo.png and /dev/null differ diff --git a/assets/android/res/drawable-xxhdpi/icon.png b/assets/android/res/drawable-xxhdpi/icon.png new file mode 100644 index 000000000..ff3682956 Binary files /dev/null and b/assets/android/res/drawable-xxhdpi/icon.png differ diff --git a/assets/android/res/drawable-xxhdpi/logo.png b/assets/android/res/drawable-xxhdpi/logo.png new file mode 100644 index 000000000..f70f5d879 Binary files /dev/null and b/assets/android/res/drawable-xxhdpi/logo.png differ diff --git a/assets/android/res/drawable-xxhdpi/splashicon.png b/assets/android/res/drawable-xxhdpi/splashicon.png deleted file mode 100644 index 97b9abc83..000000000 Binary files a/assets/android/res/drawable-xxhdpi/splashicon.png and /dev/null differ diff --git a/assets/android/res/drawable-xxxhdpi/ic_stat_logo.png b/assets/android/res/drawable-xxxhdpi/ic_stat_logo.png deleted file mode 100644 index 02dbd836d..000000000 Binary files a/assets/android/res/drawable-xxxhdpi/ic_stat_logo.png and /dev/null differ diff --git a/assets/android/res/drawable-xxxhdpi/icon.png b/assets/android/res/drawable-xxxhdpi/icon.png new file mode 100644 index 000000000..b3a52168a Binary files /dev/null and b/assets/android/res/drawable-xxxhdpi/icon.png differ diff --git a/assets/android/res/drawable-xxxhdpi/logo.png b/assets/android/res/drawable-xxxhdpi/logo.png new file mode 100644 index 000000000..454f5e095 Binary files /dev/null and b/assets/android/res/drawable-xxxhdpi/logo.png differ diff --git a/assets/android/res/drawable-xxxhdpi/splashicon.png b/assets/android/res/drawable-xxxhdpi/splashicon.png deleted file mode 100644 index dbe49eefd..000000000 Binary files a/assets/android/res/drawable-xxxhdpi/splashicon.png and /dev/null differ diff --git a/assets/android/res/drawable/splash.xml b/assets/android/res/drawable/splashscreen.xml similarity index 53% rename from assets/android/res/drawable/splash.xml rename to assets/android/res/drawable/splashscreen.xml index cc06b792e..22571a8b7 100644 --- a/assets/android/res/drawable/splash.xml +++ b/assets/android/res/drawable/splashscreen.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/assets/android/res/mipmap-hdpi/ic_launcher.png b/assets/android/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cdce83048..000000000 Binary files a/assets/android/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/assets/android/res/mipmap-hdpi/ic_launcher_round.png b/assets/android/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index cdce83048..000000000 Binary files a/assets/android/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/assets/android/res/mipmap-mdpi/ic_launcher.png b/assets/android/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 67e501cb2..000000000 Binary files a/assets/android/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/assets/android/res/mipmap-mdpi/ic_launcher_round.png b/assets/android/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 67e501cb2..000000000 Binary files a/assets/android/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/assets/android/res/mipmap-xhdpi/ic_launcher.png b/assets/android/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96898773a..000000000 Binary files a/assets/android/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/assets/android/res/mipmap-xhdpi/ic_launcher_round.png b/assets/android/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 96898773a..000000000 Binary files a/assets/android/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/assets/android/res/mipmap-xxhdpi/ic_launcher.png b/assets/android/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index f44439697..000000000 Binary files a/assets/android/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/assets/android/res/mipmap-xxhdpi/ic_launcher_round.png b/assets/android/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index f44439697..000000000 Binary files a/assets/android/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/assets/android/res/mipmap-xxxhdpi/ic_launcher.png b/assets/android/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 79f965a86..000000000 Binary files a/assets/android/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/assets/android/res/mipmap-xxxhdpi/ic_launcher_round.png b/assets/android/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 79f965a86..000000000 Binary files a/assets/android/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/assets/android/res/values/apptheme.xml b/assets/android/res/values/apptheme.xml index f4224d45a..9a9c9c8ca 100644 --- a/assets/android/res/values/apptheme.xml +++ b/assets/android/res/values/apptheme.xml @@ -1,7 +1,6 @@ diff --git a/assets/android/res/values/splashscreentheme.xml b/assets/android/res/values/splashscreentheme.xml new file mode 100644 index 000000000..53b3673d8 --- /dev/null +++ b/assets/android/res/values/splashscreentheme.xml @@ -0,0 +1,6 @@ + + + + diff --git a/assets/android/rylo-icon.png b/assets/android/rylo-icon.png new file mode 100644 index 000000000..245fcbca0 Binary files /dev/null and b/assets/android/rylo-icon.png differ diff --git a/assets/android/rylo-splash.png b/assets/android/rylo-splash.png new file mode 100644 index 000000000..19248e654 Binary files /dev/null and b/assets/android/rylo-splash.png differ diff --git a/assets/android/src/com/emeric/watchflower/WatchFlowerAndroidNotifier.java b/assets/android/src/com/emeric/watchflower/WatchFlowerAndroidNotifier.java index dc832beba..f222462e8 100644 --- a/assets/android/src/com/emeric/watchflower/WatchFlowerAndroidNotifier.java +++ b/assets/android/src/com/emeric/watchflower/WatchFlowerAndroidNotifier.java @@ -31,6 +31,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; +import androidx.core.app.NotificationCompat; public class WatchFlowerAndroidNotifier { @@ -82,7 +83,7 @@ public static void notify(final Context context, final String title, final Strin PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE); - Notification.Builder builder; + NotificationCompat.Builder builder; if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { NotificationChannel notificationChannel = new NotificationChannel(channelId, channelName, channelImportance); @@ -93,9 +94,9 @@ public static void notify(final Context context, final String title, final Strin notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC); notificationManager.createNotificationChannel(notificationChannel); - builder = new Notification.Builder(context, notificationChannel.getId()); + builder = new NotificationCompat.Builder(context, notificationChannel.getId()); } else { - builder = new Notification.Builder(context); + builder = new NotificationCompat.Builder(context); } builder.setSmallIcon(R.drawable.ic_stat_logo); @@ -110,6 +111,7 @@ public static void notify(final Context context, final String title, final Strin builder.setDefaults(Notification.DEFAULT_SOUND); builder.setOnlyAlertOnce(true); builder.setAutoCancel(true); + builder.setStyle(new NotificationCompat.BigTextStyle().bigText(message)); notificationManager.notify(channel, builder.build()); } catch (Exception e) { diff --git a/assets/android/web_hi_res_512.png b/assets/android/web_hi_res_512.png deleted file mode 100644 index e5a3f710f..000000000 Binary files a/assets/android/web_hi_res_512.png and /dev/null differ diff --git a/assets/assets.qrc b/assets/assets.qrc index bb300d1c7..b0fd75e03 100644 --- a/assets/assets.qrc +++ b/assets/assets.qrc @@ -3,17 +3,11 @@ gfx/logos/logo.svg gfx/logos/github.svg gfx/logos/watchflower.svg - gfx/logos/watchflower_tray_light.svg - gfx/logos/watchflower_tray_dark.svg - gfx/logos/watchflower_tray_monochrome.svg - gfx/logos/watchflower_monochrome.svg - gfx/tutorial/welcome-devices.svg gfx/tutorial/welcome-bluetooth-searching.svg gfx/tutorial/welcome-app-connected.svg gfx/tutorial/welcome-limits.svg gfx/tutorial/welcome-plants.svg - gfx/icons/arrow_back.svg gfx/icons/droplet1.svg gfx/icons/droplet2.svg @@ -36,5 +30,6 @@ gfx/icons/sunlight_borders.svg gfx/icons/thermometer-24px.svg gfx/icons/thermometer_big-24px.svg + gfx/logos/watchflower_monochrome.png diff --git a/assets/gfx/logos/logo.svg b/assets/gfx/logos/logo.svg index 3e190e8f9..245fcbca0 100644 Binary files a/assets/gfx/logos/logo.svg and b/assets/gfx/logos/logo.svg differ diff --git a/assets/gfx/logos/watchflower.png b/assets/gfx/logos/watchflower.png index b0d5b128e..245fcbca0 100644 Binary files a/assets/gfx/logos/watchflower.png and b/assets/gfx/logos/watchflower.png differ diff --git a/assets/gfx/logos/watchflower.svg b/assets/gfx/logos/watchflower.svg index 59cb91075..245fcbca0 100644 Binary files a/assets/gfx/logos/watchflower.svg and b/assets/gfx/logos/watchflower.svg differ diff --git a/assets/gfx/logos/watchflower_monochrome.png b/assets/gfx/logos/watchflower_monochrome.png new file mode 100644 index 000000000..c81155beb Binary files /dev/null and b/assets/gfx/logos/watchflower_monochrome.png differ diff --git a/assets/gfx/logos/watchflower_monochrome.svg b/assets/gfx/logos/watchflower_monochrome.svg deleted file mode 100644 index 89830433e..000000000 --- a/assets/gfx/logos/watchflower_monochrome.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/assets/gfx/logos/watchflower_tray_dark.svg b/assets/gfx/logos/watchflower_tray_dark.svg deleted file mode 100644 index fd1c25253..000000000 --- a/assets/gfx/logos/watchflower_tray_dark.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/assets/gfx/logos/watchflower_tray_light.svg b/assets/gfx/logos/watchflower_tray_light.svg deleted file mode 100644 index 04aa7e330..000000000 --- a/assets/gfx/logos/watchflower_tray_light.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/assets/gfx/logos/watchflower_tray_monochrome.svg b/assets/gfx/logos/watchflower_tray_monochrome.svg deleted file mode 100644 index 9293b8df2..000000000 --- a/assets/gfx/logos/watchflower_tray_monochrome.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/assets/windows/RYLOSmartCare.ico b/assets/windows/RYLOSmartCare.ico new file mode 100644 index 000000000..245fcbca0 Binary files /dev/null and b/assets/windows/RYLOSmartCare.ico differ diff --git a/assets/windows/info.rc b/assets/windows/info.rc index e44f584b2..20173bd9a 100644 --- a/assets/windows/info.rc +++ b/assets/windows/info.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "WatchFlower.ico" +IDI_ICON1 ICON DISCARDABLE "RYLOSmartCare.ico" diff --git a/assets/windows/setup.nsi b/assets/windows/setup.nsi index b865991a0..b256c2438 100644 --- a/assets/windows/setup.nsi +++ b/assets/windows/setup.nsi @@ -5,8 +5,8 @@ Unicode True !include "FileFunc.nsh" !include "LogicLib.nsh" -!define APPNAME "WatchFlower" -!define EXECNAME "WatchFlower" +!define APPNAME "RYLO SmartCare" +!define EXECNAME "RYLO SmartCare" !define COMPANYNAME "Emeric Grange" !define DESCRIPTION "A plant monitoring application that reads and plots data from compatible Bluetooth sensors and thermometers like Xiaomi 'Flower Care' or Parrot 'Flower Power'" !define VERSIONMAJOR 6 diff --git a/i18n/WatchFlower_ca.ts b/i18n/RYLO-SmartCare_ca.ts similarity index 98% rename from i18n/WatchFlower_ca.ts rename to i18n/RYLO-SmartCare_ca.ts index 8528c76ef..93b27a98c 100644 --- a/i18n/WatchFlower_ca.ts +++ b/i18n/RYLO-SmartCare_ca.ts @@ -743,7 +743,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1240,7 +1240,7 @@ - About WatchFlower + About SmartCare @@ -1446,7 +1446,7 @@ - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1471,7 +1471,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1894,7 +1894,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -1959,7 +1959,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2340,12 +2340,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2355,12 +2355,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! + If a plant needs water, SmartCare will bring it to your attention! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2395,12 +2395,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2529,7 +2529,7 @@ - Saved in your documents, under the 'WatchFlower' directory. + Saved in your documents, under the 'SmartCare' directory. @@ -2587,7 +2587,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -2602,7 +2602,7 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. @@ -2612,12 +2612,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. diff --git a/i18n/WatchFlower_da.ts b/i18n/RYLO-SmartCare_da.ts similarity index 97% rename from i18n/WatchFlower_da.ts rename to i18n/RYLO-SmartCare_da.ts index 42cf102dd..02da954f0 100644 --- a/i18n/WatchFlower_da.ts +++ b/i18n/RYLO-SmartCare_da.ts @@ -1,6 +1,6 @@ - + About @@ -1037,7 +1037,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1588,7 +1588,7 @@ - About WatchFlower + About SmartCare @@ -1814,7 +1814,7 @@ - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1839,7 +1839,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1910,8 +1910,8 @@ Placering - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - Android-styresystemet kræver, at applikationer beder om enhedsplaceringstilladelse for at scanne efter nærliggende BLE-sensorer (Bluetooth Low Energy).<br>Denne tilladelse er kun nødvendig, når du scanner efter nye sensorer.<br>WatchFlower hverken bruger, gemmer eller kommunikerer din placering til nogen eller noget. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + Android-styresystemet kræver, at applikationer beder om enhedsplaceringstilladelse for at scanne efter nærliggende BLE-sensorer (Bluetooth Low Energy).<br>Denne tilladelse er kun nødvendig, når du scanner efter nye sensorer.<br>SmartCare hverken bruger, gemmer eller kommunikerer din placering til nogen eller noget. Official information @@ -1930,8 +1930,8 @@ Bluetooth-betjening - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere enhedens bluetooth til opdatering af sensordataene. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere enhedens bluetooth til opdatering af sensordataene. @@ -2297,7 +2297,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2362,7 +2362,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2761,12 +2761,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2776,12 +2776,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - WatchFlower advarer dig hvis en plante har brug for vand! + If a plant needs water, SmartCare will bring it to your attention! + SmartCare advarer dig hvis en plante har brug for vand! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2816,12 +2816,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2950,8 +2950,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Gemt i dine dokumenter i 'WatchFlower'-mappen. + Saved in your documents, under the 'SmartCare' directory. + Gemt i dine dokumenter i 'SmartCare'-mappen. @@ -3008,7 +3008,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -3023,8 +3023,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - For at bruge WatchFlower skal du starte med <b>scanning</b> til <b>kompatible bluetooth-sensorer</b> i dit område. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + For at bruge SmartCare skal du starte med <b>scanning</b> til <b>kompatible bluetooth-sensorer</b> i dit område. @@ -3033,12 +3033,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3130,16 +3130,16 @@ Bluetooth-betjening - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan automatisk tænde enhedens bluetooth for at indlæse sensordata. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan automatisk tænde enhedens bluetooth for at indlæse sensordata. Wake up at a predefined interval to refresh sensor data. Only if Bluetooth (or Bluetooth control) is enabled. Aktiver med jævne mellemrum for at opdatere sensordataene. Kun hvis bluetooth (eller bluetooth-betjening) er slået til. - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower kører i baggrunden (i meddelelsesområde) og aktiveres med jævne mellemrum til opdatering af sensordataene. + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare kører i baggrunden (i meddelelsesområde) og aktiveres med jævne mellemrum til opdatering af sensordataene. thin @@ -3178,8 +3178,8 @@ Aktiver meddelelser - If a plant needs water, WatchFlower will bring it to your attention! - WatchFlower advarer dig hvis en plante har brug for vand! + If a plant needs water, SmartCare will bring it to your attention! + SmartCare advarer dig hvis en plante har brug for vand! Plant sensors @@ -3220,8 +3220,8 @@ Diagramsøjler - Saved in your documents, under the 'WatchFlower' directory. - Gemt i dine dokumenter i 'WatchFlower'-mappen. + Saved in your documents, under the 'SmartCare' directory. + Gemt i dine dokumenter i 'SmartCare'-mappen. Export file @@ -3380,16 +3380,16 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> er en planteovervågningsapplikation til Xiaomi '<b>Flower Care</b>' og '<b>RoPot</b>' og Parrot ' <b>Flower Power</b>' sensorer. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> er en planteovervågningsapplikation til Xiaomi '<b>Flower Care</b>' og '<b>RoPot</b>' og Parrot ' <b>Flower Power</b>' sensorer. It also works great with a couple of <b>thermometers</b>! Det fungerer også godt med nogle <b>termometre</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - For at bruge WatchFlower skal du starte med <b>scanning</b> til <b>kompatible bluetooth-sensorer</b> i dit område. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + For at bruge SmartCare skal du starte med <b>scanning</b> til <b>kompatible bluetooth-sensorer</b> i dit område. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. diff --git a/i18n/WatchFlower_de.ts b/i18n/RYLO-SmartCare_de.ts similarity index 74% rename from i18n/WatchFlower_de.ts rename to i18n/RYLO-SmartCare_de.ts index 54dc5ef01..6bc21801c 100644 --- a/i18n/WatchFlower_de.ts +++ b/i18n/RYLO-SmartCare_de.ts @@ -1,6 +1,6 @@ - + About @@ -45,52 +45,52 @@ Update data - + Daten aktualisieren Real time data - + Echtzeitdaten Update history - + Aktualisierungsverlauf Clear history - + Verlauf löschen Blink LED - + LED blinken lassen Watering - + Gießen Calibrate sensor - + Sensor kalibrieren Switch graph - + Diagramm wechseln Sensor infos - + Sensorinformationen Reboot sensor - + Sensor neu starten @@ -105,27 +105,27 @@ Bluetooth permission is missing... - + Bluetooth-Berechtigung fehlt ... Bluetooth adapter not found... - + Bluetooth-Adapter nicht gefunden ... Bluetooth is disabled... - + Bluetooth ist deaktiviert ... Request - + Anfrage Enable - Aktivieren + Aktivieren About @@ -134,7 +134,7 @@ Retry - Wiederholen + Wiederholen @@ -142,7 +142,7 @@ %n device(s) selected - + Gerät ausgewählt %n Geräte ausgewählt @@ -150,17 +150,17 @@ Delete - Löschen + Löschen Synchronize history - + Verlauf synchronisieren Refresh - Aktualisierung + Aktualisierung @@ -168,17 +168,17 @@ Connecting... - Verbinde... + Verbinde... Syncing with the sensor... - + Synchronisierung mit dem Sensor ... Stop - + Stoppen @@ -187,13 +187,13 @@ max short for maximum - + max min short for minimum - + min @@ -202,17 +202,17 @@ at "at" is used for DATE at HOUR - + um °F - + °F °C - + °C @@ -221,13 +221,13 @@ min short for minimum - + min max short for maximum - + max @@ -240,132 +240,132 @@ Switch graph - + Diagramm wechseln Watering - + Gießen Calibrate - + Kalibrieren Reboot - + Neustart Blink LED - + LED blinken lassen Synchronize history - + Verlauf synchronisieren Clear history - + Verlauf löschen Real time data - + Echtzeitdaten Refresh sensor - + Sensor aktualisieren Data - Daten + Daten History - Verlauf + Verlauf Plant - Pflanze + Pflanze Sensor - + Sensor Order by: - + Sortieren nach: water level - + Wasserstand plant name - + Pflanzenname sensor model - + Sensormodell Scan - + Scannen Scan for new sensors - + Nach neuen Sensoren scannen Sync history - + Verlauf synchronisieren Sync sensors history - + Sensorverlauf synchronisieren Refresh data - + Daten aktualisieren Refresh sensor data - + Sensordaten aktualisieren Sensor list - + Sensorliste Settings - Einstellungen + Einstellungen About - Über + Über Refresh sensors data @@ -374,7 +374,7 @@ location - standort + standort @@ -382,15 +382,15 @@ %n minute(s) - - %n Minute - %n Minuten + + %n minute + %n minuten %n hour(s) - + %n Stunde %n Stunden @@ -402,7 +402,7 @@ The device browser helps you locate nearby BLE devices. You can also use this screen to blacklist sensors so the scan doesn't pick them up. - + Der Gerätebrowser hilft Ihnen, nahegelegene BLE-Geräte zu finden. Sie können diesen Bildschirm auch verwenden, um Sensoren auf die Blacklist zu setzen, damit sie beim Scan nicht mehr erkannt werden. @@ -410,12 +410,12 @@ Device browser - + Gerätebrowser See Bluetooth sensors and devices around you. - + Bluetooth-Sensoren und -Geräte in der Nähe anzeigen. @@ -423,73 +423,73 @@ Synced - Daten sind aktuell. + Daten sind aktuell Synced %1 ago - vor %1 aktualisiert + vor %1 aktualisiert Loading... - Lade... + Lade... humidity - luftfeuchtigkeit + luftfeuchtigkeit VOC - + VOC HCHO - + HCHO eCO2 - + eCO2 CO2 - + CO2 PM2.5 - + PM2.5 PM10 - + PM10 feels like %1 - + gefühlt %1 dew point %1 - + taupunkt %1 PM1 - + PM1 @@ -498,68 +498,68 @@ µg/m³ - + µg/m³ ppm - + ppm RADIATION - + Strahlung µSv/h - + µSv/h µSv/m - + µSv/m Temperature - Temperatur + Temperatur Humidity - Bodenfeuchte + Bodenfeuchte %RH - + %RH Pressure - + Druck hPa - + hPa Luminosity - Leuchtkraft + Leuchtkraft lux - + lux UV index - + UV index @@ -601,31 +601,31 @@ Plant sensor(s) - - - + + Pflanzensensor(en) + Pflanzensensoren Thermometer(s) - - - + + Thermometer + Thermometer Environmental sensor(s) - - - + + Umweltsensor + Umweltsensor(en) Tools - + Werkzeuge @@ -633,7 +633,7 @@ -%1 dB - + -%1 dB @@ -641,17 +641,17 @@ Plant - Pflanze + Pflanze Limits - + Journal - + Protokoll @@ -659,32 +659,32 @@ Synced - Daten sind aktuell. + Synchronisiert Synced %1 ago - vor %1 aktualisiert + vor %1 aktualisiert Plant - Pflanze + Pflanze Location - Standort + Standort Status - + Loading... - Lade... + Lade... @@ -692,42 +692,42 @@ Month - Monat + Monat Week - Woche + Woche Day - Tag + Tag Soil moisture - + Bodenfeuchtigkeit Soil conductivity - + Bodenleitfähigkeit µs/cm - + Soil temperature - + Bodentemperatur lux - + Moisture @@ -736,17 +736,17 @@ Temperature - Temperatur + Temperatur Humidity - Bodenfeuchte + Bodenfeuchte Luminosity - Leuchtkraft + Leuchtkraft Fertility @@ -853,134 +853,134 @@ Bluetooth name - + Bluetooth-Name Bluetooth address - + Bluetooth-Adresse MAC Address - MAC Adresse + MAC Adresse Firmware - + Firmware Battery - Batterie + Batterie Uptime - + Betriebszeit Last time moved - + Zuletzt bewegt Last update - + Letztes Update Last history sync - + Letzte Verlaufssynchronisierung Model - + Modell Manufacturer - + Hersteller Product ID - + Produkt-ID Year - + Jahr IP Rating - + IP-Schutzart Screen - + Bildschirm Be advised - + Bitte beachten - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. - + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. + Dieser Sensor muss einmal in der offiziellen App registriert werden, bevor er mit Drittanbieter-Apps wie SmartCare verwendet werden kann. Sensors - Sensoren + Sensoren Capabilities - + Fähigkeiten Settings - Einstellungen + Einstellungen Device is enabled - + Gerät ist aktiviert Device is disabled - + Gerät ist deaktiviert inside - + innen outside - + außen The MAC address of the sensor must be set in order for some features (like history synchronization) to work. - + Die MAC-Adresse des Sensors muss festgelegt werden, damit einige Funktionen (wie die Verlaufssynchronisierung) funktionieren. Sorry for the inconvenience. - + Entschuldigung für die Unannehmlichkeiten. @@ -988,70 +988,70 @@ Plant Alarm - + Pflanzenalarm You need to water your '%1' now! - Bitte gieße dein(e) '%1'. + Du musst deine „%1“ jetzt gießen! You need to water the plant near '%1' - Bitte gießen Sie die Pflanze in der Nähe von '%1' + Bitte gießen Sie die Pflanze in der Nähe von '%1' You need to water one of your plant! - + Du musst eine deiner Pflanzen gießen! Sub zero temperature warning - + Warnung: Temperaturen unter null Temperature is %1 at %2 on %3 Used like this: "Temperature is 9° at 14:59 on 05/21" - + Die Temperatur beträgt %1 um %2 am %3 Poor air quality - + Schlechte Luftqualität You should ventilate your room now! - + Du solltest jetzt dein Zimmer lüften! Radiation warning - + Strahlungswarnung Radiation levels are high! - + Die Strahlungswerte sind hoch! Radiation levels are very high, please advise! - + Die Strahlungswerte sind sehr hoch, bitte beachten! Low battery - + Sensor '%1' has low battery level - + You need to water one of your (unnamed) plants! @@ -1068,17 +1068,17 @@ feels like %1 - + gefühlt %1 dew point %1 - + taupunkt %1 Synced - Daten sind aktuell. + Synchronisiert @@ -1088,7 +1088,7 @@ Loading... - Lade... + Lade... @@ -1096,63 +1096,63 @@ Disabled - + Deaktiviert Synced - Daten sind aktuell. + Synchronisiert Thermometer - + Thermometer µSv/h - + hPa - + VOC - + HCHO - + eCO₂ - + CO₂ - + CO₂ PM10 - + PM2.5 - + PM1 - + @@ -1160,12 +1160,12 @@ Please choose a file! - + Datei auswählen! change - + ändern @@ -1173,12 +1173,12 @@ Please choose a directory! - + Verzeichnis auswählen! change - + ändern @@ -1186,47 +1186,47 @@ Moisture - Bodenfeuchte + Bodenfeuchte µS/cm - + Soil temp. - + Bodentemp. Water tank - + Wassertank Temperature - Temperatur + Temperatur Humidity - Bodenfeuchte + Bodenfeuchte Luminosity - Leuchtkraft + Leuchtkraft lux - + Fertility - Düngung + Düngung @@ -1234,47 +1234,47 @@ Moisture - Bodenfeuchte + Bodenfeuchte µS/cm - + Soil temp. - + Bodentemp. Water tank - + Wassertank Temperature - Temperatur + Temperatur Humidity - Bodenfeuchte + Bodenfeuchte Luminosity - Leuchtkraft + Leuchtkraft lux - + Fertility - Düngung + Düngung @@ -1293,27 +1293,27 @@ Bluetooth is disabled... - + Bluetooth ist deaktiviert ... Bluetooth adapter not found... - + Bluetooth-Adapter nicht gefunden ... Enable - Aktivieren + Aktivieren Retry - Wiederholen + Wiederholen Please <b>enable Bluetooth</b> on your device in order to use the application. - + Bitte <b>aktivieren Sie Bluetooth</b> auf Ihrem Gerät, um die Anwendung nutzen zu können. @@ -1325,7 +1325,7 @@ Not enough data... - + Nicht genügend Daten... @@ -1354,12 +1354,12 @@ Scanning... - + Scannen... Please keep your device <b>close</b> to the sensors you want to scan. - + Bitte halten Sie Ihr Gerät <b>nah</b> an die Sensoren, die Sie scannen möchten. @@ -1367,7 +1367,7 @@ Looking for nearby devices... - + Suche nach Geräten in der Nähe... @@ -1375,12 +1375,12 @@ No log entry... - + Kein Protokolleintrag... Let's start! - + Los geht’s! @@ -1399,37 +1399,37 @@ Bluetooth permission(s) missing… - + Bluetooth-Berechtigung(en) fehlen… Request permission(s) - + Berechtigung(en) anfordern Authorization to use Bluetooth is <b>required</b> to connect to the sensors. - + Die Berechtigung zur Nutzung von Bluetooth ist <b>erforderlich</b>, um eine Verbindung zu den Sensoren herzustellen. On Android 6+, scanning for Bluetooth Low Energy devices requires <b>location permission</b>. - Unter Android 6 und höher ist für den Zugriff auf Bluetooth Low Energy-Geräten eine Standortberechtigung erforderlich. + Unter Android 6 und höher ist für den Zugriff auf Bluetooth Low Energy-Geräten eine Standortberechtigung erforderlich. Some Android devices also require the actual <b>GPS to be turned on</b>. - + Bei einigen Android-Geräten muss außerdem das <b>GPS eingeschaltet</b> sein. The application is neither using nor storing your location. Sorry for the inconvenience. - Die Anwendung verwendet weder Ihren Standort, noch speichert sie diesen. + Die Anwendung verwendet weder Ihren Standort, noch speichert sie diesen. Official information - Offizielle Informationen + Offizielle Informationen @@ -1437,12 +1437,12 @@ No plant set... - + Keine Pflanze festgelegt... Let's find one! - + Lass uns eins finden! @@ -1450,7 +1450,7 @@ No plants found... - + Keine Pflanzen gefunden... @@ -1458,57 +1458,57 @@ Sensor list - + Sensorliste Scan for new sensors - + Nach neuen Sensoren suchen Refresh sensors - + Sensoren aktualisieren Sensors - Sensoren + Sensoren - About WatchFlower - + About SmartCare + Über SmartCare Preferences - + Einstellungen Visit website - + Website besuchen Visit issue tracker - + Issue-Tracker besuchen Consult release notes - + Versionshinweise lesen Show the tutorial - + Tutorial anzeigen Help - + Hilfe @@ -1516,38 +1516,38 @@ Welcome - Willkommen + Willkommen Thermometer - + Thermometer Settings - Einstellungen + Einstellungen Permissions - Berechtigungen + Berechtigungen Plant browser - + Pflanzenbrowser Device browser - + Gerätebrowser About - Über + Über Sensors @@ -1571,7 +1571,7 @@ Sensors - Sensoren + Sensoren @@ -1586,52 +1586,52 @@ Order by: - + Sortieren nach: water level - + Wasserstand plant name - + Pflanzenname sensor model - + Sensormodell location - standort + standort Refresh sensor data - + Sensordaten aktualisieren Sync sensors history - + Sensorverlauf synchronisieren Search for new sensors - + Nach neuen Sensoren scannen Plant browser - + Pflanzenbrowser Device browser - + Gerätebrowser Refresh sensors data @@ -1643,7 +1643,7 @@ Press one more time to exit... - Noch einmal drücken zum beenden... + Noch einmal drücken zum beenden... @@ -1651,47 +1651,47 @@ Sensors - Sensoren + Sensoren Plant browser - + Pflanzenbrowser Device browser - + Gerätebrowser Settings - Einstellungen + Einstellungen About - Über + Über Data - Daten + Daten History - Verlauf + Verlauf Plant - Pflanze + Pflanze Sensor - + Sensor @@ -1699,97 +1699,97 @@ Bluetooth control - Bluetooth-Steuerung + Bluetooth-Steuerung - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kann Bluetooth automatisch aktivieren, was für eine korrekte Funktion benötigt wird. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kann Bluetooth automatisch aktivieren, was für eine korrekte Funktion benötigt wird. Bluetooth - + Bluetooth The Android operating system requires permission to scan for nearby Bluetooth Low Energy sensors. - + Das Android-Betriebssystem verlangt eine Berechtigung, um nach Bluetooth-Low-Energy-Sensoren in der Nähe zu suchen. Location - Standort + Standort The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors. - + Das Android-Betriebssystem verlangt, dass Apps die Berechtigung für den Gerätestandort anfragen, um nach Bluetooth-Low-Energy-Sensoren in der Nähe zu suchen. - WatchFlower doesn't use, store nor communicate your location to anyone or anything. - + SmartCare doesn't use, store nor communicate your location to anyone or anything. + SmartCare verwendet, speichert oder übermittelt deinen Standort nicht an Dritte oder sonst jemanden. Official information - Offizielle Informationen + Offizielle Informationen Background location - + Standort im Hintergrund Similarly, background location permission is needed if you want to automatically get data from the sensors, while the application is not explicitly opened. - + Kurz gesagt, die Berechtigung für Standort im Hintergrund ist erforderlich, wenn du Daten von den Sensoren automatisch erhalten möchtest, während die App nicht explizit geöffnet ist. GPS - + GPS Some Android devices also require the GPS to be turned on for Bluetooth operations. - + Bei einigen Android-Geräten muss GPS ebenfalls aktiviert sein, damit Bluetooth funktioniert. Location settings - + Standorteinstellungen Notifications - + Benachrichtigungen The Android operating system requires permission to send notifications. - + Das Android-Betriebssystem verlangt eine Berechtigung, um Benachrichtigungen zu senden. Click on the checkmarks to request missing permissions. - + Klicke auf die Häkchen, um fehlende Berechtigungen anzufordern. If it has no effect, you may have previously refused a permission and clicked on "don't ask again". - + Wenn es keine Wirkung hat, hast du möglicherweise zuvor eine Berechtigung verweigert und auf „nicht mehr fragen“ geklickt. You can go to the Android "application info" panel to change a permission manually. - + Du kannst zum Android-Panel „Anwendungsinfo“ gehen, um eine Berechtigung manuell zu ändern. Application info - + Anwendungsinfo @@ -1807,8 +1807,8 @@ Bluetooth-Steuerung - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kann Bluetooth automatisch aktivieren, was für eine korrekte Funktion benötigt wird. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kann Bluetooth automatisch aktivieren, was für eine korrekte Funktion benötigt wird. @@ -1816,29 +1816,29 @@ Search for plants - + Nach Pflanzen suchen %1 plants - + %1 Pflanzen You are previewing a plant. - + Sie sehen eine Vorschau einer Pflanze. Choose this plant - + Diese Pflanze auswählen Cancel - Abbrechen + Abbrechen @@ -1846,17 +1846,17 @@ Plant browser - + Pflanzenbrowser %1 entries - + %1 Einträge Check out all of our plants! - + Schauen Sie sich all unsere Pflanzen an! @@ -1864,27 +1864,27 @@ planting - + pflanzend fertilizing - + düngend growing - + wachsend blooming - + blühend fruiting - + fruchtend @@ -1892,37 +1892,37 @@ %1 tracked since %2 - + %1 verfolgt seit %2 Plant tracked since %1 - + Pflanze verfolgt seit %1 Add a new entry - + Neuen Eintrag hinzufügen Add a comment - + Kommentar hinzufügen Cancel - Abbrechen + Abbrechen Edit entry - + Eintrag bearbeiten Add entry - + Eintrag hinzufügen @@ -1930,17 +1930,17 @@ Drag sliders to change values - + Schiebe die Schieberegler, um Werte zu ändern Soil moisture - + Bodenfeuchtigkeit Ideal soil moisture for indoor plants is usually 15 to 50%. Cacti and succulents can go as low as 7%. Tropical plants like to have more water. - Die ideale Bodenfeuchtigkeit für Zimmerpflanzen beträgt normalerweise 15 bis 50%. Sukkulente können bis zu 7% betragen. Tropische Pflanzen haben gerne mehr Wasser. + Die ideale Bodenfeuchtigkeit für Zimmerpflanzen beträgt normalerweise 15 bis 50%. Sukkulente können bis zu 7% betragen. Tropische Pflanzen haben gerne mehr Wasser. <br><b>Tip: </b> @@ -1949,7 +1949,7 @@ Be careful, too much water over long periods of time can be just as lethal as not enough! - Seien Sie vorsichtig, zu viel Wasser über längere Zeiträume kann genauso schlecht sein wie zu wenig Wasser! + Seien Sie vorsichtig, zu viel Wasser über längere Zeiträume kann genauso schlecht sein wie zu wenig Wasser! @@ -1958,99 +1958,99 @@ Tip: - + Tipp: Water your plants more frequently during their growth period. - Gießen Sie Ihre Pflanzen während ihrer Wachstumsphase häufiger. + Gießen Sie Ihre Pflanzen während ihrer Wachstumsphase häufiger. Soil conductivity - + Bodenleitfähigkeit Soil 'Electrical Conductivity' value is an indication of the availability of nutrients in the soil. Use fertilizer (with moderation) to keep this value up. - + Der Wert der „elektrischen Leitfähigkeit“ des Bodens ist ein Hinweis auf die Verfügbarkeit von Nährstoffen im Boden. Verwende Dünger (in Maßen), um diesen Wert hoch zu halten. Be sure to use the right soil composition for your plants. - Stellen Sie sicher, dass Sie die richtige Bodenzusammensetzung für Ihre Pflanzen verwenden. + Stellen Sie sicher, dass Sie die richtige Bodenzusammensetzung für Ihre Pflanzen verwenden. Temperature - Temperatur + Temperatur Most indoor plants thrive between 15 and 25°C (59 to 77°F). Not many plants can tolerate -2°C (28°F) and below. - Die meisten Zimmerpflanzen gedeihen zwischen 15 und 25 ° C. Nicht viele Pflanzen vertragen -2 ° C oder weniger. + Die meisten Zimmerpflanzen gedeihen zwischen 15 und 25 ° C. Nicht viele Pflanzen vertragen -2 ° C oder weniger. Having constant temperature is important for indoor plants. - Eine konstante Temperatur ist wichtig für Zimmerpflanzen. + Eine konstante Temperatur ist wichtig für Zimmerpflanzen. If you have an hygrometer, you can monitor the air humidity so it stays between 40 and 60% (and even above for tropical plants). - Wenn Sie ein Hygrometer haben, können Sie die Luftfeuchtigkeit so überwachen, dass sie zwischen 40 und 60% bleibt (und bei tropischen Pflanzen auch mehr). + Wenn Sie ein Hygrometer haben, können Sie die Luftfeuchtigkeit so überwachen, dass sie zwischen 40 und 60% bleibt (und bei tropischen Pflanzen auch mehr). Luminosity - Leuchtkraft + Leuchtkraft low - niedrig + niedrig indirect - indirekt + indirekt direct light (indoor) - direktes Licht (innen) + direktes Licht (innen) sunlight - Sonnenlicht + Sonnenlicht Some plants like direct sun exposition, all day long or just for part of the day. But many indoor plants don't like direct sunlight: place them away from south oriented windows! - Einige Pflanzen mögen direktes Sonnenlicht, teilweise sogar den ganzen Tag. Aber viele Zimmerpflanzen mögen kein direktes Sonnenlicht: Wählen Sie in diesem Fall kein Südfenster! + Einige Pflanzen mögen direktes Sonnenlicht, teilweise sogar den ganzen Tag. Aber viele Zimmerpflanzen mögen kein direktes Sonnenlicht: Wählen Sie in diesem Fall kein Südfenster! Other settings - + Weitere Einstellungen Reset limits from the associated plant - + inside - + innen outside - + außen @@ -2058,176 +2058,176 @@ Plant infos - + Pflanzeninfos plant - pflanze + pflanze variety - + varietät common name - + trivialname category - + kategorie origin - + herkunft Swap plant - + Pflanze wechseln Remove - + Entfernen leaf color - + blattfarbe bract color - + hochblattfarbe flower color - + blütenfarbe fruit color - + fruchtfarbe height - + höhe diameter - + durchmesser hardiness - + winterhärte calendar - + kalender Learn more - + Mehr erfahren Plant care - + Pflanzenpflege sunlight - Sonnenlicht + Sonnenlicht watering - + gießen fertilization - + düngung pruning - + schnitt soil - + boden - Please note that WatchFlower should not be your definitive source of information about plant care. - + Please note that SmartCare should not be your definitive source of information about plant care. + Bitte beachten Sie, dass SmartCare nicht Ihre endgültige Informationsquelle zur Pflanzenpflege sein sollte. Sensor metrics - + Sensormesswerte Soil moisture - + Bodenfeuchte Soil conductivity - + Bodenleitfähigkeit Soil PH - + Boden-pH Temperature - Temperatur + Temperatur Humidity - Bodenfeuchte + Bodenfeuchte Luminosity - Leuchtkraft + Leuchtkraft low - niedrig + niedrig indirect - indirekt + indirekt direct light (indoor) - direktes Licht (innen) + direktes Licht (innen) @@ -2235,62 +2235,62 @@ About background updates - + Über Hintergrundaktualisierungen - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. - + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + Um die background update-Funktion zu verwenden, ist die <b>background location permission</b> erforderlich, andernfalls kann SmartCare keine Bluetooth-Low-Energy-Sensoren scannen und keine Daten aktualisieren, wenn die App geschlossen ist. About Bluetooth permissions - + Über Bluetooth-Berechtigungen Cancel - Abbrechen + Abbrechen Enable - Aktivieren + Aktivieren Your phone will do its best to prevent this application from running in the background. - + Dein Telefon wird sein Bestes tun, um zu verhindern, dass diese Anwendung im Hintergrund ausgeführt wird. Some settings need to be switched <b>manually</b> from the Android <b>application info panel</b>: - + Einige Einstellungen müssen <b>manuell</b> vom Android-<b>Anwendungsinfo panel</b> geändert werden: - autolaunch will need to be <b>enabled</b> - + - autostart muss <b>aktiviert</b> sein - battery saving feature(s) will need to be <b>disabled</b> - + - energiesparfunktion(en) muss/müssen <b>deaktiviert</b> sein About battery savers - + Über Energiesparer Application info panel - + Anwendungsinfo panel I understand - + Ich verstehe @@ -2298,37 +2298,37 @@ Are you sure you want to blacklist the selected sensor? - + Bist du sicher, dass du den ausgewählten Sensor auf die Blacklist setzen möchtest? Are you sure you want to whitelist the selected sensor? - + Bist du sicher, dass du den ausgewählten Sensor auf die Whitelist setzen möchtest? Blacklisting a sensor will prevent it from being scanned by the application. You can un-blacklist the sensor at any time. - + Das Blacklisten eines Sensors verhindert, dass er von der Anwendung gescannt wird. Du kannst den Sensor jederzeit wieder von der Blacklist entfernen. If the sensor is already handled by the application, nothing will happen unless you delete it from the sensor list. - + Wenn der Sensor bereits von der Anwendung verwaltet wird, passiert nichts, außer du entfernst ihn aus der Sensorliste. Cancel - Abbrechen + Abbrechen Blacklist - + Blacklist Whitelist - + Whitelist @@ -2336,32 +2336,32 @@ You are about to start sensor calibration. - + Du bist dabei, die Sensorkalibrierung zu starten. Calibration is only needed when the values from the sensor stop making sense. - + Kalibrierung ist nur erforderlich, wenn die Werte des Sensors keinen Sinn mehr ergeben. Before starting the calibration, please note that you need to place this sensor either <b>outside</b>, <b>next to a window</b>, or <b>inside a very well ventilated room</b>. - + Bevor du mit der Kalibrierung beginnst, beachte bitte, dass du diesen Sensor entweder <b>außen</b>, <b>neben ein Fenster</b> oder <b>in einem sehr gut belüfteten Raum</b> platzieren musst. The calibration process will take around 10 minutes to complete. - + Der Kalibrierungsvorgang dauert ungefähr 10 Minuten, bis er abgeschlossen ist. Cancel - Abbrechen + Abbrechen Start calibration - + Kalibrierung starten @@ -2369,12 +2369,12 @@ Cancel - Abbrechen + Abbrechen Select - + Auswählen @@ -2389,27 +2389,27 @@ Are you sure you want to delete data for this sensor? - + Bist du sicher, dass du die Daten für diesen Sensor löschen möchtest? You can either delete data from the application, or from both the sensor and application. - + Du kannst entweder die Daten aus der Anwendung löschen oder sowohl vom Sensor als auch aus der Anwendung. Cancel - Abbrechen + Abbrechen Delete local data - + Lokale Daten löschen Delete sensor data - + Sensordaten löschen @@ -2417,28 +2417,28 @@ Are you sure you want to delete selected sensor(s)? - - + + Möchten Sie wirklich ausgewählten Sensor löschen? Data from the sensor(s) are kept for an additional 90 days, in case you would like to re-add a sensor later. - - + + Daten von den Sensor(en) werden für weitere 90 Tage gespeichert, falls Sie später einen Sensor erneut hinzufügen möchten. Cancel - Abbrechen + Abbrechen Delete - Löschen + Löschen @@ -2453,69 +2453,69 @@ version %1 %2 - version %1 %2 + version %1 %2 WEBSITE - WEBSEITE + WEBSEITE SUPPORT - UNTERSTÜTZUNG + UNTERSTÜTZUNG GitHub - + GitHub A plant monitoring application that reads and plots data from compatible Bluetooth sensors and thermometers like Xiaomi 'Flower Care' or Parrot 'Flower Power'. - + Eine Pflanzenüberwachungsanwendung, die Daten von kompatiblen Bluetooth-Sensoren und Thermometern wie Xiaomi „Flower Care“ oder Parrot „Flower Power“ ausliest und darstellt. Application by <a href="https://emeric.io">Emeric Grange</a><br>Visual design by <a href="https://dribbble.com/chrisdiaz">Chris Díaz</a> - + Anwendung von <a href="https://emeric.io">Emeric Grange</a><br>Visuelles Design von <a href="https://dribbble.com/chrisdiaz">Chris Diaz</a> Rate the application - Bewerte die App + Bewerte die App Release notes - + Versionshinweise Supported sensors - + Unterstützte Sensoren Open the tutorial - Öffne die Anleitung + Öffne die Anleitung About app permissions - + Über App-Berechtigungen This application is made possible thanks to a couple of third party open source projects: - + Diese Anwendung wurde dank einiger Open-Source-Projekte von Drittanbietern ermöglicht: Special thanks to our translators: - + Besonderer Dank an unsere Übersetzer: @@ -2523,330 +2523,330 @@ User interface - + Benutzeroberfläche Theme - Benutzeroberfläche + Benutzeroberfläche snow - + schnee rain - + regen plant - pflanze + pflanze day - + tag night - + Nacht Automatic dark mode - Automatischer Dunkelmodus + Automatischer Dunkelmodus Operating System fallback string - + Betriebssystem Dark mode will follow %1 settings. - + Der Dunkelmodus folgt den Einstellungen von %1. Dark mode will switch on automatically between 9 PM and 9 AM. - Der Dunkelmodus wird zwischen 21 Uhr und 9 Uhr automatisch eingeschaltet. + Der Dunkelmodus wird zwischen 21 Uhr und 9 Uhr automatisch eingeschaltet. Dark mode schedule is disabled. - + Zeitplan für den Dunkelmodus ist deaktiviert. Split sensor list in categories - + Sensorliste in Kategorien aufteilen Devices will be split into categories (plant sensors, thermometers, air quality monitors) - + Geräte werden in Kategorien unterteilt (Pflanzensensoren, Thermometer, Luftqualitätsmessgeräte) Devices will be shown together. - + Geräte werden gemeinsam angezeigt. Language - + Sprache auto short for automatic - + auto Start application minimized - Anwendung minimiert starten + Anwendung minimiert starten Background updates - + Hintergrundaktualisierungen about - + Über Enable background updates - Aktiviert die Hintergrundaktualisierung + Aktiviert die Hintergrundaktualisierung Wake up at a predefined interval to refresh sensor data. Only if Bluetooth is enabled. - + Wacht in festgelegten Intervallen auf, um Sensordaten zu aktualisieren. Nur wenn Bluetooth aktiviert ist. - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare bleibt nach dem Schließen des Fensters im Benachrichtigungsbereich aktiv und aktualisiert die Sensordaten automatisch in regelmäßigen Abständen. - WatchFlower is only active while the window is open. - + SmartCare is only active while the window is open. + SmartCare ist nur aktiv, solange das Fenster geöffnet ist. Enable notifications - Benachrichtigungen aktivieren + Benachrichtigungen aktivieren - If a plant needs water, WatchFlower will bring it to your attention! - Wenn eine Pflanze Wasser benötigt, wird WatchFlower Sie darauf aufmerksam machen! + If a plant needs water, SmartCare will bring it to your attention! + Wenn eine Pflanze Wasser benötigt, wird SmartCare Sie darauf aufmerksam machen! - If a plant needs water, WatchFlower can bring it to your attention. - + If a plant needs water, SmartCare can bring it to your attention. + Wenn eine Pflanze Wasser braucht, kann SmartCare Sie darauf aufmerksam machen. battery level - + batteriestand water level - + Wasserstand freeze warnings - + Frostwarnungen environmental warnings - + emweltwarnungen Bluetooth - + Bluetooth Bluetooth control - Bluetooth-Steuerung + Bluetooth-Steuerung - WatchFlower will enable your device's Bluetooth in order to operate. - + SmartCare will enable your device's Bluetooth in order to operate. + SmartCare aktiviert das Bluetooth Ihres Geräts, um zu funktionieren. - WatchFlower will only operate if your device's Bluetooth is already enabled. - + SmartCare will only operate if your device's Bluetooth is already enabled. + SmartCare funktioniert nur, wenn das Bluetooth Ihres Geräts bereits aktiviert ist. Limit Bluetooth scanning range - + Bluetooth-Suchreichweite begrenzen Will only scan for sensors approximately 2 meters around you. - + Scannt nur nach Sensoren im Umkreis von etwa 2 Metern um Sie herum. Sensor scanning range is not limited. - + Die Sensor-Suchreichweite ist nicht begrenzt. Simultaneous updates - + Gleichzeitige Aktualisierungen How many sensors should be updated at once. - + Wie viele Sensoren gleichzeitig aktualisiert werden sollen. A lower number improves Bluetooth synchronization reliability, at the expense of speed. - + Eine niedrigere Zahl verbessert die Zuverlässigkeit der Bluetooth-Synchronisierung, geht jedoch zulasten der Geschwindigkeit. Plant sensors - Pflanzensensoren + Pflanzensensoren Update interval - Aktualisierungsintervall + Aktualisierungsintervall h. short for hours - + Data indicators - + Datenindikatoren thin - + dünn solid - + stabil static - + statisch dynamic - + dynamisch preview - + vorschau Thermometers - Thermometer + Thermometer Temperature unit - Temperatureinheit + Temperatureinheit °C - + °C °F - + °F My location - + Mein Standort Enable Sun and Moon widget - + Sonne-und-Mond-Widget aktivieren GPS position - + GPS position Data archiving - + Datenarchivierung Export up to 90 days of data into a CSV file. - + Exportieren Sie bis zu 90 Tage an Daten in eine CSV-Datei. - Saved in your documents, under the 'WatchFlower' directory. - + Saved in your documents, under the 'SmartCare' directory. + Gespeichert in Ihren Dokumenten im Verzeichnis 'SmartCare'. Export data - + Daten exportieren Exported - + Exportiert Open folder - + Ordner öffnen Export file - + Datei exportieren @@ -2854,106 +2854,106 @@ Connects to a remote MySQL compatible database, instead of the embedded database. Allows multiple instances of the application to share data. Database setup is at your own charge. - + erbindet sich mit einer entfernten MySQL-kompatiblen Datenbank anstelle der eingebetteten Datenbank. Ermöglicht mehreren Instanzen der Anwendung, Daten zu teilen. Die Einrichtung der Datenbank erfolgt auf eigene Verantwortung. Host - + Host Port - + Port User - + Benutzer Password - + Passwort ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. - + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> ist eine Pflanzenüberwachungsanwendung für Xiaomi-<b>Flower Care</b>- oder Parrot-<b>Flower Power</b>-Sensoren. It also works great with a couple of <b>thermometers</b> and other sensors like <b>air quality monitors</b> and <b>weather stations</b>! - + Es funktioniert auch hervorragend mit einigen <b>Thermometern</b> und anderen Sensoren wie <b>Luftqualitätsmessgeräten</b> und <b>Wetterstationen</b>! Supported sensors - + Unterstützte Sensoren - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Um WatchFlower verwenden zu können, müssen Sie nach <b>kompatiblen Bluetooth-Geräten</b> in Ihrer Nähe <b>scannen</b>. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Um SmartCare verwenden zu können, müssen Sie nach <b>kompatiblen Bluetooth-Geräten</b> in Ihrer Nähe <b>scannen</b>. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. - Sie können jederzeit <b>erneut nach Geräten suchen</b> oder <b>die löschen</b>, die Sie nicht mehr benötigen. + Sie können jederzeit <b>erneut nach Geräten suchen</b> oder <b>die löschen</b>, die Sie nicht mehr benötigen. - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. - + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. + Sobald sie <b>gekoppelt</b> sind, <b>synchronisieren</b> die Sensoren ihre Daten regelmäßig, wenn Sie SmartCare verwenden. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. - + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>kann</b> möglicherweise Sensoren im Hintergrund synchronisieren. Schauen Sie auf der Seite <b>Einstellungen</b> nach Anweisungen. Keep in mind that Bluetooth only works in <b>close proximity</b>. - + Beachten Sie, dass Bluetooth nur in <b>geringer Entfernung</b> funktioniert. Click on sensors to access <b>historical data</b>, <b>graphs</b> and <b>detailed infos</b>. - + Klicken Sie auf Sensoren, um auf <b>Verlaufsdaten</b>, <b>Diagramme</b> und <b>detaillierte Informationen</b> zuzugreifen. You can set a custom <b>name</b> and a <b>location</b> for each sensor. - + Sie können für jeden Sensor einen eigenen <b>Namen</b> und einen <b>Standort</b> festlegen. You can also <b>choose a plant</b> from our database to automatically set <b>optimal limits</b> and get <b>plant care tips</b>! - + Sie können auch <b>eine Pflanze auswählen</b> aus unserer Datenbank, um <b>optimale Grenzwerte</b> automatisch festzulegen und <b>Pflegetipps</b> zu erhalten! You can always customize <b>limits</b> (like <b>moisture level</b> or <b>temperature range</b>) to your liking. - + Sie können die <b>Grenzwerte</b> (wie den <b>Feuchtigkeitsgrad</b> oder den <b>Temperaturbereich</b>) jederzeit nach Ihren Wünschen anpassen. Start - + Previous - Zurück + Zurück Next - Weiter + Weiter @@ -2983,8 +2983,8 @@ Automatischer Dunkelmodus - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kann Bluetooth automatisch aktivieren, was für eine korrekte Funktion benötigt wird. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kann Bluetooth automatisch aktivieren, was für eine korrekte Funktion benötigt wird. Start application minimized @@ -3007,8 +3007,8 @@ Benachrichtigungen aktivieren - If a plant needs water, WatchFlower will bring it to your attention! - Wenn eine Pflanze Wasser benötigt, wird WatchFlower Sie darauf aufmerksam machen! + If a plant needs water, SmartCare will bring it to your attention! + Wenn eine Pflanze Wasser benötigt, wird SmartCare Sie darauf aufmerksam machen! Plant sensors @@ -3032,78 +3032,78 @@ last 30 days - + letzte 30 tage last 7 days - + letzte 7 tage last 24 hours - + letzte 24 stunden last month - + letzter monat last week - + letzte woche yesterday - + gestern two - + zwei three - + drei four - + vier five - + fünf six - + sechs months - + monate weeks - + wochen days - + tage %0 %1 ago Used like this: "two months ago", or "one week ago" - + @@ -3111,7 +3111,7 @@ Sun & Moon - + Sonne & Mond @@ -3119,7 +3119,7 @@ Sensor list - + Sensorliste @@ -3136,7 +3136,7 @@ Quit - + Beenden @@ -3151,16 +3151,16 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> ist eine App zur Pflanzenüberwachung, welche u. a. Xiaomi / MiJia-Sensoren '<b>Flower Care</b>' und '<b>RoPot</b>' unterstützt. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> ist eine App zur Pflanzenüberwachung, welche u. a. Xiaomi / MiJia-Sensoren '<b>Flower Care</b>' und '<b>RoPot</b>' unterstützt. It also works great with a couple of <b>thermometers</b>! Es funktioniert auch mit einigen anderen <b>Bluetooth-Thermometern</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Um WatchFlower verwenden zu können, müssen Sie nach <b>kompatiblen Bluetooth-Geräten</b> in Ihrer Nähe <b>scannen</b>. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Um SmartCare verwenden zu können, müssen Sie nach <b>kompatiblen Bluetooth-Geräten</b> in Ihrer Nähe <b>scannen</b>. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. @@ -3219,232 +3219,232 @@ Offline - + Offline Queued - In Warteschlange + In Warteschlange Disconnecting... - + Trennen... Connecting... - Verbinde... + Verbinde... Connected - Verbunden + Verbunden Working... - + Arbeiten... Updating... - Aktualisiere... + Aktualisiere... Syncing... - + Synchronisieren... Realtime data - + Echtzeitdaten Realtime - + Echtzeit History - Verlauf + Verlauf Battery - Batterie + Batterie Clock - + Uhr LED status - + LED-Status LED RGB - + LED RGB Buttons - + Tasten Last move - + Letzte Bewegung Watering - + Bewässerung Calibration - + Kalibrierung Reboot - + Neustart Soil moisture - + Bodenfeuchte Soil conductivity - + Bodenleitfähigkeit Soil temperature - + Bodentemperatur Soil PH - + Boden-pH Temperature - Temperatur + Temperatur Humididty - + Luftfeuchtigkeit Pressure - + Druck Luminosity - Leuchtkraft + Leuchtkraft UV luminosity - + UV-Helligkeit Sound - + Ton Water level - + Wasserstand Wind direction - + Windrichtung Wind speed - + Windgeschwindigkeit PM1 - + PM1 PM2.5 - + PM2.5 PM10 - + PM10 O2 - + O2 O3 - + O3 CO - + CO CO2 - + CO2 eCO2 - + eCO2 NO2 - + NO2 SO2 - + SO2 VOC - + VOC HCHO - + HCHO Geiger Counter - + Geigerzähler @@ -3452,178 +3452,178 @@ square - + quadratisch 35mm film - + 35mm Film US / UK widescreen - + US-/UK-breitbild DCI / SMPTE digital cinema - + DCI- / SMPTE-Digitalkino 70 mm film - + 70 mm Film 35 mm anamorphic - + 35 mm anamorph 35 mm modern anamorphic - + 35 mm modernes Anamorph Kb/s - + Kb/s Mb/s - + Mb/s Gb/s - + Gb/s Unknown - + Unbekannt spherical - + sphärisch equirectangular - + equirektangular EAC - + EAC cubemap - + würfelkarte mesh - + mesh rectangular - + rechteckig progressive - + progressiv interlaced - + interlaced Rotate 90° - + 90° drehen Rotate 180° - + 180° drehen Rotate 270° - + 270° drehen Unknown rotation - + Unbekannte rotation No rotation - + Keine rotation No transformation - + Keine transformation Mirror - + Spiegeln Flip - + Flip Mirror and rotate 270° - + Spiegeln und 270° drehen Mirror and rotate 90 - + Spiegeln und 90 drehen Rotate 270 - + 270 drehen Invalid transformation - + Ungültige Transformation Mirror and rotate 90° - + Spiegeln und 90° drehen Flip and rotate 90° - + Flip und 90° drehen @@ -3631,472 +3631,472 @@ fungus - + pilz bryophyte - + moospflanze angiosperms - + bedecktsamer gymnosperms - + nacktsamer aquatic plant - + wasserpflanze climbing plant - + kletterpflanze succulent - + sukkulente cacti - + kakteen bamboo - + bambus bonsai - + bonsai orchid - + orchidee rose - + rose vanilla - + kletterpflanze vegetable - + gemüse bulb - + zwiebel crops - + kulturen fern - + farn shrub - + strauch foliage - + laub tree - + baum air purifying - + luftreinigend medicinal - + medizinisch edible - + essbar poisonous - + giftig blooms once - + einmal blühend night bloomer - + nachtblüher carnivorous - + fleischfressend low - niedrig + niedrig medium - + mittel high - + hoch water needs - + wasserbedarf keep moist - + feucht halten spray water on leaves - + wasser auf die blätter sprühen water when soil is dry - + gießen wenn die erde trocken ist shade - + schatten part shade - + halbschatten part sun - + teilsonne full sun - + volle sonne low needs - + niedriger bedarf high needs - + hoher bedarf low concentration - + niedrige konzentration high concentration - + hohe konzentration during growth stage - + während der wachstumsphase during vegetative state - + während der vegetativen phase use base fertilizer - + grunddünger verwenden use topdressing fertilizer - + oberflächendünger verwenden use liquid fertilizer - + flüssigdünger verwenden use foliar fertilizer - + blattdünger verwenden no extra fertilization needed - + keine zusätzliche düngung erforderlich every 2-3 days - + alle 2–3 tage twice a week - + zweimal pro woche once a week - + einmal pro woche every 10-15 days - + alle 10–15 tage twice a month - + zweimal im monat once a month - + einmal im monat every 2 months - + alle 2 monate every 3 months - + alle 3 monate every 4 months - + alle 4 monate every 6 months - + alle 6 monate once a year - + einmal im jahr heavy soil - + schwerer boden medium soil - + mittlerer boden light soil - + leichter boden clay - + ton silty clay - + schluff-ton sandy clay - + sand-ton sandy clay loam - + sand-ton-lehm clay loam - + ton-lehm loam - + lehm silty clay loam - + schluff-ton-lehm sandy soil - + sandboden loamy sand - + sand-lehm sandy loam - + sand-lehm sandy silt loam - + sand-schluff-lehm silty loam - + schluff-lehm silty soil - + schluffboden coarse sandy soil - + grober sandboden chalk soil - + kalkboden limestone soil - + kalkhaltiger boden sphagnum moss - + sphagnum-moos peat and perlite mixed - + torf und perlit gemischt peaty soil - + torfboden no pruning needed - + kein schnitt erforderlich remove dead parts - + abgestorbene teile entfernen shape for good appearance - + für gutes aussehen formen shape to promote growth - + zur förderung des wachstums formen remove peduncle after flowering - + blütenstand nach der blüte entfernen remove daughter plants - + kindel entfernen remove flower stem - + blütenstiel entfernen remove weeds - + unkraut entfernen remove excessive branches - + überflüssige zweige entfernen keep bulbs - + zwiebeln aufbewahren keep tubers - + knollen aufbewahren zone %1 to %2 / %3 - + zone %1 bis %2 / %3 @@ -4105,79 +4105,79 @@ Unknown - + Unbekannt Comment - + Kommentar Photo - + Foto Water - + Gießen Fertilize - + Düngen Prune - + Schneiden Rotate - + Drehen Move - + Bewegen Repot - + Umtopfen Watered - + Gegossen Fertilized - + Gedüngt Pruned - + Geschnitten Rotated - + Gedreht Moved - + Bewegt Repoted - + Umtopft @@ -4185,29 +4185,29 @@ Unknown duration - + Unbekannte Dauer hours - + stunde hour - + stunde min short for minutes - + sec short for seconds - + @@ -4215,7 +4215,7 @@ ms short for milliseconds - + @@ -4223,7 +4223,7 @@ h short for hours - + @@ -4231,7 +4231,7 @@ m short for minutes - + @@ -4240,92 +4240,92 @@ s short for seconds - + ms short for miliseconds - + m short for meters - + ft short for feets - + km short for kilometers - + mi short for miles - + yd short for yards - + /h short for per hour - + km/h kilometers per hour - + mi/h miles per hour - + 0 s - + unknown - + unbekannt 0s - + meter - + feet - + diff --git a/i18n/WatchFlower_en.ts b/i18n/RYLO-SmartCare_en.ts similarity index 100% rename from i18n/WatchFlower_en.ts rename to i18n/RYLO-SmartCare_en.ts diff --git a/i18n/WatchFlower_es.ts b/i18n/RYLO-SmartCare_es.ts similarity index 97% rename from i18n/WatchFlower_es.ts rename to i18n/RYLO-SmartCare_es.ts index aa6d64471..7edabcffb 100644 --- a/i18n/WatchFlower_es.ts +++ b/i18n/RYLO-SmartCare_es.ts @@ -957,7 +957,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1492,7 +1492,7 @@ - About WatchFlower + About SmartCare @@ -1718,8 +1718,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower puede activar el Bluetooth de tu dispositivo para funcionar. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare puede activar el Bluetooth de tu dispositivo para funcionar. @@ -1743,7 +1743,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1814,7 +1814,7 @@ Ubicación - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. En Android 6 y superior, el escaneo de dispositivos Bluetooth de baja energía necesita permisos de ubicación. La aplicación no usa ni guarda dicha ubicación. Sentimos las molestias. @@ -1826,8 +1826,8 @@ Control de Bluetooth - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower puede activar el Bluetooth de tu dispositivo para funcionar. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare puede activar el Bluetooth de tu dispositivo para funcionar. @@ -2193,7 +2193,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2258,7 +2258,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2653,12 +2653,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2668,12 +2668,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - ¡Si una planta necesita agua, WatchFlower the avisará! + If a plant needs water, SmartCare will bring it to your attention! + ¡Si una planta necesita agua, SmartCare the avisará! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2708,12 +2708,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2842,7 +2842,7 @@ - Saved in your documents, under the 'WatchFlower' directory. + Saved in your documents, under the 'SmartCare' directory. @@ -2900,7 +2900,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -2915,8 +2915,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Para empezar a usar WatchFlower, necesitas <b>escanear sensores Bluetooth compatibles</b> cerca de ti. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Para empezar a usar SmartCare, necesitas <b>escanear sensores Bluetooth compatibles</b> cerca de ti. @@ -2925,12 +2925,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3006,8 +3006,8 @@ El modo oscuro se activará entre las 21:00 y las 9:00. - If a plant needs water, WatchFlower will bring it to your attention! - ¡Si una planta necesita agua, WatchFlower the avisará! + If a plant needs water, SmartCare will bring it to your attention! + ¡Si una planta necesita agua, SmartCare the avisará! Plant sensors @@ -3046,8 +3046,8 @@ Idioma - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower puede activar el Bluetooth de tu dispositivo para funcionar. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare puede activar el Bluetooth de tu dispositivo para funcionar. plant @@ -3190,12 +3190,12 @@ ¡También puede funcionar con varios <b>termómetos</b>! - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> es una aplicación de monitorización de plantas para Xiaomi <b>Flower Care</b> y <b>RoPot</b> o Parrot '<b>Flower Power</b>' sensores. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> es una aplicación de monitorización de plantas para Xiaomi <b>Flower Care</b> y <b>RoPot</b> o Parrot '<b>Flower Power</b>' sensores. - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Para empezar a usar WatchFlower, necesitas <b>escanear sensores Bluetooth compatibles</b> cerca de ti. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Para empezar a usar SmartCare, necesitas <b>escanear sensores Bluetooth compatibles</b> cerca de ti. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. diff --git a/i18n/WatchFlower_fr.ts b/i18n/RYLO-SmartCare_fr.ts similarity index 96% rename from i18n/WatchFlower_fr.ts rename to i18n/RYLO-SmartCare_fr.ts index b52882561..08f09744a 100644 --- a/i18n/WatchFlower_fr.ts +++ b/i18n/RYLO-SmartCare_fr.ts @@ -1129,8 +1129,8 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. - Ce capteur doit être enregistré une fois sur son application officielle avant de pouvoir être utilisé avec des applications tierces telles que WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. + Ce capteur doit être enregistré une fois sur son application officielle avant de pouvoir être utilisé avec des applications tierces telles que SmartCare. @@ -1710,8 +1710,8 @@ - About WatchFlower - À propos de WatchFlower + About SmartCare + À propos de SmartCare @@ -1936,8 +1936,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower peut activer le Bluetooth de votre appareil pour fonctionner. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare peut activer le Bluetooth de votre appareil pour fonctionner. @@ -1961,8 +1961,8 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. - WatchFlower n'utilise, ne conserve ni ne partage votre position. + SmartCare doesn't use, store nor communicate your location to anyone or anything. + SmartCare n'utilise, ne conserve ni ne partage votre position. @@ -2044,8 +2044,8 @@ Position - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - Le système d'exploitation Android nécessite que les applications demandent l'autorisation de localisation de l'appareil pour pouvoir rechercher les capteurs Bluetooth Low Energy à proximité.<br>Cette autorisation n'est nécessaire que lors de la recherche de nouveaux capteurs.<br>WatchFlower n'utilise, ne stocke ni ne communique votre position. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + Le système d'exploitation Android nécessite que les applications demandent l'autorisation de localisation de l'appareil pour pouvoir rechercher les capteurs Bluetooth Low Energy à proximité.<br>Cette autorisation n'est nécessaire que lors de la recherche de nouveaux capteurs.<br>SmartCare n'utilise, ne stocke ni ne communique votre position. Official information @@ -2068,8 +2068,8 @@ Contrôle du Bluetooth - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower peut activer le Bluetooth de votre appareil pour fonctionner. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare peut activer le Bluetooth de votre appareil pour fonctionner. @@ -2435,8 +2435,8 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. - Prenez en considération que WatchFlower ne doit pas être votre source d'informations définitive sur l'entretien des plantes. + Please note that SmartCare should not be your definitive source of information about plant care. + Prenez en considération que SmartCare ne doit pas être votre source d'informations définitive sur l'entretien des plantes. @@ -2519,8 +2519,8 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. - Pour utiliser la fonction de mise à jour en arrière-plan, <b>l'autorisation de localisation en arrière-plan</b> est requise, sinon WatchFlower ne peut pas rechercher les capteurs Bluetooth Low Energy et ne peut pas mettre à jour les données lorsque l'application est fermée. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + Pour utiliser la fonction de mise à jour en arrière-plan, <b>l'autorisation de localisation en arrière-plan</b> est requise, sinon SmartCare ne peut pas rechercher les capteurs Bluetooth Low Energy et ne peut pas mettre à jour les données lorsque l'application est fermée. @@ -2942,13 +2942,13 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower restera actif dans la zone de notification après la fermeture de la fenêtre et actualisera automatiquement les données des capteurs à intervalles réguliers. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare restera actif dans la zone de notification après la fermeture de la fenêtre et actualisera automatiquement les données des capteurs à intervalles réguliers. - WatchFlower is only active while the window is open. - WatchFlower n'est actif que lorsque la fenêtre est ouverte. + SmartCare is only active while the window is open. + SmartCare n'est actif que lorsque la fenêtre est ouverte. @@ -2957,13 +2957,13 @@ - If a plant needs water, WatchFlower will bring it to your attention! - Si une plante a besoin d'eau, WatchFlower vous avertira ! + If a plant needs water, SmartCare will bring it to your attention! + Si une plante a besoin d'eau, SmartCare vous avertira ! - If a plant needs water, WatchFlower can bring it to your attention. - Si une plante a besoin d'eau, WatchFlower peut vous le signaler. + If a plant needs water, SmartCare can bring it to your attention. + Si une plante a besoin d'eau, SmartCare peut vous le signaler. @@ -2997,13 +2997,13 @@ - WatchFlower will enable your device's Bluetooth in order to operate. - WatchFlower activera le Bluetooth de votre appareil pour fonctionner. + SmartCare will enable your device's Bluetooth in order to operate. + SmartCare activera le Bluetooth de votre appareil pour fonctionner. - WatchFlower will only operate if your device's Bluetooth is already enabled. - WatchFlower ne fonctionnera que si le Bluetooth de votre appareil est déjà activé. + SmartCare will only operate if your device's Bluetooth is already enabled. + SmartCare ne fonctionnera que si le Bluetooth de votre appareil est déjà activé. @@ -3131,8 +3131,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Enregistré dans vos documents, dans le répertoire 'WatchFlower'. + Saved in your documents, under the 'SmartCare' directory. + Enregistré dans vos documents, dans le répertoire 'SmartCare'. @@ -3189,8 +3189,8 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> est une application de supervision de plantes pour les capteurs Xiaomi '<b>Flower Care</b>' ou Parrot '<b>Flower Power</b>'. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> est une application de supervision de plantes pour les capteurs Xiaomi '<b>Flower Care</b>' ou Parrot '<b>Flower Power</b>'. @@ -3204,8 +3204,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Pour commencer à utiliser WatchFlower, vous devez <b>rechercher les appareils Bluetooth compatibles</b> à proximité. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Pour commencer à utiliser SmartCare, vous devez <b>rechercher les appareils Bluetooth compatibles</b> à proximité. @@ -3214,13 +3214,13 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. - Une fois les capteurs <b>appairés</b>, l'application va périodiquement <b>synchroniser</b> leurs données quand vous utilisez WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. + Une fois les capteurs <b>appairés</b>, l'application va périodiquement <b>synchroniser</b> leurs données quand vous utilisez SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. - WatchFlower <b>peut</b> être en mesure de synchroniser les capteurs en arrière-plan. Consultez la page <b>paramètres</b> pour les instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>peut</b> être en mesure de synchroniser les capteurs en arrière-plan. Consultez la page <b>paramètres</b> pour les instructions. @@ -3299,12 +3299,12 @@ à propos - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower restera actif dans la zone de notification après la fermeture de la fenêtre et actualisera automatiquement les données des capteurs à intervalles réguliers. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare restera actif dans la zone de notification après la fermeture de la fenêtre et actualisera automatiquement les données des capteurs à intervalles réguliers. - If a plant needs water, WatchFlower will bring it to your attention! - Si une plante a besoin d'eau, WatchFlower vous avertira ! + If a plant needs water, SmartCare will bring it to your attention! + Si une plante a besoin d'eau, SmartCare vous avertira ! Plant sensors @@ -3367,8 +3367,8 @@ plante - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower peut activer le Bluetooth de votre appareil pour fonctionner. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare peut activer le Bluetooth de votre appareil pour fonctionner. Limit Bluetooth scanning range @@ -3391,8 +3391,8 @@ Se réveil à intervalle régulier pour rafraichir les données. Seulement si le Bluetooth (ou le contrôle du Bluetooth) est activé. - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower restera actif dans la zone de notification, et mettra régulièrement à jour les capteurs. + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare restera actif dans la zone de notification, et mettra régulièrement à jour les capteurs. Data indicators style @@ -3455,16 +3455,16 @@ expérimental - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensor data at regular interval. - WatchFlower restera actif dans la zone de notification après la fermeture de la fenêtre et actualisera automatiquement les données du capteur à intervalles réguliers. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensor data at regular interval. + SmartCare restera actif dans la zone de notification après la fermeture de la fenêtre et actualisera automatiquement les données du capteur à intervalles réguliers. - WatchFlower is only active while the window is open. - WatchFlower n'est actif que lorsque la fenêtre est ouverte. + SmartCare is only active while the window is open. + SmartCare n'est actif que lorsque la fenêtre est ouverte. - If a plant needs water, WatchFlower can bring it to your attention. - Si une plante a besoin d'eau, WatchFlower peut vous le signaler. + If a plant needs water, SmartCare can bring it to your attention. + Si une plante a besoin d'eau, SmartCare peut vous le signaler. battery level @@ -3483,12 +3483,12 @@ alertes environnementales - WatchFlower will only operate if your device's Bluetooth is already enabled. - WatchFlower ne fonctionnera que si le Bluetooth de votre appareil est déjà activé. + SmartCare will only operate if your device's Bluetooth is already enabled. + SmartCare ne fonctionnera que si le Bluetooth de votre appareil est déjà activé. - WatchFlower will enable your device's Bluetooth in order to operate. - WatchFlower activera le Bluetooth de votre appareil pour fonctionner. + SmartCare will enable your device's Bluetooth in order to operate. + SmartCare activera le Bluetooth de votre appareil pour fonctionner. Will only scan for sensors approximately 2 meters around you. @@ -3515,8 +3515,8 @@ aperçu - Saved in your documents, under the 'WatchFlower' directory. - Enregistré dans vos documents, dans le répertoire 'WatchFlower'. + Saved in your documents, under the 'SmartCare' directory. + Enregistré dans vos documents, dans le répertoire 'SmartCare'. Export data @@ -3698,28 +3698,28 @@ L'application prend également en charge plusieurs <b>thermomètres</b>! - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> est une application de supervision de plantes pour les capteurs Xiaomi '<b>Flower Care</b>' ou Parrot '<b>Flower Power</b>'. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> est une application de supervision de plantes pour les capteurs Xiaomi '<b>Flower Care</b>' ou Parrot '<b>Flower Power</b>'. Supported sensors Capteurs pris en charge - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Pour commencer à utiliser WatchFlower, vous devez <b>rechercher les appareils Bluetooth compatibles</b> à proximité. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Pour commencer à utiliser SmartCare, vous devez <b>rechercher les appareils Bluetooth compatibles</b> à proximité. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. Vous pouvez <b>lancer une nouvelle recherche</b> à tout moment, ou <b>supprimer</b> les capteurs qui ne vous intéressent plus. - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. - Une fois les capteurs <b>appairés</b>, l'application va périodiquement <b>synchroniser</b> leurs données quand vous utilisez WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. + Une fois les capteurs <b>appairés</b>, l'application va périodiquement <b>synchroniser</b> leurs données quand vous utilisez SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. - WatchFlower <b>peut</b> être en mesure de synchroniser les capteurs en arrière-plan. Consultez la page <b>paramètres</b> pour les instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>peut</b> être en mesure de synchroniser les capteurs en arrière-plan. Consultez la page <b>paramètres</b> pour les instructions. Keep in mind that Bluetooth only works in <b>close proximity</b>. @@ -3758,8 +3758,8 @@ Une fois les capteurs <b>appairés</b>, l'application va périodiquement <b>synchroniser</b> leurs données. - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> est une application de supervision de plantes pour les capteurs Xiaomi '<b>Flower Care</b>' et '<b>RoPot</b> ou Parrot '<b>Flower Power</b>'. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> est une application de supervision de plantes pour les capteurs Xiaomi '<b>Flower Care</b>' et '<b>RoPot</b> ou Parrot '<b>Flower Power</b>'. It also works great with a couple of <b>thermometers</b> and other sensors like <b>air quality monitors</b> and <b>weather stations</b>! diff --git a/i18n/WatchFlower_fy.ts b/i18n/RYLO-SmartCare_fy.ts similarity index 97% rename from i18n/WatchFlower_fy.ts rename to i18n/RYLO-SmartCare_fy.ts index 32a463a0a..4fa2f4b97 100644 --- a/i18n/WatchFlower_fy.ts +++ b/i18n/RYLO-SmartCare_fy.ts @@ -1038,7 +1038,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1590,7 +1590,7 @@ - About WatchFlower + About SmartCare @@ -1816,7 +1816,7 @@ - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1841,7 +1841,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1912,8 +1912,8 @@ Lokaasje - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - Android-bestjoeringssysteem ferplichtet applikaasjes te freegjen om lokaasje-machtiging foar it scannen nei Bluetooth Low Energy-sensoaren yn dyn buert.<br>Dizze machtiging is allinnich nedich wilens it scannen nei nije sensoaren.<br>WatchFlower brûkt dyn lokaasje net en bewarret of kommunisearret dy ek mei nimmen of wat dan ek. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + Android-bestjoeringssysteem ferplichtet applikaasjes te freegjen om lokaasje-machtiging foar it scannen nei Bluetooth Low Energy-sensoaren yn dyn buert.<br>Dizze machtiging is allinnich nedich wilens it scannen nei nije sensoaren.<br>SmartCare brûkt dyn lokaasje net en bewarret of kommunisearret dy ek mei nimmen of wat dan ek. Official information @@ -1932,8 +1932,8 @@ Bluetooth-betsjinning - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kin bluetooth op dyn apparaat ynskeakelje foar it ynlêzen fan sensordata. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kin bluetooth op dyn apparaat ynskeakelje foar it ynlêzen fan sensordata. @@ -2299,7 +2299,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2364,7 +2364,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2763,12 +2763,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2778,12 +2778,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - At in plant wetter nedich hat lit WatchFlower it dy witte! + If a plant needs water, SmartCare will bring it to your attention! + At in plant wetter nedich hat lit SmartCare it dy witte! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2818,12 +2818,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2952,8 +2952,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Opslein yn dyn dokuminten yn de 'WatchFlower'-map. + Saved in your documents, under the 'SmartCare' directory. + Opslein yn dyn dokuminten yn de 'SmartCare'-map. @@ -3010,7 +3010,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -3025,8 +3025,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Om WatchFlower te brûken begjinst mei <b>scannen</b> nei <b>kompatibele bluetoothsensoaren</b> yn 'e buert. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Om SmartCare te brûken begjinst mei <b>scannen</b> nei <b>kompatibele bluetoothsensoaren</b> yn 'e buert. @@ -3035,12 +3035,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3116,8 +3116,8 @@ Automatyske tsjustere modus - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kin bluetooth op dyn apparaat automatysk ynskeakelje foar it ynlêzen fan sensordata. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kin bluetooth op dyn apparaat automatysk ynskeakelje foar it ynlêzen fan sensordata. Simultaneous updates @@ -3169,16 +3169,16 @@ Op fêste tiden aktivearje om sensordata te ferfarskjen. Allinnich at bluetooth (of bluetooth-betsjinning) ynskeakele is. - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower draait op 'e eftergrûn (yn it notifikaasjegebiet) en wurdt op fêste tiden aktyf om sensordata te ferfarskjen. + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare draait op 'e eftergrûn (yn it notifikaasjegebiet) en wurdt op fêste tiden aktyf om sensordata te ferfarskjen. Enable notifications Meldingen ynskeakelje - If a plant needs water, WatchFlower will bring it to your attention! - At in plant wetter nedich hat lit WatchFlower it dy witte! + If a plant needs water, SmartCare will bring it to your attention! + At in plant wetter nedich hat lit SmartCare it dy witte! Plant sensors @@ -3209,8 +3209,8 @@ Eksportearje oant 90 dagen oan data yn in CSV-bestân. - Saved in your documents, under the 'WatchFlower' directory. - Opslein yn dyn dokuminten yn de 'WatchFlower'-map. + Saved in your documents, under the 'SmartCare' directory. + Opslein yn dyn dokuminten yn de 'SmartCare'-map. Export file @@ -3369,16 +3369,16 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> is in plantobservaasjeapplikaasje foar Xiaomi '<b>Flower Care</b>' en '<b>RoPot</b>' en Parrot '<b>Flower Power</b>' sensoaren. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is in plantobservaasjeapplikaasje foar Xiaomi '<b>Flower Care</b>' en '<b>RoPot</b>' en Parrot '<b>Flower Power</b>' sensoaren. It also works great with a couple of <b>thermometers</b>! It wurket ek goed mei in tal <b>termometers</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Om WatchFlower te brûken begjinst mei <b>scannen</b> nei <b>kompatibele bluetoothsensoaren</b> yn 'e buert. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Om SmartCare te brûken begjinst mei <b>scannen</b> nei <b>kompatibele bluetoothsensoaren</b> yn 'e buert. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. diff --git a/i18n/WatchFlower_hu.ts b/i18n/RYLO-SmartCare_hu.ts similarity index 96% rename from i18n/WatchFlower_hu.ts rename to i18n/RYLO-SmartCare_hu.ts index 6d6ef4867..26831cd88 100644 --- a/i18n/WatchFlower_hu.ts +++ b/i18n/RYLO-SmartCare_hu.ts @@ -854,8 +854,8 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. - Ezt az érzékelőt egyszer regisztrálni kell a hivatalos alkalmazásban, mielőtt harmadik féltől származó alkalmazásokkal, például a WatchFlowerrel használható. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. + Ezt az érzékelőt egyszer regisztrálni kell a hivatalos alkalmazásban, mielőtt harmadik féltől származó alkalmazásokkal, például a SmartCarerel használható. @@ -1375,8 +1375,8 @@ - About WatchFlower - A WatchFlower-ről + About SmartCare + A SmartCare-ről @@ -1585,8 +1585,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower aktiválhatja az eszköz Bluetooth-ját a működéshez. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare aktiválhatja az eszköz Bluetooth-ját a működéshez. @@ -1610,8 +1610,8 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. - WatchFlower nem használja, tárolja és nem közli az Ön tartózkodási helyét senkivel vagy semmivel. + SmartCare doesn't use, store nor communicate your location to anyone or anything. + SmartCare nem használja, tárolja és nem közli az Ön tartózkodási helyét senkivel vagy semmivel. @@ -2037,8 +2037,8 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. - Kérjük, vegye figyelembe, hogy a WatchFlower nem lehet a növénygondozással kapcsolatos végleges információforrás. + Please note that SmartCare should not be your definitive source of information about plant care. + Kérjük, vegye figyelembe, hogy a SmartCare nem lehet a növénygondozással kapcsolatos végleges információforrás. @@ -2102,8 +2102,8 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. - A háttérfrissítés funkció használatához <b>háttér-helymeghatározási engedély</b> szükséges, különben a WatchFlower nem tud keresni Bluetooth Low Energy érzékelőket, és nem tudja frissíteni az adatokat, amikor az alkalmazás be van zárva. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + A háttérfrissítés funkció használatához <b>háttér-helymeghatározási engedély</b> szükséges, különben a SmartCare nem tud keresni Bluetooth Low Energy érzékelőket, és nem tudja frissíteni az adatokat, amikor az alkalmazás be van zárva. @@ -2515,13 +2515,13 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - A WatchFlower az ablak bezárása után is aktív marad az értesítési területen, és rendszeres időközönként automatikusan frissíti az érzékelők adatait. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + A SmartCare az ablak bezárása után is aktív marad az értesítési területen, és rendszeres időközönként automatikusan frissíti az érzékelők adatait. - WatchFlower is only active while the window is open. - WatchFlower csak akkor aktív, ha az ablak nyitva van. + SmartCare is only active while the window is open. + SmartCare csak akkor aktív, ha az ablak nyitva van. @@ -2530,13 +2530,13 @@ - If a plant needs water, WatchFlower will bring it to your attention! - Ha egy növénynek vízre van szüksége, a WatchFlower felhívja a figyelmét! + If a plant needs water, SmartCare will bring it to your attention! + Ha egy növénynek vízre van szüksége, a SmartCare felhívja a figyelmét! - If a plant needs water, WatchFlower can bring it to your attention. - Ha egy növénynek vízre van szüksége, a WatchFlower felhívhatja a figyelmét. + If a plant needs water, SmartCare can bring it to your attention. + Ha egy növénynek vízre van szüksége, a SmartCare felhívhatja a figyelmét. @@ -2570,13 +2570,13 @@ - WatchFlower will enable your device's Bluetooth in order to operate. - A WatchFlower működéséhez engedélyezi az eszköz Bluetooth-át. + SmartCare will enable your device's Bluetooth in order to operate. + A SmartCare működéséhez engedélyezi az eszköz Bluetooth-át. - WatchFlower will only operate if your device's Bluetooth is already enabled. - WatchFlower csak akkor működik, ha az eszköz Bluetooth-ja már engedélyezve van + SmartCare will only operate if your device's Bluetooth is already enabled. + SmartCare csak akkor működik, ha az eszköz Bluetooth-ja már engedélyezve van @@ -2704,8 +2704,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - A dokumentumokba mentve, a „WatchFlower” könyvtárban. + Saved in your documents, under the 'SmartCare' directory. + A dokumentumokba mentve, a „SmartCare” könyvtárban. @@ -2762,8 +2762,8 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. - A<b>WatchFlower</b> egy növényfigyelő alkalmazás a Xiaomi '<b>Flower Care</b>' vagy Parrot '<b>Flower Power</b>' érzékelőihez. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + A<b>SmartCare</b> egy növényfigyelő alkalmazás a Xiaomi '<b>Flower Care</b>' vagy Parrot '<b>Flower Power</b>' érzékelőihez. @@ -2777,8 +2777,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - A WatchFlower használatának megkezdéséhez <b>keresnie kell</b> a körülötte lévő <b>kompatibilis Bluetooth-érzékelőket</b>. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + A SmartCare használatának megkezdéséhez <b>keresnie kell</b> a körülötte lévő <b>kompatibilis Bluetooth-érzékelőket</b>. @@ -2787,13 +2787,13 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. - A <b>párosítást</b> követően az érzékelők időnként <b>szinkronizálják</b> adataikat, amikor Ön a WatchFlowert használja. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. + A <b>párosítást</b> követően az érzékelők időnként <b>szinkronizálják</b> adataikat, amikor Ön a SmartCaret használja. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. - WatchFlower <b>lehet, hogy</b> szinkronizálja az érzékelőket a háttérben. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>lehet, hogy</b> szinkronizálja az érzékelőket a háttérben. @@ -2892,12 +2892,12 @@ névjegy - WatchFlower is only active while the window is open. - WatchFlower csak akkor aktív, ha az ablak nyitva van. + SmartCare is only active while the window is open. + SmartCare csak akkor aktív, ha az ablak nyitva van. - If a plant needs water, WatchFlower can bring it to your attention. - Ha egy növénynek vízre van szüksége, a WatchFlower felhívhatja a figyelmét. + If a plant needs water, SmartCare can bring it to your attention. + Ha egy növénynek vízre van szüksége, a SmartCare felhívhatja a figyelmét. battery level @@ -2948,16 +2948,16 @@ Engedélyezze a háttérfrissítéseket - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - A WatchFlower az ablak bezárása után is aktív marad az értesítési területen, és rendszeres időközönként automatikusan frissíti az érzékelők adatait. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + A SmartCare az ablak bezárása után is aktív marad az értesítési területen, és rendszeres időközönként automatikusan frissíti az érzékelők adatait. - WatchFlower will only operate if your device's Bluetooth is already enabled. - WatchFlower csak akkor működik, ha az eszköz Bluetooth-ja már engedélyezve van + SmartCare will only operate if your device's Bluetooth is already enabled. + SmartCare csak akkor működik, ha az eszköz Bluetooth-ja már engedélyezve van - WatchFlower will enable your device's Bluetooth in order to operate. - A WatchFlower működéséhez engedélyezi az eszköz Bluetooth-át. + SmartCare will enable your device's Bluetooth in order to operate. + A SmartCare működéséhez engedélyezi az eszköz Bluetooth-át. Will only scan for sensors approximately 2 meters around you. @@ -2992,8 +2992,8 @@ Értesítések engedélyezése - If a plant needs water, WatchFlower will bring it to your attention! - Ha egy növénynek vízre van szüksége, a WatchFlower felhívja a figyelmét! + If a plant needs water, SmartCare will bring it to your attention! + Ha egy növénynek vízre van szüksége, a SmartCare felhívja a figyelmét! Plant sensors @@ -3016,8 +3016,8 @@ Adatarchiválás - Saved in your documents, under the 'WatchFlower' directory. - A dokumentumokba mentve, a „WatchFlower” könyvtárban. + Saved in your documents, under the 'SmartCare' directory. + A dokumentumokba mentve, a „SmartCare” könyvtárban. Export data @@ -3243,8 +3243,8 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. - A<b>WatchFlower</b> egy növényfigyelő alkalmazás a Xiaomi '<b>Flower Care</b>' vagy Parrot '<b>Flower Power</b>' érzékelőihez. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + A<b>SmartCare</b> egy növényfigyelő alkalmazás a Xiaomi '<b>Flower Care</b>' vagy Parrot '<b>Flower Power</b>' érzékelőihez. It also works great with a couple of <b>thermometers</b> and other sensors like <b>air quality monitors</b> and <b>weather stations</b>! @@ -3255,20 +3255,20 @@ Támogatott érzékelők - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - A WatchFlower használatának megkezdéséhez <b>keresnie kell</b> a körülötte lévő <b>kompatibilis Bluetooth-érzékelőket</b>. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + A SmartCare használatának megkezdéséhez <b>keresnie kell</b> a körülötte lévő <b>kompatibilis Bluetooth-érzékelőket</b>. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. Bármikor <b>újra kereshet</b> új eszközöket, vagy <b>törölheti</b> a nem kívánt eszközöket. - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. - A <b>párosítást</b> követően az érzékelők időnként <b>szinkronizálják</b> adataikat, amikor Ön a WatchFlowert használja. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. + A <b>párosítást</b> követően az érzékelők időnként <b>szinkronizálják</b> adataikat, amikor Ön a SmartCaret használja. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. - WatchFlower <b>lehet, hogy</b> szinkronizálja az érzékelőket a háttérben. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>lehet, hogy</b> szinkronizálja az érzékelőket a háttérben. Keep in mind that Bluetooth only works in <b>close proximity</b>. diff --git a/i18n/WatchFlower_nb.ts b/i18n/RYLO-SmartCare_nb.ts similarity index 97% rename from i18n/WatchFlower_nb.ts rename to i18n/RYLO-SmartCare_nb.ts index 15ac2dd6a..c00b3ba86 100644 --- a/i18n/WatchFlower_nb.ts +++ b/i18n/RYLO-SmartCare_nb.ts @@ -1008,7 +1008,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1559,7 +1559,7 @@ - About WatchFlower + About SmartCare @@ -1781,8 +1781,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere Bluetoothen på enheten din for å bruke Bluetooth. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere Bluetoothen på enheten din for å bruke Bluetooth. @@ -1806,7 +1806,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1877,8 +1877,8 @@ Plassering - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - For å søke etter Bluetooth Low Energy-enheter på Android må program be om plasseringstillatelse.<br>Denne tillatelsen trengs bare for å søke etter nye enheter.<br>WatchFlower verken bruker, lagrer eller deler plasseringa di med noen eller noe som helst. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + For å søke etter Bluetooth Low Energy-enheter på Android må program be om plasseringstillatelse.<br>Denne tillatelsen trengs bare for å søke etter nye enheter.<br>SmartCare verken bruker, lagrer eller deler plasseringa di med noen eller noe som helst. Official information @@ -1897,8 +1897,8 @@ Bluetooth-styring - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere Bluetoothen på enheten din for å bruke Bluetooth. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere Bluetoothen på enheten din for å bruke Bluetooth. @@ -2264,7 +2264,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2329,7 +2329,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2728,12 +2728,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2743,12 +2743,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - Dersom ei plante trenger vann så vil WatchFlower varsle deg om dette! + If a plant needs water, SmartCare will bring it to your attention! + Dersom ei plante trenger vann så vil SmartCare varsle deg om dette! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2783,12 +2783,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2917,8 +2917,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Lagra i WatchFlower-mappa i dokumenta dine. + Saved in your documents, under the 'SmartCare' directory. + Lagra i SmartCare-mappa i dokumenta dine. @@ -2975,7 +2975,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -2990,7 +2990,7 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. Til å begynne med , kommer du til å måtte <b>søke</b> etter <b>kompatible Bluetooth-sensorer</b> rundt deg. @@ -3000,12 +3000,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3093,8 +3093,8 @@ Bluetooth-styring - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere Bluetoothen på enheten din for å bruke Bluetooth. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere Bluetoothen på enheten din for å bruke Bluetooth. Simultaneous updates @@ -3117,8 +3117,8 @@ Våkne med faste mellomrom for å hente oppdaterte sensordata. Bare dersom Bluetooth eller Bluetooth-styring er slått på. - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower vil være aktivt i systemtrauet, og våkne opp med faste mellomrom for å laste inn data fra sensor(ene). + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare vil være aktivt i systemtrauet, og våkne opp med faste mellomrom for å laste inn data fra sensor(ene). thin @@ -3133,8 +3133,8 @@ Slå på varsel - If a plant needs water, WatchFlower will bring it to your attention! - Dersom ei plante trenger vann så vil WatchFlower varsle deg om dette! + If a plant needs water, SmartCare will bring it to your attention! + Dersom ei plante trenger vann så vil SmartCare varsle deg om dette! Plant sensors @@ -3191,8 +3191,8 @@ Eksporter opp til 90 dagers data til ei CSV-fil. - Saved in your documents, under the 'WatchFlower' directory. - Lagra i WatchFlower-mappa i dokumenta dine. + Saved in your documents, under the 'SmartCare' directory. + Lagra i SmartCare-mappa i dokumenta dine. Export file @@ -3335,15 +3335,15 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> er et planteovervåkningsprogram for Xiaomi '<b>Flower Care</b>' og '<b>RoPot-</b>' eller Parrot '<b>Flower Power</b>'-sensorer. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> er et planteovervåkningsprogram for Xiaomi '<b>Flower Care</b>' og '<b>RoPot-</b>' eller Parrot '<b>Flower Power</b>'-sensorer. It also works great with a couple of <b>thermometers</b>! Det virker også bra med et par <b>termometer</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. Til å begynne med , kommer du til å måtte <b>søke</b> etter <b>kompatible Bluetooth-sensorer</b> rundt deg. diff --git a/i18n/WatchFlower_nl.ts b/i18n/RYLO-SmartCare_nl.ts similarity index 97% rename from i18n/WatchFlower_nl.ts rename to i18n/RYLO-SmartCare_nl.ts index 2ed346ef7..a11307f4a 100644 --- a/i18n/WatchFlower_nl.ts +++ b/i18n/RYLO-SmartCare_nl.ts @@ -1037,7 +1037,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1589,7 +1589,7 @@ - About WatchFlower + About SmartCare @@ -1815,7 +1815,7 @@ - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1840,7 +1840,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1911,8 +1911,8 @@ Locatie - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - Android-besturingssysteeem verplicht applicaties te vragen om locatie-machtiging voor het scannen naar BLE-sensoren (Bluetooth Low Energy) in je omgeving.<br>Deze machtiging is alleen nodig tijdens het scannen naar nieuwe sensoren.<br>WatchFlower gebruikt je locatie niet en bewaart of communiceert deze ook met niets of niemand. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + Android-besturingssysteeem verplicht applicaties te vragen om locatie-machtiging voor het scannen naar BLE-sensoren (Bluetooth Low Energy) in je omgeving.<br>Deze machtiging is alleen nodig tijdens het scannen naar nieuwe sensoren.<br>SmartCare gebruikt je locatie niet en bewaart of communiceert deze ook met niets of niemand. Official information @@ -1931,8 +1931,8 @@ Bluetooth-bediening - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan bluetooth op je apparaat inschakelen voor het inlezen van sensordata. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan bluetooth op je apparaat inschakelen voor het inlezen van sensordata. @@ -2298,7 +2298,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2363,7 +2363,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2762,12 +2762,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2777,12 +2777,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - Als een plant water nodig heeft laat WatchFlower het je weten! + If a plant needs water, SmartCare will bring it to your attention! + Als een plant water nodig heeft laat SmartCare het je weten! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2817,12 +2817,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2951,8 +2951,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Opgeslagen in je document in de 'WatchFlower'-map. + Saved in your documents, under the 'SmartCare' directory. + Opgeslagen in je document in de 'SmartCare'-map. @@ -3009,7 +3009,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -3024,8 +3024,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Om WatchFlower te gebruiken start je met <b>scannen</b> naar <b>compatibele bluetoothsensoren</b> in de buurt. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Om SmartCare te gebruiken start je met <b>scannen</b> naar <b>compatibele bluetoothsensoren</b> in de buurt. @@ -3034,12 +3034,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3115,8 +3115,8 @@ Automatische donkere modus - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan bluetooth op je apparaat automatisch inschakelen voor het inlezen van sensordata. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan bluetooth op je apparaat automatisch inschakelen voor het inlezen van sensordata. Simultaneous updates @@ -3168,16 +3168,16 @@ Op gezette tijden activeren om sensordata te verversen. Alleen als bluetooth (of bluetooth-bediening) is ingeschakeld. - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower draait op de achtergrond (in systeemvak) en wordt op gezette tijden actief om sensordata te verversen. + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare draait op de achtergrond (in systeemvak) en wordt op gezette tijden actief om sensordata te verversen. Enable notifications Meldingen inschakelen - If a plant needs water, WatchFlower will bring it to your attention! - Als een plant water nodig heeft laat WatchFlower het je weten! + If a plant needs water, SmartCare will bring it to your attention! + Als een plant water nodig heeft laat SmartCare het je weten! Plant sensors @@ -3208,8 +3208,8 @@ Exporteer tot 90 dagen aan data in een CSV-bestand. - Saved in your documents, under the 'WatchFlower' directory. - Opgeslagen in je document in de 'WatchFlower'-map. + Saved in your documents, under the 'SmartCare' directory. + Opgeslagen in je document in de 'SmartCare'-map. Export file @@ -3368,16 +3368,16 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> is een plantobservatieapplicatie voor Xiaomi '<b>Flower Care</b>' en '<b>RoPot</b>' en Parrot '<b>Flower Power</b>' sensoren. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is een plantobservatieapplicatie voor Xiaomi '<b>Flower Care</b>' en '<b>RoPot</b>' en Parrot '<b>Flower Power</b>' sensoren. It also works great with a couple of <b>thermometers</b>! Het werkt ook goed met een aantal <b>thermometers</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Om WatchFlower te gebruiken start je met <b>scannen</b> naar <b>compatibele bluetoothsensoren</b> in de buurt. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Om SmartCare te gebruiken start je met <b>scannen</b> naar <b>compatibele bluetoothsensoren</b> in de buurt. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. diff --git a/i18n/WatchFlower_nn.ts b/i18n/RYLO-SmartCare_nn.ts similarity index 97% rename from i18n/WatchFlower_nn.ts rename to i18n/RYLO-SmartCare_nn.ts index df6793aa4..abfdf7eda 100644 --- a/i18n/WatchFlower_nn.ts +++ b/i18n/RYLO-SmartCare_nn.ts @@ -1008,7 +1008,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1555,7 +1555,7 @@ - About WatchFlower + About SmartCare @@ -1777,8 +1777,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere Bluetoothen på eininga di for å bruke Bluetooth. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere Bluetoothen på eininga di for å bruke Bluetooth. @@ -1802,7 +1802,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1873,8 +1873,8 @@ Plassering - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - For å leite etter Bluetooth Low Energy-einingar på Android må program be om plasseringsløyve.<br>Dette løyvet trengs berre for å leita etter nye einingar.<br>WatchFlower verken brukar, lagrar eller deler plasseringa di med nokon eller noko som helst. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + For å leite etter Bluetooth Low Energy-einingar på Android må program be om plasseringsløyve.<br>Dette løyvet trengs berre for å leita etter nye einingar.<br>SmartCare verken brukar, lagrar eller deler plasseringa di med nokon eller noko som helst. Official information @@ -1893,8 +1893,8 @@ Bluetooth-styring - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere Bluetoothen på eininga di for å bruke Bluetooth. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere Bluetoothen på eininga di for å bruke Bluetooth. @@ -2260,7 +2260,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2325,7 +2325,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2724,12 +2724,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2739,12 +2739,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - Dersom ei plante treng vatn så vil WatchFlower varsle deg om dette! + If a plant needs water, SmartCare will bring it to your attention! + Dersom ei plante treng vatn så vil SmartCare varsle deg om dette! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2779,12 +2779,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2913,8 +2913,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Lagra i WatchFlower-mappa i dokumenta dine. + Saved in your documents, under the 'SmartCare' directory. + Lagra i SmartCare-mappa i dokumenta dine. @@ -2971,7 +2971,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -2986,7 +2986,7 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. Til å byrja med , kjem du til å måtta <b>leita</b> etter <b>kompatible Bluetooth-sensorar</b> rundt deg. @@ -2996,12 +2996,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3089,8 +3089,8 @@ Bluetooth-styring - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower kan aktivere Bluetoothen på eininga di for å bruke Bluetooth. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare kan aktivere Bluetoothen på eininga di for å bruke Bluetooth. Simultaneous updates @@ -3113,8 +3113,8 @@ Vakna med faste mellomrom for å laste inn oppdaterte data frå sensorane. Berre dersom Bluetooth eller Bluetooth-styring er slått på. - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower vil vere aktivt i systemtrauet, og vakne opp med faste mellomrom for å laste inn oppdaterte data frå sensorane. + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare vil vere aktivt i systemtrauet, og vakne opp med faste mellomrom for å laste inn oppdaterte data frå sensorane. thin @@ -3129,8 +3129,8 @@ Slå på varslingar - If a plant needs water, WatchFlower will bring it to your attention! - Dersom ei plante treng vatn så vil WatchFlower varsle deg om dette! + If a plant needs water, SmartCare will bring it to your attention! + Dersom ei plante treng vatn så vil SmartCare varsle deg om dette! Plant sensors @@ -3182,8 +3182,8 @@ Eksporter opp til 90 dagars data til ei CSV-fil. - Saved in your documents, under the 'WatchFlower' directory. - Lagra i WatchFlower-mappa i dokumenta dine. + Saved in your documents, under the 'SmartCare' directory. + Lagra i SmartCare-mappa i dokumenta dine. Export file @@ -3326,15 +3326,15 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> er eit planteovervakingsprogram for Xiaomi '<b>Flower Care</b>' og '<b>RoPot-</b>' eller Parrot '<b>Flower Power</b>'-sensorar. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> er eit planteovervakingsprogram for Xiaomi '<b>Flower Care</b>' og '<b>RoPot-</b>' eller Parrot '<b>Flower Power</b>'-sensorar. It also works great with a couple of <b>thermometers</b>! Det virkar også bra med eit par <b>termometer</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. Til å byrja med , kjem du til å måtta <b>leita</b> etter <b>kompatible Bluetooth-sensorar</b> rundt deg. diff --git a/i18n/WatchFlower_pl.ts b/i18n/RYLO-SmartCare_pl.ts similarity index 98% rename from i18n/WatchFlower_pl.ts rename to i18n/RYLO-SmartCare_pl.ts index 7cbe1de4d..f36ad6496 100644 --- a/i18n/WatchFlower_pl.ts +++ b/i18n/RYLO-SmartCare_pl.ts @@ -752,7 +752,7 @@ Zaktualizuj dane - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1249,7 +1249,7 @@ Zaktualizuj dane - About WatchFlower + About SmartCare @@ -1455,7 +1455,7 @@ Zaktualizuj dane - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1480,7 +1480,7 @@ Zaktualizuj dane - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1903,7 +1903,7 @@ Zaktualizuj dane - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -1968,7 +1968,7 @@ Zaktualizuj dane - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2351,12 +2351,12 @@ Zaktualizuj dane - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2366,12 +2366,12 @@ Zaktualizuj dane - If a plant needs water, WatchFlower will bring it to your attention! + If a plant needs water, SmartCare will bring it to your attention! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2406,12 +2406,12 @@ Zaktualizuj dane - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2540,7 +2540,7 @@ Zaktualizuj dane - Saved in your documents, under the 'WatchFlower' directory. + Saved in your documents, under the 'SmartCare' directory. @@ -2598,7 +2598,7 @@ Zaktualizuj dane ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -2613,7 +2613,7 @@ Zaktualizuj dane - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. @@ -2623,12 +2623,12 @@ Zaktualizuj dane - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. diff --git a/i18n/WatchFlower_pt.ts b/i18n/RYLO-SmartCare_pt.ts similarity index 98% rename from i18n/WatchFlower_pt.ts rename to i18n/RYLO-SmartCare_pt.ts index 1091ece84..5026d4edb 100644 --- a/i18n/WatchFlower_pt.ts +++ b/i18n/RYLO-SmartCare_pt.ts @@ -743,7 +743,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1240,7 +1240,7 @@ - About WatchFlower + About SmartCare @@ -1446,7 +1446,7 @@ - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1471,7 +1471,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1894,7 +1894,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -1959,7 +1959,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2340,12 +2340,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2355,12 +2355,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! + If a plant needs water, SmartCare will bring it to your attention! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2395,12 +2395,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2529,7 +2529,7 @@ - Saved in your documents, under the 'WatchFlower' directory. + Saved in your documents, under the 'SmartCare' directory. @@ -2587,7 +2587,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -2602,7 +2602,7 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. @@ -2612,12 +2612,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. diff --git a/i18n/WatchFlower_ru.ts b/i18n/RYLO-SmartCare_ru.ts similarity index 97% rename from i18n/WatchFlower_ru.ts rename to i18n/RYLO-SmartCare_ru.ts index 74fdb95b0..3f388cbc3 100644 --- a/i18n/WatchFlower_ru.ts +++ b/i18n/RYLO-SmartCare_ru.ts @@ -1026,7 +1026,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1573,7 +1573,7 @@ - About WatchFlower + About SmartCare @@ -1799,7 +1799,7 @@ - WatchFlower can activate your device's Bluetooth in order to operate. + SmartCare can activate your device's Bluetooth in order to operate. @@ -1824,7 +1824,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1895,8 +1895,8 @@ Местоположение - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - Операционная система Android требует, чтобы приложения запрашивали разрешение на определение местоположения устройства для возможности сканировать близлежащие датчики Bluetooth LE.<br>Это разрешение требуется только при поиске новых датчиков.<br>WatchFlower не использует, не хранит и никому не передает данные о вашем местоположении. + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + Операционная система Android требует, чтобы приложения запрашивали разрешение на определение местоположения устройства для возможности сканировать близлежащие датчики Bluetooth LE.<br>Это разрешение требуется только при поиске новых датчиков.<br>SmartCare не использует, не хранит и никому не передает данные о вашем местоположении. Official information @@ -1915,8 +1915,8 @@ Управление Bluetooth - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower может активировать Bluetooth вашего устройства для работы приложения. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare может активировать Bluetooth вашего устройства для работы приложения. @@ -2282,7 +2282,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2347,7 +2347,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2744,12 +2744,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2759,12 +2759,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - Если растению нужна вода, WatchFlower уведомит вас об этом! + If a plant needs water, SmartCare will bring it to your attention! + Если растению нужна вода, SmartCare уведомит вас об этом! - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2799,12 +2799,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2933,8 +2933,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - Сохраняется в ваших документах в папке WatchFlower. + Saved in your documents, under the 'SmartCare' directory. + Сохраняется в ваших документах в папке SmartCare. @@ -2991,7 +2991,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -3006,8 +3006,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Чтобы начать пользоваться WatchFlower, вам необходимо <b>найти совместимые Bluetooth-датчики</b> рядом с вами. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Чтобы начать пользоваться SmartCare, вам необходимо <b>найти совместимые Bluetooth-датчики</b> рядом с вами. @@ -3016,12 +3016,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3105,8 +3105,8 @@ Пробуждаться через определенные промежутки времени, чтобы обновлять данные датчика. Только если включен Bluetooth (или управление Bluetooth). - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower останется активным на панели задач и будет регулярно выходить из режима сна для обновления данных датчика. + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare останется активным на панели задач и будет регулярно выходить из режима сна для обновления данных датчика. Data archiving @@ -3117,8 +3117,8 @@ Экспорт данных до 90 дней в файл CSV. - Saved in your documents, under the 'WatchFlower' directory. - Сохраняется в ваших документах в папке WatchFlower. + Saved in your documents, under the 'SmartCare' directory. + Сохраняется в ваших документах в папке SmartCare. Export file @@ -3141,8 +3141,8 @@ Включить уведомления - If a plant needs water, WatchFlower will bring it to your attention! - Если растению нужна вода, WatchFlower уведомит вас об этом! + If a plant needs water, SmartCare will bring it to your attention! + Если растению нужна вода, SmartCare уведомит вас об этом! Plant sensors @@ -3174,8 +3174,8 @@ Автоматическй тёмный режим - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower может активировать Bluetooth вашего устройства для работы. + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare может активировать Bluetooth вашего устройства для работы. Dynamic scale for indicators @@ -3326,8 +3326,8 @@ Оно также отлично работает с некоторыми <b>термометрами</b>! - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - Чтобы начать пользоваться WatchFlower, вам необходимо <b>найти совместимые Bluetooth-датчики</b> рядом с вами. + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + Чтобы начать пользоваться SmartCare, вам необходимо <b>найти совместимые Bluetooth-датчики</b> рядом с вами. You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. @@ -3354,8 +3354,8 @@ Вы можете <b>давать названия растениям</b> и указывать их <b>расположение</b>. - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b> - это приложение для отслеживания датчиков Xiaomi '<b>Flower Care</b>' и '<b>RoPot</b>'. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> - это приложение для отслеживания датчиков Xiaomi '<b>Flower Care</b>' и '<b>RoPot</b>'. Previous diff --git a/i18n/WatchFlower_zh_CN.ts b/i18n/RYLO-SmartCare_zh_CN.ts similarity index 97% rename from i18n/WatchFlower_zh_CN.ts rename to i18n/RYLO-SmartCare_zh_CN.ts index 0d67711dd..080e568c3 100644 --- a/i18n/WatchFlower_zh_CN.ts +++ b/i18n/RYLO-SmartCare_zh_CN.ts @@ -1052,7 +1052,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1599,7 +1599,7 @@ - About WatchFlower + About SmartCare @@ -1825,8 +1825,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower运作时可启动您的装置之蓝牙功能。 + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare运作时可启动您的装置之蓝牙功能。 @@ -1850,7 +1850,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1921,8 +1921,8 @@ 位置 - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - 安卓作业系统需要应用程式先徵得装置位置权限才可侦测附近的低功率蓝牙（BLE）传感器。<br>我们只会在侦测新传感器时才会徵求此权限。<br>WatchFlower不会使用、储存或向任何人或东西传送您的位置信息。 + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + 安卓作业系统需要应用程式先徵得装置位置权限才可侦测附近的低功率蓝牙（BLE）传感器。<br>我们只会在侦测新传感器时才会徵求此权限。<br>SmartCare不会使用、储存或向任何人或东西传送您的位置信息。 Official information @@ -1941,8 +1941,8 @@ 控制蓝牙 - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower运作时可启动您的装置之蓝牙功能。 + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare运作时可启动您的装置之蓝牙功能。 @@ -2308,7 +2308,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2373,7 +2373,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2770,12 +2770,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2785,12 +2785,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - WatchFlower会在植物需要浇水时提示请您注意！ + If a plant needs water, SmartCare will bring it to your attention! + SmartCare会在植物需要浇水时提示请您注意！ - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2825,12 +2825,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2959,8 +2959,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - 储存在您的文件，在「WatchFlower」资料夹内。 + Saved in your documents, under the 'SmartCare' directory. + 储存在您的文件，在「SmartCare」资料夹内。 @@ -3017,7 +3017,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -3032,8 +3032,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - 在开始使用WatchFlower前，请先<b>侦测</b>您周围<b>可适配的蓝牙传感器</b>。 + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + 在开始使用SmartCare前，请先<b>侦测</b>您周围<b>可适配的蓝牙传感器</b>。 @@ -3042,12 +3042,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3148,8 +3148,8 @@ 控制蓝牙 - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower运作时可启动您的装置之蓝牙功能。 + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare运作时可启动您的装置之蓝牙功能。 Simultaneous updates @@ -3172,16 +3172,16 @@ 在预设时间周期醒来更新传感器数据。只在蓝牙（或蓝牙控制）启动时有效。 - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower会在系统匣中保持运作，并会定时醒来更新传感器数据。 + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare会在系统匣中保持运作，并会定时醒来更新传感器数据。 Enable notifications 开启通知 - If a plant needs water, WatchFlower will bring it to your attention! - WatchFlower会在植物需要浇水时提示请您注意！ + If a plant needs water, SmartCare will bring it to your attention! + SmartCare会在植物需要浇水时提示请您注意！ water level @@ -3232,8 +3232,8 @@ 把最多90天的数据导出至CSV档。 - Saved in your documents, under the 'WatchFlower' directory. - 储存在您的文件，在「WatchFlower」资料夹内。 + Saved in your documents, under the 'SmartCare' directory. + 储存在您的文件，在「SmartCare」资料夹内。 Export file @@ -3376,16 +3376,16 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b>是一款为小米「<b>花花草草检测仪</b>」及「<b>RoPot花花草草智能花盆</b>」或Parrot牌「<b>Flower Power</b>」智能花盆内的传感器而设的植物监测应用程式。 + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b>是一款为小米「<b>花花草草检测仪</b>」及「<b>RoPot花花草草智能花盆</b>」或Parrot牌「<b>Flower Power</b>」智能花盆内的传感器而设的植物监测应用程式。 It also works great with a couple of <b>thermometers</b>! 配对数款<b>温度计</b>也效果理想！ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - 在开始使用WatchFlower前，请先<b>侦测</b>您周围<b>可适配的蓝牙传感器</b>。 + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + 在开始使用SmartCare前，请先<b>侦测</b>您周围<b>可适配的蓝牙传感器</b>。 You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. diff --git a/i18n/WatchFlower_zh_TW.ts b/i18n/RYLO-SmartCare_zh_TW.ts similarity index 97% rename from i18n/WatchFlower_zh_TW.ts rename to i18n/RYLO-SmartCare_zh_TW.ts index 202914161..b86f0f781 100644 --- a/i18n/WatchFlower_zh_TW.ts +++ b/i18n/RYLO-SmartCare_zh_TW.ts @@ -1052,7 +1052,7 @@ - This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower. + This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare. @@ -1599,7 +1599,7 @@ - About WatchFlower + About SmartCare @@ -1825,8 +1825,8 @@ - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower运作时可启动您的装置之蓝牙功能。 + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare运作时可启动您的装置之蓝牙功能。 @@ -1850,7 +1850,7 @@ - WatchFlower doesn't use, store nor communicate your location to anyone or anything. + SmartCare doesn't use, store nor communicate your location to anyone or anything. @@ -1921,8 +1921,8 @@ 位置 - The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>WatchFlower doesn't use, store nor communicate your location to anyone or anything. - 安卓作業系統需要應用程式先徵得裝置位置賴權限才可偵測附近的低功率藍牙（BLE）傳感器。<br>我們只會在偵測新傳感器時才会徵求此權限。<br>WatchFlower不會使用、儲存或向任何人或東西傳送送您的位置訊息。 + The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.<br>This permission is only needed while scanning for new sensors.<br>SmartCare doesn't use, store nor communicate your location to anyone or anything. + 安卓作業系統需要應用程式先徵得裝置位置賴權限才可偵測附近的低功率藍牙（BLE）傳感器。<br>我們只會在偵測新傳感器時才会徵求此權限。<br>SmartCare不會使用、儲存或向任何人或東西傳送送您的位置訊息。 Official information @@ -1941,8 +1941,8 @@ 控制藍牙 - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower运作时可启动您的装置之蓝牙功能。 + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare运作时可启动您的装置之蓝牙功能。 @@ -2308,7 +2308,7 @@ - Please note that WatchFlower should not be your definitive source of information about plant care. + Please note that SmartCare should not be your definitive source of information about plant care. @@ -2373,7 +2373,7 @@ - To use the background update feature, the <b>background location permission</b> is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. + To use the background update feature, the <b>background location permission</b> is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed. @@ -2770,12 +2770,12 @@ - WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. + SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval. - WatchFlower is only active while the window is open. + SmartCare is only active while the window is open. @@ -2785,12 +2785,12 @@ - If a plant needs water, WatchFlower will bring it to your attention! - WatchFlower會在植物需要澆水時提示請您注意！ + If a plant needs water, SmartCare will bring it to your attention! + SmartCare會在植物需要澆水時提示請您注意！ - If a plant needs water, WatchFlower can bring it to your attention. + If a plant needs water, SmartCare can bring it to your attention. @@ -2825,12 +2825,12 @@ - WatchFlower will enable your device's Bluetooth in order to operate. + SmartCare will enable your device's Bluetooth in order to operate. - WatchFlower will only operate if your device's Bluetooth is already enabled. + SmartCare will only operate if your device's Bluetooth is already enabled. @@ -2959,8 +2959,8 @@ - Saved in your documents, under the 'WatchFlower' directory. - 儲存在您的文件，在「WatchFlower」資料夾內。 + Saved in your documents, under the 'SmartCare' directory. + 儲存在您的文件，在「SmartCare」資料夾內。 @@ -3017,7 +3017,7 @@ ScreenTutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' or Parrot '<b>Flower Power</b>' sensors. @@ -3032,8 +3032,8 @@ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - 在開始使用WatchFlower前，請先<b>偵測</b>您周圍<b>可適配的藍牙傳感器</b>。 + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + 在開始使用SmartCare前，請先<b>偵測</b>您周圍<b>可適配的藍牙傳感器</b>。 @@ -3042,12 +3042,12 @@ - Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use WatchFlower. + Once <b>paired</b>, sensors will periodically <b>sync</b> their data when you use SmartCare. - WatchFlower <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. + SmartCare <b>might</b> be able to sync sensors in the background. Check out the <b>settings</b> page for instructions. @@ -3148,8 +3148,8 @@ 控制藍牙 - WatchFlower can activate your device's Bluetooth in order to operate. - WatchFlower运作时可启动您的装置之蓝牙功能。 + SmartCare can activate your device's Bluetooth in order to operate. + SmartCare运作时可启动您的装置之蓝牙功能。 Simultaneous updates @@ -3172,16 +3172,16 @@ 在預設時間周期醒來更新傳感器數據。只在藍牙（或藍牙控制）啟動時有效。 - WatchFlower will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. - WatchFlower會在系統匣中保持運作，並會定時醒來更新傳感器數據。 + SmartCare will remain active in the system tray, and will wake up at a regular interval to refresh sensor data. + SmartCare會在系統匣中保持運作，並會定時醒來更新傳感器數據。 Enable notifications 啟動通知 - If a plant needs water, WatchFlower will bring it to your attention! - WatchFlower會在植物需要澆水時提示請您注意！ + If a plant needs water, SmartCare will bring it to your attention! + SmartCare會在植物需要澆水時提示請您注意！ water level @@ -3232,8 +3232,8 @@ 把最多90天的數據導出至CSV檔。 - Saved in your documents, under the 'WatchFlower' directory. - 儲存在您的文件，在「WatchFlower」資料夾內。 + Saved in your documents, under the 'SmartCare' directory. + 儲存在您的文件，在「SmartCare」資料夾內。 Export file @@ -3376,16 +3376,16 @@ Tutorial - <b>WatchFlower</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. - <b>WatchFlower</b>是一款為小米「<b>花花草草檢測儀</b>」及「<b>RoPot花花草草智能花盆</b>」或Parrot牌「<b>Flower Power</b>」智能花盆内的傳感器而設的植物監測應用程式。 + <b>SmartCare</b> is a plant monitoring application for Xiaomi '<b>Flower Care</b>' and '<b>RoPot</b>' or Parrot '<b>Flower Power</b>' sensors. + <b>SmartCare</b>是一款為小米「<b>花花草草檢測儀</b>」及「<b>RoPot花花草草智能花盆</b>」或Parrot牌「<b>Flower Power</b>」智能花盆内的傳感器而設的植物監測應用程式。 It also works great with a couple of <b>thermometers</b>! 配對數款<b>溫度計</b>也效果理想！ - To start using WatchFlower, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. - 在開始使用WatchFlower前，請先<b>偵測</b>您周圍<b>可適配的藍牙傳感器</b>。 + To start using SmartCare, you'll need to <b>scan</b> for <b>compatible Bluetooth sensors</b> around you. + 在開始使用SmartCare前，請先<b>偵測</b>您周圍<b>可適配的藍牙傳感器</b>。 You can <b>rescan</b> for new devices at any time, or <b>delete</b> the ones you don't want. diff --git a/qml/DesktopApplication.qml b/qml/DesktopApplication.qml index 38a855e3e..ac66943ec 100644 --- a/qml/DesktopApplication.qml +++ b/qml/DesktopApplication.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Window import ComponentLibrary -import WatchFlower +import SmartCare import DeviceUtils ApplicationWindow { diff --git a/qml/DesktopHeader.qml b/qml/DesktopHeader.qml index 1f603ae6d..edb2bfdeb 100644 --- a/qml/DesktopHeader.qml +++ b/qml/DesktopHeader.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare Rectangle { id: appHeader @@ -18,7 +18,7 @@ Rectangle { property int headerPosition: 64 - property string headerTitle: "WatchFlower" + property string headerTitle: "SmartCare" property bool headerCompact: singleColumn @@ -56,11 +56,11 @@ Rectangle { buttonBack.source = "qrc:/IconLibrary/material-symbols/close.svg" } else { - headerTitle = "WatchFlower" + headerTitle = "SmartCare" menus.visible = true if (appContent.state === "DeviceList") { - buttonBack.source = "qrc:/assets/gfx/logos/watchflower_monochrome.svg" + buttonBack.source = "qrc:/assets/gfx/logos/watchflower_monochrome.png" } else { buttonBack.source = "qrc:/assets/gfx/icons/arrow_back.svg" } @@ -109,7 +109,7 @@ Rectangle { anchors.leftMargin: 12 anchors.verticalCenter: parent.verticalCenter - hoverEnabled: (buttonBack.source !== "qrc:/assets/gfx/logos/watchflower_monochrome.svg") + hoverEnabled: (buttonBack.source !== "qrc:/assets/gfx/logos/watchflower_monochrome.png") onEntered: { buttonBackBg.opacity = 0.5; } onExited: { buttonBackBg.opacity = 0; buttonBack.width = 32; } @@ -117,7 +117,7 @@ Rectangle { onReleased: buttonBack.width = 32 onClicked: backButtonClicked() - enabled: (buttonBack.source !== "qrc:/assets/gfx/logos/watchflower_monochrome.svg" || wideMode) + enabled: (buttonBack.source !== "qrc:/assets/gfx/logos/watchflower_monochrome.png" || wideMode) visible: enabled Rectangle { @@ -136,7 +136,7 @@ Rectangle { height: width anchors.centerIn: parent - source: "qrc:/assets/gfx/logos/watchflower_monochrome.svg" + source: "qrc:/assets/gfx/logos/watchflower_monochrome.png" color: Theme.colorHeaderContent } } @@ -622,7 +622,7 @@ Rectangle { height: headerHeight text: headerCompact ? "" : qsTr("Sensor list") - source: "qrc:/assets/gfx/logos/watchflower_tray_monochrome.svg" + source: "qrc:/assets/gfx/logos/watchflower_monochrome.png" colorContent: Theme.colorHeaderContent colorHighlight: Theme.colorHeaderHighlight diff --git a/qml/DeviceBrowser.qml b/qml/DeviceBrowser.qml index 8e14ee54d..bf04506e8 100644 --- a/qml/DeviceBrowser.qml +++ b/qml/DeviceBrowser.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Item { id: deviceBrowser diff --git a/qml/DeviceEnvironmental.qml b/qml/DeviceEnvironmental.qml index 096663893..01fbc606a 100644 --- a/qml/DeviceEnvironmental.qml +++ b/qml/DeviceEnvironmental.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare import DeviceUtils Loader { diff --git a/qml/DeviceList.qml b/qml/DeviceList.qml index 6227da26b..014b171a5 100644 --- a/qml/DeviceList.qml +++ b/qml/DeviceList.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Item { id: screenDeviceList diff --git a/qml/DeviceListSplit.qml b/qml/DeviceListSplit.qml index 251c33ca2..6c1b1a051 100644 --- a/qml/DeviceListSplit.qml +++ b/qml/DeviceListSplit.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Item { id: deviceList diff --git a/qml/DevicePlantSensor.qml b/qml/DevicePlantSensor.qml index 275073875..da279bf40 100644 --- a/qml/DevicePlantSensor.qml +++ b/qml/DevicePlantSensor.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Loader { id: devicePlantSensor diff --git a/qml/DevicePlantSensorCare.qml b/qml/DevicePlantSensorCare.qml index 689910c76..ece2b4bbe 100644 --- a/qml/DevicePlantSensorCare.qml +++ b/qml/DevicePlantSensorCare.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Item { id: devicePlantSensorCare diff --git a/qml/DevicePlantSensorData.qml b/qml/DevicePlantSensorData.qml index f7ad6b561..2f1a9ee23 100644 --- a/qml/DevicePlantSensorData.qml +++ b/qml/DevicePlantSensorData.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare import DeviceUtils Item { diff --git a/qml/DevicePlantSensorHistory.qml b/qml/DevicePlantSensorHistory.qml index b13af3163..69a76c5f7 100644 --- a/qml/DevicePlantSensorHistory.qml +++ b/qml/DevicePlantSensorHistory.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare Item { id: devicePlantSensorHistory diff --git a/qml/DevicePlantSensorSettings.qml b/qml/DevicePlantSensorSettings.qml index 3568daca8..391b3f63f 100644 --- a/qml/DevicePlantSensorSettings.qml +++ b/qml/DevicePlantSensorSettings.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import ComponentLibrary -import WatchFlower +import SmartCare Flickable { id: plantSensorSettings @@ -462,7 +462,7 @@ Flickable { Text { Layout.fillWidth: true - text: qsTr("This sensor needs to be registered to its official application once before it can be used with third party applications like WatchFlower.") + text: qsTr("This sensor needs to be registered to its official application once before it can be used with third party applications like SmartCare.") textFormat: Text.PlainText color: Theme.colorSubText font.bold: false diff --git a/qml/DeviceThermometer.qml b/qml/DeviceThermometer.qml index 23eaaaed3..fa2ae0e04 100644 --- a/qml/DeviceThermometer.qml +++ b/qml/DeviceThermometer.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare import DeviceUtils Loader { diff --git a/qml/MobileApplication.qml b/qml/MobileApplication.qml index 8595ea3d1..3ae87d1c5 100644 --- a/qml/MobileApplication.qml +++ b/qml/MobileApplication.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Window import ComponentLibrary -import WatchFlower +import SmartCare import MobileUI ApplicationWindow { @@ -423,7 +423,7 @@ ApplicationWindow { }, State { name: "DeviceList" - PropertyChanges { target: appHeader; headerTitle: "WatchFlower"; } + PropertyChanges { target: appHeader; headerTitle: "SmartCare"; } PropertyChanges { target: screenTutorial; visible: false; enabled: false; } PropertyChanges { target: screenDeviceList; visible: true; enabled: true; } PropertyChanges { target: screenDevicePlantSensor; visible: false; enabled: false } diff --git a/qml/MobileDrawer.qml b/qml/MobileDrawer.qml index e2c52eac6..706d80005 100644 --- a/qml/MobileDrawer.qml +++ b/qml/MobileDrawer.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare DrawerThemed { contentItem: Item { @@ -53,7 +53,7 @@ DrawerThemed { anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: 2 - text: "WatchFlower" + text: "SmartCare" textFormat: Text.PlainText color: Theme.colorText font.bold: true @@ -91,7 +91,7 @@ DrawerThemed { DrawerItem { highlighted: (appContent.state === "DeviceList") text: qsTr("Sensors") - source: "qrc:/assets/gfx/logos/watchflower_tray_dark.svg" + source: "qrc:/assets/gfx/logos/watchflower_monochrome.png" onClicked: { screenDeviceList.loadScreen() diff --git a/qml/MobileExit.qml b/qml/MobileExit.qml index d374cb883..1679b9bf1 100644 --- a/qml/MobileExit.qml +++ b/qml/MobileExit.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare Rectangle { id: mobileExit diff --git a/qml/MobileHeader.qml b/qml/MobileHeader.qml index 668108ef8..c290784f9 100644 --- a/qml/MobileHeader.qml +++ b/qml/MobileHeader.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare Rectangle { id: appHeader diff --git a/qml/MobileMenu.qml b/qml/MobileMenu.qml index 496c8d4b3..8710eed9f 100644 --- a/qml/MobileMenu.qml +++ b/qml/MobileMenu.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare Item { id: mobileMenu @@ -108,7 +108,7 @@ Item { height: mobileMenu.hhh text: qsTr("Sensors") - source: "qrc:/assets/gfx/logos/watchflower_tray_monochrome.svg" + source: "qrc:/assets/gfx/logos/watchflower_monochrome.png" sourceSize: mobileMenu.hhi colorContent: Theme.colorTabletmenuContent colorHighlight: Theme.colorTabletmenuHighlight diff --git a/qml/MobilePermissions.qml b/qml/MobilePermissions.qml index 4e5278335..62f69a256 100644 --- a/qml/MobilePermissions.qml +++ b/qml/MobilePermissions.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Item { id: screenAboutPermissions @@ -161,7 +161,7 @@ Item { visible: (Qt.platform.os === "android") - text: qsTr("WatchFlower can activate your device's Bluetooth in order to operate.") + text: qsTr("SmartCare can activate your device's Bluetooth in order to operate.") textFormat: Text.PlainText wrapMode: Text.WordWrap color: Theme.colorSubText @@ -286,7 +286,7 @@ Item { anchors.rightMargin: Theme.componentMargin text: qsTr("The Android operating system requires applications to ask for device location permission in order to scan for nearby Bluetooth Low Energy sensors.") + "
" + - qsTr("WatchFlower doesn't use, store nor communicate your location to anyone or anything.") + qsTr("SmartCare doesn't use, store nor communicate your location to anyone or anything.") textFormat: Text.StyledText wrapMode: Text.WordWrap color: Theme.colorSubText @@ -297,7 +297,7 @@ Item { anchors.leftMargin: appHeader.headerPosition height: 38 - colorBackground: Theme.colorForeground + colorBackground: Theme.colorBackground text: qsTr("Official information") source: "qrc:/IconLibrary/material-icons/duotone/launch.svg" @@ -446,7 +446,7 @@ Item { height: 38 visible: (Qt.platform.os === "android") - colorBackground: Theme.colorForeground + colorBackground: Theme.colorBackground text: qsTr("Location settings") source: "qrc:/IconLibrary/material-icons/duotone/tune.svg" @@ -582,7 +582,7 @@ Item { height: 38 visible: (Qt.platform.os === "android") - colorBackground: Theme.colorForeground + colorBackground: Theme.colorBackground text: qsTr("Application info") source: "qrc:/IconLibrary/material-icons/duotone/tune.svg" diff --git a/qml/PlantBrowser.qml b/qml/PlantBrowser.qml index 56e39c6a7..4852cb806 100644 --- a/qml/PlantBrowser.qml +++ b/qml/PlantBrowser.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import ComponentLibrary -import WatchFlower +import SmartCare Loader { id: plantBrowser @@ -218,7 +218,7 @@ Loader { width: ListView.view.width height: 40 - color: (index % 2) ? Theme.colorForeground :Theme.colorBackground + color: (index % 2) ? Theme.colorComponentBorder :Theme.colorBackground Row { anchors.left: parent.left @@ -384,7 +384,7 @@ Loader { z: 5 height: 52 - color: Theme.colorForeground + color: Theme.colorBackground visible: (singleColumn && appContent.state === "PlantBrowser" && screenPlantBrowser.entryPoint === "DevicePlantSensor" && diff --git a/qml/PlantCareInfos.qml b/qml/PlantCareInfos.qml index 89e516f34..1515ed6ec 100644 --- a/qml/PlantCareInfos.qml +++ b/qml/PlantCareInfos.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Item { id: plantCareInfos diff --git a/qml/PlantCareJournal.qml b/qml/PlantCareJournal.qml index 27242ff2d..9b7a26a85 100644 --- a/qml/PlantCareJournal.qml +++ b/qml/PlantCareJournal.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare import JournalUtils Item { diff --git a/qml/PlantCareLimits.qml b/qml/PlantCareLimits.qml index 2466a83b2..81b2ad239 100644 --- a/qml/PlantCareLimits.qml +++ b/qml/PlantCareLimits.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Flickable { id: plantCareLimits diff --git a/qml/PlantScreen.qml b/qml/PlantScreen.qml index 80270baf4..9ae5c1476 100644 --- a/qml/PlantScreen.qml +++ b/qml/PlantScreen.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import ComponentLibrary -import WatchFlower +import SmartCare import PlantUtils Grid { @@ -28,37 +28,17 @@ Grid { //////// property var currentPlant: null + property string soilMoistureCheckMessage: "" + property string soilConductivityCheckMessage : "" + property string soilPHCheckMessage : "" + property string soilTemperatureCheckMessage : "" + property string soilHumidityCheckMessage : "" + property string soilLuminosityLUXCheckMessage : "" + property string soilLuminosityMMOLCheckMessage : "" onCurrentPlantChanged: { if (typeof currentPlant === "undefined" || !currentPlant) return -/* - console.log("> onCurrentPlantChanged()") - - console.log("full name: " + currentPlant.name) - console.log("botanical name: " + currentPlant.nameBotanical) - console.log("variety name: " + currentPlant.nameVariety) - console.log("common name: " + currentPlant.nameCommon) - - console.log("diameter: " + currentPlant.diameter) - console.log("height: " + currentPlant.height) - - console.log("tags: " + currentPlant.tags) - - console.log("calendarPlanting: " + currentPlant.calendarPlanting) - console.log("calendarGrowing: " + currentPlant.calendarGrowing) - console.log("calendarBlooming: " + currentPlant.calendarBlooming) - console.log("calendarFruiting: " + currentPlant.calendarFruiting) - - console.log("colors1: " + currentPlant.colorsLeaf) - console.log("colors2: " + currentPlant.colorsBract) - console.log("colors3: " + currentPlant.colorsFlower) - console.log("colors4: " + currentPlant.colorsFruit) - - console.log("watering: " + currentPlant.watering) - console.log("soil Moisture m/m: " + currentPlant.soilMoist_min + " / " + currentPlant.soilMoist_max) - console.log("mmol m/m: " + currentPlant.lightMmol_min + " / " + currentPlant.lightMmol_max) -*/ col1.contentY = 0 col2.contentY = 0 col3.contentY = 0 @@ -173,6 +153,7 @@ Grid { rangeSlider_humi.setValues(currentPlant.envHumi_min, currentPlant.envHumi_max) rangeSlider_lumi_lux.setValues(currentPlant.lightLux_min, currentPlant.lightLux_max) + itemLumiMmol.visible = (currentPlant.lightMmol_min > 0) rangeSlider_lumi_mmol.setValues(currentPlant.lightMmol_min, Math.max(currentPlant.lightMmol_min, currentPlant.lightMmol_max)) } @@ -327,7 +308,9 @@ Grid { anchors.rightMargin: (uiMode === 1) ? -plantScreen.padding : 0 height: columnHeader.height - color: (uiMode === 1) ? Theme.colorForeground : Theme.colorBackground + color: (uiMode === 1) ? Theme.colorBackground : Theme.colorBackground + border.width : (uiMode === 1) ? 3 : 0 + border.color : (uiMode === 1) ? Theme.colorComponentBorder : Theme.colorBackground Column { id: columnHeader @@ -949,9 +932,10 @@ Grid { height: width radius: Theme.componentRadius - color: Theme.colorForeground + color: Theme.colorBackground border.width: 2 - border.color: Qt.darker(color, 1.03) + //border.color: Qt.darker(color, 1.03) + border.color: Theme.colorComponentBorder Item { anchors.right: parent.right @@ -1036,9 +1020,10 @@ Grid { height: width radius: Theme.componentRadius - color: Theme.colorForeground + color: Theme.colorBackground border.width: 2 - border.color: Qt.darker(color, 1.03) + //border.color: Qt.darker(color, 1.03) + border.color : Theme.colorComponentBorder Item { anchors.right: parent.right @@ -1122,9 +1107,10 @@ Grid { height: colFert.height + plantScreen.insidemargins*2 radius: Theme.componentRadius - color: Theme.colorForeground + color: Theme.colorBackground border.width: 2 - border.color: Qt.darker(color, 1.03) + //border.color: Qt.darker(color, 1.03) + border.color : Theme.colorComponentBorder Column { id: colFert @@ -1173,9 +1159,10 @@ Grid { height: colPrun.height + plantScreen.insidemargins*2 radius: Theme.componentRadius - color: Theme.colorForeground + color: Theme.colorBackground border.width: 2 - border.color: Qt.darker(color, 1.03) + //border.color: Qt.darker(color, 1.03) + border.color : Theme.colorComponentBorder Column { id: colPrun @@ -1212,9 +1199,9 @@ Grid { height: colSoil.height + plantScreen.insidemargins*2 radius: Theme.componentRadius - color: Theme.colorForeground + color: Theme.colorBackground border.width: 2 - border.color: Qt.darker(color, 1.03) + border.color : Theme.colorComponentBorder Column { id: colSoil @@ -1288,7 +1275,7 @@ Grid { anchors.right: parent.right anchors.rightMargin: 8 - text: qsTr("Please note that WatchFlower should not be your definitive source of information about plant care.") + text: qsTr("Please note that SmartCare should not be your definitive source of information about plant care.") textFormat: Text.PlainText wrapMode: Text.WordWrap color: Theme.colorSubText @@ -1420,6 +1407,7 @@ Grid { to: 5000 stepSize: 50 } + } Item { @@ -1764,6 +1752,7 @@ Grid { to: 25000 stepSize: 100 } + } //// diff --git a/qml/ScreenAbout.qml b/qml/ScreenAbout.qml index a6181afe1..900acd980 100644 --- a/qml/ScreenAbout.qml +++ b/qml/ScreenAbout.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import ComponentLibrary -import WatchFlower +import SmartCare Loader { id: screenAbout @@ -54,7 +54,7 @@ Loader { anchors.rightMargin: -screenPaddingRight height: 96 - color: headerUnicolor ? Theme.colorBackground : Theme.colorForeground + color: headerUnicolor ? Theme.colorForeground : Theme.colorBackground Row { anchors.left: parent.left @@ -67,8 +67,8 @@ Loader { Image { // logo anchors.verticalCenter: parent.verticalCenter - width: 96 - height: 96 + width: 90 + height: 90 source: "qrc:/assets/gfx/logos/logo.svg" sourceSize: Qt.size(width, height) @@ -84,7 +84,7 @@ Loader { anchors.verticalCenterOffset: 4 Text { - text: "WatchFlower" + text: "SmartCare" textFormat: Text.PlainText color: Theme.colorText font.pixelSize: Theme.fontSizeTitle @@ -116,7 +116,7 @@ Loader { source: "qrc:/IconLibrary/material-symbols/link.svg" sourceSize: 28 font.bold: true - color: (Theme.currentTheme === Theme.THEME_NIGHT) ? Theme.colorHeader : "#5483EF" + color: Theme.colorPrimary onClicked: Qt.openUrlExternally("https://emeric.io/WatchFlower") } @@ -129,7 +129,7 @@ Loader { source: "qrc:/IconLibrary/material-symbols/support.svg" sourceSize: 22 font.bold: true - color: (Theme.currentTheme === Theme.THEME_NIGHT) ? Theme.colorHeader : "#5483EF" + color: Theme.colorPrimary onClicked: Qt.openUrlExternally("https://emeric.io/WatchFlower/support.html") } @@ -144,7 +144,7 @@ Loader { source: "qrc:/assets/gfx/logos/github.svg" sourceSize: 22 font.bold: true - color: (Theme.currentTheme === Theme.THEME_NIGHT) ? Theme.colorHeader : "#5483EF" + color: Theme.colorPrimary onClicked: Qt.openUrlExternally("https://github.com/emericg/WatchFlower") } @@ -184,7 +184,7 @@ Loader { source: "qrc:/IconLibrary/material-symbols/link.svg" sourceSize: 28 font.bold: true - color: (Theme.currentTheme === Theme.THEME_NIGHT) ? Theme.colorHeader : "#5483EF" + color: Theme.colorPrimary onClicked: Qt.openUrlExternally("https://emeric.io/WatchFlower") } @@ -197,7 +197,7 @@ Loader { source: "qrc:/IconLibrary/material-symbols/support.svg" sourceSize: 22 font.bold: true - color: (Theme.currentTheme === Theme.THEME_NIGHT) ? Theme.colorHeader : "#5483EF" + color: Theme.colorPrimary onClicked: Qt.openUrlExternally("https://emeric.io/WatchFlower/support.html") } @@ -208,7 +208,6 @@ Loader { ListItem { // description anchors.left: parent.left anchors.right: parent.right - text: qsTr("A plant monitoring application that reads and plots data from compatible Bluetooth sensors and thermometers like Xiaomi 'Flower Care' or Parrot 'Flower Power'.") source: "qrc:/IconLibrary/material-symbols/info.svg" } diff --git a/qml/ScreenSettings.qml b/qml/ScreenSettings.qml index 18460ef3d..20462d404 100644 --- a/qml/ScreenSettings.qml +++ b/qml/ScreenSettings.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtPositioning import ComponentLibrary -import WatchFlower +import SmartCare Loader { id: screenSettings @@ -82,255 +82,89 @@ Loader { //////////////// - Item { // element_appTheme - anchors.left: parent.left - anchors.leftMargin: contentColumn.paddingLeft - anchors.right: parent.right - anchors.rightMargin: contentColumn.paddingRight - height: Theme.componentHeightXL - - IconSvg { - anchors.left: parent.left - anchors.leftMargin: contentColumn.padIcon - anchors.verticalCenter: parent.verticalCenter - - width: 24 - height: 24 - color: Theme.colorIcon - source: "qrc:/IconLibrary/material-icons/duotone/style.svg" - } - - Text { - anchors.left: parent.left - anchors.leftMargin: contentColumn.padText - anchors.right: appTheme_selector.left - anchors.rightMargin: Theme.componentMargin - anchors.verticalCenter: parent.verticalCenter - - text: qsTr("Theme") - textFormat: Text.PlainText - font.pixelSize: Theme.fontSizeContent - color: Theme.colorText - wrapMode: Text.WordWrap - } - - Row { - id: appTheme_selector - anchors.right: parent.right - anchors.rightMargin: Theme.componentMargin - anchors.verticalCenter: parent.verticalCenter - - z: 1 - spacing: Theme.componentMargin / 2 - - Rectangle { - id: rectangleSnow - width: wideWideMode ? 80 : 32 - height: 32 - anchors.verticalCenter: parent.verticalCenter - - radius: 2 - color: "white" - border.color: (settingsManager.appTheme === "THEME_SNOW") ? Theme.colorSubText : "#ddd" - border.width: 2 - - Text { - anchors.centerIn: parent - visible: wideWideMode - text: qsTr("snow") - textFormat: Text.PlainText - color: (settingsManager.appTheme === "THEME_SNOW") ? Theme.colorSubText : "#ccc" - font.bold: true - font.pixelSize: Theme.fontSizeContentSmall - } - MouseArea { - anchors.fill: parent - onClicked: settingsManager.appTheme = "THEME_SNOW" - } - } - Rectangle { - id: rectangleRain - width: wideWideMode ? 80 : 32 - height: 32 - anchors.verticalCenter: parent.verticalCenter - - radius: 2 - color: "#476cae" - border.color: "#06307a" - border.width: (settingsManager.appTheme === "THEME_RAIN") ? 2 : 0 - - Text { - anchors.centerIn: parent - visible: wideWideMode - text: qsTr("rain") - textFormat: Text.PlainText - color: "white" - font.bold: true - font.pixelSize: Theme.fontSizeContentSmall - } - MouseArea { - anchors.fill: parent - onClicked: settingsManager.appTheme = "THEME_RAIN" - } - } - Rectangle { - id: rectangleGreen - width: wideWideMode ? 80 : 32 - height: 32 - anchors.verticalCenter: parent.verticalCenter - - radius: 2 - color: "#09debc" // green theme colorSecondary - border.color: Theme.colorPrimary - border.width: (settingsManager.appTheme === "THEME_PLANT") ? 2 : 0 - - Text { - anchors.centerIn: parent - visible: wideWideMode - text: qsTr("plant") - textFormat: Text.PlainText - color: "white" - font.bold: true - font.pixelSize: Theme.fontSizeContentSmall - } - MouseArea { - anchors.fill: parent - onClicked: settingsManager.appTheme = "THEME_PLANT" - } - } - Rectangle { - id: rectangleDay - width: wideWideMode ? 80 : 32 - height: 32 - anchors.verticalCenter: parent.verticalCenter - - radius: 2 - color: "#FFE400" // day theme colorSecondary - border.color: Theme.colorPrimary - border.width: (settingsManager.appTheme === "THEME_DAY") ? 2 : 0 - - Text { - anchors.centerIn: parent - visible: wideWideMode - text: qsTr("day") - textFormat: Text.PlainText - color: "white" - font.bold: true - font.pixelSize: Theme.fontSizeContentSmall - } - MouseArea { - anchors.fill: parent - onClicked: settingsManager.appTheme = "THEME_DAY" - } - } - Rectangle { - id: rectangleNight - width: wideWideMode ? 80 : 32 - height: 32 - anchors.verticalCenter: parent.verticalCenter - - radius: 2 - color: "#555151" - border.color: Theme.colorPrimary - border.width: (settingsManager.appTheme === "THEME_NIGHT") ? 2 : 0 - - Text { - anchors.centerIn: parent - visible: wideWideMode - text: qsTr("night") - textFormat: Text.PlainText - color: (settingsManager.appTheme === "THEME_NIGHT") ? Theme.colorPrimary : "#ececec" - font.bold: true - font.pixelSize: Theme.fontSizeContentSmall - } - MouseArea { - anchors.fill: parent - onClicked: settingsManager.appTheme = "THEME_NIGHT" - } - } - } - } //////// - Item { // element_appThemeAuto - anchors.left: parent.left - anchors.leftMargin: contentColumn.paddingLeft - anchors.right: parent.right - anchors.rightMargin: contentColumn.paddingRight - height: Theme.componentHeightXL - - IconSvg { - anchors.left: parent.left - anchors.leftMargin: contentColumn.padIcon - anchors.verticalCenter: parent.verticalCenter - - width: 24 - height: 24 - color: Theme.colorIcon - source: "qrc:/IconLibrary/material-icons/duotone/brightness_4.svg" - } - - Text { - anchors.left: parent.left - anchors.leftMargin: contentColumn.padText - anchors.right: switch_appThemeAuto.left - anchors.rightMargin: Theme.componentMargin - anchors.verticalCenter: parent.verticalCenter - - text: qsTr("Automatic dark mode") - textFormat: Text.PlainText - font.pixelSize: Theme.fontSizeContent - color: Theme.colorText - wrapMode: Text.WordWrap - } - - SwitchThemed { - id: switch_appThemeAuto - anchors.right: parent.right - anchors.rightMargin: Theme.componentMargin - anchors.verticalCenter: parent.verticalCenter - z: 1 - - checked: settingsManager.appThemeAuto - onClicked: { - settingsManager.appThemeAuto = checked - Theme.loadTheme(settingsManager.appTheme) - } - } - } - Text { // legend_appThemeAuto - anchors.left: parent.left - anchors.leftMargin: contentColumn.paddingLeft + contentColumn.padText - anchors.right: parent.right - anchors.rightMargin: contentColumn.paddingRight + Theme.componentMargin - - topPadding: -12 - bottomPadding: isDesktop ? 6 : 6 - - property bool osSupport: (Qt.platform.os !== "linux") - property string osName: { - if (Qt.platform.os === "android") return "Android" - if (Qt.platform.os === "ios") return "iOS" - if (Qt.platform.os === "osx") return "macOS" - if (Qt.platform.os === "linux") return "Linux" - if (Qt.platform.os === "windows") return "Windows" - //: fallback string - return qsTr("Operating System") - } - - text: { - if (settingsManager.appThemeAuto) { - if (osSupport) return qsTr("Dark mode will follow %1 settings.").arg(osName) - return qsTr("Dark mode will switch on automatically between 9 PM and 9 AM.") - } - return qsTr("Dark mode schedule is disabled.") - } - textFormat: Text.PlainText - wrapMode: Text.WordWrap - color: Theme.colorSubText - font.pixelSize: Theme.fontSizeContentSmall - } + // Item { // element_appThemeAuto + // anchors.left: parent.left + // anchors.leftMargin: contentColumn.paddingLeft + // anchors.right: parent.right + // anchors.rightMargin: contentColumn.paddingRight + // height: Theme.componentHeightXL + + // IconSvg { + // anchors.left: parent.left + // anchors.leftMargin: contentColumn.padIcon + // anchors.verticalCenter: parent.verticalCenter + + // width: 24 + // height: 24 + // color: Theme.colorIcon + // source: "qrc:/IconLibrary/material-icons/duotone/brightness_4.svg" + // } + + // Text { + // anchors.left: parent.left + // anchors.leftMargin: contentColumn.padText + // anchors.right: switch_appThemeAuto.left + // anchors.rightMargin: Theme.componentMargin + // anchors.verticalCenter: parent.verticalCenter + + // text: qsTr("Automatic dark mode") + // textFormat: Text.PlainText + // font.pixelSize: Theme.fontSizeContent + // color: Theme.colorText + // wrapMode: Text.WordWrap + // } + + // SwitchThemed { + // id: switch_appThemeAuto + // anchors.right: parent.right + // anchors.rightMargin: Theme.componentMargin + // anchors.verticalCenter: parent.verticalCenter + // z: 1 + + // checked: settingsManager.appThemeAuto + // onClicked: { + // settingsManager.appThemeAuto = checked + // Theme.loadTheme(settingsManager.appTheme) + // } + // } + // } + + // Text { // legend_appThemeAuto + // anchors.left: parent.left + // anchors.leftMargin: contentColumn.paddingLeft + contentColumn.padText + // anchors.right: parent.right + // anchors.rightMargin: contentColumn.paddingRight + Theme.componentMargin + + // topPadding: -12 + // bottomPadding: isDesktop ? 6 : 6 + + // property bool osSupport: (Qt.platform.os !== "linux") + // property string osName: { + // if (Qt.platform.os === "android") return "Android" + // if (Qt.platform.os === "ios") return "iOS" + // if (Qt.platform.os === "osx") return "macOS" + // if (Qt.platform.os === "linux") return "Linux" + // if (Qt.platform.os === "windows") return "Windows" + // //: fallback string + // return qsTr("Operating System") + // } + + // text: { + // if (settingsManager.appThemeAuto) { + // if (osSupport) return qsTr("Dark mode will follow %1 settings.").arg(osName) + // return qsTr("Dark mode will switch on automatically between 9 PM and 9 AM.") + // } + // return qsTr("Dark mode schedule is disabled.") + // } + + // textFormat: Text.PlainText + // wrapMode: Text.WordWrap + // color: Theme.colorSubText + // font.pixelSize: Theme.fontSizeContentSmall + // } //////// @@ -546,7 +380,7 @@ Loader { height: 32 text: qsTr("about") - colorBackground: Theme.colorForeground + colorBackground: Theme.colorBackground colorText: Theme.colorOrange colorBorder: Theme.colorOrange @@ -639,8 +473,8 @@ Loader { visible: (element_worker.visible && isDesktop) text: settingsManager.systray ? - qsTr("WatchFlower will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval.") : - qsTr("WatchFlower is only active while the window is open.") + qsTr("SmartCare will remain active in the notification area after the window is closed, and will automatically refresh sensors data at regular interval.") : + qsTr("SmartCare is only active while the window is open.") textFormat: Text.PlainText wrapMode: Text.WordWrap color: Theme.colorSubText @@ -716,8 +550,8 @@ Loader { opacity: settingsManager.systray ? 1 : 0.4 text: settingsManager.notifications ? - qsTr("If a plant needs water, WatchFlower will bring it to your attention!") : - qsTr("If a plant needs water, WatchFlower can bring it to your attention.") + qsTr("If a plant needs water, SmartCare will bring it to your attention!") : + qsTr("If a plant needs water, SmartCare can bring it to your attention.") textFormat: Text.PlainText wrapMode: Text.WordWrap color: Theme.colorSubText @@ -880,7 +714,7 @@ Loader { width: 24 height: 24 - color: Theme.colorIcon + color: Theme.colorPrimary source: "qrc:/IconLibrary/material-icons/outlined/bluetooth_disabled.svg" } @@ -920,8 +754,8 @@ Loader { bottomPadding: 0 visible: (Qt.platform.os === "android") - text: settingsManager.bluetoothControl ? qsTr("WatchFlower will enable your device's Bluetooth in order to operate.") : - qsTr("WatchFlower will only operate if your device's Bluetooth is already enabled.") + text: settingsManager.bluetoothControl ? qsTr("SmartCare will enable your device's Bluetooth in order to operate.") : + qsTr("SmartCare will only operate if your device's Bluetooth is already enabled.") textFormat: Text.PlainText wrapMode: Text.WordWrap color: Theme.colorSubText @@ -1660,7 +1494,7 @@ Loader { visible: isDesktop - text: qsTr("Saved in your documents, under the 'WatchFlower' directory.") + text: qsTr("Saved in your documents, under the 'SmartCare' directory.") textFormat: Text.PlainText wrapMode: Text.WordWrap color: Theme.colorSubText diff --git a/qml/ScreenTutorial.qml b/qml/ScreenTutorial.qml index 2adb8923a..35bf96f82 100644 --- a/qml/ScreenTutorial.qml +++ b/qml/ScreenTutorial.qml @@ -87,7 +87,7 @@ Rectangle { anchors.right: parent.right anchors.rightMargin: tutorialPages.margins - text: qsTr("WatchFlower is a plant monitoring application for Xiaomi 'Flower Care' or Parrot 'Flower Power' sensors.") + text: qsTr("SmartCare is a plant monitoring application for Xiaomi 'Flower Care' or Parrot 'Flower Power' sensors.") textFormat: Text.StyledText wrapMode: Text.WrapAtWordBoundaryOrAnywhere font.pixelSize: Theme.fontSizeContentBig @@ -149,7 +149,7 @@ Rectangle { anchors.right: parent.right anchors.rightMargin: tutorialPages.margins - text: qsTr("To start using WatchFlower, you'll need to scan for compatible Bluetooth sensors around you.") + text: qsTr("To start using SmartCare, you'll need to scan for compatible Bluetooth sensors around you.") textFormat: Text.StyledText color: Theme.colorHeaderContent font.pixelSize: Theme.fontSizeContentBig @@ -200,7 +200,7 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: tutorialPages.margins - text: qsTr("Once paired, sensors will periodically sync their data when you use WatchFlower.") + text: qsTr("Once paired, sensors will periodically sync their data when you use SmartCare.") textFormat: Text.StyledText color: Theme.colorHeaderContent wrapMode: Text.WrapAtWordBoundaryOrAnywhere @@ -214,7 +214,7 @@ Rectangle { anchors.rightMargin: tutorialPages.margins visible: (Qt.platform.os !== "ios") - text: qsTr("WatchFlower might be able to sync sensors in the background. Check out the settings page for instructions.") + text: qsTr("SmartCare might be able to sync sensors in the background. Check out the settings page for instructions.") textFormat: Text.StyledText color: Theme.colorHeaderContent wrapMode: Text.WrapAtWordBoundaryOrAnywhere diff --git a/qml/components/ItemNoBluetooth.qml b/qml/components/ItemNoBluetooth.qml index 37df5865a..fe0c2004a 100644 --- a/qml/components/ItemNoBluetooth.qml +++ b/qml/components/ItemNoBluetooth.qml @@ -27,7 +27,9 @@ Item { width: singleColumn ? (itemNoBluetooth.width*0.5) : (itemNoBluetooth.height*0.4) height: width radius: width - color: Theme.colorForeground + color: Theme.colorBackground + border.width : 3 + border.color : Theme.colorPrimary IconSvg { // bluetooth disabled icon anchors.centerIn: parent @@ -36,7 +38,7 @@ Item { source: "qrc:/IconLibrary/material-icons/outlined/bluetooth_disabled.svg" fillMode: Image.PreserveAspectFit - color: Theme.colorSubText + color: Theme.colorPrimary opacity: 0.9 smooth: true } diff --git a/qml/components/ItemNoDeviceNearby.qml b/qml/components/ItemNoDeviceNearby.qml index c4503eebb..ee6ba86d7 100644 --- a/qml/components/ItemNoDeviceNearby.qml +++ b/qml/components/ItemNoDeviceNearby.qml @@ -11,7 +11,10 @@ Rectangle { width: singleColumn ? (parent.width*0.5) : (parent.height*0.4) height: width radius: width - color: Theme.colorForeground + color: Theme.colorBackground + + border.width : 2 + border.color: Theme.colorPrimary IconSvg { anchors.centerIn: parent @@ -20,7 +23,7 @@ Rectangle { source: "qrc:/IconLibrary/material-symbols/sensors/radar.svg" fillMode: Image.PreserveAspectFit - color: Theme.colorIcon + color: Theme.colorPrimary opacity: 0.9 smooth: true diff --git a/qml/components/ItemNoPermissions.qml b/qml/components/ItemNoPermissions.qml index 01c090cbf..7091b170b 100644 --- a/qml/components/ItemNoPermissions.qml +++ b/qml/components/ItemNoPermissions.qml @@ -27,7 +27,9 @@ Item { width: singleColumn ? (itemNoPermissions.width*0.5) : (itemNoPermissions.height*0.4) height: width radius: width - color: Theme.colorForeground + color: Theme.colorBackground + border.width : 3 + border.color : Theme.colorPrimary IconSvg { // lock icon anchors.centerIn: parent @@ -36,7 +38,7 @@ Item { source: "qrc:/IconLibrary/material-symbols/lock.svg" fillMode: Image.PreserveAspectFit - color: Theme.colorSubText + color: Theme.colorPrimary opacity: 0.9 smooth: true } diff --git a/qml/components/ItemNoPlants.qml b/qml/components/ItemNoPlants.qml index 82c941a8b..284520dac 100644 --- a/qml/components/ItemNoPlants.qml +++ b/qml/components/ItemNoPlants.qml @@ -10,16 +10,19 @@ Rectangle { width: singleColumn ? (parent.width*0.5) : (parent.height*0.4) height: width radius: width - color: Theme.colorForeground + color: Theme.colorBackground + border.width: 3 + border.color: Theme.colorPrimary IconSvg { anchors.centerIn: parent width: parent.width*0.66 height: width - source: "qrc:/assets/gfx/logos/watchflower_monochrome.svg" + source: "qrc:/assets/gfx/logos/watchflower_monochrome.png" fillMode: Image.PreserveAspectFit - color: Theme.colorIcon + color: Theme.colorPrimary + opacity: 0.8 smooth: true } diff --git a/qml/components/PlantCalendarWidget.qml b/qml/components/PlantCalendarWidget.qml index 50da882ec..979364cae 100644 --- a/qml/components/PlantCalendarWidget.qml +++ b/qml/components/PlantCalendarWidget.qml @@ -12,7 +12,7 @@ Column { property int hhh: 18 property int rrr: 18 - property var colorBackground: Theme.colorForeground + property var colorBackground: Theme.colorBackground property var plant: null diff --git a/qml/components/PlantHardinessWidget.qml b/qml/components/PlantHardinessWidget.qml index 73bb260bd..5c853f8c2 100644 --- a/qml/components/PlantHardinessWidget.qml +++ b/qml/components/PlantHardinessWidget.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare import PlantUtils Column { diff --git a/qml/components/SpinBoxHistory.qml b/qml/components/SpinBoxHistory.qml index 8777f7c67..c9d6fa2d3 100644 --- a/qml/components/SpinBoxHistory.qml +++ b/qml/components/SpinBoxHistory.qml @@ -3,7 +3,7 @@ import QtQuick.Controls.impl import QtQuick.Templates as T import ComponentLibrary -import WatchFlower +import SmartCare T.SpinBox { id: control diff --git a/qml/popups/PopupBackgroundUpdates.qml b/qml/popups/PopupBackgroundUpdates.qml index 4a249503e..658c1861d 100644 --- a/qml/popups/PopupBackgroundUpdates.qml +++ b/qml/popups/PopupBackgroundUpdates.qml @@ -114,7 +114,7 @@ Popup { anchors.left: parent.left anchors.right: parent.right - text: qsTr("To use the background update feature, the background location permission is required, otherwise WatchFlower can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed.") + text: qsTr("To use the background update feature, the background location permission is required, otherwise SmartCare can't scan for Bluetooth Low Energy sensors and can't update data when the app is closed.") textFormat: Text.StyledText font.pixelSize: Theme.fontSizeContent color: Theme.colorSubText diff --git a/qml/widgets/DeviceNearbyWidget.qml b/qml/widgets/DeviceNearbyWidget.qml index 03e7d9a6d..5e95145bc 100644 --- a/qml/widgets/DeviceNearbyWidget.qml +++ b/qml/widgets/DeviceNearbyWidget.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare Item { id: deviceNearbyWidget diff --git a/qml/widgets/DeviceWidget.qml b/qml/widgets/DeviceWidget.qml index 05d272b40..ecbe15da4 100644 --- a/qml/widgets/DeviceWidget.qml +++ b/qml/widgets/DeviceWidget.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare import DeviceUtils Item { @@ -547,7 +547,7 @@ Item { width: 32 height: 32 - color: Theme.colorIcon + color: Theme.colorPrimary opacity: 0.8 source: { diff --git a/qml/widgets/JournalWidget.qml b/qml/widgets/JournalWidget.qml index 0d4b43c2d..800eee669 100644 --- a/qml/widgets/JournalWidget.qml +++ b/qml/widgets/JournalWidget.qml @@ -1,7 +1,7 @@ import QtQuick import ComponentLibrary -import WatchFlower +import SmartCare import JournalUtils Item { diff --git a/qml/widgets/SunAndMoonWidget.qml b/qml/widgets/SunAndMoonWidget.qml index 04850b3be..497e99b61 100644 --- a/qml/widgets/SunAndMoonWidget.qml +++ b/qml/widgets/SunAndMoonWidget.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Shapes import ComponentLibrary -import WatchFlower +import SmartCare Item { id: sunAndMoonWidget diff --git a/src/DatabaseManager.cpp b/src/DatabaseManager.cpp index a20f7a75f..e39157b87 100644 --- a/src/DatabaseManager.cpp +++ b/src/DatabaseManager.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -82,7 +82,7 @@ bool DatabaseManager::saveDatabase() if (!internalDir.exists()) return false; // save dir - QString externalPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/WatchFlower"; + QString externalPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/SmartCare"; QDir externalDir(externalPath); if (!externalDir.exists()) externalDir.mkpath(externalPath); diff --git a/src/DatabaseManager.h b/src/DatabaseManager.h index f382b3162..4b45e31af 100644 --- a/src/DatabaseManager.h +++ b/src/DatabaseManager.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/DeviceFilter.cpp b/src/DeviceFilter.cpp index 8d736da2b..f4a70559c 100644 --- a/src/DeviceFilter.cpp +++ b/src/DeviceFilter.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/DeviceFilter.h b/src/DeviceFilter.h index 9ec973500..17fbd617c 100644 --- a/src/DeviceFilter.h +++ b/src/DeviceFilter.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index 8edca00cf..0573e1527 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -1644,7 +1644,7 @@ void DeviceManager::addBleDevice(const QBluetoothDeviceInfo &info) Device *d = nullptr; - // Regular WatchFlower device + // Regular SmartCare device if (info.name() == "Flower care" || info.name() == "Flower mate" || info.name() == "Grow care garden" || info.name() == "TY" || diff --git a/src/DeviceManager.h b/src/DeviceManager.h index bce68708c..c144bcc0e 100644 --- a/src/DeviceManager.h +++ b/src/DeviceManager.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/DeviceManager_advertisement.cpp b/src/DeviceManager_advertisement.cpp index fce069c0f..cb036cbaa 100644 --- a/src/DeviceManager_advertisement.cpp +++ b/src/DeviceManager_advertisement.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/DeviceManager_export.cpp b/src/DeviceManager_export.cpp index 5a84bb695..380c4feca 100644 --- a/src/DeviceManager_export.cpp +++ b/src/DeviceManager_export.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -42,7 +42,7 @@ bool DeviceManager::exportDataSave() if (!m_devices_model->hasDevices()) return status; - QString exportDirectoryPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/WatchFlower"; + QString exportDirectoryPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/SmartCare"; // Create exportDirectory if (!exportDirectoryPath.isEmpty()) @@ -115,7 +115,7 @@ QString DeviceManager::exportDataOpen() QString DeviceManager::exportDataFolder() { // Get home directory path - QString exportDirectoryPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/WatchFlower"; + QString exportDirectoryPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/SmartCare"; // Check if directory exist QDir exportDirectory(exportDirectoryPath); diff --git a/src/DeviceManager_nearby.cpp b/src/DeviceManager_nearby.cpp index e568bbfba..328d412b0 100644 --- a/src/DeviceManager_nearby.cpp +++ b/src/DeviceManager_nearby.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/Journal.cpp b/src/Journal.cpp index 3e0ea1855..45be9b26e 100644 --- a/src/Journal.cpp +++ b/src/Journal.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/Journal.h b/src/Journal.h index 7bce56f13..75c0476b8 100644 --- a/src/Journal.h +++ b/src/Journal.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/MenubarManager.cpp b/src/MenubarManager.cpp index 888ec8134..1c9da772e 100644 --- a/src/MenubarManager.cpp +++ b/src/MenubarManager.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -91,7 +91,7 @@ void MenubarManager::setupMenubar(QQuickWindow *view, DeviceManager *dm) m_menuSensors->addAction(m_actionSensorScan); menuBar->addMenu(m_menuSensors); - m_actionAbout = new QAction(tr("About WatchFlower")); + m_actionAbout = new QAction(tr("About SmartCare")); m_actionPreferences = new QAction(tr("Preferences")); m_actionWebsite = new QAction(tr("Visit website")); m_actionIssueTracker = new QAction(tr("Visit issue tracker")); diff --git a/src/MenubarManager.h b/src/MenubarManager.h index 184ba5336..528e4f9c9 100644 --- a/src/MenubarManager.h +++ b/src/MenubarManager.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/NotificationManager.cpp b/src/NotificationManager.cpp index 975d6716f..3fe455933 100644 --- a/src/NotificationManager.cpp +++ b/src/NotificationManager.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/NotificationManager.h b/src/NotificationManager.h index cb18911df..38dca4016 100644 --- a/src/NotificationManager.h +++ b/src/NotificationManager.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -74,8 +74,8 @@ private slots: Q_INVOKABLE bool requestNotificationPermissions(); QString getNotification() const { return m_message; } - void setNotification(const QString &title, const QString &message, int channel = 0); - void setNotificationShort(const QString &message); + Q_INVOKABLE void setNotification(const QString &title, const QString &message, int channel = 0); + Q_INVOKABLE void setNotificationShort(const QString &message); }; /* ************************************************************************** */ diff --git a/src/Plant.cpp b/src/Plant.cpp index 094b7d85c..0d7492d54 100644 --- a/src/Plant.cpp +++ b/src/Plant.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/Plant.h b/src/Plant.h index cb5dd1389..9af08d631 100644 --- a/src/Plant.h +++ b/src/Plant.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/PlantDatabase.cpp b/src/PlantDatabase.cpp index 721e20516..9df1ef8a8 100644 --- a/src/PlantDatabase.cpp +++ b/src/PlantDatabase.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/PlantDatabase.h b/src/PlantDatabase.h index 5b673ae49..29eaade7a 100644 --- a/src/PlantDatabase.h +++ b/src/PlantDatabase.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/PlantUtils.h b/src/PlantUtils.h index c606a83d2..c7c0841b9 100644 --- a/src/PlantUtils.h +++ b/src/PlantUtils.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2020 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/SettingsManager.cpp b/src/SettingsManager.cpp index 77fd5744c..34e2d3495 100644 --- a/src/SettingsManager.cpp +++ b/src/SettingsManager.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -71,7 +71,7 @@ bool SettingsManager::saveSettings() QString internalPath = settings.fileName(); // save dir - QString externalPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/WatchFlower"; + QString externalPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/SmartCare"; QDir externalDir(externalPath); if (!externalDir.exists()) externalDir.mkpath(externalPath); diff --git a/src/SettingsManager.h b/src/SettingsManager.h index 3bc1f3a14..4550414bf 100644 --- a/src/SettingsManager.h +++ b/src/SettingsManager.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/SystrayManager.cpp b/src/SystrayManager.cpp index 84cb952ec..25128dc13 100644 --- a/src/SystrayManager.cpp +++ b/src/SystrayManager.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -123,9 +123,9 @@ void SystrayManager::initSystray() } #if defined(Q_OS_MACOS) - m_sysTrayIcon = new QIcon(":/assets/gfx/logos/watchflower_tray_dark.svg"); + m_sysTrayIcon = new QIcon(":/assets/gfx/logos/watchflower_monochrome.png"); #else - m_sysTrayIcon = new QIcon(":/assets/gfx/logos/watchflower_tray_dark.svg"); + m_sysTrayIcon = new QIcon(":/assets/gfx/logos/watchflower_monochrome.png"); #endif } } @@ -159,7 +159,7 @@ bool SystrayManager::installSystray() connect(m_saved_window, &QQuickWindow::visibilityChanged, this, &SystrayManager::visibilityChanged); // Show greetings - //m_sysTray->showMessage("WatchFlower", tr("WatchFlower is running in the background!")); + //m_sysTray->showMessage("SmartCare", tr("SmartCare is running in the background!")); status = true; } @@ -229,7 +229,7 @@ void SystrayManager::sendNotification(const QString &text) { if (m_sysTray && QSystemTrayIcon::isSystemTrayAvailable()) { - m_sysTray->showMessage("WatchFlower", text); + m_sysTray->showMessage("SmartCare", text); } } diff --git a/src/SystrayManager.h b/src/SystrayManager.h index 1d10ce8b9..77ed6e3df 100644 --- a/src/SystrayManager.h +++ b/src/SystrayManager.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device.cpp b/src/device.cpp index 17dbf6225..596a3f318 100644 --- a/src/device.cpp +++ b/src/device.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device.h b/src/device.h index b76046bb6..8e206786c 100644 --- a/src/device.h +++ b/src/device.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_environmental.cpp b/src/device_environmental.cpp index 336925e7a..628e6d76b 100644 --- a/src/device_environmental.cpp +++ b/src/device_environmental.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_environmental.h b/src/device_environmental.h index 66f06b115..ef26ad9bf 100644 --- a/src/device_environmental.h +++ b/src/device_environmental.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_firmwares.h b/src/device_firmwares.h index 9ba350f8a..901c78a64 100644 --- a/src/device_firmwares.h +++ b/src/device_firmwares.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_infos.cpp b/src/device_infos.cpp index 5e7385b96..7b4530408 100644 --- a/src/device_infos.cpp +++ b/src/device_infos.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_infos.h b/src/device_infos.h index 22a7316f4..37cb54392 100644 --- a/src/device_infos.h +++ b/src/device_infos.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_plantsensor.cpp b/src/device_plantsensor.cpp index 99df51d4e..a20a6457f 100644 --- a/src/device_plantsensor.cpp +++ b/src/device_plantsensor.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -201,7 +201,7 @@ bool DevicePlantSensor::loadPlant() bool status = false; QSqlQuery queryPlant; - queryPlant.prepare("SELECT plantId, plantName, plantCache, plantStart " \ + queryPlant.prepare("SELECT plantId, plantName, plantCache, plantStart " \ "FROM plants WHERE deviceAddr = :deviceAddr;"); queryPlant.bindValue(":deviceAddr", m_deviceAddress); diff --git a/src/device_plantsensor.h b/src/device_plantsensor.h index a1c33e49f..da63a68f6 100644 --- a/src/device_plantsensor.h +++ b/src/device_plantsensor.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_sensor.cpp b/src/device_sensor.cpp index cae82a7ed..6a0e88597 100644 --- a/src/device_sensor.cpp +++ b/src/device_sensor.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_sensor.h b/src/device_sensor.h index 726b9f8f4..f02d9d160 100644 --- a/src/device_sensor.h +++ b/src/device_sensor.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_sensor_advertisement.cpp b/src/device_sensor_advertisement.cpp index 8b6c14ef8..e3b10f8f6 100644 --- a/src/device_sensor_advertisement.cpp +++ b/src/device_sensor_advertisement.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_thermometer.cpp b/src/device_thermometer.cpp index 6c7d2fc2a..3ea578327 100644 --- a/src/device_thermometer.cpp +++ b/src/device_thermometer.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_thermometer.h b/src/device_thermometer.h index 53252894a..ad0fffee5 100644 --- a/src/device_thermometer.h +++ b/src/device_thermometer.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/device_utils.h b/src/device_utils.h index c6671b8c8..287a5ac03 100644 --- a/src/device_utils.h +++ b/src/device_utils.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_bparasite.cpp b/src/devices/device_bparasite.cpp index bda3a2f4e..280bea27d 100644 --- a/src/devices/device_bparasite.cpp +++ b/src/devices/device_bparasite.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_bparasite.h b/src/devices/device_bparasite.h index fb4a157d7..ba0fe592f 100644 --- a/src/devices/device_bparasite.h +++ b/src/devices/device_bparasite.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ * b-parasite DIY sensor * * Protocol infos: - * - WatchFlower/docs/bparasite-ble-api.md + * - SmartCare/docs/bparasite-ble-api.md */ class DeviceBParasite: public DevicePlantSensor { diff --git a/src/devices/device_cgdn1.cpp b/src/devices/device_cgdn1.cpp index eaed3cdfc..8253e106e 100644 --- a/src/devices/device_cgdn1.cpp +++ b/src/devices/device_cgdn1.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_cgdn1.h b/src/devices/device_cgdn1.h index dc36647a4..a8512ed6b 100644 --- a/src/devices/device_cgdn1.h +++ b/src/devices/device_cgdn1.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ * CGDN1 device / squared body / OLED * * Protocol infos: - * - WatchFlower/docs/cgdn1-ble-api.md + * - SmartCare/docs/cgdn1-ble-api.md */ class DeviceCGDN1: public DeviceEnvironmental { diff --git a/src/devices/device_esp32_airqualitymonitor.cpp b/src/devices/device_esp32_airqualitymonitor.cpp index bc8cc924c..b4b6f449c 100644 --- a/src/devices/device_esp32_airqualitymonitor.cpp +++ b/src/devices/device_esp32_airqualitymonitor.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_esp32_airqualitymonitor.h b/src/devices/device_esp32_airqualitymonitor.h index d91cf84a7..9b1b40a8f 100644 --- a/src/devices/device_esp32_airqualitymonitor.h +++ b/src/devices/device_esp32_airqualitymonitor.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_esp32_geigercounter.cpp b/src/devices/device_esp32_geigercounter.cpp index 6cf3d2ed0..a064b42a4 100644 --- a/src/devices/device_esp32_geigercounter.cpp +++ b/src/devices/device_esp32_geigercounter.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_esp32_geigercounter.h b/src/devices/device_esp32_geigercounter.h index 20534c565..7323b7a90 100644 --- a/src/devices/device_esp32_geigercounter.h +++ b/src/devices/device_esp32_geigercounter.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_esp32_higrow.cpp b/src/devices/device_esp32_higrow.cpp index 536795a5f..ce7bd6145 100644 --- a/src/devices/device_esp32_higrow.cpp +++ b/src/devices/device_esp32_higrow.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_esp32_higrow.h b/src/devices/device_esp32_higrow.h index 100326aed..f94b8fe79 100644 --- a/src/devices/device_esp32_higrow.h +++ b/src/devices/device_esp32_higrow.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_ess_generic.cpp b/src/devices/device_ess_generic.cpp index 561954048..4c0553948 100644 --- a/src/devices/device_ess_generic.cpp +++ b/src/devices/device_ess_generic.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_ess_generic.h b/src/devices/device_ess_generic.h index 1b8fc7135..a782e9afb 100644 --- a/src/devices/device_ess_generic.h +++ b/src/devices/device_ess_generic.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ * Generic implementation for Bluetooth Low Energy "Environmental Sensing Service". * * Protocol infos: - * - WatchFlower/docs/ess-ble-api.md + * - SmartCare/docs/ess-ble-api.md * - https://www.bluetooth.com/specifications/specs/environmental-sensing-profile-1-0/ * - https://www.bluetooth.com/specifications/specs/environmental-sensing-service-1-0/ * - https://www.bluetooth.com/specifications/assigned-numbers/environmental-sensing-service-characteristics/ diff --git a/src/devices/device_flowercare.cpp b/src/devices/device_flowercare.cpp index 5d7c89c67..7f1fcb0ce 100644 --- a/src/devices/device_flowercare.cpp +++ b/src/devices/device_flowercare.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_flowercare.h b/src/devices/device_flowercare.h index 8c4eea31c..ba5270a73 100644 --- a/src/devices/device_flowercare.h +++ b/src/devices/device_flowercare.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ * Xiaomi "Flower Care Max" (HHCCJCY09) or VegTrug "Grow Care Garden" (GCLS002) * * Protocol infos: - * - WatchFlower/docs/flowercare-ble-api.md + * - SmartCare/docs/flowercare-ble-api.md */ class DeviceFlowerCare: public DevicePlantSensor { diff --git a/src/devices/device_flowercare_tuya.cpp b/src/devices/device_flowercare_tuya.cpp index 1d7e2dfd6..e6674200f 100644 --- a/src/devices/device_flowercare_tuya.cpp +++ b/src/devices/device_flowercare_tuya.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_flowercare_tuya.h b/src/devices/device_flowercare_tuya.h index aa7c75b86..bcbd853df 100644 --- a/src/devices/device_flowercare_tuya.h +++ b/src/devices/device_flowercare_tuya.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ * Tuya "Flower Care" (HHCCJCY10) * * Protocol infos: - * - WatchFlower/docs/flowercare_tuya-ble-api.md + * - SmartCare/docs/flowercare_tuya-ble-api.md */ class DeviceFlowerCare_tuya: public DevicePlantSensor { diff --git a/src/devices/device_flowerpower.cpp b/src/devices/device_flowerpower.cpp index c3e7e99b4..06bf01860 100644 --- a/src/devices/device_flowerpower.cpp +++ b/src/devices/device_flowerpower.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_flowerpower.h b/src/devices/device_flowerpower.h index 2007ae261..e9f263cfa 100644 --- a/src/devices/device_flowerpower.h +++ b/src/devices/device_flowerpower.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ * Parrot "Flower Power" devices * * Protocol infos: - * - WatchFlower/docs/flowerpower-ble-api.md + * - SmartCare/docs/flowerpower-ble-api.md * - https://developer.parrot.com/docs/FlowerPower/FlowerPower-BLE.pdf */ class DeviceFlowerPower: public DevicePlantSensor diff --git a/src/devices/device_hygrotemp_atc.cpp b/src/devices/device_hygrotemp_atc.cpp index a01a3f093..0c39479ef 100644 --- a/src/devices/device_hygrotemp_atc.cpp +++ b/src/devices/device_hygrotemp_atc.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_atc.h b/src/devices/device_hygrotemp_atc.h index 38bfb974b..c70f7b6a3 100644 --- a/src/devices/device_hygrotemp_atc.h +++ b/src/devices/device_hygrotemp_atc.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -44,14 +44,14 @@ * Qingping Temp & RH Monitor Lite (CGDK2) * * MiBeacon format: - * - WatchFlower/docs/mibeacon-ble-api.md + * - SmartCare/docs/mibeacon-ble-api.md * * BTHome v1 format: * - https://bthome.io/v1/ * * BTHome v2 format: * - https://bthome.io/format/ - * - WatchFlower/docs/bthome-ble-api.md + * - SmartCare/docs/bthome-ble-api.md */ class DeviceHygrotempATC: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_cgd1.cpp b/src/devices/device_hygrotemp_cgd1.cpp index f28d26b8c..3b40dd854 100644 --- a/src/devices/device_hygrotemp_cgd1.cpp +++ b/src/devices/device_hygrotemp_cgd1.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_cgd1.h b/src/devices/device_hygrotemp_cgd1.h index 25505dd5e..fedff94e3 100644 --- a/src/devices/device_hygrotemp_cgd1.h +++ b/src/devices/device_hygrotemp_cgd1.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ * CGD1 device / squared body / LCD * * Protocol infos: - * - WatchFlower/docs/cgd1-ble-api.md + * - SmartCare/docs/cgd1-ble-api.md */ class DeviceHygrotempCGD1: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_cgdk2.cpp b/src/devices/device_hygrotemp_cgdk2.cpp index 8790fc5a6..ebc455b0f 100644 --- a/src/devices/device_hygrotemp_cgdk2.cpp +++ b/src/devices/device_hygrotemp_cgdk2.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_cgdk2.h b/src/devices/device_hygrotemp_cgdk2.h index 83a34da53..d055efa96 100644 --- a/src/devices/device_hygrotemp_cgdk2.h +++ b/src/devices/device_hygrotemp_cgdk2.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ * CGDK2 device / round body / LCD screen * * Protocol infos: - * - WatchFlower/docs/cgdk2-ble-api.md + * - SmartCare/docs/cgdk2-ble-api.md */ class DeviceHygrotempCGDK2: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_cgg1.cpp b/src/devices/device_hygrotemp_cgg1.cpp index 0f99c94cf..0baf7ef16 100644 --- a/src/devices/device_hygrotemp_cgg1.cpp +++ b/src/devices/device_hygrotemp_cgg1.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_cgg1.h b/src/devices/device_hygrotemp_cgg1.h index ef265f63c..f70fd931b 100644 --- a/src/devices/device_hygrotemp_cgg1.h +++ b/src/devices/device_hygrotemp_cgg1.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ * CGG1 device / round body / E-Ink * * Protocol infos: - * - WatchFlower/docs/cgg1-ble-api.md + * - SmartCare/docs/cgg1-ble-api.md */ class DeviceHygrotempCGG1: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_cgp1w.cpp b/src/devices/device_hygrotemp_cgp1w.cpp index d14904ffb..2dadacad1 100644 --- a/src/devices/device_hygrotemp_cgp1w.cpp +++ b/src/devices/device_hygrotemp_cgp1w.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_cgp1w.h b/src/devices/device_hygrotemp_cgp1w.h index 6957e17a4..c8e14ca4b 100644 --- a/src/devices/device_hygrotemp_cgp1w.h +++ b/src/devices/device_hygrotemp_cgp1w.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ * CGP1W device / squared body / LCD * * Protocol infos: - * - WatchFlower/docs/cgp1w-ble-api.md + * - SmartCare/docs/cgp1w-ble-api.md */ class DeviceHygrotempCGP1W: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_clock.cpp b/src/devices/device_hygrotemp_clock.cpp index d96fe8e1d..f275cddc9 100644 --- a/src/devices/device_hygrotemp_clock.cpp +++ b/src/devices/device_hygrotemp_clock.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_clock.h b/src/devices/device_hygrotemp_clock.h index fa13acf99..eff53c2f8 100644 --- a/src/devices/device_hygrotemp_clock.h +++ b/src/devices/device_hygrotemp_clock.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -41,8 +41,8 @@ * MHO-C303 device / rectangular body / E-Ink * * Protocol infos: - * - WatchFlower/docs/lywsd02-ble-api.md - * - WatchFlower/docs/mchohc303-ble-api.md + * - SmartCare/docs/lywsd02-ble-api.md + * - SmartCare/docs/mchohc303-ble-api.md */ class DeviceHygrotempClock: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_lywsdcgq.cpp b/src/devices/device_hygrotemp_lywsdcgq.cpp index ff075b5b0..a88f1b41d 100644 --- a/src/devices/device_hygrotemp_lywsdcgq.cpp +++ b/src/devices/device_hygrotemp_lywsdcgq.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_lywsdcgq.h b/src/devices/device_hygrotemp_lywsdcgq.h index b6240ff9f..5583b7146 100644 --- a/src/devices/device_hygrotemp_lywsdcgq.h +++ b/src/devices/device_hygrotemp_lywsdcgq.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ * LYWSDCGQ device / round body / LCD * * Protocol infos: - * - WatchFlower/docs/lywsdcgq-ble-api.md + * - SmartCare/docs/lywsdcgq-ble-api.md */ class DeviceHygrotempLYWSDCGQ: public DeviceThermometer { diff --git a/src/devices/device_hygrotemp_square.cpp b/src/devices/device_hygrotemp_square.cpp index ffa42db74..65938911c 100644 --- a/src/devices/device_hygrotemp_square.cpp +++ b/src/devices/device_hygrotemp_square.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_hygrotemp_square.h b/src/devices/device_hygrotemp_square.h index c52608a33..801fae803 100644 --- a/src/devices/device_hygrotemp_square.h +++ b/src/devices/device_hygrotemp_square.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -44,9 +44,9 @@ * XMWSDJO4MMC device / rectangular body / E-Ink * * Protocol infos: - * - WatchFlower/docs/lywsd03mmc-ble-api.md - * - WatchFlower/docs/mchoh401-ble-api.md - * - WatchFlower/docs/xmwsdjo4mmc-ble-api.md + * - SmartCare/docs/lywsd03mmc-ble-api.md + * - SmartCare/docs/mchoh401-ble-api.md + * - SmartCare/docs/xmwsdjo4mmc-ble-api.md */ class DeviceHygrotempSquare: public DeviceThermometer { diff --git a/src/devices/device_jqjcy01ym.cpp b/src/devices/device_jqjcy01ym.cpp index f6ba311af..70223548c 100644 --- a/src/devices/device_jqjcy01ym.cpp +++ b/src/devices/device_jqjcy01ym.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_jqjcy01ym.h b/src/devices/device_jqjcy01ym.h index 52e5b44d0..7ed9a3d17 100644 --- a/src/devices/device_jqjcy01ym.h +++ b/src/devices/device_jqjcy01ym.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ * JQJCY01YM device / squared body / OLED * * Protocol infos: - * - WatchFlower/docs/jqjcy01m-ble-api.md + * - SmartCare/docs/jqjcy01m-ble-api.md */ class DeviceJQJCY01YM: public DeviceEnvironmental { diff --git a/src/devices/device_parrotpot.cpp b/src/devices/device_parrotpot.cpp index 5328de393..0be38ad21 100644 --- a/src/devices/device_parrotpot.cpp +++ b/src/devices/device_parrotpot.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_parrotpot.h b/src/devices/device_parrotpot.h index 2efbc47f4..5c2ff608b 100644 --- a/src/devices/device_parrotpot.h +++ b/src/devices/device_parrotpot.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_ropot.cpp b/src/devices/device_ropot.cpp index 1efedb97a..91a88107b 100644 --- a/src/devices/device_ropot.cpp +++ b/src/devices/device_ropot.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_ropot.h b/src/devices/device_ropot.h index 5e4a22228..03fd4df89 100644 --- a/src/devices/device_ropot.h +++ b/src/devices/device_ropot.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ * Xiaomi "RoPot" or VegTrug "Grow Care Pot" (HHCCPOT002) * * Protocol infos: - * - WatchFlower/docs/ropot-ble-api.md + * - SmartCare/docs/ropot-ble-api.md */ class DeviceRopot: public DevicePlantSensor { diff --git a/src/devices/device_thermobeacon.cpp b/src/devices/device_thermobeacon.cpp index 7f1431f50..7fcb79e84 100644 --- a/src/devices/device_thermobeacon.cpp +++ b/src/devices/device_thermobeacon.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_thermobeacon.h b/src/devices/device_thermobeacon.h index 1505a8795..96f6afc48 100644 --- a/src/devices/device_thermobeacon.h +++ b/src/devices/device_thermobeacon.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -41,7 +41,7 @@ * Keychain Hygrometer (2ACD3-WS07) / (2ACD3-WS02) * * Protocol infos: - * - WatchFlower/docs/thermobeacon-ble-api.md + * - SmartCare/docs/thermobeacon-ble-api.md */ class DeviceThermoBeacon: public DeviceThermometer { diff --git a/src/devices/device_wp6003.cpp b/src/devices/device_wp6003.cpp index ed3321070..47264f23a 100644 --- a/src/devices/device_wp6003.cpp +++ b/src/devices/device_wp6003.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify diff --git a/src/devices/device_wp6003.h b/src/devices/device_wp6003.h index eb880015d..7e428d7a1 100644 --- a/src/devices/device_wp6003.h +++ b/src/devices/device_wp6003.h @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ * VSON technology "Air Box WP6003" * * Protocol infos: - * - WatchFlower/docs/wp6003.md + * - SmartCare/docs/wp6003.md */ class DeviceWP6003: public DeviceEnvironmental { diff --git a/src/main.cpp b/src/main.cpp index 17cb141cb..fac35a909 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ /*! - * This file is part of WatchFlower. + * This file is part of SmartCare. * Copyright (c) 2022 Emeric Grange - All Rights Reserved * * This program is free software: you can redistribute it and/or modify @@ -49,6 +49,8 @@ #include #include #include +#include // Make sure this is included for QTimer +#include // Make sure this is included for qDebug() #if defined(Q_OS_ANDROID) #include "AndroidService.h" @@ -59,6 +61,8 @@ int main(int argc, char *argv[]) { + qDebug() << "main(): Application started."; // Debug: Entry point + // Arguments parsing /////////////////////////////////////////////////////// bool start_minimized = false; @@ -84,10 +88,11 @@ int main(int argc, char *argv[]) // Refresh data in the background, without starting the UI, then exit if (refresh_only) { + qDebug() << "main(): Running in refresh-only mode."; // Debug: Mode check QCoreApplication app(argc, argv); - app.setApplicationName("WatchFlower"); - app.setOrganizationName("WatchFlower"); - app.setOrganizationDomain("WatchFlower"); + app.setApplicationName("SmartCare"); + app.setOrganizationName("SmartCare"); + app.setOrganizationDomain("SmartCare"); SettingsManager *sm = SettingsManager::getInstance(); DatabaseManager *db = DatabaseManager::getInstance(); @@ -106,11 +111,12 @@ int main(int argc, char *argv[]) // Android daemon if (background_service) { + qDebug() << "main(): Running as Android background service."; // Debug: Mode check #if defined(Q_OS_ANDROID) QAndroidService app(argc, argv); - app.setApplicationName("WatchFlower"); - app.setOrganizationName("WatchFlower"); - app.setOrganizationDomain("WatchFlower"); + app.setApplicationName("SmartCare"); + app.setOrganizationName("SmartCare"); + app.setOrganizationDomain("SmartCare"); SettingsManager *sm = SettingsManager::getInstance(); if (sm && sm->getSysTray()) @@ -141,13 +147,14 @@ int main(int argc, char *argv[]) // GUI application ///////////////////////////////////////////////////////// + qDebug() << "main(): Initializing GUI application."; // Debug: GUI setup SingleApplication app(argc, argv, false); // Application name - app.setApplicationName("WatchFlower"); - app.setApplicationDisplayName("WatchFlower"); - app.setOrganizationName("WatchFlower"); - app.setOrganizationDomain("WatchFlower"); + app.setApplicationName("SmartCare"); + app.setApplicationDisplayName("SmartCare"); + app.setOrganizationName("SmartCare"); + app.setOrganizationDomain("SmartCare"); // Init app components SettingsManager *sm = SettingsManager::getInstance(); @@ -159,11 +166,14 @@ int main(int argc, char *argv[]) qWarning() << "Cannot init app components!"; return EXIT_FAILURE; } + qDebug() << "main(): Application components initialized."; // Debug: Components ready + + #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) ShareUtils *utilsShare = new ShareUtils(); #else - QIcon appIcon(":/assets/gfx/logos/watchflower.svg"); + QIcon appIcon(":/assets/gfx/logos/watchflower.png"); app.setWindowIcon(appIcon); SystrayManager *st = SystrayManager::getInstance(); @@ -189,6 +199,7 @@ int main(int argc, char *argv[]) qWarning() << "Cannot init generic utils!"; return EXIT_FAILURE; } + qDebug() << "main(): Generic utils initialized."; // Debug: Utils ready bool qtConnectivityPatched = false; #if defined(QT_CONNECTIVITY_PATCHED) @@ -204,7 +215,7 @@ int main(int argc, char *argv[]) PlantUtils::registerQML(); QQmlApplicationEngine engine; - engine.addImportPath(":/WatchFlower"); + engine.addImportPath(":/SmartCare"); engine.addImportPath(":/ComponentLibrary"); QQmlContext *engine_context = engine.rootContext(); @@ -222,12 +233,14 @@ int main(int argc, char *argv[]) // Load the main view #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) + qDebug() << "main(): Loading MobileApplication QML."; // Debug: QML Load engine_context->setContextProperty("utilsShare", utilsShare); - engine.loadFromModule("WatchFlower", "MobileApplication"); + engine.loadFromModule("SmartCare", "MobileApplication"); #else + qDebug() << "main(): Loading DesktopApplication QML."; // Debug: QML Load engine_context->setContextProperty("systrayManager", st); engine_context->setContextProperty("menubarManager", mb); - engine.loadFromModule("WatchFlower", "DesktopApplication"); + engine.loadFromModule("SmartCare", "DesktopApplication"); #endif if (engine.rootObjects().isEmpty()) @@ -235,6 +248,7 @@ int main(int argc, char *argv[]) qWarning() << "Cannot init QmlApplicationEngine!"; return EXIT_FAILURE; } + qDebug() << "main(): QML engine loaded successfully."; // Debug: QML loaded // For i18n retranslate utilsLanguage->setQmlEngine(&engine); @@ -243,23 +257,34 @@ int main(int argc, char *argv[]) // QQuickWindow must be valid at this point QQuickWindow *window = qobject_cast(engine.rootObjects().value(0)); - - // React to secondary instances - QObject::connect(&app, &SingleApplication::instanceStarted, window, &QQuickWindow::show); - QObject::connect(&app, &SingleApplication::instanceStarted, window, &QQuickWindow::raise); + if (window) { + qDebug() << "main(): QQuickWindow obtained."; // Debug: Window check + // React to secondary instances + QObject::connect(&app, &SingleApplication::instanceStarted, window, &QQuickWindow::show); + QObject::connect(&app, &SingleApplication::instanceStarted, window, &QQuickWindow::raise); + } else { + qWarning() << "main(): QQuickWindow is null, cannot setup desktop features."; // Debug: Window is null + } // Systray? st->setupSystray(window); - if (sm->getSysTray()) st->installSystray(); + if (sm->getSysTray()) { + st->installSystray(); + qDebug() << "main(): Systray installed."; // Debug: Systray + } else { + qDebug() << "main(): Systray not enabled."; + } // Menu bar mb->setupMenubar(window, dm); + qDebug() << "main(): Menubar setup."; // Debug: Menubar #if defined(Q_OS_MACOS) // macOS dock MacOSDockHandler *dockIconHandler = MacOSDockHandler::getInstance(); dockIconHandler->setupDock(window); engine_context->setContextProperty("utilsDock", dockIconHandler); + qDebug() << "main(): MacOS dock handler setup."; // Debug: MacOS dock #endif #endif // desktop section @@ -267,8 +292,10 @@ int main(int argc, char *argv[]) #if defined(Q_OS_ANDROID) QNativeInterface::QAndroidApplication::hideSplashScreen(333); if (sm->getSysTray()) AndroidService::service_start(); + qDebug() << "main(): Android specific setup complete."; // Debug: Android #endif + qDebug() << "main(): Entering application event loop."; // Debug: Before app.exec() return app.exec(); } diff --git a/thirdparty/AppUtils/utils_language.cpp b/thirdparty/AppUtils/utils_language.cpp index 02be17681..10918fb5c 100644 --- a/thirdparty/AppUtils/utils_language.cpp +++ b/thirdparty/AppUtils/utils_language.cpp @@ -134,7 +134,7 @@ void UtilsLanguage::loadLanguage(const QString &lng) m_appTranslator = new QTranslator; if (m_appTranslator) { - if (m_appTranslator->load(":/i18n/" + m_appName + "_" + m_locale_str_short + ".qm")) { + if (m_appTranslator->load(":/i18n/RYLO-SmartCare_" + m_locale_str_short + ".qm")) { m_qt_app->installTranslator(m_appTranslator); } else { qWarning() << "appTranslator ERROR !" << m_appName << m_locale_str_full; diff --git a/thirdparty/ComponentLibrary/ThemeEngine.qml b/thirdparty/ComponentLibrary/ThemeEngine.qml index cba8bd452..32ce08179 100644 --- a/thirdparty/ComponentLibrary/ThemeEngine.qml +++ b/thirdparty/ComponentLibrary/ThemeEngine.qml @@ -8,31 +8,7 @@ import ComponentLibrary Item { enum ThemeNames { // Generic mobile themes - THEME_MOBILE_LIGHT, - THEME_MOBILE_DARK, - - // Generic mobile material themes - THEME_MATERIAL_LIGHT, - THEME_MATERIAL_DARK, - - // Generic desktop themes - THEME_DESKTOP_LIGHT, - THEME_DESKTOP_DARK, - - // WatchFlower - THEME_SNOW, - THEME_PLANT, - THEME_RAIN, - THEME_DAY, - THEME_NIGHT, - - // OffloadBuddy - THEME_LIGHT_AND_WARM, - THEME_DARK_AND_SPOOKY, - THEME_PLAIN_AND_BORING, - THEME_BLOOD_AND_TEARS, - THEME_MIGHTY_KITTENS, - + THEME_SNOW , THEME_LAST } property int currentTheme: -1 @@ -108,7 +84,7 @@ Item { // App specific (OffloadBuddy) property string sidebarSelector // 'arrow' or 'bar' - // App specific (WatchFlower) + // App specific (SmartCare) property color colorDeviceWidget readonly property color colorLightGrey: "#a9bcb8" readonly property color colorLightGreen: "#09debc" @@ -156,7 +132,7 @@ Item { property color colorComponentBorder property color colorComponentDown property color colorComponentBackground - property color colorComponentShadow: isLight ? "#40000000" : "#88000000" + property color colorComponentShadow: "#40000000" property int componentRadius: 4 property int componentBorderWidth: 2 @@ -209,1033 +185,87 @@ Item { //////////////////////////////////////////////////////////////////////////// function getThemeIndex(name) { - if (name === "THEME_MOBILE_LIGHT") return Theme.THEME_MOBILE_LIGHT - if (name === "THEME_MOBILE_DARK") return Theme.THEME_MOBILE_DARK - - if (name === "THEME_MATERIAL_LIGHT") return Theme.THEME_MATERIAL_LIGHT - if (name === "THEME_MATERIAL_DARK") return Theme.THEME_MATERIAL_DARK - - if (name === "THEME_DESKTOP_LIGHT") return Theme.THEME_DESKTOP_LIGHT - if (name === "THEME_DESKTOP_DARK") return Theme.THEME_DESKTOP_DARK - if (name === "THEME_SNOW") return Theme.THEME_SNOW - if (name === "THEME_PLANT") return Theme.THEME_PLANT - if (name === "THEME_RAIN") return Theme.THEME_RAIN - if (name === "THEME_DAY") return Theme.THEME_DAY - if (name === "THEME_NIGHT") return Theme.THEME_NIGHT - - if (name === "THEME_LIGHT_AND_WARM") return Theme.THEME_LIGHT_AND_WARM - if (name === "THEME_DARK_AND_SPOOKY") return Theme.THEME_DARK_AND_SPOOKY - if (name === "THEME_PLAIN_AND_BORING") return Theme.THEME_PLAIN_AND_BORING - if (name === "THEME_BLOOD_AND_TEARS") return Theme.THEME_BLOOD_AND_TEARS - if (name === "THEME_MIGHTY_KITTENS") return Theme.THEME_MIGHTY_KITTENS - return -1 } function getThemeName(index) { - if (index === Theme.THEME_MOBILE_LIGHT) return "THEME_MOBILE_LIGHT" - if (index === Theme.THEME_MOBILE_DARK) return "THEME_MOBILE_DARK" - - if (index === Theme.THEME_MATERIAL_LIGHT) return "THEME_MATERIAL_LIGHT" - if (index === Theme.THEME_MATERIAL_DARK) return "THEME_MATERIAL_DARK" - - if (index === Theme.THEME_DESKTOP_LIGHT) return "THEME_DESKTOP_LIGHT" - if (index === Theme.THEME_DESKTOP_DARK) return "THEME_DESKTOP_DARK" - if (index === Theme.THEME_SNOW) return "THEME_SNOW" - if (index === Theme.THEME_PLANT) return "THEME_PLANT" - if (index === Theme.THEME_RAIN) return "THEME_RAIN" - if (index === Theme.THEME_DAY) return "THEME_DAY" - if (index === Theme.THEME_NIGHT) return "THEME_NIGHT" - - if (index === Theme.THEME_LIGHT_AND_WARM) return "THEME_LIGHT_AND_WARM" - if (index === Theme.THEME_DARK_AND_SPOOKY) return "THEME_DARK_AND_SPOOKY" - if (index === Theme.THEME_PLAIN_AND_BORING) return "THEME_PLAIN_AND_BORING" - if (index === Theme.THEME_BLOOD_AND_TEARS) return "THEME_BLOOD_AND_TEARS" - if (index === Theme.THEME_MIGHTY_KITTENS) return "THEME_MIGHTY_KITTENS" - return "" } //////////////////////////////////////////////////////////////////////////// - Component.onCompleted: loadTheme(settingsManager.appTheme) + Component.onCompleted: loadTheme(Theme.THEME_SNOW) Connections { target: settingsManager - function onAppThemeChanged() { loadTheme(settingsManager.appTheme) } + function onAppThemeChanged() { loadTheme(Theme.THEME_SNOW) } } function loadTheme(newIndex) { //console.log("Theme.loadTheme(" + newIndex + ")") - var themeIndex = -1 - - // Get the theme index - if ((typeof newIndex === 'string' || newIndex instanceof String)) { - themeIndex = getThemeIndex(newIndex) - } else { - themeIndex = newIndex - } - - // Validate the result (or set the default) - if (themeIndex < 0 || themeIndex >= Theme.THEME_LAST) { - if (isDesktop) themeIndex = Theme.THEME_DESKTOP_LIGHT - else if (isMobile) themeIndex = Theme.THEME_MOBILE_LIGHT - } - - // Handle day/night themes - if (settingsManager.appThemeAuto) { - var rightnow = new Date() - var hour = Qt.formatDateTime(rightnow, "hh") - if (hour >= 21 || hour <= 8) { - if (themeIndex === Theme.THEME_MOBILE_LIGHT) - themeIndex = Theme.THEME_MOBILE_DARK - - if (themeIndex === Theme.THEME_MATERIAL_LIGHT) - themeIndex = Theme.THEME_MATERIAL_DARK - - if (themeIndex === Theme.THEME_DESKTOP_LIGHT) - themeIndex = Theme.THEME_DESKTOP_DARK - - if (themeIndex === Theme.THEME_SNOW || - themeIndex === Theme.THEME_PLANT || - themeIndex === Theme.THEME_RAIN || - themeIndex === Theme.THEME_DAY) - themeIndex = Theme.THEME_NIGHT - - if (themeIndex === Theme.THEME_LIGHT_AND_WARM || - themeIndex === Theme.THEME_PLAIN_AND_BORING) - themeIndex = Theme.THEME_DARK_AND_SPOOKY - - // theme doesn't have a dark variant set? just don't change the theme... - } - } + var themeIndex = Theme.THEME_SNOW // Do not reload the same theme if (themeIndex === currentTheme) return - // Set the theme - if (themeIndex === Theme.THEME_MOBILE_LIGHT) { /////////////////// - - colorGreen = "#07bf97" - colorBlue = "#4CA1D5" - colorYellow = "#ffba5a" - colorOrange = "#ff863a" - colorRed = "#ff523a" - - isLight = true - isDark = false - - themeStatusbar = Material.Light - colorStatusbar = "#eeeeee" - - colorHeader = "#eeeeee" - colorHeaderContent = "#ff7b36" - colorHeaderHighlight = "white" - - colorSidebar = "#f2f2f2" - colorSidebarContent = "#eaeaea" - colorSidebarHighlight = "#c0c0c0" - - colorActionbar = colorGreen - colorActionbarContent = "white" - colorActionbarHighlight = "#00a27d" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = colorMaterialDeepOrange // "#ff7b36" - - colorBackground = colorMaterialLightGrey - colorForeground = "#f0f0f0" - - colorPrimary = colorMaterialDeepOrange // colorRed - colorSecondary = colorMaterialOrange // "#ff7b36" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#303030" - colorSubText = "#666666" - colorIcon = "#303030" - colorSeparator = "#ececec" - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#f0f0f0" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#e0e0e0" - colorComponentDown = "#e9e9e9" - colorComponentBackground = "white" - - componentRadius = 6 - componentBorderWidth = 2 - - } else if (themeIndex === Theme.THEME_MOBILE_DARK) { - - colorGreen = "#58CF77" - colorBlue = "#4dceeb" - colorYellow = "#fcc632" - colorOrange = "#ff7657" - colorRed = "#e8635a" - - isLight = false - isDark = true - - themeStatusbar = Material.Dark - colorStatusbar = "#292929" - - colorHeader = "#292929" - colorHeaderContent = "#ee8c21" - colorHeaderHighlight = "#444" - - colorSidebar = "#333" - colorSidebarContent = "#444" - colorSidebarHighlight = "#666" - - colorActionbar = colorGreen - colorActionbarContent = "white" - colorActionbarHighlight = "#00a27d" - - colorTabletmenu = "#292929" - colorTabletmenuContent = "#808080" - colorTabletmenuHighlight = "#ff9f1a" - - colorBackground = "#313236" - colorForeground = "#292929" - - colorPrimary = "#ff9f1a" - colorSecondary = "#ffb81a" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "white" - colorSubText = "#aaa" - colorIcon = "#ddd" - colorSeparator = "#404040" - colorLowContrast = "black" - colorHighContrast = "white" - - colorComponent = "#666" - colorComponentText = "#eee" - colorComponentContent = "white" - colorComponentBorder = "#666" - colorComponentDown = "#444" - colorComponentBackground = "#505050" - - componentRadius = 6 - componentBorderWidth = 2 - - } else if (themeIndex === Theme.THEME_MATERIAL_LIGHT) { ///////// - - colorGreen = "#07bf97" - colorBlue = "#4CA1D5" - colorYellow = "#ffba5a" - colorOrange = "#ff863a" - colorRed = "#ff523a" - - isLight = true - isDark = false - - themeStatusbar = Material.Light - colorStatusbar = "white" - - colorHeader = "white" - colorHeaderContent = "#1a73e8" - colorHeaderHighlight = "white" - - colorSidebar = "#fafafa" - colorSidebarContent = "#efefef" - colorSidebarHighlight = "#ccc" - - colorActionbar = colorGreen - colorActionbarContent = "white" - colorActionbarHighlight = "#00a27d" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#888" - colorTabletmenuHighlight = colorMaterialDeepOrange - - colorBackground = "white" - colorForeground = "#f9f9f9" - - colorPrimary = "#1a73e8" - colorSecondary = "#ff7b36" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#303030" - colorSubText = "#666" - colorIcon = "#303030" - colorSeparator = "#ececec" - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#f6f6f6" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#f2f2f2" - colorComponentDown = "#eee" - colorComponentBackground = "white" - - componentRadius = 6 - componentBorderWidth = 2 - - } else if (themeIndex === Theme.THEME_MATERIAL_DARK) { - - colorGreen = "#58CF77" - colorBlue = "#4dceeb" - colorYellow = "#fcc632" - colorOrange = "#ff7657" - colorRed = "#e8635a" - - isLight = false - isDark = true - - themeStatusbar = Material.Dark - colorStatusbar = "#313236" - - colorHeader = "#313236" - colorHeaderContent = "#ee8c21" - colorHeaderHighlight = "#444" - - colorActionbar = colorGreen - colorActionbarContent = "white" - colorActionbarHighlight = "#00a27d" - - colorSidebar = "#333" - colorSidebarContent = "#444" - colorSidebarHighlight = "#666" - - colorTabletmenu = "#292929" - colorTabletmenuContent = "#808080" - colorTabletmenuHighlight = "#ff9f1a" - - colorBackground = "#313236" - colorForeground = "#292929" - - colorPrimary = "#ff9f1a" - colorSecondary = "#ffb81a" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "white" - colorSubText = "#aaa" - colorIcon = "#ccc" - colorSeparator = "#404040" - colorLowContrast = "black" - colorHighContrast = "white" - - colorComponent = "#666" - colorComponentText = "#ddd" - colorComponentContent = "white" - colorComponentBorder = "#666" - colorComponentDown = "#444" - colorComponentBackground = "#505050" - - componentRadius = 8 - componentBorderWidth = 2 - - } else if (themeIndex === Theme.THEME_DESKTOP_LIGHT) { /////////// - - colorRed = "#ff7657" - colorGreen = "#85c700" - colorBlue = "#4cafe9" - colorYellow = "#ffcf00" - colorOrange = "#ffa635" - colorGrey = "#9E9E9E" - - isLight = true - isDark = false - - themeStatusbar = Material.Light - colorStatusbar = "#f1f0ef" - - colorHeader = "#f1f0ef" - colorHeaderContent = "#444" - colorHeaderHighlight = "#e2e1df" - - colorSidebar = "#f2f2f2" - colorSidebarContent = "#e9e9e9" - colorSidebarHighlight = "#c0c0c0" - - colorActionbar = "#eaeaea" - colorActionbarContent = "#eaeaea" - colorActionbarHighlight = "#dadada" - - colorTabletmenu = "#ffffff" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#cfcbcb" - - colorBackground = "#f9f8f7" - colorForeground = "#fcfcfc" - - colorPrimary = "#ffc900" - colorSecondary = "#ffeb00" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#373737" - colorSubText = "#666666" - colorIcon = "#373737" - colorSeparator = "#e8e8e8" - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#ebebeb" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#ebebeb" - colorComponentDown = "#dadada" - colorComponentBackground = "#fcfcfc" - - componentRadius = 6 - componentBorderWidth = 2 - - // (app) - colorBox = "white" - colorBoxBorder = "#f4f4f4" - colorBoxShadow = "#20000000" - colorGrid = "#ebebeb" - colorLVheader = "#fafafa" - colorLVpair = "white" - colorLVimpair = "#f5f5f5" - colorLVselected = "#0080e0" - colorLVseparator = "#e2e2e2" - - } else if (themeIndex === Theme.THEME_DESKTOP_DARK) { - - colorRed = "#e8635a" - colorGreen = "#58cf77" - colorBlue = "#4dceeb" - colorYellow = "#ffcf00" - colorOrange = "#ff8f35" - colorGrey = "#5e5e5e" - - isLight = false - isDark = true - - themeStatusbar = Material.Dark - colorStatusbar = "#b16bee" - - colorHeader = "#b16bee" - colorHeaderContent = "white" - colorHeaderHighlight = "#725595" - - colorSidebar = "#373949" - colorSidebarContent = "#494a5a" - colorSidebarHighlight = "#1f254a" - - colorActionbar = "#252024" - colorActionbarContent = "white" - colorActionbarHighlight = "#7c54ac" - - colorTabletmenu = "#292929" - colorTabletmenuContent = "#808080" - colorTabletmenuHighlight = "#bb86fc" - - colorBackground = "#282a39" - colorForeground = "#373949" - - colorPrimary = "#bb86fc" - colorSecondary = "#b16bee" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#eee" - colorSubText = "#999" - colorIcon = "#eee" - colorSeparator = "#1d1e27" - colorLowContrast = "#111" - colorHighContrast = "white" - - colorComponent = "#53535c" - colorComponentText = "#eee" - colorComponentContent = "white" - colorComponentBorder = "#717181" - colorComponentDown = "#46464f" - colorComponentBackground = "#363746" - - componentRadius = 6 - componentBorderWidth = 2 - - // (app) - colorBox = "#252024" - colorBoxBorder = "#333" - colorBoxShadow = "#aa000000" - colorGrid = "#333" - colorLVheader = "#252024" - colorLVpair = "#302b2e" - colorLVimpair = "#252024" - colorLVseparator = "#333" - colorLVselected = "#e90c76" - - } else if (themeIndex === Theme.THEME_SNOW) { //////////////////// - - colorGreen = "#85c700" - colorBlue = "#4cafe9" - colorYellow = "#facb00" - colorOrange = "#ffa635" - colorRed = "#ff7657" - - isLight = true - isDark = false - - themeStatusbar = Material.Light - colorStatusbar = "white" - - colorHeader = "white" - colorHeaderContent = "#444" - colorHeaderHighlight = colorMaterialDarkGrey - - colorSidebar = "white" - colorSidebarContent = "#f8f8f8" - colorSidebarHighlight = "#d2d2d2" - - colorActionbar = colorGreen - colorActionbarContent = "white" - colorActionbarHighlight = "#7ab800" - - colorTabletmenu = "#ffffff" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#0079fe" - - colorBackground = "white" - colorForeground = "#fbfbfb" - - colorPrimary = colorYellow - colorSecondary = "#ffe800" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#474747" - colorSubText = "#666666" - colorIcon = "#474747" - colorSeparator = colorMaterialDarkGrey - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#EFEFEF" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#EAEAEA" - colorComponentDown = "#DADADA" - colorComponentBackground = "#FAFAFA" - - componentRadius = (componentHeight / 2) - componentBorderWidth = 2 - - // (app) - colorDeviceWidget = "#fdfdfd" - - } else if (themeIndex === Theme.THEME_PLANT) { - - colorGreen = "#07bf97" - colorBlue = "#4CA1D5" - colorYellow = "#ffba5a" - colorOrange = "#ffa635" - colorRed = "#ff7657" - - isLight = true - isDark = false - - themeStatusbar = Material.Dark - colorStatusbar = "#009688" - - colorHeader = colorGreen - colorHeaderContent = "white" - colorHeaderHighlight = "#009688" - - colorSidebar = "#f2f2f2" - colorSidebarContent = "#ececec" - colorSidebarHighlight = "#c0c0c0" - - colorActionbar = "#00b5c4" - colorActionbarContent = "white" - colorActionbarHighlight = "#069fac" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#0079fe" - - colorBackground = (Qt.platform.os === "android" || Qt.platform.os === "ios") ? "white" : colorMaterialLightGrey - colorForeground = (Qt.platform.os === "android" || Qt.platform.os === "ios") ? colorMaterialLightGrey : "#eeeeee" - - colorPrimary = colorGreen - colorSecondary = colorLightGreen - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#333333" - colorSubText = "#666666" - colorIcon = "#333333" - colorSeparator = "#e8e8e8" - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#EAEAEA" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#E3E3E3" - colorComponentDown = "#D0D0D0" - colorComponentBackground = "#F1F1F1" - - componentRadius = 4 - componentBorderWidth = 2 - - // (app) - colorDeviceWidget = "#fdfdfd" - - } else if (themeIndex === Theme.THEME_RAIN) { - - colorGreen = "#8cd200" - colorBlue = "#4cafe9" - colorYellow = "#ffcf00" - colorOrange = "#ffa635" - colorRed = "#ff7657" - - isLight = true - isDark = false - - themeStatusbar = Material.Dark - colorStatusbar = "#1e3c77" - - colorHeader = "#325da9" - colorHeaderHighlight = "#0f295c" - colorHeaderContent = "white" - - colorSidebar = "#fbfbfb" - colorSidebarContent = "#f0f0f0" - colorSidebarHighlight = "#d0d0d0" - - colorActionbar = colorBlue - colorActionbarContent = "white" - colorActionbarHighlight = "#4c8ee9" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#0079fe" - - colorBackground = "white" - colorForeground = colorMaterialLightGrey - - colorPrimary = "#325da9" - colorSecondary = "#446eb7" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#474747" - colorSubText = "#666666" - colorIcon = "#474747" - colorSeparator = colorMaterialDarkGrey - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#EFEFEF" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#E8E8E8" - colorComponentDown = "#DDDDDD" - colorComponentBackground = "#FAFAFA" - - componentRadius = 6 - componentBorderWidth = 2 - - // (app) - colorDeviceWidget = "#fdfdfd" - - } else if (themeIndex === Theme.THEME_DAY) { - - colorGreen = "#8cd200" - colorBlue = "#4cafe9" - colorYellow = "#ffcf00" - colorOrange = "#ffa635" - colorRed = "#ff7657" - - isLight = true - isDark = false - - themeStatusbar = Material.Dark - colorStatusbar = colorNeutralNight - - colorHeader = "#ffcf00" - colorHeaderContent = "white" - colorHeaderHighlight = colorNeutralNight - - colorSidebar = "#fcfcfc" - colorSidebarContent = "#f7f7f7" - colorSidebarHighlight = "#d6d6d6" - - colorActionbar = colorGreen - colorActionbarContent = "white" - colorActionbarHighlight = "#7ab800" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#0079fe" - - colorBackground = "white" - colorForeground = colorMaterialLightGrey - - colorPrimary = colorYellow - colorSecondary = "#ffe800" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#474747" - colorSubText = "#666666" - colorIcon = "#474747" - colorSeparator = colorMaterialDarkGrey - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#EFEFEF" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#E8E8E8" - colorComponentDown = "#DDDDDD" - colorComponentBackground = "#FAFAFA" - - componentRadius = 6 - componentBorderWidth = 2 - - // (app) - colorDeviceWidget = "#fdfdfd" - - } else if (themeIndex === Theme.THEME_NIGHT) { - - colorGreen = "#58CF77" - colorBlue = "#4dceeb" - colorYellow = "#fcc632" - colorOrange = "#ff8f35" - colorRed = "#e8635a" - - isLight = false - isDark = true - - themeStatusbar = Material.Dark - colorStatusbar = "#725595" - - colorHeader = "#b16bee" - colorHeaderContent = "white" - colorHeaderHighlight = "#725595" - - colorSidebar = "#333" - colorSidebarContent = "#444" - colorSidebarHighlight = "#666" - - colorActionbar = colorBlue - colorActionbarContent = "white" - colorActionbarHighlight = "#4dabeb" - - colorTabletmenu = "#292929" - colorTabletmenuContent = "#808080" - colorTabletmenuHighlight = "#bb86fc" - - colorBackground = "#313236" - colorForeground = "#292929" - - colorPrimary = "#bb86fc" - colorSecondary = "#b16bee" - colorSuccess = colorGreen - colorWarning = colorOrange - colorError = colorRed - - colorText = "#EEE" - colorSubText = "#AAA" - colorIcon = "#EEE" - colorSeparator = "#404040" - colorLowContrast = "#111" - colorHighContrast = "white" - - colorComponent = "#757575" - colorComponentText = "#eee" - colorComponentContent = "white" - colorComponentBorder = "#777" - colorComponentDown = "#595959" - colorComponentBackground = "#292929" - - componentRadius = 4 - componentBorderWidth = 2 - - // (app) - colorDeviceWidget = "#333" - - } else if (themeIndex === Theme.THEME_LIGHT_AND_WARM) { ////////// - - isLight = true - isDark = false - - themeStatusbar = Material.Dark - colorStatusbar = "#BBB" - - colorHeader = "#e4e5e6" - colorHeaderContent = "#353637" - colorHeaderHighlight = Qt.darker(colorHeader, 1.08) - - colorSidebar = "#efefef" - colorSidebarContent = "#e6e6e6" - colorSidebarHighlight = "#c0c0c0" - - colorActionbar = "#e9e9e9" - colorActionbarContent = "#333" - colorActionbarHighlight = "#dadada" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#0079fe" - - colorBackground = "#F4F4F4" - colorForeground = "#E9E9E9" - - colorPrimary = "#FFCA28" - colorSecondary = "#FFDD28" - colorSuccess = "#8CD200" - colorWarning = "#FFAC00" - colorError = "#E64B39" - - colorText = "#222" - colorSubText = "#555" - colorIcon = "#333" - colorSeparator = "#E4E4E4" - colorLowContrast = "white" - colorHighContrast = "#303030" - - colorComponent = "#EAEAEA" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#DDD" - colorComponentDown = "#E6E6E6" - colorComponentBackground = "#FAFAFA" - - componentRadius = 6 - componentBorderWidth = 2 - - // (app) - sidebarSelector = "" - - } else if (themeIndex === Theme.THEME_DARK_AND_SPOOKY) { - - isLight = false - isDark = true - - themeStatusbar = Material.Dark - colorStatusbar = "black" - - colorHeader = "#282828" - colorHeaderContent = "#C0C0C0" - colorHeaderHighlight = Qt.lighter(colorHeader, 1.4) - - colorSidebar = "#333" - colorSidebarContent = "#444" - colorSidebarHighlight = "#666" - - colorActionbar = "#ff894a" - colorActionbarContent = "white" - colorActionbarHighlight = Qt.darker(colorActionbar, 1.3) - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#FF9F1A" - - colorBackground = "#3F3F3F" - colorForeground = "#555555" - - colorPrimary = "#FF9F1A" // indigo: "#6C5ECD" - colorSecondary = "#FFB81A" // indigo2: "#9388E5" - colorSuccess = colorMaterialLightGreen - colorWarning = "#FE8F2D" - colorError = "#D33E39" - - colorText = "white" - colorSubText = "#999" - colorIcon = "white" - colorSeparator = "#666" // darker: "#333" // lighter: "#666" - colorLowContrast = "black" - colorHighContrast = "white" - - colorComponent = "#666" - colorComponentText = "white" - colorComponentContent = "white" - colorComponentBorder = "#6C6C6C" - colorComponentDown = "#7C7C7C" - colorComponentBackground = "#333" - - componentRadius = 3 - componentBorderWidth = 2 - - // (app) - sidebarSelector = "" - - } else if (themeIndex === Theme.THEME_PLAIN_AND_BORING) { - - isLight = true - isDark = false - - themeStatusbar = Material.Dark - colorStatusbar = "#BBB" - - colorHeader = "#eee" - colorHeaderContent = "#444" - colorHeaderHighlight = Qt.darker(colorHeader, 1.08) - - colorSidebar = "#f6f6f6" - colorSidebarContent = "#e9e9e9" - colorSidebarHighlight = "#c0c0c0" - - colorActionbar = "#e0e0e0" - colorActionbarContent = "#444" - colorActionbarHighlight = Qt.darker(colorActionbar, 1.08) - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#0079fe" - - colorBackground = "#fefefe" - colorForeground = "#f6f6f6" - - colorPrimary = "#ffca28" - colorSecondary = "#ffdb28" - colorSuccess = colorMaterialLightGreen - colorWarning = "#ffac00" - colorError = "#dc4543" - - colorText = "#222222" - colorSubText = "#555555" - colorIcon = "#333333" - colorSeparator = "#e4e4e4" - colorLowContrast = "white" - colorHighContrast = "black" - - colorComponent = "#f5f5f5" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#ddd" - colorComponentDown = "#eee" - colorComponentBackground = "#f8f8f8" - - componentRadius = 4 - componentBorderWidth = 2 - - // (app) - sidebarSelector = "arrow" - - } else if (themeIndex === Theme.THEME_BLOOD_AND_TEARS) { - - isLight = false - isDark = true - - themeStatusbar = Material.Dark - colorStatusbar = "black" - - colorHeader = "#141414" - colorHeaderContent = "white" - colorHeaderHighlight = "#222" - - colorSidebar = "#181818" - colorSidebarContent = "#444" - colorSidebarHighlight = "#222" - - colorActionbar = "#009EE2" - colorActionbarContent = "white" - colorActionbarHighlight = "#0089C3" - - colorTabletmenu = "#f3f3f3" - colorTabletmenuContent = "#9d9d9d" - colorTabletmenuHighlight = "#009EE2" - - colorBackground = "#222" - colorForeground = "#333" - - colorPrimary = "#009EE2" - colorSecondary = "#00BEE2" - colorSuccess = colorMaterialLightGreen - colorWarning = "#FFDB63" - colorError = "#FA6871" - - colorText = "#D4D4D4" - colorSubText = "#888" - colorIcon = "#A0A0A0" - colorSeparator = "#666" - colorLowContrast = "black" - colorHighContrast = "white" - - colorComponent = "#fcfcfc" - colorComponentText = "black" - colorComponentContent = "black" - colorComponentBorder = "#e4e4e4" - colorComponentDown = "#ddd" - colorComponentBackground = "white" - - componentRadius = 2 - componentBorderWidth = 2 - - // (app) - sidebarSelector = "bar" - - } else if (themeIndex === Theme.THEME_MIGHTY_KITTENS) { + colorGreen = "#58CF77" + colorBlue = "#4dceeb" + colorYellow = "#fcc632" + colorOrange = "#ff8f35" + colorRed = "#e8635a" - isLight = true - isDark = false + isLight = true + isDark = false - themeStatusbar = Material.Dark - colorStatusbar = "#944197" + themeStatusbar = Material.Dark + colorStatusbar = "#0E6B15" - colorHeader = "#FFB4DC" - colorHeaderContent = "#aa39ae" - colorHeaderHighlight = Qt.darker(colorHeader, 1.1) + colorHeader = "#0E6B15" + colorHeaderContent = "white" + colorHeaderHighlight = "#0E6B15" - colorSidebar = "#FFB4DC" - colorSidebarContent = "#ffc8e4" - colorSidebarHighlight = Qt.darker(colorSidebar, 1.15) + colorSidebar = "#333" + colorSidebarContent = "#444" + colorSidebarHighlight = "#666" - colorActionbar = "#FFE400" - colorActionbarContent = "white" - colorActionbarHighlight = Qt.darker(colorActionbar, 1.1) + colorActionbar = colorGreen + colorActionbarContent = "white" + colorActionbarHighlight = "#4dabeb" - colorTabletmenu = "white" - colorTabletmenuContent = "#FFAAD4" - colorTabletmenuHighlight = "#944197" + colorTabletmenu = "#292929" + colorTabletmenuContent = "#808080" + colorTabletmenuHighlight = "#bb86fc" - colorBackground = "white" - colorForeground = "#ffe0ef" + colorBackground = "white" + colorForeground = "black" - colorPrimary = "#FFE400" - colorSecondary = "#FFF600" - colorSuccess = colorMaterialLightGreen - colorWarning = "#944197" - colorError = "#FA6871" + colorPrimary = "#0E6B15" + colorSecondary = "#0E6B15" + colorSuccess = colorGreen + colorWarning = colorOrange + colorError = colorRed - colorText = "#932A97" - colorSubText = "#B746BB" - colorIcon = "#ffd947" - colorSeparator = "#FFDCED" - colorLowContrast = "white" - colorHighContrast = "#944197" + colorText = "#111" + colorSubText = "#404040" + colorIcon = "#404040" + colorSeparator = "#AAA" + colorLowContrast = "#EEE" + colorHighContrast = "#404040" - colorComponent = "#FF87D0" - colorComponentText = "#944197" - colorComponentContent = "white" - colorComponentBorder = "#F592C1" - colorComponentDown = "#FF9ED9" - colorComponentBackground = "#FFF4F9" + colorComponent = "#AAA" + colorComponentText = "#292929" + colorComponentContent = "#292929" + colorComponentBorder = "#AAA" + colorComponentDown = "#EEE" + colorComponentBackground = "#EEE" - componentRadius = (componentHeight / 2) - componentBorderWidth = 2 + componentRadius = 4 + componentBorderWidth = 2 - // (app) - sidebarSelector = "" + // (app) + colorDeviceWidget = "#EEE" - } // This will emit the signal 'onCurrentThemeChanged' currentTheme = themeIndex diff --git a/thirdparty/ComponentLibrary/controls/ComboBoxThemed.qml b/thirdparty/ComponentLibrary/controls/ComboBoxThemed.qml index fc40b8def..68992acb9 100644 --- a/thirdparty/ComponentLibrary/controls/ComboBoxThemed.qml +++ b/thirdparty/ComponentLibrary/controls/ComboBoxThemed.qml @@ -26,7 +26,7 @@ T.ComboBox { radius: Theme.componentRadius opacity: control.enabled ? 1 : 0.66 - color: control.down ? Theme.colorComponentDown : Theme.colorComponent + color: control.down ? Theme.colorComponentDown : Theme.colorComponentBackground border.width: 2 border.color: Theme.colorComponentBorder } diff --git a/thirdparty/ComponentLibrary/controls/SliderValueSolid.qml b/thirdparty/ComponentLibrary/controls/SliderValueSolid.qml index e1d9ba8fb..73be77a83 100644 --- a/thirdparty/ComponentLibrary/controls/SliderValueSolid.qml +++ b/thirdparty/ComponentLibrary/controls/SliderValueSolid.qml @@ -24,7 +24,7 @@ T.Slider { property bool showvalue: true // colors - property color colorBackground: Theme.colorForeground + property color colorBackground: Theme.colorBackground property color colorForeground: Theme.colorPrimary property color colorForegroundDisabled: Qt.tint(Theme.colorPrimary, "#44eeeeee") property color colorText: "white" @@ -40,6 +40,8 @@ T.Slider { height: control.horizontal ? implicitHeight : control.availableHeight radius: control.hhh + border.width: 2 + border.color: Theme.colorSeparator color: control.colorBackground scale: control.horizontal && control.mirrored ? -1 : 1 diff --git a/thirdparty/ComponentLibrary/controls/SpinBoxThemedMobile.qml b/thirdparty/ComponentLibrary/controls/SpinBoxThemedMobile.qml index 4577031b1..5ad971bcd 100644 --- a/thirdparty/ComponentLibrary/controls/SpinBoxThemedMobile.qml +++ b/thirdparty/ComponentLibrary/controls/SpinBoxThemedMobile.qml @@ -36,7 +36,7 @@ T.SpinBox { implicitHeight: Theme.componentHeight radius: Theme.componentRadius - color: Theme.colorComponentBackground + color: Theme.colorBackground opacity: control.enabled ? 1 : 0.66 Rectangle { @@ -44,7 +44,7 @@ T.SpinBox { height: control.height anchors.verticalCenter: parent.verticalCenter x: control.mirrored ? 0 : control.width - width - color: control.up.pressed ? Theme.colorComponentDown : Theme.colorComponent + color: control.up.pressed ? Theme.colorPrimary : Theme.colorPrimary opacity: control.up.hovered ? 0.8 : 1 Behavior on opacity { NumberAnimation { duration: 133 } } } @@ -53,7 +53,7 @@ T.SpinBox { height: control.height anchors.verticalCenter: parent.verticalCenter x: control.mirrored ? control.width - width : 0 - color: control.down.pressed ? Theme.colorComponentDown : Theme.colorComponent + color: control.down.pressed ? Theme.colorPrimary : Theme.colorPrimary opacity: control.down.hovered ? 0.8 : 1 Behavior on opacity { NumberAnimation { duration: 133 } } } @@ -96,9 +96,9 @@ T.SpinBox { height: control.height anchors.verticalCenter: parent.verticalCenter - color: Theme.colorComponentText + color: Theme.colorComponentContent selectionColor: Theme.colorPrimary - selectedTextColor: "white" + selectedTextColor: Theme.colorComponentContent selectByMouse: control.editable text: control.value @@ -134,7 +134,7 @@ T.SpinBox { anchors.verticalCenter: parent.verticalCenter visible: control.legend - color: Theme.colorComponentText + color: "black" opacity: 0.66 text: control.legend @@ -163,13 +163,13 @@ T.SpinBox { anchors.centerIn: parent width: UtilsNumber.round2(parent.height * 0.4) height: 2 - color: Theme.colorComponentContent + color: Theme.colorLowContrast } Rectangle { anchors.centerIn: parent width: 2 height: UtilsNumber.round2(parent.height * 0.4) - color: Theme.colorComponentContent + color: Theme.colorLowContrast } } @@ -190,7 +190,7 @@ T.SpinBox { anchors.centerIn: parent width: UtilsNumber.round2(parent.height * 0.4) height: 2 - color: Theme.colorComponentContent + color: Theme.colorLowContrast } } diff --git a/thirdparty/ComponentLibrary/generic/DataBarCompact.qml b/thirdparty/ComponentLibrary/generic/DataBarCompact.qml index 8e1929aba..443f0d9e7 100644 --- a/thirdparty/ComponentLibrary/generic/DataBarCompact.qml +++ b/thirdparty/ComponentLibrary/generic/DataBarCompact.qml @@ -29,8 +29,8 @@ Item { // colors property color colorText: Theme.colorText - property color colorForeground: Theme.colorPrimary - property color colorBackground: Theme.colorForeground + property color colorForeground: Theme.colorForeground + property color colorBackground: Theme.colorBackground //////////////// @@ -69,6 +69,8 @@ Item { radius: 4 clip: isDesktop color: control.colorBackground + border.width: 2 + border.color: Theme.colorSeparator layer.enabled: !isDesktop layer.effect: MultiEffect { diff --git a/thirdparty/ComponentLibrary/generic/DataBarSolid.qml b/thirdparty/ComponentLibrary/generic/DataBarSolid.qml index 08d63d3b3..73c77b5cc 100644 --- a/thirdparty/ComponentLibrary/generic/DataBarSolid.qml +++ b/thirdparty/ComponentLibrary/generic/DataBarSolid.qml @@ -29,7 +29,7 @@ Item { // colors property color colorForeground: Theme.colorPrimary - property color colorBackground: Theme.colorForeground + property color colorBackground: Theme.colorBackground //////////////// @@ -67,6 +67,8 @@ Item { radius: control.hhh color: control.colorBackground + border.width: 2 + border.color: Theme.colorComponentBorder layer.enabled: true layer.effect: MultiEffect { @@ -138,7 +140,7 @@ Item { textFormat: Text.PlainText font.pixelSize: Theme.fontSizeContentVerySmall - color: (control.limitMin <= control.value) ? Theme.colorLowContrast : Theme.colorHighContrast + color: (control.limitMin <= control.value) ? Theme.colorHighContrast : Theme.colorHighContrast opacity: (control.limitMin <= control.value) ? 0.75 : 0.25 Behavior on color { ColorAnimation { duration: control.animated ? 333 : 0 } } Behavior on opacity { OpacityAnimator { duration: control.animated ? 333 : 0 } } @@ -194,7 +196,7 @@ Item { textFormat: Text.PlainText font.pixelSize: Theme.fontSizeContentVerySmall - color: (control.limitMax < control.value) ? Theme.colorLowContrast : Theme.colorHighContrast + color: (control.limitMax < control.value) ? Theme.colorHighContrast : Theme.colorHighContrast opacity: (control.limitMax < control.value) ? 0.75 : 0.25 Behavior on color { ColorAnimation { duration: control.animated ? 333 : 0 } } Behavior on opacity { OpacityAnimator { duration: control.animated ? 333 : 0 } } diff --git a/thirdparty/ComponentLibrary/generic/SelectorMenuColorful.qml b/thirdparty/ComponentLibrary/generic/SelectorMenuColorful.qml index 4d89e1bd7..11248f3a8 100644 --- a/thirdparty/ComponentLibrary/generic/SelectorMenuColorful.qml +++ b/thirdparty/ComponentLibrary/generic/SelectorMenuColorful.qml @@ -33,7 +33,7 @@ Item { color: selectorMenu.colorBackground border.width: 2 - border.color: Theme.colorComponentDown + border.color: Theme.colorComponentBorder } //////////////// diff --git a/thirdparty/ComponentLibrary/menus/DrawerItem.qml b/thirdparty/ComponentLibrary/menus/DrawerItem.qml index b1318a67f..cd059f1ea 100644 --- a/thirdparty/ComponentLibrary/menus/DrawerItem.qml +++ b/thirdparty/ComponentLibrary/menus/DrawerItem.qml @@ -31,7 +31,7 @@ T.ItemDelegate { background: Rectangle { implicitHeight: Theme.componentHeightL - color: control.highlighted ? Theme.colorForeground : Theme.colorBackground + color: control.highlighted ? Theme.colorSeparator : Theme.colorBackground RippleThemed { anchors.fill: parent @@ -40,7 +40,7 @@ T.ItemDelegate { clip: visible pressed: control.pressed active: enabled && (control.down || control.visualFocus || control.hovered) - color: Qt.rgba(Theme.colorForeground.r, Theme.colorForeground.g, Theme.colorForeground.b, 0.5) + color: Qt.rgba(Theme.colorBackground.r, Theme.colorBackground.g, Theme.colorBackground.b, 0.5) } } diff --git a/thirdparty/ComponentLibrary/menus/ListTitle.qml b/thirdparty/ComponentLibrary/menus/ListTitle.qml index 6744ff109..1c7f41816 100644 --- a/thirdparty/ComponentLibrary/menus/ListTitle.qml +++ b/thirdparty/ComponentLibrary/menus/ListTitle.qml @@ -15,7 +15,7 @@ Rectangle { radius: singleColumn ? 0 : Theme.componentRadius z: 2 - color: Theme.colorForeground + color: Theme.colorBackground border.width: singleColumn ? 0 : Theme.componentBorderWidth border.color: Theme.colorSeparator