aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2017-08-29 13:56:55 +0200
committerWeblate <noreply@weblate.org>2017-08-29 13:56:55 +0200
commit5482bf00f5fd3f268576f81c21c06e8dfc638b03 (patch)
treedc2a78416fb87ddec2865c12ebd5b777f4151ee6
parent5b7f3294c7735833ffcaf94e262c87e62386340e (diff)
parent31cf9437cb57f9b6235246fb411fd83076815731 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--main.qml8
1 files changed, 3 insertions, 5 deletions
diff --git a/main.qml b/main.qml
index 92fdf3f..d646c17 100644
--- a/main.qml
+++ b/main.qml
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.5
+import QtQuick 2.9
import org.asteroid.controls 1.0
import org.nemomobile.configuration 1.0
@@ -81,7 +81,7 @@ Application {
textFormat: Text.RichText
anchors.centerIn: parent
text: toTimeString(elapsed.value)
- font.pixelSize: parent.height*0.25
+ font.pixelSize: Dims.h(25)
color: "#FFFFFF"
horizontalAlignment: Text.AlignHCenter
@@ -97,7 +97,6 @@ Application {
MouseArea {
anchors.fill: parent
onClicked: {
- console.log("from:" + mainPage.state + " " + elapsed.value + " " + running.value + " " + previousTime.value)
switch(mainPage.state) {
case "zero":
case "paused":
@@ -109,7 +108,6 @@ Application {
running.value = false
break;
}
- console.log("from:" + mainPage.state + " " + elapsed.value + " " + running.value + " " + previousTime.value)
}
}
@@ -124,7 +122,7 @@ Application {
anchors {
horizontalCenter: parent.horizontalCenter
- topMargin: Units.dp(8)
+ topMargin: Dims.iconButtonMargin
top: parent.top
}