diff options
author | Weblate <noreply@weblate.org> | 2017-11-09 07:53:45 +0100 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-11-09 07:53:45 +0100 |
commit | 5d3db2e41d9be38d3eecb8738fbcfc021b6ae173 (patch) | |
tree | 29e35994a6639a9eece6436498a316c76f20a22a | |
parent | ae51112a70dbeb3c3def30e6ea94d40533ee0c67 (diff) | |
parent | b7dd6c0e03f96e0cc87aba9c38678a2c1b887fc8 (diff) |
Merge remote-tracking branch 'origin/master'
-rw-r--r-- | main.qml | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -76,13 +76,12 @@ Application { State { name: "paused" } ] - Text { + Label { id: elapsedLabel textFormat: Text.RichText anchors.centerIn: parent text: toTimeString(elapsed.value) font.pixelSize: Dims.h(25) - color: "#FFFFFF" horizontalAlignment: Text.AlignHCenter SequentialAnimation { @@ -113,19 +112,9 @@ Application { IconButton { id: resetButton - iconColor: "white" - pressedIconColor: "lightgrey" iconName: "ios-refresh" visible: mainPage.state === "paused" - - hovered: false - - anchors { - horizontalCenter: parent.horizontalCenter - topMargin: Dims.iconButtonMargin - top: parent.top - } - + edge: Qt.TopEdge onClicked: elapsed.value = -1 } } |