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
aacb4a3Michael Terry
qml/Components/Lockscreen.qml−5
compare with xenial
unifiedsplit
@@ -208,11 +208,6 @@ Showable {
208 property: "entryEnabled"
208 property: "entryEnabled"
209 value: !pinPadLoader.waiting && !forcedDelayTimer.running
209 value: !pinPadLoader.waiting && !forcedDelayTimer.running
210 }
210 }
211− Binding {
212− target: pinPadLoader.item
213− property: "waiting"
214− value: pinPadLoader.waiting
215− }
216 }
211 }
217
212
218 Column {
213 Column {
qml/Components/PassphraseLockscreen.qml−9
@@ -25,7 +25,6 @@ Item {
25 property string placeholderText
25 property string placeholderText
26 property string username: ""
26 property string username: ""
27 property bool entryEnabled: true
27 property bool entryEnabled: true
28− property bool waiting: false
29
28
30 signal entered(string passphrase)
29 signal entered(string passphrase)
31 signal cancel()
30 signal cancel()
@@ -84,14 +83,6 @@ Item {
84 root.entered(pinentryField.text);
83 root.entered(pinentryField.text);
85 }
84 }
86 }
85 }
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− }
95 }
86 }
96 }
87 }
97
88
qml/Components/PinLockscreen.qml+2−9
@@ -34,7 +34,6 @@ Column {
34 signal cancel()
34 signal cancel()
35
35
36 property bool entryEnabled: true
36 property bool entryEnabled: true
37− property bool waiting: false
38
37
39 function clear(playAnimation) {
38 function clear(playAnimation) {
40 pinentryField.text = "";
39 pinentryField.text = "";
@@ -75,11 +74,6 @@ Column {
75 }
74 }
76 }
75 }
77
76
78− ActivityIndicator {
79− id: spinner
80− anchors.centerIn: parent
81− running: root.waiting
82− }
83 Label {
77 Label {
84 id: pinentryFieldLabel
78 id: pinentryFieldLabel
85 anchors.centerIn: parent
79 anchors.centerIn: parent
@@ -89,7 +83,6 @@ Column {
89 font.pixelSize: units.dp(44)
83 font.pixelSize: units.dp(44)
90 color: "#f3f3e7"
84 color: "#f3f3e7"
91 opacity: 0.6
85 opacity: 0.6
92− visible: !spinner.running
93 }
86 }
94 Label {
87 Label {
95 id: pinentryFieldPlaceHolder
88 id: pinentryFieldPlaceHolder
@@ -99,7 +92,7 @@ Column {
99 color: "#f3f3e7"
92 color: "#f3f3e7"
100 opacity: 0.6
93 opacity: 0.6
101 text: parent.placeholderText
94 text: parent.placeholderText
102− visible: !spinner.running && pinentryFieldLabel.text.length == 0
95+ visible: pinentryFieldLabel.text.length == 0
103 }
96 }
104
97
105 Icon {
98 Icon {
@@ -113,7 +106,7 @@ Column {
113 bottom: parent.bottom
106 bottom: parent.bottom
114 bottomMargin: units.gu(1)
107 bottomMargin: units.gu(1)
115 }
108 }
116− visible: !spinner.running && entryEnabled && !priv.autoConfirm
109+ visible: entryEnabled && !priv.autoConfirm
117 width: height
110 width: height
118 name: "erase"
111 name: "erase"
119 color: "#f3f3e7"
112 color: "#f3f3e7"