Skip to content

Language English (United Kingdom) now 100% translated #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 130 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
d90deea
Initial commit from te fork: Change recording map to OSM, add the PR …
ernesst Jul 2, 2018
868fb97
first version with cmake for translations
mymike00 Jul 2, 2018
7ab9ee2
fixed bug not closing the popup
mymike00 Jul 2, 2018
8dc802c
small changes and italian translation
mymike00 Jul 2, 2018
174a4de
the po cmake file doesn't add the desktop file any more
mymike00 Jul 2, 2018
b3655ff
fixed cmake for translations
mymike00 Jul 3, 2018
d20a999
added translations and small improvements
mymike00 Jul 3, 2018
23d627f
Merge pull request #1 from mymike00/master
ernesst Jul 3, 2018
107314c
Update About with Icons credit + url of original repo + update Fr.po
ernesst Jul 3, 2018
4881a27
small gui improvements
mymike00 Jul 3, 2018
1547302
added a timer to log the trackpoints and the setting to change the ti…
mymike00 Aug 1, 2018
62e413b
Rename WebMap to QMLMap, update date on About, Remove folder html, ad…
ernesst Aug 2, 2018
679bf65
Merge pull request #2 from ernesst/OSM_viewer
ernesst Aug 2, 2018
76cdc09
New Catalan Translation
wagafo Aug 2, 2018
ec8e97d
Catalan translations from wagafo
mymike00 Aug 2, 2018
69871ba
Correction in Catalan translation
wagafo Aug 2, 2018
c6cf815
Correction in Catalan translation from wagafo
mymike00 Aug 2, 2018
b9cc2a9
update French translation
ernesst Aug 4, 2018
032f1d0
update zoom on recording
ernesst Aug 4, 2018
615993a
improved point track timer gui. moved the bottomedge to a file
mymike00 Aug 4, 2018
6437331
small fixes
mymike00 Aug 4, 2018
4fb6d68
revert applicationName and next version number
mymike00 Aug 6, 2018
2c5d924
deleted old pot
mymike00 Aug 6, 2018
67b6727
merge
mymike00 Aug 6, 2018
4a4e8ef
restore thing I messed up
mymike00 Aug 6, 2018
115a4bb
fixed new applicationName in CMake
mymike00 Aug 6, 2018
5ce3c80
remove focus when the track is saved to keep the keyboard hidden, upd…
ernesst Aug 12, 2018
8eb4364
Update translation Fr and It.
ernesst Aug 12, 2018
da273c3
Update README.md
ernesst Aug 12, 2018
7f4741e
Update README.md
ernesst Aug 12, 2018
9289978
Update README.md
ernesst Aug 12, 2018
4e05435
Create es.po
j2g2rp Aug 13, 2018
4a3da36
Merge pull request #6 from j2g2rp/patch-1
ernesst Aug 13, 2018
745076b
Update About, Readme, remove .js and .svg not use
ernesst Aug 14, 2018
5598013
english correction fixes #7
mymike00 Aug 17, 2018
a10dc52
back to appname cwayne18, ux and translation improvements. update it.po
mymike00 Aug 22, 2018
92d90b2
missing appname substitution and removed unused images
mymike00 Aug 22, 2018
85046a7
fixed wrong font.pointSize
mymike00 Aug 22, 2018
9bf9663
svg images + symbolic
mymike00 Sep 2, 2018
5478a92
improved sport selection
mymike00 Sep 2, 2018
71e4111
version bump to 0.11
mymike00 Sep 2, 2018
8039982
fixed legacy sctivity type name
mymike00 Sep 14, 2018
4ac6b2d
fixed problem with translating activity types
mymike00 Sep 14, 2018
0405930
Add features: Importing gpx files from other folder through the conte…
ernesst Oct 21, 2018
17c39fc
Add GPX info feature next to editing
ernesst Oct 22, 2018
3b659c6
Add refresh indicator to load gpx information + some cleanup
ernesst Oct 23, 2018
151741c
Fix map centralization on some files after loading the track, add a r…
ernesst Oct 28, 2018
af203b7
Code cleanup : Remove metrics, contentPickerDialog & Polyline
ernesst Nov 11, 2018
90d902b
created proper components to handle useful dialogs
mymike00 Nov 11, 2018
f6dbfb4
Improved Activityindicator position
mymike00 Nov 11, 2018
7bcd98f
fixed PositionSource not being closed and code claning
mymike00 Nov 11, 2018
cfc77fa
Theme support
mymike00 Nov 11, 2018
e3940a4
Merge pull request #8 from ernesst/Import
ernesst Nov 11, 2018
4e3b258
Update README.md
ernesst Nov 11, 2018
db7f57d
Translated using Weblate (Catalan)
mymike00 Nov 12, 2018
9e7c5b9
Translated using Weblate (French)
mymike00 Nov 12, 2018
0bf2740
Update es.po
j2g2rp Nov 18, 2018
2f36314
Merge pull request #9 from j2g2rp/patch-2
ernesst Nov 18, 2018
7735ae5
version 0.12.1 with spanish
mymike00 Nov 19, 2018
ecf88da
Added translation using Weblate (Arabic)
mohammadA19 Nov 23, 2018
6cd765f
Added translation using Weblate (Indonesian)
Nov 24, 2018
bed75af
Added translation using Weblate (German)
Atalanttore Nov 30, 2018
24fd983
Translated using Weblate (German)
Atalanttore Nov 30, 2018
8352be4
Added translation using Weblate (Finnish)
mymike00 Dec 10, 2018
fa7be4f
Translated using Weblate (German)
SantosSi Dec 13, 2018
f434e6f
Translated using Weblate (German)
Dec 16, 2018
3e24391
Added translation using Weblate (Chinese (Simplified))
yahoohelloworld Dec 18, 2018
6caf00a
Merge branch 'origin/master' into Weblate.
weblate Dec 22, 2018
dde9dee
Added translation using Weblate (Norwegian Bokmål)
comradekingu Dec 24, 2018
34a1c3a
Added translation using Weblate (Russian)
superrnovae Jan 6, 2019
8ba6c42
Added translation using Weblate (Chinese (Traditional))
louies0623 Jan 11, 2019
afdd3dc
Translated using Weblate (Arabic)
PrivateLabs Jan 12, 2019
dfcdd9a
Translated using Weblate (French)
mymike00 Jan 15, 2019
a1595da
Translated using Weblate (French)
EwanLehnebach Jan 15, 2019
690d641
Translated using Weblate (Catalan)
mymike00 Jan 15, 2019
f26b2c8
Translated using Weblate (Chinese (Simplified))
Jan 15, 2019
b050bf4
Translated using Weblate (German)
SantosSi Jan 15, 2019
7acfad2
Translated using Weblate (Spanish)
advocatux Jan 15, 2019
f4d4b48
Added translation using Weblate (Abkhazian)
Jan 21, 2019
48ed5ec
Langauge of readme reworked
comradekingu Jan 24, 2019
d6f82ea
Merge pull request #11 from comradekingu/patch-1
mymike00 Jan 24, 2019
e7a2f9e
Translated using Weblate (Chinese (Simplified))
ta88 Jan 25, 2019
c9e95c1
Translated using Weblate (Chinese (Simplified))
Jan 26, 2019
bac0081
Translated using Weblate (Chinese (Traditional))
Jan 26, 2019
acba093
Translated using Weblate (Chinese (Simplified))
Jan 26, 2019
e96b33f
Translated using Weblate (Norwegian Bokmål)
comradekingu Jan 24, 2019
ac11572
Translated using Weblate (German)
Feb 6, 2019
dd8d400
Info button in the map page
mymike00 Feb 25, 2019
40d8277
Translated using Weblate (Russian)
WWWesten Feb 26, 2019
8caec22
Translated using Weblate (Russian)
WWWesten Feb 28, 2019
9bf8c03
Added translation using Weblate (Serbian)
Fooftilly Mar 3, 2019
d0731eb
Translated using Weblate (Serbian)
Fooftilly Mar 3, 2019
ec286ca
Merge translations from weblate
mymike00 Mar 12, 2019
fbf65bb
dutch translation
mymike00 Mar 15, 2019
6fbdd9f
new version
mymike00 Mar 15, 2019
3302d09
link pointing to weblate for translations
mymike00 May 23, 2019
c3869db
fix clickable.json for Clickable v6
mymike00 Sep 11, 2019
793ae3d
filter activities by type (and move info icon in settings)
mymike00 Sep 13, 2019
bb23049
Altitude offset (#21)
ernesst Sep 21, 2019
d6c910d
Merge PR #22: Filter activities by type
mymike00 Sep 21, 2019
f5f1b72
update .pot
mymike00 Sep 21, 2019
26ac81b
moved qml under qml/ and cmake fix, cleaning some files
mymike00 Oct 2, 2019
fca9189
Added a new sport: UnicycleRide. Built using clickable and tested on…
Oct 4, 2019
8034883
Merge translations from Weblate
mymike00 Oct 14, 2019
31aba3a
Redo of the icons to closer match the BikeRide.svg and BikeRide-symbo…
Oct 15, 2019
3a7a95d
Tweaked icon for style-consistency and unique bg color
mymike00 Oct 15, 2019
39ee3bf
Merge PR #23 from mr-growl: Added Unicycle as sport
mymike00 Oct 15, 2019
ef6163b
Add: When delete entry in the app the gpx file is also deleted
Oct 28, 2019
d3d965e
replaced by the up to date version
Oct 30, 2019
f39975f
Merge pull request #26 from ernesst/rm
ernesst Oct 30, 2019
f81609a
Update the readme to match the 0.14 changes + Thanks.
Nov 3, 2019
f0f5f37
Add Download information
Nov 3, 2019
2060966
merge translation from weblate
mymike00 Nov 11, 2019
13283b9
Update the web library use to Morph.Web, in case some image are not s…
Nov 24, 2019
ad4ddc8
merge translations from weblate
mymike00 Feb 16, 2020
6792e1f
revert Spanish translation in English file
mymike00 Feb 16, 2020
d4e2015
sort strings into pot (and po) files
mymike00 Feb 16, 2020
10ec09b
build pot file
mymike00 Feb 16, 2020
60aaa79
merge translation from weblate
mymike00 May 20, 2020
e0848ba
update clickable.json
mymike00 Oct 26, 2020
a6f1eea
fixes #30: Length units not translatable
mymike00 Oct 26, 2020
55e6669
merge translation from weblate
mymike00 Oct 26, 2020
097ae69
Make length units translatable (issue #30)
mymike00 Oct 26, 2020
4bd0954
Colors (#41)
Danfro Feb 14, 2023
f384b48
fix some spelling and wording for sport selector (#40)
Danfro Feb 14, 2023
d11dd98
port app to focal and upgrade to clickable.yaml (#44)
Danfro May 10, 2023
f8e8994
add sport type nordic walking (#48)
Danfro May 10, 2023
b4ac2d6
split changelog and readme for easier reading (#52)
Danfro May 10, 2023
ce022e4
Fix AppIcon not showing
ivoxavier Jul 15, 2022
2c19336
Update README.md
ernesst Feb 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .bzrignore

This file was deleted.

6 changes: 0 additions & 6 deletions .excludes

This file was deleted.

5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
keys.js
build/
activitytracker.qmlproject.user
*.mo
*.OLD
.clickable/
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
## Changes 0.14:
- Add the possibility to calibrate the altitude,
- Remove JavaScript lib,
- Thanks to the contributors to update translation,
- remove .gpx file when trip is deleted,
- Add Unicycle sport,
- Filter activities by type,

## Changes 0.13:
- Thanks to the contributors to update translation.

## Changes 0.12:
- Improved sport selection
- Missing appname substitution and removed unused images
- Back to appname cwayne18, UX and translation improvements. Updated it.po
- Add features: Importing GPX files from another folder through the contenthub, renaming and changing activity
- Bumping the software revsion to 0.12
- Add GPX info feature next to editing
- Add refresh indicator to load GPX info + some cleanup
- Created proper components to handle useful dialogs
- Code cleanup: Remove metrics, contentPickerDialog & Polyline
- Fixed PositionSource not being closed and code cleaning
- Theme support

## Changes initial Xenial version:
- Add speed and altitude, thanks to https://github.com/cwayne18/ActivityTracker/pull/17
- Update of the QML code
- Uniformise and change the tile service to QML/OSM.
- Implement a routing to parse locally the gpx track
- Allow setting frequency of position recording. (it's adviced to not go below a frequency of 10 or 5 seconds in order to not saturate the GPX file. The more data points it has, the longer it will take to display.)
76 changes: 76 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
project(activitytracker C CXX)
cmake_minimum_required(VERSION 3.5.0)

set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

find_package(Qt5Core)
find_package(Qt5Qml)
find_package(Qt5Quick)

# Automatically create moc files
set(CMAKE_AUTOMOC ON)

# Components PATH
execute_process(
COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
OUTPUT_VARIABLE ARCH_TRIPLET
OUTPUT_STRIP_TRAILING_WHITESPACE
)

set(PROJECT_NAME "activitytracker")
set(FULL_PROJECT_NAME "activitytracker.cwayne18")
set(CMAKE_INSTALL_PREFIX /)
set(DATA_DIR /)
set(DESKTOP_FILE_NAME ${PROJECT_NAME}.desktop)

# This command figures out the target architecture for use in the manifest file
execute_process(
COMMAND dpkg-architecture -qDEB_HOST_ARCH
OUTPUT_VARIABLE CLICK_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)

configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})
install(DIRECTORY images DESTINATION ${DATA_DIR})
install(DIRECTORY py DESTINATION ${DATA_DIR})
install(DIRECTORY qml DESTINATION ${DATA_DIR})

# Translations
file(GLOB_RECURSE I18N_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po qml/*.qml)
list(APPEND I18N_SRC_FILES ${DESKTOP_FILE_NAME}.in.h)

find_program(INTLTOOL_MERGE intltool-merge)
if(NOT INTLTOOL_MERGE)
message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
endif()
find_program(INTLTOOL_EXTRACT intltool-extract)
if(NOT INTLTOOL_EXTRACT)
message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
endif()

add_custom_target(${DESKTOP_FILE_NAME} ALL
COMMENT "Merging translations into ${DESKTOP_FILE_NAME}..."
COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_SOURCE_DIR}/${DESKTOP_FILE_NAME}.in ${DESKTOP_FILE_NAME}
COMMAND sed -i 's/${PROJECT_NAME}-//g' ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}
)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DATA_DIR})

add_subdirectory(po)

# Make source files visible in qtcreator
# We don't need to add plugin sources here as they get exposed
# via the library target.
file(GLOB_RECURSE PROJECT_SRC_FILES
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
qml/*.qml
qml/*.js
*.json
*.json.in
*.apparmor
*.desktop.in
)

add_custom_target(${PROJECT_NAME}_FILES ALL SOURCES ${PROJECT_SRC_FILES})
Loading