Now presets auto reload inner timers. New icon. New version

qml/pages/AboutPage.qml

@@ -97,6 +97,24 @@ Sources at: <a href=\"https://github.com/UnitooTeam/harbour-boxing-timer\">https
                 }
             }
 
+            SectionHeader { text: qsTr("Artists") }
+            Label {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+
+                    leftMargin: Theme.paddingLarge
+                    rightMargin: Theme.paddingLarge
+                }
+
+                wrapMode: Text.Wrap
+
+                font.pixelSize: Theme.fontSizeSmall
+                text: qsTr("
+Stefano Amandonico
+                ")
+            }
+
             SectionHeader { text: qsTr("License") }
             Label {
                 anchors {

qml/pages/PresetList.qml

@@ -25,8 +25,9 @@ Page {
 
             width: parent.width; height: parent.height
 
-            model: listModel
+            VerticalScrollDecorator { flickable: presetsList }
 
+            model: listModel
             delegate: ListItem {
                 width: parent.width
 

qml/pages/SettingsPage.qml

@@ -47,26 +47,18 @@ Page {
     property int mRoundMs: settings.roundsMs
     property int mRestMs: settings.restMs
 
-    property var mListOfInnerTimers: []
+    property var mListOfInnerTimers: settings.innerTimers
 
     onStatusChanged: {
         if (status === PageStatus.Active) {
             Helper.pushPresetListPage()
-
-            var counter = 0
-            for (var i = 0; i < settingsColumn.children.length; i++) {
-                if (settingsColumn.children[i].objectName === 'innerSlider') {
-//                    if (counter in mListOfInnerTimers) {
-//                        counter++
-//                    } else {
-//                        settingsColumn.children[i].destroy()
-//                    }
-                }
-            }
+            Helper.generateSlidersForInnerTimers()
         }
     }
 
     SilicaFlickable {
+        id: flickable
+
         anchors.fill: parent
 
         PullDownMenu {
@@ -92,7 +84,10 @@ Page {
         PushUpMenu {
             MenuItem {
                 text: qsTr("Add inner time")
-                onClicked: Helper.addSliderForInnerTime()
+                onClicked: {
+                    Helper.addSliderForInnerTime()
+                    Helper.generateSlidersForInnerTimers()
+                }
             }
 
             MenuItem {
@@ -105,6 +100,8 @@ Page {
 
         contentHeight: settingsColumn.height
 
+        VerticalScrollDecorator { flickable: flickable }
+
         Column {
             id: settingsColumn
 

qml/pages/js/helpers.js

@@ -12,45 +12,11 @@ function playPauseTimer() {
     }
 }
 
-function addSliderForInnerTime(value) {
-    if (value === undefined) value = 5
+function addSliderForInnerTime() {
+    var newArray = settingsPage.mListOfInnerTimers
+    newArray.push(5)
 
-    var remainingTimeForInner = settingsPage.mRoundMs
-    var numberOfInnerTimers = settingsPage.mListOfInnerTimers.length
-    for (var i = 0; i < numberOfInnerTimers; i++) {
-        remainingTimeForInner -= settingsPage.mListOfInnerTimers[i].value
-    }
-
-    if (remainingTimeForInner > 0) {
-        var number = parseInt(numberOfInnerTimers) + 1
-        var id = "innerTime_" + number
-        var newSlider = Qt.createQmlObject(
-            "import QtQuick 2.2;" +
-            "import Sailfish.Silica 1.0;" +
-            "import 'converter.js' as Converter;" +
-            "Slider {" +
-                "id: " + id + ";" +
-                "objectName: 'innerSlider';" +
-
-                "width: parent.width;" +
-
-                "minimumValue: Converter.sToMs(5);" +
-                "maximumValue: "+ remainingTimeForInner +";" +
-                "stepSize: Converter.sToMs(5);" +
-
-                "value: "+ value +";" +
-                "valueText: Converter.msToTime(value);" +
-
-                "label: qsTr('Inner time "+ number +"');" +
-            "}",
-            settingsColumn,
-            "dynamicInnerTimerSlider"
-        );
-
-        var newArray = settingsPage.mListOfInnerTimers
-        newArray.push(newSlider);
-        settingsPage.mListOfInnerTimers = newArray;
-    }
+    settingsPage.mListOfInnerTimers = newArray
 }
 
 function removeLastSliderFromInnerTimers() {
@@ -72,3 +38,51 @@ function getListOfInnerTimers() {
 
     return list;
 }
+
+function generateSlidersForInnerTimers() {
+    for (var i = 0; i < settingsColumn.children.length; i++) {
+        if (settingsColumn.children[i].objectName === 'innerSlider') {
+            settingsColumn.children[i].destroy()
+        }
+    }
+
+    var value = 5
+    var remainingTimeForInner = settingsPage.mRoundMs
+    var numberOfInnerTimers = settingsPage.mListOfInnerTimers.length
+    var newArray = []
+
+    for (i = 0; i < numberOfInnerTimers; i++) {
+        value = settings.getInnerTimer(i)
+        if (value === undefined) {
+            value = 5
+        }
+
+        remainingTimeForInner -= settings.getInnerTimer(i)
+
+        var newSlider = Qt.createQmlObject(
+            "import QtQuick 2.2;" +
+            "import Sailfish.Silica 1.0;" +
+            "import 'converter.js' as Converter;" +
+            "Slider {" +
+                "objectName: 'innerSlider';" +
+
+                "width: parent.width;" +
+
+                "minimumValue: Converter.sToMs(5);" +
+                "maximumValue: "+ remainingTimeForInner +";" +
+                "stepSize: Converter.sToMs(5);" +
+
+                "value: "+ value +";" +
+                "valueText: Converter.msToTime(value);" +
+
+                "label: qsTr('"+ (i + 1) +"° inner time');" +
+            "}",
+            settingsColumn,
+            "dynamicInnerTimerSlider"
+        );
+
+        newArray.push(newSlider);
+    }
+
+    settingsPage.mListOfInnerTimers = newArray;
+}