aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2017-11-09 07:53:45 +0100
committerWeblate <noreply@weblate.org>2017-11-09 07:53:45 +0100
commit5d3db2e41d9be38d3eecb8738fbcfc021b6ae173 (patch)
tree29e35994a6639a9eece6436498a316c76f20a22a
parentae51112a70dbeb3c3def30e6ea94d40533ee0c67 (diff)
parentb7dd6c0e03f96e0cc87aba9c38678a2c1b887fc8 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--main.qml15
1 files changed, 2 insertions, 13 deletions
diff --git a/main.qml b/main.qml
index d646c17..c1926e5 100644
--- a/main.qml
+++ b/main.qml
@@ -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
}
}