8a968c8 · unity8 · git.iko.soy

git.iko.soy/unity8

More fixes/cleanup

commit8a968c8e227c5ad4cf1e033a84eb2915a979e99a authorMichael Terry <michael.terry@canonical.com> dateSun 1 Feb 2015, 14:53 (12 years ago) parente372307

9 files changed+35−30

compare with xenial

unifiedsplit

qml/Greeter/CoverPage.qml+2 qml/Greeter/Greeter.qml+19−10 qml/Greeter/LoginList.qml−1 qml/Shell.qml+1−3 tests/mocks/libusermetrics/UserMetrics.cpp−1 tests/qmltests/Dash/tst_DashContent.qml+1−1 tests/qmltests/Greeter/tst_Greeter.qml+4−1 tests/qmltests/Greeter/tst_WideView.qml+4−2 tests/qmltests/tst_ShellWithPin.qml+4−11

qml/Greeter/CoverPage.qml+2

@@ -55,6 +55,8 @@ Showable {

5555 // We don't directly bind "x" because that's owned by the DragHandle. So

5656 // instead, we can get a little extra horizontal push by using transforms.

5757 transform: Translate { id: translation; x: root.draggable ? launcherOffset : 0 }

58+

59+ MouseArea { anchors.fill: parent; }

5860

5961 Rectangle {

6062 // In case background fails to load

qml/Greeter/Greeter.qml+19−10

@@ -19,6 +19,7 @@ import AccountsService 0.1

1919import LightDM 0.1 as LightDM

2020import Ubuntu.Components 1.1

2121import Ubuntu.SystemImage 0.1

22+import Unity.Connectivity 0.1

2223import Unity.Launcher 0.1

2324import "../Components"

2425

@@ -56,6 +57,11 @@ Showable {

5657 signal sessionStarted()

5758 signal emergencyCall()

5859

60+ function forceShow() {

61+ showNow();

62+ loader.item.reset();

63+ }

64+

5965 function notifyAppFocused(appId) {

6066 if (!active) {

6167 return;

@@ -120,9 +126,11 @@ Showable {

120126 StandardAnimation {}

121127 }

122128

123− function selectUser(uid) {

129+ function selectUser(uid, reset) {

124130 d.waiting = true;

125− loader.item.reset();

131+ if (reset) {

132+ loader.item.reset();

133+ }

126134 currentIndex = uid;

127135 var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

128136 AccountsService.user = user;

@@ -162,6 +170,10 @@ Showable {

162170 }

163171 }

164172

173+ Component.onCompleted: {

174+ Connectivity.unlockAllModems();

175+ }

176+

165177 Timer {

166178 id: forcedDelayTimer

167179 interval: 1000 * 60

@@ -192,14 +204,14 @@ Showable {

192204 onLoaded: {

193205 root.lockedApp = "";

194206 root.forceActiveFocus();

195− d.selectUser(d.currentIndex);

207+ d.selectUser(d.currentIndex, true);

196208 LightDM.Infographic.readyForDataChange();

197209 }

198210

199211 Connections {

200212 target: loader.item

201213 onSelected: {

202− d.selectUser(index);

214+ d.selectUser(index, true);

203215 }

204216 onResponded: {

205217 if (root.locked) {

@@ -284,10 +296,7 @@ Showable {

284296 Connections {

285297 target: LightDM.Greeter

286298

287− onShowGreeter: {

288− root.show();

289− loader.item.reset();

290− }

299+ onShowGreeter: root.forceShow()

291300

292301 onHideGreeter: {

293302 d.login();

@@ -352,7 +361,7 @@ Showable {

352361

353362 loader.item.authenticated(false);

354363 if (!LightDM.Greeter.promptless) {

355− d.selectUser(d.currentIndex);

364+ d.selectUser(d.currentIndex, false);

356365 }

357366 }

358367 }

@@ -361,7 +370,7 @@ Showable {

361370 // Find index for requested user, if it exists

362371 for (var i = 0; i < LightDM.Users.count; i++) {

363372 if (user === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {

364− d.selectUser(i);

373+ d.selectUser(i, true);

365374 return;

366375 }

367376 }

qml/Greeter/LoginList.qml−1

@@ -230,7 +230,6 @@ Item {

230230 height: units.gu(4.5)

231231 width: parent.width - anchors.margins * 2

232232 opacity: userList.movingInternally ? 0 : 1

233− enabled: root.wasPrompted

234233

235234 property string promptText

236235 placeholderText: root.wasPrompted ? promptText

qml/Shell.qml+1−3

@@ -23,7 +23,6 @@ import Ubuntu.Components 0.1

2323import Ubuntu.Components.Popups 1.0

2424import Ubuntu.Gestures 0.1

2525import Ubuntu.Telephony 0.1 as Telephony

26−import Unity.Connectivity 0.1

2726import Unity.Launcher 0.1

2827import Utils 0.1

2928import LightDM 0.1 as LightDM

@@ -139,7 +138,6 @@ Item {

139138 if (orientationLockEnabled) {

140139 orientation = OrientationLock.savedOrientation;

141140 }

142− Connectivity.unlockAllModems();

143141 }

144142

145143 VolumeControl {

@@ -373,7 +371,7 @@ Item {

373371 id: showGreeterDelayed

374372 interval: 1

375373 onTriggered: {

376− greeter.showNow();

374+ greeter.forceShow();

377375 }

378376 }

379377

tests/mocks/libusermetrics/UserMetrics.cpp−1

@@ -26,7 +26,6 @@

2626

2727#include <functional>

2828#include <random>

29−#include <QDebug>

3029

3130using namespace UserMetricsOutput;

3231

tests/qmltests/Dash/tst_DashContent.qml+1−1

@@ -71,7 +71,7 @@ Item {

7171 scopeLoadedSpy.clear();

7272 scopesModel.load();

7373 tryCompare(scopeLoadedSpy, "count", 6, 15000);

74− tryCompare(scopesModel, "loaded", true, 1000, typeof scopesModel.loaded);

74+ tryCompare(scopesModel, "loaded", true);

7575 tryCompareFunction(function() {

7676 var mockScope1Loader = findChild(shell, "scopeLoader0");

7777 return mockScope1Loader && mockScope1Loader.item != null; },

tests/qmltests/Greeter/tst_Greeter.qml+4−1

@@ -430,11 +430,14 @@ Item {

430430

431431 function test_dbusShowGreeterFromShownState() {

432432 selectUser("has-password");

433+ compare(viewResetSpy.count, 1);

433434 tryCompare(viewShowPromptSpy, "count", 1);

435+

436+ viewResetSpy.clear();

434437 viewShowPromptSpy.clear();

438+

435439 LightDM.Greeter.showGreeter();

436440 compare(viewResetSpy.count, 1);

437− tryCompare(viewShowPromptSpy, "count", 1);

438441 }

439442 }

440443}

tests/qmltests/Greeter/tst_WideView.qml+4−2

@@ -397,10 +397,12 @@ Item {

397397

398398 compare(selectedSpy.count, 0);

399399 keyClick(Qt.Key_Escape);

400− compare(passwordInput.focus, false);

401− compare(passwordInput.enabled, true);

402400 compare(selectedSpy.count, 1);

403401 compare(selectedSpy.signalArguments[0][0], 1);

402+

403+ view.reset();

404+ compare(passwordInput.focus, false);

405+ compare(passwordInput.enabled, true);

404406 }

405407

406408 function test_unicode() {

tests/qmltests/tst_ShellWithPin.qml+4−11

@@ -81,15 +81,7 @@ Item {

8181 Button {

8282 anchors { left: parent.left; right: parent.right }

8383 text: "Show Greeter"

84− onClicked: {

85− if (shellLoader.status !== Loader.Ready)

86− return

87−

88− var greeter = testCase.findChild(shellLoader.item, "greeter")

89− if (!greeter.shown) {

90− greeter.show()

91− }

92− }

84+ onClicked: LightDM.Greeter.showGreeter()

9385 }

9486

9587 Label {

@@ -191,7 +183,8 @@ Item {

191183 function swipeAwayGreeter(waitForCoverPage) {

192184 var greeter = findChild(shell, "greeter");

193185 waitForRendering(greeter)

194− tryCompare(greeter, "fullyShown", true);

186+ var coverPage = findChild(shell, "coverPage");

187+ tryCompare(coverPage, "showProgress", 1);

195188

196189 var touchX = shell.width - (shell.edgeSize / 2);

197190 var touchY = shell.height / 2;

@@ -212,10 +205,10 @@ Item {

212205 }

213206

214207 function enterPin(pin) {

215− var inputField = findChild(shell, "pinentryField")

216208 for (var i = 0; i < pin.length; ++i) {

217209 var character = pin.charAt(i)

218210 var button = findChild(shell, "pinPadButton" + character)

211+ tryCompare(button, "enabled", true);

219212 tap(button)

220213 }

221214 }