diff --git a/icons/108x108/harbour-boxing-timer.png b/icons/108x108/harbour-boxing-timer.png
index e0f8cba..5ee4bb9 100644
Binary files a/icons/108x108/harbour-boxing-timer.png and b/icons/108x108/harbour-boxing-timer.png differ
diff --git a/icons/128x128/harbour-boxing-timer.png b/icons/128x128/harbour-boxing-timer.png
index f4ab9cb..12491db 100644
Binary files a/icons/128x128/harbour-boxing-timer.png and b/icons/128x128/harbour-boxing-timer.png differ
diff --git a/icons/256x256/harbour-boxing-timer.png b/icons/256x256/harbour-boxing-timer.png
index 0184420..19a2c69 100644
Binary files a/icons/256x256/harbour-boxing-timer.png and b/icons/256x256/harbour-boxing-timer.png differ
diff --git a/icons/86x86/harbour-boxing-timer.png b/icons/86x86/harbour-boxing-timer.png
index 46dcb23..9c73022 100644
Binary files a/icons/86x86/harbour-boxing-timer.png and b/icons/86x86/harbour-boxing-timer.png differ
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index 9ac1184..caed60d 100644
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@@ -5,10 +5,14 @@ Page {
id: aboutPage
SilicaFlickable {
+ id: aboutFlickable
+
anchors.fill: parent
contentHeight: column.height
+ VerticalScrollDecorator { flickable: aboutFlickable }
+
Column {
id: column
@@ -34,13 +38,14 @@ Page {
\"Boxing Timer\" is a customizable timer for fighting sports like boxe.
You can set duration, rest and number of rounds. If you set 0 rounds, timer loops and count number of rounds.
+You can add inner timers too.
You can save, load and delete your settings giving a name to them.
")
}
SectionHeader { text: qsTr("Developers and sources") }
- Label {
+ LinkedLabel {
anchors {
left: parent.left
right: parent.right
@@ -51,13 +56,18 @@ You can save, load and delete your settings giving a name to them.
wrapMode: Text.Wrap
+ color: Theme.primaryColor
+ linkColor: Theme.highlightColor
+
font.pixelSize: Theme.fontSizeSmall
- text: qsTr("
+ plainText: qsTr("
Copyright (C) 2017 Claudio Maradonna
Unitoo Team, Italy
-Sources at: https://github.com/UnitooTeam/harbour-boxing-timer
+Sources at: https://github.com/UnitooTeam/harbour-boxing-timer
")
+
+ textFormat: Text.RichText
}
Repeater {
@@ -84,6 +94,8 @@ Sources at: https
verticalAlignment: Text.AlignVCenter
color: Theme.secondaryColor
+
+ textFormat: Text.RichText
}
Label {
@@ -98,7 +110,7 @@ Sources at: https
}
SectionHeader { text: qsTr("Artists") }
- Label {
+ LinkedLabel {
anchors {
left: parent.left
right: parent.right
@@ -109,10 +121,19 @@ Sources at: https
wrapMode: Text.Wrap
+ color: Theme.primaryColor
+ linkColor: Theme.highlightColor
+
font.pixelSize: Theme.fontSizeSmall
- text: qsTr("
+ plainText: qsTr("
Stefano Amandonico
+GrafixPrint, Italy
+
+info@grafixprint.it
+http://www.grafixprint.it
")
+
+ textFormat: Text.RichText
}
SectionHeader { text: qsTr("License") }
@@ -132,16 +153,21 @@ Stefano Amandonico
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+along with this program. If not, see .
+
+
+All artworks are licensed under a Creative Commons Attribution-ShareAlike 4.0 International
")
+
+ textFormat: Text.RichText
}
}
}
diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
index 30dfc58..a18d2df 100644
--- a/qml/pages/SettingsPage.qml
+++ b/qml/pages/SettingsPage.qml
@@ -92,7 +92,10 @@ Page {
MenuItem {
text: qsTr("Remove last inner time")
- onClicked: Helper.removeLastSliderFromInnerTimers()
+ onClicked: {
+ Helper.removeLastSliderFromInnerTimers()
+ Helper.generateSlidersForInnerTimers()
+ }
visible: mListOfInnerTimers.length
}
diff --git a/qml/pages/TimerPage.qml b/qml/pages/TimerPage.qml
index 272356f..e0d607a 100644
--- a/qml/pages/TimerPage.qml
+++ b/qml/pages/TimerPage.qml
@@ -45,7 +45,11 @@ Page {
PullDownMenu {
MenuItem {
text: qsTr("About")
- onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+ onClicked: {
+ boxingTimer.status = BoxingTimer.Pause
+
+ pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+ }
}
MenuItem {
diff --git a/qml/pages/js/helpers.js b/qml/pages/js/helpers.js
index 495d0e8..b6454e2 100644
--- a/qml/pages/js/helpers.js
+++ b/qml/pages/js/helpers.js
@@ -21,9 +21,7 @@ function addSliderForInnerTime() {
function removeLastSliderFromInnerTimers() {
var newArray = settingsPage.mListOfInnerTimers
- var slider = newArray.pop()
-
- slider.destroy()
+ newArray.pop()
settingsPage.mListOfInnerTimers = newArray
}
@@ -59,12 +57,18 @@ function generateSlidersForInnerTimers() {
remainingTimeForInner -= settings.getInnerTimer(i)
+ var enabled = "true"
+ if ((i + 1) < numberOfInnerTimers) {
+ enabled = "false"
+ }
+
var newSlider = Qt.createQmlObject(
"import QtQuick 2.2;" +
"import Sailfish.Silica 1.0;" +
"import 'converter.js' as Converter;" +
"Slider {" +
"objectName: 'innerSlider';" +
+ "enabled: "+ enabled +"; "+
"width: parent.width;" +
@@ -72,7 +76,7 @@ function generateSlidersForInnerTimers() {
"maximumValue: "+ remainingTimeForInner +";" +
"stepSize: Converter.sToMs(5);" +
- "value: "+ value +";" +
+ "value: "+ parseInt(value) +";" +
"valueText: Converter.msToTime(value);" +
"label: qsTr('"+ (i + 1) +"° inner time');" +
diff --git a/rpm/harbour-boxing-timer.spec b/rpm/harbour-boxing-timer.spec
index 08e7fd8..43a2458 100644
--- a/rpm/harbour-boxing-timer.spec
+++ b/rpm/harbour-boxing-timer.spec
@@ -13,7 +13,7 @@ Name: harbour-boxing-timer
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Boxing timer
-Version: 0.1a
+Version: 1.0
Release: 1
Group: Applications/Multimedia
License: GPLv3