[app] Tweaking the "Loading..." screen
This commit is contained in:
parent
34f8070d8d
commit
0220a2c79a
1 changed files with 16 additions and 16 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2015 Jolla Ltd.
|
Copyright (C) 2015-2016 Jolla Ltd.
|
||||||
Contact: Slava Monich <slava.monich@jolla.com>
|
Contact: Slava Monich <slava.monich@jolla.com>
|
||||||
|
|
||||||
You may use this file under the terms of BSD license as follows:
|
You may use this file under the terms of BSD license as follows:
|
||||||
|
@ -219,21 +219,6 @@ SilicaFlickable {
|
||||||
opacity: (_loading && bookModel.progress > 0) ? 1 : 0
|
opacity: (_loading && bookModel.progress > 0) ? 1 : 0
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
|
||||||
anchors {
|
|
||||||
bottom: busyIndicator.top
|
|
||||||
bottomMargin: Theme.paddingLarge
|
|
||||||
horizontalCenter: busyIndicator.horizontalCenter
|
|
||||||
|
|
||||||
}
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
|
||||||
color: Theme.highlightColor
|
|
||||||
opacity: _loading ? 1 : 0
|
|
||||||
visible: opacity > 0
|
|
||||||
Behavior on opacity { FadeAnimation {} }
|
|
||||||
text: bookModel ? _loadingTextLabel[bookModel.resetReason] : ""
|
|
||||||
}
|
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
//% "Cancel"
|
//% "Cancel"
|
||||||
text: qsTrId("book-view-cancel-loading")
|
text: qsTrId("book-view-cancel-loading")
|
||||||
|
@ -248,4 +233,19 @@ SilicaFlickable {
|
||||||
opacity: enabled ? 1.0 : 0.0
|
opacity: enabled ? 1.0 : 0.0
|
||||||
Behavior on opacity { FadeAnimation { } }
|
Behavior on opacity { FadeAnimation { } }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Label {
|
||||||
|
anchors {
|
||||||
|
top: busyIndicator.bottom
|
||||||
|
topMargin: Theme.paddingLarge
|
||||||
|
horizontalCenter: busyIndicator.horizontalCenter
|
||||||
|
|
||||||
|
}
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
color: Theme.highlightColor
|
||||||
|
opacity: _loading ? 1 : 0
|
||||||
|
visible: opacity > 0
|
||||||
|
Behavior on opacity { FadeAnimation {} }
|
||||||
|
text: bookModel ? _loadingTextLabel[bookModel.resetReason] : ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue