Last changes for release.

jdrescher2006 · Jul 13, 2018 · 782584b · 782584b
1 parent e2846a6
commit 782584b
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 63 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-* Thu Jul 12 2018 Jens Drescher <[email protected]> 1.1.0-2
+* Fri Jul 13 2018 Jens Drescher <[email protected]> 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
@@ -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
@@ -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
@@ -289,75 +289,75 @@
     <name>MainPage</name>
     <message>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>Über Laufhelden</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <source>My Strava Activities</source>
-        <translation type="unfinished">Meine Strava Aktivitäten</translation>
+        <translation>Meine Strava Aktivitäten</translation>
     </message>
     <message>
         <source>Start new workout</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivität starten</translation>
     </message>
     <message>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation>Filter:</translation>
     </message>
     <message>
         <source>of</source>
-        <translation type="unfinished">von</translation>
+        <translation>von</translation>
     </message>
     <message>
         <source>Loading GPX files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade GPX-Dateien...</translation>
     </message>
     <message>
         <source>Remove workout</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivität löschen</translation>
     </message>
     <message>
         <source>Removing workout...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche Aktivität...</translation>
     </message>
     <message>
         <source>Edit workout</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Send to Sports-Tracker.com</source>
-        <translation type="unfinished">Senden an Sports-Tracker.com</translation>
+        <translation>Senden an Sports-Tracker.com</translation>
     </message>
     <message>
         <source>(Unnamed track)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Unbenannte Aktivität)</translation>
     </message>
     <message>
         <source>Uncompleted workout found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Abgebrochene Aktivität gefunden!</translation>
     </message>
     <message>
         <source>Resume</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortsetzen</translation>
     </message>
     <message>
         <source>Workout name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Workout description</source>
-        <translation type="unfinished">Beschreibung</translation>
+        <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Workout:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivität:</translation>
     </message>
     <message>
         <source>workouts</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivitäten</translation>
     </message>
 </context>
 <context>
@@ -564,11 +564,11 @@
     </message>
     <message>
         <source>Use HRM service if available</source>
-        <translation type="unfinished"></translation>
+        <translation>HRM service benutzen</translation>
     </message>
     <message>
         <source>Use heart rate monitor from another application e.g. Amazfish</source>
-        <translation type="unfinished"></translation>
+        <translation>Herzfrequenzmonitor aus einer anderen Anwendung verwenden, z.B. Amazfish</translation>
     </message>
 </context>
 <context>
@@ -921,7 +921,7 @@
     </message>
     <message>
         <source>All activities</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Aktivitäten</translation>
     </message>
 </context>
 <context>