New version. Fixed BUG with inner timer generation. Fixed BUG in about page
This commit is contained in:
parent
0f1f9734f1
commit
b91ea9f768
|
@ -137,7 +137,7 @@ http://www.grafixprint.it
|
|||
}
|
||||
|
||||
SectionHeader { text: qsTr("License") }
|
||||
Label {
|
||||
LinkedLabel {
|
||||
anchors {
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
|
@ -148,6 +148,9 @@ http://www.grafixprint.it
|
|||
|
||||
wrapMode: Text.Wrap
|
||||
|
||||
color: Theme.primaryColor
|
||||
linkColor: Theme.highlightColor
|
||||
|
||||
font.pixelSize: Theme.fontSizeSmall
|
||||
text: qsTr("
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
@ -161,7 +164,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|||
GNU General Public License for more details.<br><br>
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <a href=\"http://www.gnu.org/licenses\">http://www.gnu.org/licenses.<br><br><br>
|
||||
along with this program. If not, see <a href=\"http://www.gnu.org/licenses\">http://www.gnu.org/licenses</a>.<br><br><br>
|
||||
|
||||
|
||||
All artworks are licensed under a <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-ShareAlike 4.0 International</a>
|
||||
|
|
|
@ -84,18 +84,12 @@ Page {
|
|||
PushUpMenu {
|
||||
MenuItem {
|
||||
text: qsTr("Add inner time")
|
||||
onClicked: {
|
||||
Helper.addSliderForInnerTime()
|
||||
Helper.generateSlidersForInnerTimers()
|
||||
}
|
||||
onClicked: Helper.addSliderForInnerTime()
|
||||
}
|
||||
|
||||
MenuItem {
|
||||
text: qsTr("Remove last inner time")
|
||||
onClicked: {
|
||||
Helper.removeLastSliderFromInnerTimers()
|
||||
Helper.generateSlidersForInnerTimers()
|
||||
}
|
||||
onClicked: Helper.removeLastSliderFromInnerTimers()
|
||||
|
||||
visible: mListOfInnerTimers.length
|
||||
}
|
||||
|
|
|
@ -17,6 +17,8 @@ function addSliderForInnerTime() {
|
|||
newArray.push(5)
|
||||
|
||||
settingsPage.mListOfInnerTimers = newArray
|
||||
|
||||
generateSlidersForInnerTimers()
|
||||
}
|
||||
|
||||
function removeLastSliderFromInnerTimers() {
|
||||
|
@ -24,6 +26,8 @@ function removeLastSliderFromInnerTimers() {
|
|||
newArray.pop()
|
||||
|
||||
settingsPage.mListOfInnerTimers = newArray
|
||||
|
||||
generateSlidersForInnerTimers()
|
||||
}
|
||||
|
||||
function getListOfInnerTimers() {
|
||||
|
@ -37,6 +41,13 @@ function getListOfInnerTimers() {
|
|||
return list;
|
||||
}
|
||||
|
||||
function updateValueInnerTimer(i, value) {
|
||||
var newArray = settingsPage.mListOfInnerTimers
|
||||
newArray[i] = value
|
||||
|
||||
settingsPage.mListOfInnerTimers = newArray
|
||||
}
|
||||
|
||||
function generateSlidersForInnerTimers() {
|
||||
for (var i = 0; i < settingsColumn.children.length; i++) {
|
||||
if (settingsColumn.children[i].objectName === 'innerSlider') {
|
||||
|
@ -50,12 +61,12 @@ function generateSlidersForInnerTimers() {
|
|||
var newArray = []
|
||||
|
||||
for (i = 0; i < numberOfInnerTimers; i++) {
|
||||
value = settings.getInnerTimer(i)
|
||||
value = settingsPage.mListOfInnerTimers[i]
|
||||
if (value === undefined) {
|
||||
value = 5
|
||||
}
|
||||
|
||||
remainingTimeForInner -= settings.getInnerTimer(i)
|
||||
remainingTimeForInner -= value
|
||||
|
||||
var enabled = "true"
|
||||
if ((i + 1) < numberOfInnerTimers) {
|
||||
|
@ -66,6 +77,7 @@ function generateSlidersForInnerTimers() {
|
|||
"import QtQuick 2.2;" +
|
||||
"import Sailfish.Silica 1.0;" +
|
||||
"import 'converter.js' as Converter;" +
|
||||
"import 'helpers.js' as Helper;" +
|
||||
"Slider {" +
|
||||
"objectName: 'innerSlider';" +
|
||||
"enabled: "+ enabled +"; "+
|
||||
|
@ -80,12 +92,14 @@ function generateSlidersForInnerTimers() {
|
|||
"valueText: Converter.msToTime(value);" +
|
||||
|
||||
"label: qsTr('"+ (i + 1) +"° inner time');" +
|
||||
|
||||
"onValueChanged: Helper.updateValueInnerTimer("+ i +", value);" +
|
||||
"}",
|
||||
settingsColumn,
|
||||
"dynamicInnerTimerSlider"
|
||||
);
|
||||
|
||||
newArray.push(newSlider);
|
||||
newArray.push(value);
|
||||
}
|
||||
|
||||
settingsPage.mListOfInnerTimers = newArray;
|
||||
|
|
|
@ -8,6 +8,10 @@
|
|||
# * date Author's Name <author's email> version-release
|
||||
# - Summary of changes
|
||||
|
||||
* Thu Sep 07 2017 Claudio Maradonna <claudio@unitoo.pw> 1.2.1
|
||||
- Fixed bug with inner timer adjust and new inner timer
|
||||
- Fixed link bug in about page
|
||||
|
||||
* Wed Sep 06 2017 Claudio Maradonna <claudio@unitoo.pw> 1.1
|
||||
- Fixed bug with preset's deleting
|
||||
- Fixed license in about page (cutted by html tag)
|
||||
|
|
|
@ -13,8 +13,8 @@ Name: harbour-boxing-timer
|
|||
%{!?qtc_make:%define qtc_make make}
|
||||
%{?qtc_builddir:%define _builddir %qtc_builddir}
|
||||
Summary: Boxing timer
|
||||
Version: 1.1
|
||||
Release: 1
|
||||
Version: 1.2.1
|
||||
Release: 3
|
||||
Group: Applications/Utilities
|
||||
License: GPLv3
|
||||
URL: https://github.com/UnitooTeam/harbour-boxing-timer
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Name: harbour-boxing-timer
|
||||
Summary: Boxing timer
|
||||
Version: 1.1
|
||||
Release: 1
|
||||
Version: 1.2.1
|
||||
Release: 3
|
||||
# The contents of the Group field should be one of the groups listed here:
|
||||
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
|
||||
Group: Applications/Utilities
|
||||
|
|
Loading…
Reference in New Issue