git.iko.soy/unity8
on xenial help sign in
Remove spinner; design didn't like it and it complicates other UI changes down the line
commitaacb4a30581aaaf65cd26d9c4496a3ef81651bd7 authorMichael Terry <michael.terry@canonical.com> dateWed 13 Aug 2014, 09:59 (12 years ago) parent20f2276
3 files changed+2−23
compare with xenial
unifiedsplit
qml/Components/Lockscreen.qml−5 qml/Components/PassphraseLockscreen.qml−9 qml/Components/PinLockscreen.qml+2−9
qml/Components/Lockscreen.qml−5
@@ -208,11 +208,6 @@ Showable {
208208 property: "entryEnabled"
209209 value: !pinPadLoader.waiting && !forcedDelayTimer.running
210210 }
211− Binding {
212− target: pinPadLoader.item
213− property: "waiting"
214− value: pinPadLoader.waiting
215− }
216211 }
217212
218213 Column {
qml/Components/PassphraseLockscreen.qml−9
@@ -25,7 +25,6 @@ Item {
2525 property string placeholderText
2626 property string username: ""
2727 property bool entryEnabled: true
28− property bool waiting: false
2928
3029 signal entered(string passphrase)
3130 signal cancel()
@@ -84,14 +83,6 @@ Item {
8483 root.entered(pinentryField.text);
8584 }
8685 }
87−
88− ActivityIndicator {
89− id: spinner
90− anchors.verticalCenter: parent.verticalCenter
91− anchors.right: parent.right
92− anchors.rightMargin: units.gu(1)
93− running: root.waiting
94− }
9586 }
9687 }
9788
qml/Components/PinLockscreen.qml+2−9
@@ -34,7 +34,6 @@ Column {
3434 signal cancel()
3535
3636 property bool entryEnabled: true
37− property bool waiting: false
3837
3938 function clear(playAnimation) {
4039 pinentryField.text = "";
@@ -75,11 +74,6 @@ Column {
7574 }
7675 }
7776
78− ActivityIndicator {
79− id: spinner
80− anchors.centerIn: parent
81− running: root.waiting
82− }
8377 Label {
8478 id: pinentryFieldLabel
8579 anchors.centerIn: parent
@@ -89,7 +83,6 @@ Column {
8983 font.pixelSize: units.dp(44)
9084 color: "#f3f3e7"
9185 opacity: 0.6
92− visible: !spinner.running
9386 }
9487 Label {
9588 id: pinentryFieldPlaceHolder
@@ -99,7 +92,7 @@ Column {
9992 color: "#f3f3e7"
10093 opacity: 0.6
10194 text: parent.placeholderText
102− visible: !spinner.running && pinentryFieldLabel.text.length == 0
95+ visible: pinentryFieldLabel.text.length == 0
10396 }
10497
10598 Icon {
@@ -113,7 +106,7 @@ Column {
113106 bottom: parent.bottom
114107 bottomMargin: units.gu(1)
115108 }
116− visible: !spinner.running && entryEnabled && !priv.autoConfirm
109+ visible: entryEnabled && !priv.autoConfirm
117110 width: height
118111 name: "erase"
119112 color: "#f3f3e7"