diff options
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | asteroid-health.desktop.template (renamed from asteroid-helloworld.desktop.template) | 2 | ||||
-rw-r--r-- | asteroid-health.in (renamed from asteroid-helloworld.in) | 2 | ||||
-rw-r--r-- | i18n/asteroid-health.desktop.h (renamed from i18n/asteroid-helloworld.desktop.h) | 0 | ||||
-rw-r--r-- | src/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/main.qml | 12 |
6 files changed, 20 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b7965f..bf0a494 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) -project(asteroid-helloworld +project(asteroid-health VERSION 0.0.1 DESCRIPTION "Sample application to get started on Asteroid") @@ -17,14 +17,14 @@ include(AsteroidTranslations) add_subdirectory(src) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/asteroid-helloworld.in - ${CMAKE_BINARY_DIR}/asteroid-helloworld +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/asteroid-health.in + ${CMAKE_BINARY_DIR}/asteroid-health @ONLY) -install(PROGRAMS ${CMAKE_BINARY_DIR}/asteroid-helloworld +install(PROGRAMS ${CMAKE_BINARY_DIR}/asteroid-health DESTINATION ${CMAKE_INSTALL_BINDIR}) -generate_desktop(${CMAKE_SOURCE_DIR} asteroid-helloworld) +generate_desktop(${CMAKE_SOURCE_DIR} asteroid-health) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/asteroid-helloworld.desktop.template b/asteroid-health.desktop.template index 7276d69..c7c33b5 100644 --- a/asteroid-helloworld.desktop.template +++ b/asteroid-health.desktop.template @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Categories=Applications; -Exec=asteroid-helloworld +Exec=asteroid-health Icon=ios-pulse-outline X-Asteroid-Center-Color=#b04d1c X-Asteroid-Outer-Color=#421c0a diff --git a/asteroid-helloworld.in b/asteroid-health.in index 1083798..acc92e2 100644 --- a/asteroid-helloworld.in +++ b/asteroid-health.in @@ -1,3 +1,3 @@ #!/bin/sh -exec invoker --single-instance --type=qt5 @CMAKE_INSTALL_FULL_LIBDIR@/asteroid-helloworld.so +exec invoker --single-instance --type=qt5 @CMAKE_INSTALL_FULL_LIBDIR@/asteroid-health.so diff --git a/i18n/asteroid-helloworld.desktop.h b/i18n/asteroid-health.desktop.h index f5e8875..f5e8875 100644 --- a/i18n/asteroid-helloworld.desktop.h +++ b/i18n/asteroid-health.desktop.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6b802c..f6a79d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,8 @@ -add_library(asteroid-helloworld main.cpp resources.qrc) -set_target_properties(asteroid-helloworld PROPERTIES PREFIX "") +add_library(asteroid-health main.cpp resources.qrc) +set_target_properties(asteroid-health PROPERTIES PREFIX "") -target_link_libraries(asteroid-helloworld PUBLIC +target_link_libraries(asteroid-health PUBLIC AsteroidApp) -install(TARGETS asteroid-helloworld +install(TARGETS asteroid-health DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/main.qml b/src/main.qml index 9c181e2..04e5c21 100644 --- a/src/main.qml +++ b/src/main.qml @@ -1,5 +1,6 @@ /* - * Copyright (C) 2019 Florent Revest <revestflo@gmail.com> + * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com> + * 2019 Florent Revest <revestflo@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,16 +19,21 @@ import QtQuick 2.9 import org.asteroid.controls 1.0 +import org.asteroid.sensorlogd 1.0 + Application { id: app centerColor: "#b04d1c" outerColor: "#421c0a" + StepsDataLoader { + Component.onCompleted: stepsLabel.text = getTodayData() + } + Label { - id: hello + id: stepsLabel anchors.centerIn: parent horizontalAlignment: Text.AlignHCenter - text: "Hello World!" } } |