From fdc71d176c3d2c3e569c1d26998d4def12d9d1c3 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 23 Apr 2021 14:24:16 +0200 Subject: Port to CMake Qt is slowly deprecating QMake. They have stopped building Qt itself with QMake and moved Qt6 to CMake instead. Although QMake is still around, it's clear the focus has shifted and it would be good for applications to switch over to an alternative build system as well So hereby, switch the build system to CMake --- .gitignore | 1 + CMakeLists.txt | 25 +++++++++ asteroid-stopwatch.pro | 13 ----- i18n/generate-desktop.sh | 88 ------------------------------- main.cpp | 23 -------- main.qml | 134 ----------------------------------------------- resources.qrc | 5 -- src/CMakeLists.txt | 8 +++ src/main.cpp | 23 ++++++++ src/main.qml | 134 +++++++++++++++++++++++++++++++++++++++++++++++ src/resources.qrc | 5 ++ 11 files changed, 196 insertions(+), 263 deletions(-) create mode 100644 .gitignore create mode 100644 CMakeLists.txt delete mode 100644 asteroid-stopwatch.pro delete mode 100755 i18n/generate-desktop.sh delete mode 100644 main.cpp delete mode 100644 main.qml delete mode 100644 resources.qrc create mode 100644 src/CMakeLists.txt create mode 100644 src/main.cpp create mode 100644 src/main.qml create mode 100644 src/resources.qrc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8f3648a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.6.0) + +project(asteroid-stopwatch + VERSION 0.0.1 + DESCRIPTION "Default stopwatch app for AsteroidOS") + +find_package(ECM REQUIRED NO_MODULE) +find_package(AsteroidApp REQUIRED) + +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ASTEROID_MODULE_PATH}) + +include(FeatureSummary) +include(GNUInstallDirs) +include(ECMQMLModules) +include(AsteroidCMakeSettings) +include(AsteroidTranslations) + +ecm_find_qmlmodule(Nemo.Configuration 1.0) + +add_subdirectory(src) + +build_translations(i18n) +generate_desktop(${CMAKE_SOURCE_DIR} asteroid-stopwatch) + +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/asteroid-stopwatch.pro b/asteroid-stopwatch.pro deleted file mode 100644 index 46f5dbe..0000000 --- a/asteroid-stopwatch.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = asteroid-stopwatch -CONFIG += asteroidapp link_pkgconfig -PKGCONFIG += asteroidapp - -SOURCES += main.cpp -RESOURCES += resources.qrc -OTHER_FILES += main.qml - -lupdate_only{ SOURCES += i18n/asteroid-stopwatch.desktop.h } -TRANSLATIONS = $$files(i18n/$$TARGET.*.ts) - -target.path = /usr/bin/ -INSTALLS += target diff --git a/i18n/generate-desktop.sh b/i18n/generate-desktop.sh deleted file mode 100755 index b1738c2..0000000 --- a/i18n/generate-desktop.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2017 Florent Revest -# All rights reserved. -# -# You may use this file under the terms of BSD license as follows: -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the author nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# This script is used to extract the translated app names found inevery .ts file -# and gather those strings with the .desktop.template file in a single .desktop - -if [ "$#" -ne 2 ]; then - echo "usage: $0 src_directory output.desktop" - exit 1 -fi - -SRC_DIR=$1 -OUTPUT_DESKTOP_FILE=$2 -if [ ! -f "${SRC_DIR}/${OUTPUT_DESKTOP_FILE}.template" ]; then - echo "${SRC_DIR}/${OUTPUT_DESKTOP_FILE}.template not found" - exit 2 -fi -if [ ! -f "${SRC_DIR}/i18n/${OUTPUT_DESKTOP_FILE}.h" ]; then - echo "${SRC_DIR}/i18n/${OUTPUT_DESKTOP_FILE}.h not found" - exit 2 -fi - -DEFAULT_NAME=`grep -oP '//% "\K[^"]+(?=")' ${SRC_DIR}/i18n/${OUTPUT_DESKTOP_FILE}.h` -if [ -z "$DEFAULT_NAME" ]; then - echo "Default name can not be found in ${SRC_DIR}/i18n/${OUTPUT_DESKTOP_FILE}.h" - exit 3 -fi - -cat ${SRC_DIR}/${OUTPUT_DESKTOP_FILE}.template > ${OUTPUT_DESKTOP_FILE} -echo "Name=$DEFAULT_NAME" >> $OUTPUT_DESKTOP_FILE - -for FILE in ${SRC_DIR}/i18n/*.ts; do - echo "Processing $FILE..." - - PROCESSED_LANG=`grep -oP 'language="\K[^"]+(?=")' $FILE` - if [ -z "$PROCESSED_LANG" ]; then - echo "> Couldn't find a corresponding language id, aborting" - continue - fi - echo "> Language: $PROCESSED_LANG detected" - - TRANSLATION_LINE=`grep -A 3 '' $FILE | grep ' Couldn't find a corresponding desktop.h translation, aborting" - continue - fi - - LINE_IS_UNFINISHED=`echo $TRANSLATION_LINE | grep unfinished` - if [ ! -z "$LINE_IS_UNFINISHED" ]; then - echo "> Translation line has been found but is marked as unfinished, aborting" - continue - fi - - TRANSLATED_NAME=`echo $TRANSLATION_LINE | grep -oP '>\K[^<]*(?=)'` - if [ -z "$TRANSLATED_NAME" ]; then - echo "> Translation is empty, aborting" - continue - fi - echo "> Translation '$TRANSLATED_NAME' found, filling $OUTPUT_DESKTOP_FILE" - - echo "Name[$PROCESSED_LANG]=$TRANSLATED_NAME" >> $OUTPUT_DESKTOP_FILE -done diff --git a/main.cpp b/main.cpp deleted file mode 100644 index a44544c..0000000 --- a/main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2017 - Florent Revest - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -int main(int argc, char *argv[]) -{ - return AsteroidApp::main(argc, argv); -} diff --git a/main.qml b/main.qml deleted file mode 100644 index a0b6e4a..0000000 --- a/main.qml +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2016 Florent Revest - * 2015 Tim Süberkrüb - * Part of this code is based on "Stopwatch" (https://github.com/baleboy/stopwatch) - * Copyright (C) 2011 Francesco Balestrieri - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.9 -import org.asteroid.controls 1.0 -import Nemo.Configuration 1.0 - -Application { - id: app - - centerColor: "#b01c7e" - outerColor: "#420a2f" - - ConfigurationValue { - id: previousTime - key: "/stopwatch/previousTime" - defaultValue: -1 - } - ConfigurationValue { - id: elapsed - key: "/stopwatch/elapsed" - defaultValue: -1 - } - ConfigurationValue { - id: running - key: "/stopwatch/running" - defaultValue: false - } - - function zeroPad(n) { - return (n < 10 ? "0" : "") + n - } - - function toTimeString(usec) { - var mod = Math.abs(usec) - if (mod >= 3600000) { // Hours + Minutes + Seconds - return '' + Math.floor(mod / 3600000) + 'h' + '
' + - '' + zeroPad(Math.floor((mod % 3600000) / 60000)) + 'm' + - zeroPad(Math.floor((mod % 60000) / 1000)) + 's' - - } else if (mod >= 60000) { // Minutes + Seconds + Tenth - return '' + zeroPad(Math.floor((mod % 3600000) / 60000)) + 'm' + '
' + - '' + zeroPad(Math.floor((mod % 60000) / 1000)) + 's' + - Math.floor((mod % 1000) / 100) + '' - } else { // Seconds + Tenth - return '' + zeroPad(Math.floor((mod % 60000) / 1000)) + 's' + '' + - '' + Math.floor((mod % 1000) / 100) + '' - } - } - - Item { - id: mainPage - anchors.fill: parent - - state: running.value ? "running" : elapsed.value == -1 ? "zero" : "paused" - states: [ - State { name: "zero" }, - State { name: "running" }, - State { name: "paused" } - ] - - Label { - id: elapsedLabel - textFormat: Text.RichText - anchors.centerIn: parent - text: toTimeString(elapsed.value) - font.pixelSize: Dims.h(25) - horizontalAlignment: Text.AlignHCenter - - SequentialAnimation { - running: mainPage.state == "paused" - loops: Animation.Infinite - NumberAnimation { target: elapsedLabel; property: "opacity"; from: 1; to: 0; duration: 500 } - NumberAnimation { target: elapsedLabel; property: "opacity"; from: 0; to: 1; duration: 500 } - onStopped: elapsedLabel.opacity = 1 - } - } - - MouseArea { - anchors.fill: parent - onClicked: { - switch(mainPage.state) { - case "zero": - case "paused": - var curTime = new Date - previousTime.value = curTime.getTime() - running.value = true - break; - case "running": - running.value = false - break; - } - } - } - - IconButton { - id: resetButton - iconName: "ios-refresh" - visible: mainPage.state === "paused" - onClicked: elapsed.value = -1 - } - } - - Timer { - interval: 100 - repeat: true - running: mainPage.state == "running" - triggeredOnStart: true - - onTriggered: { - var currentTime = new Date - var delta = (currentTime.getTime() - previousTime.value) - previousTime.value = currentTime.getTime() - elapsed.value += delta - } - } -} diff --git a/resources.qrc b/resources.qrc deleted file mode 100644 index 5f6483a..0000000 --- a/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - main.qml - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..446b4c9 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,8 @@ +add_library(asteroid-stopwatch main.cpp resources.qrc) +set_target_properties(asteroid-stopwatch PROPERTIES PREFIX "" SUFFIX "") + +target_link_libraries(asteroid-stopwatch PUBLIC + AsteroidApp) + +install(TARGETS asteroid-stopwatch + DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..a44544c --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2017 - Florent Revest + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +int main(int argc, char *argv[]) +{ + return AsteroidApp::main(argc, argv); +} diff --git a/src/main.qml b/src/main.qml new file mode 100644 index 0000000..a0b6e4a --- /dev/null +++ b/src/main.qml @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2016 Florent Revest + * 2015 Tim Süberkrüb + * Part of this code is based on "Stopwatch" (https://github.com/baleboy/stopwatch) + * Copyright (C) 2011 Francesco Balestrieri + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.9 +import org.asteroid.controls 1.0 +import Nemo.Configuration 1.0 + +Application { + id: app + + centerColor: "#b01c7e" + outerColor: "#420a2f" + + ConfigurationValue { + id: previousTime + key: "/stopwatch/previousTime" + defaultValue: -1 + } + ConfigurationValue { + id: elapsed + key: "/stopwatch/elapsed" + defaultValue: -1 + } + ConfigurationValue { + id: running + key: "/stopwatch/running" + defaultValue: false + } + + function zeroPad(n) { + return (n < 10 ? "0" : "") + n + } + + function toTimeString(usec) { + var mod = Math.abs(usec) + if (mod >= 3600000) { // Hours + Minutes + Seconds + return '' + Math.floor(mod / 3600000) + 'h' + '
' + + '' + zeroPad(Math.floor((mod % 3600000) / 60000)) + 'm' + + zeroPad(Math.floor((mod % 60000) / 1000)) + 's' + + } else if (mod >= 60000) { // Minutes + Seconds + Tenth + return '' + zeroPad(Math.floor((mod % 3600000) / 60000)) + 'm' + '
' + + '' + zeroPad(Math.floor((mod % 60000) / 1000)) + 's' + + Math.floor((mod % 1000) / 100) + '' + } else { // Seconds + Tenth + return '' + zeroPad(Math.floor((mod % 60000) / 1000)) + 's' + '' + + '' + Math.floor((mod % 1000) / 100) + '' + } + } + + Item { + id: mainPage + anchors.fill: parent + + state: running.value ? "running" : elapsed.value == -1 ? "zero" : "paused" + states: [ + State { name: "zero" }, + State { name: "running" }, + State { name: "paused" } + ] + + Label { + id: elapsedLabel + textFormat: Text.RichText + anchors.centerIn: parent + text: toTimeString(elapsed.value) + font.pixelSize: Dims.h(25) + horizontalAlignment: Text.AlignHCenter + + SequentialAnimation { + running: mainPage.state == "paused" + loops: Animation.Infinite + NumberAnimation { target: elapsedLabel; property: "opacity"; from: 1; to: 0; duration: 500 } + NumberAnimation { target: elapsedLabel; property: "opacity"; from: 0; to: 1; duration: 500 } + onStopped: elapsedLabel.opacity = 1 + } + } + + MouseArea { + anchors.fill: parent + onClicked: { + switch(mainPage.state) { + case "zero": + case "paused": + var curTime = new Date + previousTime.value = curTime.getTime() + running.value = true + break; + case "running": + running.value = false + break; + } + } + } + + IconButton { + id: resetButton + iconName: "ios-refresh" + visible: mainPage.state === "paused" + onClicked: elapsed.value = -1 + } + } + + Timer { + interval: 100 + repeat: true + running: mainPage.state == "running" + triggeredOnStart: true + + onTriggered: { + var currentTime = new Date + var delta = (currentTime.getTime() - previousTime.value) + previousTime.value = currentTime.getTime() + elapsed.value += delta + } + } +} diff --git a/src/resources.qrc b/src/resources.qrc new file mode 100644 index 0000000..5f6483a --- /dev/null +++ b/src/resources.qrc @@ -0,0 +1,5 @@ + + + main.qml + + -- cgit v1.2.3-54-g00ecf