diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 7f92404..16a46bf 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -113,7 +113,7 @@ Page anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: Theme.fontSizeExtraSmall color: Theme.secondaryColor - text: qsTr("Date: ") + "15.06.2018"; + text: qsTr("Date: ") + "13.07.2018"; } Label { diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 3d90416..f18b09d 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -373,45 +373,48 @@ Page Item { width: parent.width - height: parent.height / 3 + height: parent.height / 3.2 visible: !bLoadingFiles - Image - { - id: imgWorkoutImage - anchors.left: parent.left - anchors.verticalCenter: parent.verticalCenter - height: parent.width / 14 - width: parent.width / 14 - fillMode: Image.PreserveAspectFit - } - ComboBox - { - id: cmbWorkoutFilter - //width: (parent.width / 20) * 19 - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - label: qsTr("Filter:") - menu: ContextMenu + Row + { + width: parent.width + //spacing: Theme.paddingSmall + + Image { - Repeater + id: imgWorkoutImage + height: parent.width / 14 + width: parent.width / 14 + anchors.verticalCenter: parent.verticalCenter + fillMode: Image.PreserveAspectFit + } + ComboBox + { + id: cmbWorkoutFilter + anchors.verticalCenter: parent.verticalCenter + label: qsTr("Filter:") + menu: ContextMenu { - id: idRepeaterFilterWorkout - model: SharedResources.arrayWorkoutTypesFilterMainPage; - MenuItem { text: modelData.labeltext } + Repeater + { + id: idRepeaterFilterWorkout + model: SharedResources.arrayWorkoutTypesFilterMainPage; + MenuItem { text: modelData.labeltext } + } } - } - onCurrentItemChanged: - { - if (bLockOnCompleted) - return; + onCurrentItemChanged: + { + if (bLockOnCompleted) + return; - imgWorkoutImage.source = SharedResources.arrayWorkoutTypesFilterMainPage[currentIndex].icon; - settings.workoutTypeMainPage = SharedResources.arrayWorkoutTypesFilterMainPage[currentIndex].name; + imgWorkoutImage.source = SharedResources.arrayWorkoutTypesFilterMainPage[currentIndex].icon; + settings.workoutTypeMainPage = SharedResources.arrayWorkoutTypesFilterMainPage[currentIndex].name; - fncSetWorkoutFilter(); + fncSetWorkoutFilter(); + } } - } + } } Item { @@ -432,9 +435,9 @@ Page id: id_LBL_WorkoutCount anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top - anchors.topMargin: parent.height / 4 + anchors.topMargin: parent.height / 7 text: historyList.count === 0 ? "0" : sWorkoutCount; - font.pixelSize: parent.height / 2 + font.pixelSize: parent.height / 2.3 } Label { @@ -773,10 +776,11 @@ Page Row { spacing: Theme.paddingSmall - width:parent.width; + width:parent.width + Image { - id: imgWorkoutImage + id: imgDialogWorkoutImage height: parent.width / 8 width: parent.width / 8 fillMode: Image.PreserveAspectFit @@ -799,7 +803,7 @@ Page { console.log("Workout changed!"); - imgWorkoutImage.source = SharedResources.arrayWorkoutTypes[currentIndex].icon; + imgDialogWorkoutImage.source = SharedResources.arrayWorkoutTypes[currentIndex].icon; iWorkout = currentIndex; sWorkout = SharedResources.arrayWorkoutTypes[currentIndex].name; } diff --git a/rpm/harbour-laufhelden.changes b/rpm/harbour-laufhelden.changes index 50292db..3cf63fd 100644 --- a/rpm/harbour-laufhelden.changes +++ b/rpm/harbour-laufhelden.changes @@ -1,4 +1,4 @@ -* Thu Jul 12 2018 Jens Drescher 1.1.0-2 +* Fri Jul 13 2018 Jens Drescher 1.1.1-1 - layout changes for main page, workout list can now be filtered - use heart rate monitor from another application e.g. Amazfish by @piggz - hide pace in the detailed view if the workout is biking by @martonmiklos diff --git a/rpm/harbour-laufhelden.spec b/rpm/harbour-laufhelden.spec index c2c2df1..c07cd06 100644 --- a/rpm/harbour-laufhelden.spec +++ b/rpm/harbour-laufhelden.spec @@ -13,8 +13,8 @@ Name: harbour-laufhelden %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Laufhelden - Sport tracker -Version: 1.1.0 -Release: 2 +Version: 1.1.1 +Release: 1 Group: Qt/Qt License: GPL URL: http://example.org/ diff --git a/rpm/harbour-laufhelden.yaml b/rpm/harbour-laufhelden.yaml index d0fe55a..cfebcb4 100644 --- a/rpm/harbour-laufhelden.yaml +++ b/rpm/harbour-laufhelden.yaml @@ -1,7 +1,7 @@ Name: harbour-laufhelden Summary: Laufhelden - Sport tracker -Version: 1.1.0 -Release: 2 +Version: 1.1.1 +Release: 1 Group: Qt/Qt URL: http://example.org/ License: GPL diff --git a/translations/harbour-laufhelden-de.ts b/translations/harbour-laufhelden-de.ts index c879e56..1175137 100644 --- a/translations/harbour-laufhelden-de.ts +++ b/translations/harbour-laufhelden-de.ts @@ -289,75 +289,75 @@ MainPage About - + Über Laufhelden Settings - Einstellungen + Einstellungen My Strava Activities - Meine Strava Aktivitäten + Meine Strava Aktivitäten Start new workout - + Aktivität starten Filter: - + Filter: of - von + von Loading GPX files... - + Lade GPX-Dateien... Remove workout - + Aktivität löschen Removing workout... - + Lösche Aktivität... Edit workout - Bearbeiten + Bearbeiten Send to Sports-Tracker.com - Senden an Sports-Tracker.com + Senden an Sports-Tracker.com (Unnamed track) - + (Unbenannte Aktivität) Uncompleted workout found! - + Abgebrochene Aktivität gefunden! Resume - + Fortsetzen Workout name - Name + Name Workout description - Beschreibung + Beschreibung Workout: - + Aktivität: workouts - + Aktivitäten @@ -564,11 +564,11 @@ Use HRM service if available - + HRM service benutzen Use heart rate monitor from another application e.g. Amazfish - + Herzfrequenzmonitor aus einer anderen Anwendung verwenden, z.B. Amazfish @@ -921,7 +921,7 @@ All activities - + Alle Aktivitäten