e3cbeff · unity8 · git.iko.soy

cmake/modules/QmlTest.cmake+1−1

compare with xenial

unifiedsplit

@@ -135,7 +135,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

135 set(testCommand

136 LD_LIBRARY_PATH=${LD_PATH}

137 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

138− -o ${CMAKE_BINARY_DIR}/${CLASSNAME}Test.xml,xunitxml

138+ -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml

139 -o -,txt)

140

141 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)

debian/changelog+45

@@ -1,3 +1,48 @@

1+unity8 (8.00+14.10.20140731.1-0ubuntu1) utopic; urgency=low

2+

3+ [ Gerry Boland ]

4+ * Fix the run.sh script - pretend to be running with qtmir and emit

5+ SIGSTOP at the right time

6+

7+ [ Ying-Chun Liu ]

8+ * Implement Attribute UI. (LP: #1282460)

9+

10+ [ Albert Astals ]

11+ * Hide search history popup as soon as you start typing As discussed

12+ with Mike and Saviq

13+ * Compile with for scopes-v3 unity-api

14+ * PageHeader: Unfocus search field when search entry is selected

15+ * Show search field if the search query changes

16+ * Test: Add a condition for art.height being > 0 means stuff has

17+ already been layouted a bit without it it can happen that we get 0

18+ for everything at startup and tests still pass

19+ * Remove leftover in test of an old headerless implementation

20+

21+ [ Michael Zanetti ]

22+ * Drop Recent apps category from Dash (LP: #1281092)

23+ * update launcher count emblems to match new spec (LP: #1338984)

24+

25+ [ Bill Filler ]

26+ * disable predictive text for dash search field (LP: #1340409)

27+

28+ [ CI bot ]

29+ * Resync trunk

30+

31+ [ Antti Kaijanmäki ]

32+ * DefaultIndicatorPage: use Loader status to determine the visible

33+ property. (LP: #1350555)

34+

35+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 31 Jul 2014 16:51:01 +0000

36+

37+unity8 (8.00+14.10.20140729.1-0ubuntu1) utopic; urgency=low

38+

39+ [ Michael Terry ]

40+ * Check user's pin/password using PAM, instead of a plaintext keyfile.

41+ New build dependency: libpam0g-dev for phone unlock with PAM (LP:

42+ #1234983)

43+

44+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 29 Jul 2014 23:36:30 +0000

45+

1unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium

46unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium

2

47

3 [ Gerry Boland ]

48 [ Gerry Boland ]

debian/control+2−1

@@ -19,11 +19,12 @@ Build-Depends: cmake,

19 libgsettings-qt-dev,

20 libhardware-dev,

21 libhud-client2-dev,

22+ libpam0g-dev,

22 libpay2-dev,

23 libpay2-dev,

23 libpulse-dev,

24 libpulse-dev,

24 libqmenumodel-dev (>= 0.2.8),

25 libqmenumodel-dev (>= 0.2.8),

25 libqt5xmlpatterns5-dev,

26 libqt5xmlpatterns5-dev,

26− libunity-api-dev (>= 7.85),

27+ libunity-api-dev (>= 7.87),

27 libusermetricsoutput1-dev,

28 libusermetricsoutput1-dev,

28 libxcb1-dev,

29 libxcb1-dev,

29 pkg-config,

30 pkg-config,

plugins/AccountsService/AccountsService.cpp+21−1

@@ -26,7 +26,8 @@ AccountsService::AccountsService(QObject* parent)

26 m_service(new AccountsServiceDBusAdaptor(this)),

27 m_user(qgetenv("USER")),

28 m_demoEdges(false),

29− m_statsWelcomeScreen(false)

29+ m_statsWelcomeScreen(false),

30+ m_passwordDisplayHint(Keyboard)

30{

31{

31 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

32 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

32 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

33 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

@@ -47,6 +48,7 @@ void AccountsService::setUser(const QString &user)

47 updateDemoEdges();

48 updateDemoEdges();

48 updateBackgroundFile();

49 updateBackgroundFile();

49 updateStatsWelcomeScreen();

50 updateStatsWelcomeScreen();

51+ updatePasswordDisplayHint();

50}

52}

51

53

52bool AccountsService::demoEdges() const

54bool AccountsService::demoEdges() const

@@ -70,6 +72,11 @@ bool AccountsService::statsWelcomeScreen() const

70 return m_statsWelcomeScreen;

72 return m_statsWelcomeScreen;

71}

73}

72

74

75+AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

76+{

77+ return m_passwordDisplayHint;

78+}

79+

73void AccountsService::updateDemoEdges()

80void AccountsService::updateDemoEdges()

74{

81{

75 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

82 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

@@ -97,6 +104,15 @@ void AccountsService::updateStatsWelcomeScreen()

97 }

104 }

98}

105}

99

106

107+void AccountsService::updatePasswordDisplayHint()

108+{

109+ PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "PasswordDisplayHint").toInt();

110+ if (m_passwordDisplayHint != passwordDisplayHint) {

111+ m_passwordDisplayHint = passwordDisplayHint;

112+ Q_EMIT passwordDisplayHintChanged();

113+ }

114+}

115+

100void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

116void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

101{

117{

102 if (m_user != user) {

118 if (m_user != user) {

@@ -111,6 +127,10 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte

111 if (changed.contains("StatsWelcomeScreen")) {

127 if (changed.contains("StatsWelcomeScreen")) {

112 updateStatsWelcomeScreen();

128 updateStatsWelcomeScreen();

113 }

129 }

130+ } else if (interface == "com.ubuntu.AccountsService.SecurityPrivacy") {

131+ if (changed.contains("PasswordDisplayHint")) {

132+ updatePasswordDisplayHint();

133+ }

114 }

134 }

115}

135}

116

136

plugins/AccountsService/AccountsService.h+13

@@ -27,6 +27,7 @@ class AccountsServiceDBusAdaptor;

27class AccountsService: public QObject

28{

29 Q_OBJECT

30+ Q_ENUMS(PasswordDisplayHint)

30 Q_PROPERTY (QString user

31 Q_PROPERTY (QString user

31 READ user

32 READ user

32 WRITE setUser

33 WRITE setUser

@@ -41,8 +42,16 @@ class AccountsService: public QObject

41 Q_PROPERTY (bool statsWelcomeScreen

42 Q_PROPERTY (bool statsWelcomeScreen

42 READ statsWelcomeScreen

43 READ statsWelcomeScreen

43 NOTIFY statsWelcomeScreenChanged)

44 NOTIFY statsWelcomeScreenChanged)

45+ Q_PROPERTY (PasswordDisplayHint passwordDisplayHint

46+ READ passwordDisplayHint

47+ NOTIFY passwordDisplayHintChanged)

44

48

45public:

49public:

50+ enum PasswordDisplayHint {

51+ Keyboard,

52+ Numeric,

53+ };

54+

46 explicit AccountsService(QObject *parent = 0);

55 explicit AccountsService(QObject *parent = 0);

47

56

48 QString user() const;

57 QString user() const;

@@ -51,12 +60,14 @@ public:

51 void setDemoEdges(bool demoEdges);

60 void setDemoEdges(bool demoEdges);

52 QString backgroundFile() const;

61 QString backgroundFile() const;

53 bool statsWelcomeScreen() const;

62 bool statsWelcomeScreen() const;

63+ PasswordDisplayHint passwordDisplayHint() const;

54

64

55Q_SIGNALS:

65Q_SIGNALS:

56 void userChanged();

66 void userChanged();

57 void demoEdgesChanged();

67 void demoEdgesChanged();

58 void backgroundFileChanged();

68 void backgroundFileChanged();

59 void statsWelcomeScreenChanged();

69 void statsWelcomeScreenChanged();

70+ void passwordDisplayHintChanged();

60

71

61private Q_SLOTS:

72private Q_SLOTS:

62 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

73 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

@@ -66,12 +77,14 @@ private:

66 void updateDemoEdges();

77 void updateDemoEdges();

67 void updateBackgroundFile();

78 void updateBackgroundFile();

68 void updateStatsWelcomeScreen();

79 void updateStatsWelcomeScreen();

80+ void updatePasswordDisplayHint();

69

81

70 AccountsServiceDBusAdaptor *m_service;

82 AccountsServiceDBusAdaptor *m_service;

71 QString m_user;

83 QString m_user;

72 bool m_demoEdges;

84 bool m_demoEdges;

73 QString m_backgroundFile;

85 QString m_backgroundFile;

74 bool m_statsWelcomeScreen;

86 bool m_statsWelcomeScreen;

87+ PasswordDisplayHint m_passwordDisplayHint;

75};

88};

76

89

77#endif

90#endif

plugins/AccountsService/plugin.cpp+1

@@ -33,5 +33,6 @@ void AccountsServicePlugin::registerTypes(const char *uri)

33{

34 Q_ASSERT(uri == QLatin1String("AccountsService"));

35 qDBusRegisterMetaType<QList<QVariantMap>>();

36+ qRegisterMetaType<AccountsService::PasswordDisplayHint>("AccountsService::PasswordDisplayHint");

36 qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

37 qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

37}

38}

plugins/Dash/CardAttributes.qmlnew file+65

@@ -0,0 +1,65 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.2

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 1.1

20+import Ubuntu.Settings.Components 0.1

21+

22+GridLayout {

23+ id: grid

24+ anchors {

25+ left: parent.left;

26+ right: parent.right;

27+ }

28+ columns: 2 + repeater.count % 2

29+ property alias model: repeater.model

30+ property var color

31+

32+ Repeater {

33+ id: repeater

34+ delegate: Row {

35+ spacing: units.gu(0.5)

36+ readonly property int column: index % grid.columns;

37+ Layout.alignment: {

38+ if (column == 0) return Qt.AlignLeft;

39+ if (column == grid.columns - 1 || index == repeater.count - 1) return Qt.AlignRight;

40+ if (column == 1) return Qt.AlignHCenter;

41+ }

42+ Layout.columnSpan: index == repeater.count - 1 && grid.columns == 3 && column == 1 ? 2 : 1

43+ Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)

44+ Layout.fillWidth: true

45+ StatusIcon {

46+ id: icon

47+ height: units.gu(2)

48+ sets: ["actions", "status", "apps"]

49+ source: "icon" in modelData ? modelData["icon"] : ""

50+ }

51+ Label {

52+ id: label

53+ width: parent.width - x

54+ anchors.verticalCenter: parent.verticalCenter

55+ text: "value" in modelData ? modelData["value"] : "";

56+ elide: Text.ElideRight

57+ maximumLineCount: 1

58+ font.weight: "style" in modelData && modelData["style"] == "highlighted" ? Font.DemiBold : Font.Light

59+ fontSize: "small"

60+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

61+ color: grid.color

62+ }

63+ }

64+ }

65+}

plugins/Dash/CardCreator.js+76−7

@@ -187,6 +187,21 @@ var kHeaderColumnCode = 'Column { \n\

187 ] \n\

188 }\n';

189

190+// multiple column version of kHeaderColumnCode.

191+function kHeaderColumnCodeGenerator() {

192+ var headerColumnCodeTemplate = 'Column { \n\

193+ anchors.verticalCenter: parent.verticalCenter; \n\

194+ spacing: units.dp(2); \n\

195+ width: parent.width - x;\n\

196+ data: [ \n\

197+ %1 \n\

198+ ]\n\

199+ }\n';

200+ var args = Array.prototype.slice.call(arguments);

201+ var code = headerColumnCodeTemplate.arg(args.join(',\n'));

202+ return code;

203+}

204+

190// %1 is used as anchors of mascotShapeLoader

205// %1 is used as anchors of mascotShapeLoader

191var kMascotShapeLoaderCode = 'Loader { \n\

206var kMascotShapeLoaderCode = 'Loader { \n\

192 id: mascotShapeLoader; \n\

207 id: mascotShapeLoader; \n\

@@ -218,7 +233,7 @@ var kMascotImageCode = 'Image { \n\

218 }\n';

233 }\n';

219

234

220// %1 is used as anchors of titleLabel

235// %1 is used as anchors of titleLabel

221−// %1 is used as color of titleLabel

236+// %2 is used as color of titleLabel

222// %3 is used as extra condition for visible of titleLabel

237// %3 is used as extra condition for visible of titleLabel

223var kTitleLabelCode = 'Label { \n\

238var kTitleLabelCode = 'Label { \n\

224 id: titleLabel; \n\

239 id: titleLabel; \n\

@@ -252,6 +267,15 @@ var kSubtitleLabelCode = 'Label { \n\

252 horizontalAlignment: root.headerAlignment; \n\

267 horizontalAlignment: root.headerAlignment; \n\

253 }\n';

268 }\n';

254

269

270+// %1 is used as anchors of attributesRow

271+var kAttributesRowCode = 'CardAttributes { \n\

272+ id: attributesRow; \n\

273+ objectName: "attributesRow"; \n\

274+ anchors { %1 } \n\

275+ color: %2; \n\

276+ model: cardData && cardData["attributes"] || undefined; \n\

277+ }\n';

278+

255// %1 is used as top anchor of summary

279// %1 is used as top anchor of summary

256// %2 is used as topMargin anchor of summary

280// %2 is used as topMargin anchor of summary

257// %3 is used as color of summary

281// %3 is used as color of summary

@@ -302,6 +326,7 @@ function cardString(template, components) {

302 var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);

326 var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);

303 var hasSubtitle = hasTitle && components["subtitle"] || false;

327 var hasSubtitle = hasTitle && components["subtitle"] || false;

304 var hasHeaderRow = hasMascot && hasTitle;

328 var hasHeaderRow = hasMascot && hasTitle;

329+ var hasAttributes = hasTitle && components["attributes"] || false;

305

330

306 if (hasBackground) {

331 if (hasBackground) {

307 code += kBackgroundLoaderCode;

332 code += kBackgroundLoaderCode;

@@ -371,6 +396,14 @@ function cardString(template, components) {

371 code += 'readonly property int headerHeight: row.height;\n'

396 code += 'readonly property int headerHeight: row.height;\n'

372 } else if (hasMascot) {

397 } else if (hasMascot) {

373 code += 'readonly property int headerHeight: mascotImage.height;\n'

398 code += 'readonly property int headerHeight: mascotImage.height;\n'

399+ } else if (hasAttributes) {

400+ if (hasTitle && hasSubtitle) {

401+ code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'

402+ } else if (hasTitle) {

403+ code += 'readonly property int headerHeight: titleLabel.height + attributesRow.height + attributesRow.anchors.topMargin;\n'

404+ } else {

405+ code += 'readonly property int headerHeight: attributesRow.height;\n'

406+ }

374 } else if (hasSubtitle) {

407 } else if (hasSubtitle) {

375 code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'

408 code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'

376 } else if (hasTitle) {

409 } else if (hasTitle) {

@@ -419,10 +452,12 @@ function cardString(template, components) {

419

452

420 var titleAnchors;

453 var titleAnchors;

421 var subtitleAnchors;

454 var subtitleAnchors;

455+ var attributesAnchors;

422− if (hasMascot && hasSubtitle) {

456+ if (hasMascot && (hasSubtitle || hasAttributes)) {

423 // Using row + column

457 // Using row + column

424 titleAnchors = 'left: parent.left; right: parent.right';

458 titleAnchors = 'left: parent.left; right: parent.right';

425 subtitleAnchors = titleAnchors;

459 subtitleAnchors = titleAnchors;

460+ attributesAnchors = subtitleAnchors;

426 } else if (hasMascot) {

461 } else if (hasMascot) {

427 // Using row + label

462 // Using row + label

428 titleAnchors = 'verticalCenter: parent.verticalCenter;\n'

463 titleAnchors = 'verticalCenter: parent.verticalCenter;\n'

@@ -432,11 +467,13 @@ function cardString(template, components) {

432 titleAnchors = 'left: parent.left; \n\

467 titleAnchors = 'left: parent.left; \n\

433 leftMargin: units.gu(1); \n\

468 leftMargin: units.gu(1); \n\

434 right: parent.right; \n\

469 right: parent.right; \n\

470+ rightMargin: units.gu(1); \n\

435 top: overlayLoader.top; \n\

471 top: overlayLoader.top; \n\

436 topMargin: units.gu(1);\n';

472 topMargin: units.gu(1);\n';

437 } else {

473 } else {

438 // Using anchors to the mascot/parent

474 // Using anchors to the mascot/parent

439− titleAnchors = "right: parent.right;";

475+ titleAnchors = "right: parent.right;\n";

476+ titleAnchors += "rightMargin: units.gu(1);\n";

440 titleAnchors += headerLeftAnchor;

477 titleAnchors += headerLeftAnchor;

441 titleAnchors += headerVerticalAnchors;

478 titleAnchors += headerVerticalAnchors;

442 if (!headerLeftAnchorHasMargin) {

479 if (!headerLeftAnchorHasMargin) {

@@ -446,8 +483,19 @@ function cardString(template, components) {

446 subtitleAnchors = 'left: titleLabel.left; \n\

483 subtitleAnchors = 'left: titleLabel.left; \n\

447 leftMargin: titleLabel.leftMargin; \n\

484 leftMargin: titleLabel.leftMargin; \n\

448 right: titleLabel.right; \n\

485 right: titleLabel.right; \n\

486+ rightMargin: titleLabel.rightMargin; \n\

449 top: titleLabel.bottom; \n\

487 top: titleLabel.bottom; \n\

450 topMargin: units.dp(2);\n';

488 topMargin: units.dp(2);\n';

489+ if (hasSubtitle) {

490+ attributesAnchors = 'left: subtitleLabel.left; \n\

491+ leftMargin: subtitleLabel.leftMargin; \n\

492+ right: subtitleLabel.right; \n\

493+ rightMargin: subtitleLabel.rightMargin; \n\

494+ top: subtitleLabel.bottom; \n\

495+ topMargin: units.dp(2);\n';

496+ } else {

497+ attributesAnchors = subtitleAnchors;

498+ }

451 }

499 }

452

500

453 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');

501 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');

@@ -457,11 +505,27 @@ function cardString(template, components) {

457 subtitleCode += kSubtitleLabelCode.arg(subtitleAnchors).arg(color);

505 subtitleCode += kSubtitleLabelCode.arg(subtitleAnchors).arg(color);

458 }

506 }

459

507

460− if (hasMascot && hasSubtitle) {

508+ if (hasMascot && (hasSubtitle || hasAttributes)) {

461 // If using row + column wrap the code in the column

509 // If using row + column wrap the code in the column

462 titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);

510 titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);

511+ if (hasSubtitle && hasAttributes) {

512+ var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);

513+ titleSubtitleCode = kHeaderColumnCodeGenerator(titleCode, subtitleCode, attributesCode);

514+ } else if (hasSubtitle) {

515+ titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);

516+ } else if (hasAttributes) {

517+ var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);

518+ titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(attributesCode);

519+ }

463 } else {

520 } else {

464− titleSubtitleCode = titleCode + subtitleCode;

521+ titleSubtitleCode = titleCode;

522+ if (hasSubtitle) {

523+ titleSubtitleCode = titleSubtitleCode + subtitleCode;

524+ }

525+ if (hasAttributes) {

526+ var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);

527+ titleSubtitleCode = titleSubtitleCode + attributesCode;

528+ }

465 }

529 }

466 }

530 }

467

531

@@ -481,6 +545,7 @@ function cardString(template, components) {

481 else if (headerAsOverlay && hasArt) summaryTopAnchor = "artShapeHolder.bottom";

545 else if (headerAsOverlay && hasArt) summaryTopAnchor = "artShapeHolder.bottom";

482 else if (hasHeaderRow) summaryTopAnchor = "row.bottom";

546 else if (hasHeaderRow) summaryTopAnchor = "row.bottom";

483 else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";

547 else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";

548+ else if (hasAttributes) summaryTopAnchor = "attributesRow.bottom";

484 else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";

549 else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";

485 else if (hasTitle) summaryTopAnchor = "titleLabel.bottom";

550 else if (hasTitle) summaryTopAnchor = "titleLabel.bottom";

486 else if (hasArt) summaryTopAnchor = "artShapeHolder.bottom";

551 else if (hasArt) summaryTopAnchor = "artShapeHolder.bottom";

@@ -493,7 +558,7 @@ function cardString(template, components) {

493 color = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';

558 color = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';

494 }

559 }

495

560

496− var summaryTopMargin = (hasMascot || hasSubtitle ? 'anchors.margins' : '0');

561+ var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');

497

562

498 code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);

563 code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);

499 }

564 }

@@ -504,6 +569,8 @@ function cardString(template, components) {

504 code += 'implicitHeight: row.y + row.height + units.gu(1);\n';

569 code += 'implicitHeight: row.y + row.height + units.gu(1);\n';

505 } else if (hasMascot) {

570 } else if (hasMascot) {

506 code += 'implicitHeight: mascotImage.y + mascotImage.height;\n';

571 code += 'implicitHeight: mascotImage.y + mascotImage.height;\n';

572+ } else if (hasAttributes) {

573+ code += 'implicitHeight: attributesRow.y + attributesRow.height + units.gu(1);\n';

507 } else if (hasSubtitle) {

574 } else if (hasSubtitle) {

508 code += 'implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';

575 code += 'implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';

509 } else if (hasTitle) {

576 } else if (hasTitle) {

@@ -520,8 +587,10 @@ function cardString(template, components) {

520function createCardComponent(parent, template, components) {

587function createCardComponent(parent, template, components) {

521 var imports = 'import QtQuick 2.2; \n\

588 var imports = 'import QtQuick 2.2; \n\

522 import Ubuntu.Components 0.1; \n\

589 import Ubuntu.Components 0.1; \n\

523− import Ubuntu.Thumbnailer 0.1;\n';

590+ import Ubuntu.Thumbnailer 0.1;\n\

591+ import Dash 0.1;\n';

524 var card = cardString(template, components);

592 var card = cardString(template, components);

525 var code = imports + 'Component {\n' + card + '}\n';

593 var code = imports + 'Component {\n' + card + '}\n';

594+

526 return Qt.createQmlObject(code, parent, "createCardComponent");

595 return Qt.createQmlObject(code, parent, "createCardComponent");

527}

596}

plugins/Dash/qmldir+1

@@ -3,3 +3,4 @@ plugin Dash-qml

3typeinfo Dash.qmltypes

4singleton CardCreatorCache 0.1 CardCreatorCache.qml

5ScopeStyle 0.1 ScopeStyle.qml

6+CardAttributes 0.1 CardAttributes.qml

plugins/LightDM/plugin.cpp+2

@@ -69,6 +69,8 @@ void LightDMPlugin::registerTypes(const char *uri)

69 qmlRegisterType<UserMetricsOutput::ColorTheme>();

70

71 Q_ASSERT(uri == QLatin1String("LightDM"));

72+ qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

73+ qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

72 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

74 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

73 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

75 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

74 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");

76 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");

po/da.po+4−4

@@ -9,13 +9,13 @@ msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11"POT-Creation-Date: 2014-07-11 14:59+0200\n"

12−"PO-Revision-Date: 2014-07-29 23:18+0000\n"

12+"PO-Revision-Date: 2014-07-30 12:37+0000\n"

13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

15"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

18−"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"

18+"X-Launchpad-Export-Date: 2014-07-31 07:15+0000\n"

19"X-Generator: Launchpad (build 17131)\n"

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

@@ -114,7 +114,7 @@ msgstr "Seneste"

114

115#: qml/Dash/GenericScopeView.qml:330

116msgid "See all"

117−msgstr ""

117+msgstr "Se alle"

118

119#: qml/Dash/Previews/PreviewActionCombo.qml:34

120msgid "More..."

@@ -170,7 +170,7 @@ msgstr "Indtast venligst PIN for SIM"

170

171#: qml/Panel/ActiveCallHint.qml:77

172msgid "Tap to return to call..."

173−msgstr ""

173+msgstr "Tryk for at besvare opkaldet..."

174

175#: qml/Panel/ActiveCallHint.qml:90

176msgid "Conference"

po/hu.po+4−4

@@ -8,13 +8,13 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-07-27 15:04+0000\n"

11+"PO-Revision-Date: 2014-07-30 18:42+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-28 06:44+0000\n"

17+"X-Launchpad-Export-Date: 2014-07-31 07:15+0000\n"

18"X-Generator: Launchpad (build 17131)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

@@ -82,7 +82,7 @@ msgstr "Vészhívás"

82

83#: qml/Components/Lockscreen.qml:231

84msgid "OK"

85−msgstr "OK"

85+msgstr "Oké"

86

87#: qml/Components/PassphraseLockscreen.qml:60

88#, qt-format

@@ -127,7 +127,7 @@ msgstr "Kevesebb…"

127

128#: qml/Dash/Previews/PreviewRatingInput.qml:81

129msgid "Rate this"

130−msgstr "Osztályzás"

130+msgstr "Értékelje"

131

132#: qml/Dash/Previews/PreviewRatingInput.qml:126

133msgid "Add a review"

po/ru.po+12−12

@@ -8,13 +8,13 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-05-15 12:57+0000\n"

11+"PO-Revision-Date: 2014-07-30 12:49+0000\n"

12−"Last-Translator: Zonov Roman <Unknown>\n"

12+"Last-Translator: Jay ZDLin <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-26 07:17+0000\n"

17+"X-Launchpad-Export-Date: 2014-07-31 07:15+0000\n"

18"X-Generator: Launchpad (build 17131)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

@@ -85,7 +85,7 @@ msgstr "Экстренный вызов"

85

86#: qml/Components/Lockscreen.qml:231

87msgid "OK"

88−msgstr ""

88+msgstr "ОК"

89

90#: qml/Components/PassphraseLockscreen.qml:60

91#, qt-format

@@ -98,11 +98,11 @@ msgstr "Привет"

98

99#: qml/Components/PinLockscreen.qml:198

100msgid "CANCEL"

101−msgstr ""

101+msgstr "ОТМЕНИТЬ"

102

103#: qml/Components/PinLockscreen.qml:216

104msgid "DONE"

105−msgstr ""

105+msgstr "ГОТОВО"

106

107#: qml/Components/SeeMore.qml:35

108msgid "See more"

@@ -118,7 +118,7 @@ msgstr "Недавние"

118

119#: qml/Dash/GenericScopeView.qml:330

120msgid "See all"

121−msgstr ""

121+msgstr "Показать всё"

122

123#: qml/Dash/Previews/PreviewActionCombo.qml:34

124msgid "More..."

@@ -178,15 +178,15 @@ msgstr ""

178

179#: qml/Panel/ActiveCallHint.qml:90

180msgid "Conference"

181−msgstr ""

181+msgstr "Конференция"

182

183#: qml/Panel/Indicators/MenuItemFactory.qml:583

184msgid "In queue…"

185−msgstr ""

185+msgstr "В очереди..."

186

187#: qml/Panel/Indicators/MenuItemFactory.qml:587

188msgid "Downloading"

189−msgstr ""

189+msgstr "Загрузка"

190

191#: qml/Panel/Indicators/MenuItemFactory.qml:589

192msgid "Paused, tap to resume"

@@ -194,11 +194,11 @@ msgstr ""

194

195#: qml/Panel/Indicators/MenuItemFactory.qml:591

196msgid "Canceled"

197−msgstr ""

197+msgstr "Отменено"

198

199#: qml/Panel/Indicators/MenuItemFactory.qml:593

200msgid "Finished"

201−msgstr ""

201+msgstr "Завершено"

202

203#: qml/Panel/Indicators/MenuItemFactory.qml:595

204msgid "Failed, tap to retry"

po/ug.po+1−1

@@ -14,7 +14,7 @@ msgstr ""

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"

17+"X-Launchpad-Export-Date: 2014-07-31 07:15+0000\n"

18"X-Generator: Launchpad (build 17131)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

po/uk.po+1−1

@@ -14,7 +14,7 @@ msgstr ""

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"

17+"X-Launchpad-Export-Date: 2014-07-31 07:15+0000\n"

18"X-Generator: Launchpad (build 17131)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

po/zh_CN.po+1−1

@@ -14,7 +14,7 @@ msgstr ""

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"

17+"X-Launchpad-Export-Date: 2014-07-31 07:15+0000\n"

18"X-Generator: Launchpad (build 17131)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

qml/Components/PageHeader.qml+24−7

@@ -44,6 +44,12 @@ Item {

44 signal backClicked()

45

46 onScopeStyleChanged: refreshLogo()

47+ onSearchQueryChanged: {

48+ // Make sure we are at the search page if the search query changes behind our feet

49+ if (searchQuery) {

50+ headerContainer.showSearch = true;

51+ }

52+ }

47

53

48 function triggerSearch() {

54 function triggerSearch() {

49 if (searchEntryEnabled) {

55 if (searchEntryEnabled) {

@@ -52,6 +58,12 @@ Item {

52 }

58 }

53 }

59 }

54

60

61+ function closePopup() {

62+ if (headerContainer.popover != null) {

63+ PopupUtils.close(headerContainer.popover);

64+ }

65+ }

66+

55 function resetSearch(keepFocus) {

67 function resetSearch(keepFocus) {

56 if (searchHistory) {

68 if (searchHistory) {

57 searchHistory.addQuery(searchTextField.text);

69 searchHistory.addQuery(searchTextField.text);

@@ -60,9 +72,7 @@ Item {

60 unfocus();

72 unfocus();

61 }

73 }

62 searchTextField.text = "";

74 searchTextField.text = "";

63− if (headerContainer.popover != null) {

75+ closePopup();

64− PopupUtils.close(headerContainer.popover);

65− }

66 }

76 }

67

77

68 function unfocus() {

78 function unfocus() {

@@ -103,9 +113,7 @@ Item {

103 anchors { fill: parent; margins: units.gu(1); bottomMargin: units.gu(3) + bottomContainer.height }

113 anchors { fill: parent; margins: units.gu(1); bottomMargin: units.gu(3) + bottomContainer.height }

104 visible: headerContainer.showSearch

114 visible: headerContainer.showSearch

105 onPressed: {

115 onPressed: {

106− if (headerContainer.popover) {

116+ closePopup();

107− PopupUtils.close(headerContainer.popover);

108− }

109 if (!searchTextField.text) {

117 if (!searchTextField.text) {

110 headerContainer.showSearch = false;

118 headerContainer.showSearch = false;

111 }

119 }

@@ -172,6 +180,7 @@ Item {

172 property var contents: TextField {

180 property var contents: TextField {

173 id: searchTextField

181 id: searchTextField

174 objectName: "searchTextField"

182 objectName: "searchTextField"

183+ inputMethodHints: Qt.ImhNoPredictiveText

175 hasClearButton: false

184 hasClearButton: false

176 anchors {

185 anchors {

177 fill: parent

186 fill: parent

@@ -221,6 +230,12 @@ Item {

221 root.openSearchHistory();

230 root.openSearchHistory();

222 }

231 }

223 }

232 }

233+

234+ onTextChanged: {

235+ if (text != "") {

236+ closePopup();

237+ }

238+ }

224 }

239 }

225 }

240 }

226

241

@@ -298,6 +313,7 @@ Item {

298

313

299 Repeater {

314 Repeater {

300 id: recentSearches

315 id: recentSearches

316+ objectName: "recentSearches"

301 model: searchHistory

317 model: searchHistory

302

318

303 delegate: Standard {

319 delegate: Standard {

@@ -306,7 +322,8 @@ Item {

306 onClicked: {

322 onClicked: {

307 searchHistory.addQuery(text);

323 searchHistory.addQuery(text);

308 searchTextField.text = text;

324 searchTextField.text = text;

309− PopupUtils.close(popover);

325+ closePopup();

326+ unfocus();

310 }

327 }

311 }

328 }

312 }

329 }

qml/Components/PassphraseLockscreen.qml+3

@@ -31,8 +31,10 @@ Item {

31

32 function clear(playAnimation) {

33 pinentryField.text = "";

34+ pinentryField.enabled = true

34 if (playAnimation) {

35 if (playAnimation) {

35 wrongPasswordAnimation.start();

36 wrongPasswordAnimation.start();

37+ pinentryField.forceActiveFocus();

36 } else {

38 } else {

37 pinentryField.focus = false

39 pinentryField.focus = false

38 }

40 }

@@ -78,6 +80,7 @@ Item {

78

80

79 onAccepted: {

81 onAccepted: {

80 if (pinentryField.text) {

82 if (pinentryField.text) {

83+ pinentryField.enabled = false;

81 root.entered(pinentryField.text);

84 root.entered(pinentryField.text);

82 }

85 }

83 }

86 }

qml/Dash/Apps/CloseIcon.qmldeleted−62

@@ -1,62 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−

19−Item {

20− id: root

21−

22− Image {

23− id: closeIcon

24− anchors.centerIn: parent

25− source: "graphics/close_btn.png"

26−

27− state: (root.enabled) ? "shown" : "hidden"

28−

29− states: [

30− State {

31− name: "shown"

32− PropertyChanges {

33− target: closeIcon

34− height: root.height

35− width: root.width

36− }

37− },

38− State {

39− name: "hidden"

40− PropertyChanges {

41− target: closeIcon

42− height: 0

43− width: 0

44− }

45− }

46−

47− ]

48− transitions: [

49− Transition {

50− to: "shown"

51− NumberAnimation {

52− properties: "width, height"; duration: 300

53− easing { type: Easing.OutBack; overshoot: 5 }

54− }

55− },

56− Transition {

57− to: "hidden"

58− NumberAnimation { properties: "width, height"; duration: 250; }

59− }

60− ]

61− }

62−}

qml/Dash/Apps/RunningApplicationTile.qmldeleted−136

@@ -1,136 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−import Ubuntu.Components 0.1

19−import Unity.Application 0.1

20−import "../../Components/"

21−import "../../Components/ListItems"

22−

23−AbstractButton {

24− id: root

25− property var application

26−

27− signal requestedApplicationActivation(var application)

28− signal requestedApplicationTermination(var application)

29− signal requestedActivationMode()

30− signal requestedTerminationMode()

31−

32− width: thumbnail.width

33− height: thumbnail.height + labelContainer.height

34−

35− property bool terminationModeEnabled: false

36−

37− onClicked: {

38− if (!terminationModeEnabled)

39− requestedApplicationActivation(application)

40− }

41−

42− onPressAndHold: {

43− if (terminationModeEnabled) {

44− requestedActivationMode()

45− } else {

46− requestedTerminationMode()

47− }

48− }

49−

50− Item {

51− id: thumbnail

52−

53− width: shapedApplicationImage.width

54− height: shapedApplicationImage.height

55−

56− UbuntuShape {

57− id: shapedApplicationImage

58− x: 0

59− y: 0

60− height: applicationImage.height

61− width: applicationImage.width

62− radius: "medium"

63−

64− image: Image {

65− id: applicationImage

66− source: application.screenshot

67− // height : width = ss.height : ss.width

68−

69− property bool isLandscape: sourceSize.width > sourceSize.height

70− property real maxDimension: units.gu(17)

71−

72− width: isLandscape ? Math.min(sourceSize.width, maxDimension) : height * (sourceSize.width / sourceSize.height)

73− height: isLandscape ? width * (sourceSize.height / sourceSize.width) : Math.min(sourceSize.height, maxDimension)

74− fillMode: Image.Stretch

75− }

76−

77− }

78−

79− UbuntuShape {

80− id: borderPressed

81−

82− anchors.fill: shapedApplicationImage

83− radius: "medium"

84− borderSource: "radius_pressed.sci"

85− opacity: root.pressed ? 1.0 : 0.0

86− Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }

87− }

88− }

89−

90− // FIXME: label code duplicated with Tile

91− Item {

92− id: labelContainer

93− anchors {

94− left: thumbnail.left

95− right: thumbnail.right

96− top: thumbnail.bottom

97− }

98− height: units.gu(2)

99−

100− Label {

101− id: label

102− anchors {

103− baseline: parent.bottom

104− left: parent.left

105− right: parent.right

106− }

107− text: (application) ? application.name : ""

108−

109− // TODO karni: Update Ubuntu.Components.Themes.Palette and use theme color instead

110− color: "grey"

111− opacity: 0.9

112− fontSize: "small"

113− elide: Text.ElideMiddle

114− horizontalAlignment: Text.AlignHCenter

115− }

116− }

117−

118− CloseIcon {

119− objectName: "closeIcon " + model.name

120− anchors {

121− left: thumbnail.left

122− leftMargin: -units.gu(1)

123− top: thumbnail.top

124− topMargin: -units.gu(1)

125− }

126− height: units.gu(6)

127− width: units.gu(6)

128− id: closeIcon

129− enabled: root.terminationModeEnabled

130−

131− MouseArea {

132− anchors { fill: parent; margins: -units.gu(1) }

133− onClicked: requestedApplicationTermination(application)

134− }

135− }

136−}

qml/Dash/Apps/RunningApplicationsGrid.qmldeleted−105

@@ -1,105 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−import "../../Components"

19−

20−import Ubuntu.Gestures 0.1

21−import Unity.Application 0.1

22−

23−ResponsiveFlowView {

24− id: root

25− clip: true

26−

27− signal updateScreenshots

28− property alias enableHeightBehavior: heightBehaviour.enabled

29− property bool enableHeightBehaviorOnNextCreation: model.count === 0

30−

31− Behavior on height {

32− id: heightBehaviour

33− enabled: false

34− NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }

35− }

36−

37− Connections {

38− target: root.model

39− onCountChanged: {

40− heightBehaviour.enabled = true;

41− }

42− }

43−

44− property bool canEnableTerminationMode: true

45−

46− onCanEnableTerminationModeChanged: {

47− if (!canEnableTerminationMode)

48− terminationModeEnabled = false

49− }

50−

51− // when false, it means it's on activation mode

52− property bool terminationModeEnabled: false

53−

54− maximumNumberOfColumns: 10

55− minimumHorizontalSpacing: units.gu(2)

56− referenceDelegateWidth: units.gu(11)

57− verticalSpacing: units.gu(2)

58−

59− delegate: Item {

60− width: runningAppTile.width + root.horizontalSpacing

61− height: runningAppTile.height + root.verticalSpacing

62−

63− RunningApplicationTile {

64− id: runningAppTile

65− objectName: "runningAppTile " + model.name

66− anchors {

67− top: parent.top

68− horizontalCenter: parent.horizontalCenter

69− }

70− application: model

71− onRequestedActivationMode: { root.terminationModeEnabled = false }

72− onRequestedTerminationMode: {

73− if (canEnableTerminationMode)

74− root.terminationModeEnabled = true

75− }

76− onRequestedApplicationTermination: {

77− ApplicationManager.stopApplication(model.appId)

78− }

79− onRequestedApplicationActivation: {

80− ApplicationManager.requestFocusApplication(model.appId)

81− }

82−

83− terminationModeEnabled: root.terminationModeEnabled

84− }

85− }

86−

87− move: Transition {

88− NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutCubic }

89− }

90−

91− MouseArea {

92− anchors.fill: parent

93− z: -1 // behind all RunningApplicationTiles

94− enabled: root.terminationModeEnabled

95− onPressed: { root.terminationModeEnabled = false; }

96− }

97−

98− PressedOutsideNotifier {

99− anchors.fill: parent

100− enabled: root.terminationModeEnabled

101− onPressedOutside: {

102− root.terminationModeEnabled = false;

103− }

104− }

105−}

qml/Dash/Apps/graphics/close_btn@9.pngdeleted

Binary file not shown.

qml/Dash/CardTool.qml+27−2

@@ -165,15 +165,40 @@ Item {

165 }

166 }

167

168+ Item {

169+ id: attributesModel

170+ property int numOfAttributes: 0

171+ property var model: []

172+ property bool hasAttributes: {

173+ var attributes = components["attributes"];

174+ var hasAttributesFlag = (attributes != undefined) && attributes["field"];

175+

176+ if (hasAttributesFlag) {

177+ if (attributes["max-count"]) {

178+ numOfAttributes = attributes["max-count"];

179+ }

180+ }

181+ return hasAttributesFlag

182+ }

183+

184+ onNumOfAttributesChanged: {

185+ model = []

186+ for (var i = 0; i < numOfAttributes; i++) {

187+ model.push( {"value":"text"+(i+1), "icon":"image://theme/ok" } );

188+ }

189+ }

190+ }

191+

168 Loader {

192 Loader {

169 id: cardLoader

193 id: cardLoader

170− property var fields: ["art", "mascot", "title", "subtitle", "summary"]

194+ property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]

171 property var maxData: {

195 property var maxData: {

172 "art": Qt.resolvedUrl("graphics/checkers.png"),

196 "art": Qt.resolvedUrl("graphics/checkers.png"),

173 "mascot": Qt.resolvedUrl("graphics/checkers.png"),

197 "mascot": Qt.resolvedUrl("graphics/checkers.png"),

174 "title": "—\n—",

198 "title": "—\n—",

175 "subtitle": "—",

199 "subtitle": "—",

176− "summary": "—\n—\n—\n—\n—"

200+ "summary": "—\n—\n—\n—\n—",

201+ "attributes": attributesModel.model

177 }

202 }

178 sourceComponent: cardTool.cardComponent

203 sourceComponent: cardTool.cardComponent

179 onLoaded: {

204 onLoaded: {

qml/Dash/DashApps.qmldeleted−40

@@ -1,40 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−import Ubuntu.Components 0.1

19−import Utils 0.1

20−import Unity.Application 0.1

21−import "../Components"

22−import "../Components/ListItems"

23−import "Apps"

24−

25−GenericScopeView {

26− id: scopeView

27− objectName: "DashApps"

28−

29− property var runningApps: ApplicationManager

30−

31− QtObject {

32− id: countObject

33− property int count: scopeView.scope.searchQuery.length == 0 ? scopeView.runningApps.count : 0

34− }

35−

36− onScopeChanged: {

37− scopeView.scope.categories.addSpecialCategory("running.apps.category", i18n.tr("Recent"), "", "{ \"template\": { \"category-layout\": \"running-apps\" } }", countObject);

38− enableHeightBehaviorOnNextCreation = scopeView.runningApps.count === 0

39− }

40−}

qml/Dash/DashContent.qml+1−3

@@ -126,9 +126,7 @@ Item {

126 return (xPositionRelativetoView > -width && xPositionRelativetoView < width) ? 1 : 0

127 }

128 asynchronous: true

129− // TODO This if will eventually go away since we're killing DashApps.qml

130− // once we move app closing to the spread

131− source: (scope.id == "clickscope") ? "DashApps.qml" : "GenericScopeView.qml"

129+ source: "GenericScopeView.qml"

132 objectName: scope.id + " loader"

130 objectName: scope.id + " loader"

133

131

134 readonly property bool moving: item ? item.moving : false

132 readonly property bool moving: item ? item.moving : false

qml/Dash/GenericScopeView.qml+1−10

@@ -18,7 +18,6 @@ import QtQuick 2.0

18import Ubuntu.Components 0.1

19import Utils 0.1

20import Unity 0.2

21−import Unity.Application 0.1

22import Dash 0.1

21import Dash 0.1

23import "../Components"

22import "../Components"

24import "../Components/ListItems" as ListItems

23import "../Components/ListItems" as ListItems

@@ -194,7 +193,6 @@ FocusScope {

194 switch (cardTool.categoryLayout) {

193 switch (cardTool.categoryLayout) {

195 case "carousel": return "CardCarousel.qml";

194 case "carousel": return "CardCarousel.qml";

196 case "vertical-journal": return "CardVerticalJournal.qml";

195 case "vertical-journal": return "CardVerticalJournal.qml";

197− case "running-apps": return "Apps/RunningApplicationsGrid.qml";

198 case "grid":

196 case "grid":

199 default: return "CardGrid.qml";

197 default: return "CardGrid.qml";

200 }

198 }

@@ -205,14 +203,7 @@ FocusScope {

205 item.enableHeightBehavior = scopeView.enableHeightBehaviorOnNextCreation;

203 item.enableHeightBehavior = scopeView.enableHeightBehaviorOnNextCreation;

206 scopeView.enableHeightBehaviorOnNextCreation = false;

204 scopeView.enableHeightBehaviorOnNextCreation = false;

207 }

205 }

208− if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {

209− // TODO: this is still a kludge :D Ideally add some kind of hook so that we

210− // can do this from DashApps.qml or think a better way that needs no special casing

211− item.model = Qt.binding(function() { return runningApps; })

212− item.canEnableTerminationMode = Qt.binding(function() { return scopeView.isCurrent })

213− } else {

214− item.model = Qt.binding(function() { return results })

206+ item.model = Qt.binding(function() { return results })

215− }

216 item.objectName = Qt.binding(function() { return categoryId })

207 item.objectName = Qt.binding(function() { return categoryId })

217 item.scopeStyle = scopeView.scopeStyle;

208 item.scopeStyle = scopeView.scopeStyle;

218 if (baseItem.expandable) {

209 if (baseItem.expandable) {

qml/Launcher/LauncherDelegate.qml+9−6

@@ -70,28 +70,31 @@ Item {

70 height: root.itemHeight - units.gu(1)

71 }

72

73− BorderImage {

73+ UbuntuShape {

74 objectName: "countEmblem"

75 anchors {

76 right: parent.right

77 top: parent.top

78 margins: units.dp(3)

79 }

80− width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

80+ width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))

81− height: units.gu(3)

81+ height: units.gu(2)

82− source: "graphics/notification.sci"

82+ color: UbuntuColors.orange

83 visible: root.count > 0

84+ borderSource: "none"

84

85

85 Label {

86 Label {

86 id: countLabel

87 id: countLabel

87 text: root.count

88 text: root.count

88 anchors.centerIn: parent

89 anchors.centerIn: parent

90+ // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine

91+ // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479

92+ anchors.verticalCenterOffset: -units.dp(.5)

89 width: root.itemWidth - units.gu(1)

93 width: root.itemWidth - units.gu(1)

90 horizontalAlignment: Text.AlignHCenter

94 horizontalAlignment: Text.AlignHCenter

91 elide: Text.ElideRight

95 elide: Text.ElideRight

92 color: "white"

96 color: "white"

93− fontSize: "small"

97+ fontSize: "x-small"

94− font.bold: true

95 }

98 }

96 }

99 }

97

100

qml/Launcher/graphics/notification@30.pngdeleted

Binary file not shown.

qml/Launcher/graphics/notification@30.scideleted−5

@@ -1,5 +0,0 @@

1−border.left: 36

2−border.top: 36

3−border.bottom: 36

4−border.right: 36

5−source: notification@30.png

qml/Panel/Indicators/DefaultIndicatorPage.qml+1−1

@@ -126,7 +126,7 @@ IndicatorBase {

126 id: loader

127 objectName: "menuItem" + index

128 asynchronous: false

129− visible: height > 0

129+ visible: status == Loader.Ready

130

131 property int modelIndex: index

132

qml/Shell.qml+27−21

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

348 width: parent.width

349 height: parent.height - panel.panelHeight

350 background: shell.background

351+ alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard

351 minPinLength: 4

352 minPinLength: 4

352 maxPinLength: 4

353 maxPinLength: 4

353

354

@@ -362,7 +363,7 @@ Item {

362 onShownChanged: if (shown) greeter.fakeActiveForApp = ""

363 onShownChanged: if (shown) greeter.fakeActiveForApp = ""

363

364

364 Component.onCompleted: {

365 Component.onCompleted: {

365− if (LightDM.Users.count == 1) {

366+ if (greeter.narrowMode) {

366 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

367 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

367 }

368 }

369 }

@@ -374,14 +375,17 @@ Item {

374 onShowGreeter: greeter.show()

375 onShowGreeter: greeter.show()

375

376

376 onShowPrompt: {

377 onShowPrompt: {

377− if (LightDM.Users.count == 1) {

378+ if (greeter.narrowMode) {

378− // TODO: There's no better way for now to determine if its a PIN or a passphrase.

379− if (text == "PIN") {

380− lockscreen.alphaNumeric = false

381− } else {

382− lockscreen.alphaNumeric = true

383− }

384− lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);

379+ lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text.toLowerCase());

380+ lockscreen.show();

381+ }

382+ }

383+

384+ onPromptlessChanged: {

385+ if (LightDM.Greeter.promptless) {

386+ lockscreen.hide()

387+ } else {

388+ lockscreen.reset();

385 lockscreen.show();

389 lockscreen.show();

386 }

390 }

387 }

391 }

@@ -395,6 +399,9 @@ Item {

395 greeter.login();

399 greeter.login();

396 } else {

400 } else {

397 lockscreen.clear(true);

401 lockscreen.clear(true);

402+ if (greeter.narrowMode) {

403+ LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

404+ }

398 }

405 }

399 }

406 }

400 }

407 }

@@ -449,25 +456,24 @@ Item {

449

456

450 function login() {

457 function login() {

451 enabled = false;

458 enabled = false;

452− LightDM.Greeter.startSessionSync();

459+ if (LightDM.Greeter.startSessionSync()) {

453− sessionStarted();

460+ sessionStarted();

454− greeter.hide();

461+ greeter.hide();

455− lockscreen.hide();

462+ lockscreen.hide();

456− launcher.hide();

463+ launcher.hide();

464+ }

457 enabled = true;

465 enabled = true;

458 }

466 }

459

467

460 onShownChanged: {

468 onShownChanged: {

461 if (shown) {

469 if (shown) {

462− lockscreen.reset();

470+ if (greeter.narrowMode) {

463− if (!LightDM.Greeter.promptless) {

464− lockscreen.show();

465− }

466− // If there is only one user, we start authenticating with that one here.

467− // If there are more users, the Greeter will handle that

468− if (LightDM.Users.count == 1) {

469 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

471 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

470 }

472 }

473+ if (!LightDM.Greeter.promptless) {

474+ lockscreen.reset();

475+ lockscreen.show();

476+ }

471 greeter.fakeActiveForApp = "";

477 greeter.fakeActiveForApp = "";

472 greeter.forceActiveFocus();

478 greeter.forceActiveFocus();

473 }

479 }

run.sh+15−6

@@ -8,6 +8,7 @@ GDB=false

8FAKE=false

9PINLOCK=false

10KEYLOCK=false

11+USE_MOCKS=false

11MOUSE_TOUCH=true

12MOUSE_TOUCH=true

12

13

13usage() {

14usage() {

@@ -31,9 +32,9 @@ eval set -- "$ARGS"

31while [ $# -gt 0 ]

32while [ $# -gt 0 ]

32do

33do

33 case "$1" in

34 case "$1" in

34− -f|--fake) FAKE=true;;

35+ -f|--fake) FAKE=true; USE_MOCKS=true;;

35− -p|--pinlock) PINLOCK=true;;

36+ -p|--pinlock) PINLOCK=true; USE_MOCKS=true;;

36− -k|--keylock) KEYLOCK=true;;

37+ -k|--keylock) KEYLOCK=true; USE_MOCKS=true;;

37 -g|--gdb) GDB=true;;

38 -g|--gdb) GDB=true;;

38 -h|--help) usage;;

39 -h|--help) usage;;

39 -m|--nomousetouch) MOUSE_TOUCH=false;;

40 -m|--nomousetouch) MOUSE_TOUCH=false;;

@@ -43,20 +44,28 @@ do

43done

44done

44

45

45if $FAKE; then

46if $FAKE; then

46− export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules

47 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single

48fi

49

50if $PINLOCK; then

51− export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules

52 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin

51 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin

53fi

52fi

54

53

55if $KEYLOCK; then

54if $KEYLOCK; then

56− export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules

57 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase

55 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase

58fi

56fi

59

57

58+if $USE_MOCKS; then

59+ rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness

60+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules

61+else

62+ # Still fake no-login user for convenience (it's annoying to be prompted for your password when testing)

63+ # And in particular, just link our LightDM mock into the nonmirplugins folder. We don't want the rest of

64+ # our plugins to be used.

65+ ln -s $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/

66+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single

67+fi

68+

60QML_PHONE_SHELL_ARGS=""

69QML_PHONE_SHELL_ARGS=""

61if $MOUSE_TOUCH; then

70if $MOUSE_TOUCH; then

62 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"

71 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"

src/main.cpp+7

@@ -25,6 +25,7 @@

25#include <QtQml/QQmlContext>

26#include <QLibrary>

27#include <QDebug>

28+#include <csignal>

28#include <libintl.h>

29#include <libintl.h>

29

30

30// local

31// local

@@ -140,6 +141,12 @@ Load the testability driver");

140 view->setSource(source);

141 view->setSource(source);

141 QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));

142 QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));

142

143

144+ if (!isMirServer && qEnvironmentVariableIsSet("UNITY_MIR_EMITS_SIGSTOP")) {

145+ // Emit SIGSTOP as expected by upstart, under Mir it's qtmir that will raise it.

146+ // see http://upstart.ubuntu.com/cookbook/#expect-stop

147+ raise(SIGSTOP);

148+ }

149+

143 if (isMirServer || parser.isSet(fullscreenOption)) {

150 if (isMirServer || parser.isSet(fullscreenOption)) {

144 view->showFullScreen();

151 view->showFullScreen();

145 } else {

152 } else {

tests/autopilot/unity8/shell/emulators/dash.py−4

@@ -188,10 +188,6 @@ class GenericScopeView(emulators.UnityEmulatorBase):

188 raise emulators.UnityEmulatorException(

189 'No category found with name {}'.format(category))

190

191−

192−class DashApps(GenericScopeView):

193− """Autopilot emulator for the applications scope."""

194−

195 def get_applications(self, category):

191 def get_applications(self, category):

196 """Return the list of applications on a category.

192 """Return the list of applications on a category.

197

193

tests/autopilot/unity8/shell/tests/test_emulators.py+1−1

@@ -142,7 +142,7 @@ class DashEmulatorTestCase(DashBaseTestCase):

142 scope_id = 'clickscope'

143 scope = self.dash.open_scope(scope_id)

144 self._assert_scope_is_opened(scope, scope_id)

145− self.assertIsInstance(scope, dash_emulators.DashApps)

145+ self.assertIsInstance(scope, dash_emulators.GenericScopeView)

146

147

148class GenericScopeViewEmulatorTestCase(DashBaseTestCase):

tests/autopilot/unity8/shell/tests/test_upstart.py+18−3

@@ -25,7 +25,8 @@ import signal

25import subprocess

26import time

27

28+import fixtures

28−from testtools.matchers._basic import Equals

29+from testtools.matchers import Equals, MismatchError

29from autopilot.matchers import Eventually

30from autopilot.matchers import Eventually

30from autopilot.introspection import get_proxy_object_for_existing_process

31from autopilot.introspection import get_proxy_object_for_existing_process

31

32

@@ -100,8 +101,21 @@ class UpstartIntegrationTests(UnityTestCase):

100 emulator_base=UnityEmulatorBase,))

101 emulator_base=UnityEmulatorBase,))

101

102

102 def test_no_sigstop(self):

103 def test_no_sigstop(self):

104+ self.useFixture(

105+ fixtures.EnvironmentVariable(

103− self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "")

106+ 'UNITY_MIR_EMITS_SIGSTOP', newvalue=None))

104 self._launch_unity()

107 self._launch_unity()

108+

109+ try:

110+ self.assertThat(

111+ lambda: os.WIFSTOPPED(self._get_status()),

112+ Eventually(Equals(True)))

113+ except MismatchError:

114+ pass

115+ else:

116+ self.process.send_signal(signal.SIGCONT)

117+ self.fail('Unity8 raised SIGSTOP')

118+

105 self._set_proxy()

119 self._set_proxy()

106

120

107 logger.debug("Unity started, waiting for it to be ready.")

121 logger.debug("Unity started, waiting for it to be ready.")

@@ -109,7 +123,8 @@ class UpstartIntegrationTests(UnityTestCase):

109 logger.debug("Unity loaded and ready.")

123 logger.debug("Unity loaded and ready.")

110

124

111 def test_expect_sigstop(self):

125 def test_expect_sigstop(self):

126+ self.useFixture(

112− self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "1")

127+ fixtures.EnvironmentVariable('UNITY_MIR_EMITS_SIGSTOP', '1'))

113 self._launch_unity()

128 self._launch_unity()

114 self.assertThat(

129 self.assertThat(

115 lambda: os.WIFSTOPPED(self._get_status()),

130 lambda: os.WIFSTOPPED(self._get_status()),

tests/mocks/AccountsService/AccountsService.cpp+12−2

@@ -29,12 +29,14 @@ AccountsService::AccountsService(QObject* parent)

29

30QString AccountsService::user() const

31{

32− return "testuser";

32+ return m_user;

33}

34

35void AccountsService::setUser(const QString &user)

36{

37− Q_UNUSED(user)

37+ m_user = user;

38+ Q_EMIT userChanged();

39+ Q_EMIT passwordDisplayHintChanged();

38}

40}

39

41

40bool AccountsService::demoEdges() const

42bool AccountsService::demoEdges() const

@@ -68,3 +70,11 @@ void AccountsService::setStatsWelcomeScreen(bool statsWelcomeScreen)

68 m_statsWelcomeScreen = statsWelcomeScreen;

70 m_statsWelcomeScreen = statsWelcomeScreen;

69 statsWelcomeScreenChanged();

71 statsWelcomeScreenChanged();

70}

72}

73+

74+AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

75+{

76+ if (m_user == "has-pin")

77+ return PasswordDisplayHint::Numeric;

78+ else

79+ return PasswordDisplayHint::Keyboard;

80+}

tests/mocks/AccountsService/AccountsService.h+12

@@ -27,6 +27,7 @@

27class AccountsService: public QObject

28{

29 Q_OBJECT

30+ Q_ENUMS(PasswordDisplayHint)

30 Q_PROPERTY (QString user

31 Q_PROPERTY (QString user

31 READ user

32 READ user

32 WRITE setUser

33 WRITE setUser

@@ -43,8 +44,16 @@ class AccountsService: public QObject

43 READ statsWelcomeScreen

44 READ statsWelcomeScreen

44 WRITE setStatsWelcomeScreen // only available in mock

45 WRITE setStatsWelcomeScreen // only available in mock

45 NOTIFY statsWelcomeScreenChanged)

46 NOTIFY statsWelcomeScreenChanged)

47+ Q_PROPERTY (PasswordDisplayHint passwordDisplayHint

48+ READ passwordDisplayHint

49+ NOTIFY passwordDisplayHintChanged)

46

50

47public:

51public:

52+ enum PasswordDisplayHint {

53+ Keyboard,

54+ Numeric,

55+ };

56+

48 explicit AccountsService(QObject *parent = 0);

57 explicit AccountsService(QObject *parent = 0);

49

58

50 QString user() const;

59 QString user() const;

@@ -55,15 +64,18 @@ public:

55 void setBackgroundFile(const QString &backgroundFile);

64 void setBackgroundFile(const QString &backgroundFile);

56 bool statsWelcomeScreen() const;

65 bool statsWelcomeScreen() const;

57 void setStatsWelcomeScreen(bool statsWelcomeScreen);

66 void setStatsWelcomeScreen(bool statsWelcomeScreen);

67+ PasswordDisplayHint passwordDisplayHint() const;

58

68

59Q_SIGNALS:

69Q_SIGNALS:

60 void userChanged();

70 void userChanged();

61 void demoEdgesChanged();

71 void demoEdgesChanged();

62 void backgroundFileChanged();

72 void backgroundFileChanged();

63 void statsWelcomeScreenChanged();

73 void statsWelcomeScreenChanged();

74+ void passwordDisplayHintChanged();

64

75

65private:

76private:

66 QString m_backgroundFile;

77 QString m_backgroundFile;

78+ QString m_user;

67 bool m_statsWelcomeScreen;

79 bool m_statsWelcomeScreen;

68};

80};

69

81

tests/mocks/AccountsService/CMakeLists.txt+4−1

@@ -5,4 +5,7 @@ add_library(MockAccountsService-qml MODULE

5

6qt5_use_modules(MockAccountsService-qml DBus Qml)

7

8−add_unity8_mock(AccountsService 0.1 AccountsService TARGETS MockAccountsService-qml)

8+add_unity8_mock(AccountsService 0.1 AccountsService

9+ PREFIX mocks

10+ TARGETS MockAccountsService-qml

11+ )

tests/mocks/AccountsService/plugin.cpp+1

@@ -32,5 +32,6 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

32void AccountsServicePlugin::registerTypes(const char *uri)

33{

34 Q_ASSERT(uri == QLatin1String("AccountsService"));

35+ qRegisterMetaType<AccountsService::PasswordDisplayHint>("AccountsService::PasswordDisplayHint");

35 qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

36 qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

36}

37}

tests/mocks/LightDM/GreeterPrivate.h+2

@@ -24,6 +24,7 @@

24namespace QLightDM

25{

26class Greeter;

27+class GreeterImpl;

27

28

28class GreeterPrivate

29class GreeterPrivate

29{

30{

@@ -40,6 +41,7 @@ public:

40 void handleRespond(const QString &response);

41 void handleRespond(const QString &response);

41

42

42protected:

43protected:

44+ GreeterImpl *m_impl; // if the backend needs more private data

43 Greeter * const q_ptr;

45 Greeter * const q_ptr;

44

46

45private:

47private:

tests/mocks/LightDM/demo/CMakeLists.txt+4−2

@@ -11,11 +11,13 @@ set(LibLightDM_SOURCES

11add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})

12

13include_directories(

14+ ${CMAKE_CURRENT_BINARY_DIR}

14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

15 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

15)

16)

16

17

17target_link_libraries(MockLightDM-demo

18target_link_libraries(MockLightDM-demo

18 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

19 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

20+ -lpam

19− )

21+)

20

22

21−qt5_use_modules(MockLightDM-demo Gui)

23+qt5_use_modules(MockLightDM-demo Concurrent Gui)

tests/mocks/LightDM/demo/GreeterPrivate.cpp+202−30

@@ -18,53 +18,225 @@

18

19#include "../Greeter.h"

20#include "../GreeterPrivate.h"

21−#include <QtCore/QDir>

21+#include <QFuture>

22−#include <QtCore/QSettings>

22+#include <QFutureInterface>

23+#include <QFutureWatcher>

24+#include <QQueue>

25+#include <QtConcurrent>

26+#include <QVector>

27+#include <security/pam_appl.h>

23

28

24namespace QLightDM

29namespace QLightDM

25{

30{

26

31

32+class GreeterImpl : public QObject

33+{

34+ Q_OBJECT

35+

36+ typedef QFutureInterface<QString> ResponseFuture;

37+

38+public:

39+ explicit GreeterImpl(Greeter *parent, GreeterPrivate *greeterPrivate)

40+ : QObject(parent),

41+ greeter(parent),

42+ greeterPrivate(greeterPrivate),

43+ pamHandle(NULL)

44+ {

45+ qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");

46+

47+ connect(&futureWatcher, SIGNAL(finished()),

48+ this, SLOT(finishPam()));

49+ connect(this, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)),

50+ greeter, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)));

51+ // This next connect is how we pass ResponseFutures between threads

52+ connect(this, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),

53+ this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));

54+ }

55+

56+ void start(QString username)

57+ {

58+ // Clear out any existing PAM interactions first (we can't simply

59+ // cancel our QFuture because QtConcurrent::run doesn't support cancel)

60+ if (pamHandle != NULL) {

61+ pam_handle *handle = pamHandle;

62+ pamHandle = NULL; // to disable normal finishPam() handling

63+ while (respond(QString())); // clear our local queue of QFutures

64+ pam_end(handle, PAM_CONV_ERR);

65+ }

66+

67+ // Now actually start a new conversation with PAM

68+ pam_conv conversation;

69+ conversation.conv = converseWithPam;

70+ conversation.appdata_ptr = static_cast<void*>(this);

71+

72+ if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {

73+ futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));

74+ } else {

75+ greeterPrivate->authenticated = false;

76+ Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);

77+ Q_EMIT greeter->authenticationComplete();

78+ }

79+ }

80+

81+ static int authenticateWithPam(pam_handle* pamHandle)

82+ {

83+ int pamStatus = pam_authenticate(pamHandle, 0);

84+ if (pamStatus == PAM_SUCCESS) {

85+ pamStatus = pam_acct_mgmt(pamHandle, 0);

86+ }

87+ if (pamStatus == PAM_NEW_AUTHTOK_REQD) {

88+ pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);

89+ }

90+ if (pamStatus == PAM_SUCCESS) {

91+ pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);

92+ }

93+ return pamStatus;

94+ }

95+

96+ static int converseWithPam(int num_msg, const pam_message** msg,

97+ pam_response** resp, void* appdata_ptr)

98+ {

99+ if (num_msg <= 0)

100+ return PAM_CONV_ERR;

101+

102+ auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));

103+ if (!tmp_response)

104+ return PAM_CONV_ERR;

105+

106+ GreeterImpl* impl = static_cast<GreeterImpl*>(appdata_ptr);

107+

108+ int count;

109+ QVector<ResponseFuture> responses;

110+

111+ for (count = 0; count < num_msg; ++count)

112+ {

113+ switch (msg[count]->msg_style)

114+ {

115+ case PAM_PROMPT_ECHO_ON:

116+ {

117+ QString message(msg[count]->msg);

118+ responses.append(ResponseFuture());

119+ responses.last().reportStarted();

120+ Q_EMIT impl->showPrompt(message, Greeter::PromptTypeQuestion, responses.last());

121+ break;

122+ }

123+ case PAM_PROMPT_ECHO_OFF:

124+ {

125+ QString message(msg[count]->msg);

126+ responses.append(ResponseFuture());

127+ responses.last().reportStarted();

128+ Q_EMIT impl->showPrompt(message, Greeter::PromptTypeSecret, responses.last());

129+ break;

130+ }

131+ case PAM_TEXT_INFO:

132+ {

133+ QString message(msg[count]->msg);

134+ Q_EMIT impl->showMessage(message, Greeter::MessageTypeInfo);

135+ break;

136+ }

137+ default:

138+ {

139+ QString message(msg[count]->msg);

140+ Q_EMIT impl->showMessage(message, Greeter::MessageTypeError);

141+ break;

142+ }

143+ }

144+ }

145+

146+ int i = 0;

147+ bool raise_error = false;

148+

149+ for (auto &response : responses)

150+ {

151+ pam_response* resp_item = &tmp_response[i++];

152+ resp_item->resp_retcode = 0;

153+ resp_item->resp = strdup(response.future().result().toUtf8());

154+

155+ if (!resp_item->resp)

156+ {

157+ raise_error = true;

158+ break;

159+ }

160+ }

161+

162+ if (raise_error)

163+ {

164+ for (int i = 0; i < count; ++i)

165+ free(tmp_response[i].resp);

166+

167+ free(tmp_response);

168+ return PAM_CONV_ERR;

169+ }

170+ else

171+ {

172+ *resp = tmp_response;

173+ return PAM_SUCCESS;

174+ }

175+ }

176+

177+public Q_SLOTS:

178+ bool respond(QString response)

179+ {

180+ if (!futures.isEmpty()) {

181+ futures.dequeue().reportFinished(&response);

182+ return true;

183+ } else {

184+ return false;

185+ }

186+ }

187+

188+Q_SIGNALS:

189+ void showMessage(QString text, QLightDM::Greeter::MessageType type);

190+ void showPrompt(QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);

191+

192+private Q_SLOTS:

193+ void finishPam()

194+ {

195+ if (pamHandle == NULL) {

196+ return;

197+ }

198+

199+ int pamStatus = futureWatcher.result();

200+

201+ pam_end(pamHandle, pamStatus);

202+ pamHandle = NULL;

203+

204+ greeterPrivate->authenticated = (pamStatus == PAM_SUCCESS);

205+ Q_EMIT greeter->authenticationComplete();

206+ }

207+

208+ void handlePrompt(QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)

209+ {

210+ futures.enqueue(future);

211+ Q_EMIT greeter->showPrompt(text, type);

212+ }

213+

214+private:

215+ Greeter *greeter;

216+ GreeterPrivate *greeterPrivate;

217+ pam_handle* pamHandle;

218+ QFutureWatcher<int> futureWatcher;

219+ QQueue<ResponseFuture> futures;

220+};

221+

27GreeterPrivate::GreeterPrivate(Greeter* parent)

222GreeterPrivate::GreeterPrivate(Greeter* parent)

28 : authenticated(false),

223 : authenticated(false),

29 authenticationUser(),

224 authenticationUser(),

225+ m_impl(new GreeterImpl(parent, this)),

30 q_ptr(parent)

226 q_ptr(parent)

31{

227{

32}

228}

33

229

34void GreeterPrivate::handleAuthenticate()

230void GreeterPrivate::handleAuthenticate()

35{

231{

36− Q_Q(Greeter);

37−

38− QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);

39− settings.beginGroup(authenticationUser);

232+ m_impl->start(authenticationUser);

40− QVariant password = settings.value("password", "none");

41−

42− if (password == "pin") {

43− Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);

44− } else if (password == "keyboard") {

45− Q_EMIT q->showPrompt("Password", Greeter::PromptTypeSecret);

46− } else {

47− authenticated = true;

48− Q_EMIT q->authenticationComplete();

49− }

50}

233}

51

234

52void GreeterPrivate::handleRespond(const QString &response)

235void GreeterPrivate::handleRespond(const QString &response)

53{

236{

54− Q_Q(Greeter);

237+ m_impl->respond(response);

55−

56− QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);

57− settings.beginGroup(authenticationUser);

58− QVariant password = settings.value("password", "none");

59−

60− QString passwordValue;

61− if (password == "pin") {

62− passwordValue = settings.value("passwordValue", "1234").toString();

63− } else {

64− passwordValue = settings.value("passwordValue", "password").toString();

65− }

66− authenticated = (response == passwordValue);

67− Q_EMIT q->authenticationComplete();

68}

238}

69

239

70}

240}

241+

242+#include "GreeterPrivate.moc"

tests/mocks/LightDM/demo/UsersModelPrivate.cpp+1−1

@@ -29,7 +29,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

29 : q_ptr(parent)

30{

31 QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);

32− QStringList users = settings.value("users", QStringList() << "phablet").toStringList();

32+ QStringList users = settings.value("users", QStringList() << qgetenv("USER")).toStringList();

33

34 Q_FOREACH(const QString &user, users)

35 {

tests/mocks/LightDM/full/GreeterPrivate.cpp+1−1

@@ -54,7 +54,7 @@ void GreeterPrivate::handleAuthenticate()

54 authenticated = true;

55 Q_EMIT q->authenticationComplete();

56 } else if (authenticationUser == "has-pin"){

57− Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);

57+ Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);

58 } else if (authenticationUser == "auth-error") {

59 authenticated = false;

60 Q_EMIT q->authenticationComplete();

tests/mocks/LightDM/single-pin/GreeterPrivate.cpp+1−1

@@ -32,7 +32,7 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)

32void GreeterPrivate::handleAuthenticate()

33{

34 Q_Q(Greeter);

35− Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);

35+ Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);

36}

37

38void GreeterPrivate::handleRespond(const QString &response)

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

26{

27 entries =

28 {

29− { "single", "Has PIN", 0, 0, false, false, 0, 0 },

29+ { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },

30 };

31}

32

tests/plugins/Dash/CMakeLists.txt+1

@@ -79,3 +79,4 @@ set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

79set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")

80add_qml_test(. ScopeStyle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

81add_qml_test(. ListViewWithPageHeaderQML IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

82+add_qml_test(. CardAttributes IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

tests/plugins/Dash/cardcreator/1.res+57−55

@@ -5,8 +5,8 @@ AbstractButton {

5 property var cardData;

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8− property var scopeStyle: null;

8+ property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int headerAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -16,65 +16,67 @@ AbstractButton {

16onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }

17readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

18Item {

19− id: artShapeHolder;

19+ id: artShapeHolder;

20− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

20+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

21− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

21+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

22− anchors { horizontalCenter: parent.horizontalCenter; }

22+ anchors { horizontalCenter: parent.horizontalCenter; }

23− Loader {

23+ Loader {

24− id: artShapeLoader;

24+ id: artShapeLoader;

25− objectName: "artShapeLoader";

25+ objectName: "artShapeLoader";

26− active: cardData && cardData["art"] || false;

26+ active: cardData && cardData["art"] || false;

27− asynchronous: root.asynchronous;

28− visible: status == Loader.Ready;

29− sourceComponent: UbuntuShape {

30− id: artShape;

31− objectName: "artShape";

32− radius: "medium";

33− visible: image.status == Image.Ready;

34− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

37− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

38− function updateWidthHeightBindings() {

39− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

40− width = root.fixedArtShapeSize.width;

41− height = root.fixedArtShapeSize.height;

42− } else {

43− width = Qt.binding(function() { return !visible ? 0 : image.width });

44− height = Qt.binding(function() { return !visible ? 0 : image.height });

45− }

46− }

47− image: Image {

48− objectName: "artImage";

49− source: cardData && cardData["art"] || "";

50− cache: true;

51 asynchronous: root.asynchronous;

27 asynchronous: root.asynchronous;

28+ visible: status == Loader.Ready;

29+ sourceComponent: UbuntuShape {

30+ id: artShape;

31+ objectName: "artShape";

32+ radius: "medium";

33+ visible: image.status == Image.Ready;

34+ readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35+ readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

37+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

38+ function updateWidthHeightBindings() {

39+ if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

40+ width = root.fixedArtShapeSize.width;

41+ height = root.fixedArtShapeSize.height;

42+ } else {

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

44+ height = Qt.binding(function() { return !visible ? 0 : image.height });

45+ }

46+ }

47+ image: Image {

48+ objectName: "artImage";

49+ source: cardData && cardData["art"] || "";

50+ cache: true;

51+ asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

53− width: root.width;

53+ width: root.width;

54− height: width / artShape.aspect;

54+ height: width / artShape.aspect;

55+ }

56+ }

55 }

57 }

56− }

58+ }

57− }

58− }

59readonly property int headerHeight: titleLabel.height;

60Label {

61− id: titleLabel;

61+ id: titleLabel;

62− objectName: "titleLabel";

62+ objectName: "titleLabel";

63− anchors { right: parent.right;left: parent.left;

63+ anchors { right: parent.right;

64+rightMargin: units.gu(1);

65+left: parent.left;

64top: artShapeHolder.bottom;

66top: artShapeHolder.bottom;

65 topMargin: units.gu(1);

67 topMargin: units.gu(1);

66leftMargin: units.gu(1);

68leftMargin: units.gu(1);

67− }

69+ }

68− elide: Text.ElideRight;

70+ elide: Text.ElideRight;

69− fontSize: "small";

71+ fontSize: "small";

70− wrapMode: Text.Wrap;

72+ wrapMode: Text.Wrap;

71− maximumLineCount: 2;

73+ maximumLineCount: 2;

72− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

74+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

75+ color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

74− visible: showHeader ;

76+ visible: showHeader ;

75− text: root.title;

77+ text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

78+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

79+ horizontalAlignment: root.headerAlignment;

78− }

80+ }

79implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);

81implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);

80}

82}

tests/plugins/Dash/cardcreator/2.res+94−91

@@ -5,8 +5,8 @@ AbstractButton {

5 property var cardData;

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8− property var scopeStyle: null;

8+ property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int headerAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -14,104 +14,107 @@ AbstractButton {

14 property bool showHeader: true;

15 implicitWidth: childrenRect.width;

16Loader {

17− id: backgroundLoader;

17+ id: backgroundLoader;

18− objectName: "backgroundLoader";

18+ objectName: "backgroundLoader";

19− anchors.fill: parent;

19+ anchors.fill: parent;

20− asynchronous: root.asynchronous;

20+ asynchronous: root.asynchronous;

21− visible: status == Loader.Ready;

21+ visible: status == Loader.Ready;

22− sourceComponent: UbuntuShape {

22+ sourceComponent: UbuntuShape {

23− objectName: "background";

23+ objectName: "background";

24− radius: "medium";

24+ radius: "medium";

25− color: getColor(0) || "white";

25+ color: getColor(0) || "white";

26− gradientColor: getColor(1) || color;

26+ gradientColor: getColor(1) || color;

27− anchors.fill: parent;

27+ anchors.fill: parent;

28− image: backgroundImage.source ? backgroundImage : null;

28+ image: backgroundImage.source ? backgroundImage : null;

29− property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;

29+ property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;

30− property Image backgroundImage: Image {

30+ property Image backgroundImage: Image {

31− objectName: "backgroundImage";

31+ objectName: "backgroundImage";

32− source: {

32+ source: {

33− if (cardData && typeof cardData["background"] === "string") return cardData["background"];

33+ if (cardData && typeof cardData["background"] === "string") return cardData["background"];

34− else if (template && typeof template["card-background"] === "string") return template["card-background"];

34+ else if (template && typeof template["card-background"] === "string") return template["card-background"];

35− else return "";

35+ else return "";

36− }

36+ }

37− }

37+ }

38− function getColor(index) {

38+ function getColor(index) {

39− if (cardData && typeof cardData["background"] === "object"

39+ if (cardData && typeof cardData["background"] === "object"

40− && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {

40+ && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {

41− return cardData["background"]["elements"][index];

41+ return cardData["background"]["elements"][index];

42− } else if (template && typeof template["card-background"] === "object"

42+ } else if (template && typeof template["card-background"] === "object"

43− && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {

43+ && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {

44− return template["card-background"]["elements"][index];

44+ return template["card-background"]["elements"][index];

45− } else return undefined;

45+ } else return undefined;

46− }

46+ }

47− }

47+ }

48− }

48+ }

49readonly property size artShapeSize: Qt.size(-1, -1);

50readonly property int headerHeight: row.height;

51Row {

52− id: row;

52+ id: row;

53− objectName: "outerRow";

53+ objectName: "outerRow";

54− property real margins: units.gu(1);

54+ property real margins: units.gu(1);

55− spacing: margins;

55+ spacing: margins;

56− height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;

56+ height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;

57− anchors { top: parent.top;

57+ anchors { top: parent.top;

58 topMargin: units.gu(1);

59− left: parent.left;

59+left: parent.left;

60−}

60+ }

61− anchors.right: parent.right;

61+ anchors.right: parent.right;

62− anchors.margins: margins;

62+ anchors.margins: margins;

63−data: [ Image {

63+ data: [ Image {

64− id: mascotImage;

64+ id: mascotImage;

65− objectName: "mascotImage";

65+ objectName: "mascotImage";

66− anchors { verticalCenter: parent.verticalCenter; }

66+ anchors { verticalCenter: parent.verticalCenter; }

67− readonly property int maxSize: Math.max(width, height) * 4;

67+ readonly property int maxSize: Math.max(width, height) * 4;

68− source: cardData && cardData["mascot"];

68+ source: cardData && cardData["mascot"];

69− width: units.gu(6);

69+ width: units.gu(6);

70− height: units.gu(5.625);

70+ height: units.gu(5.625);

71− sourceSize { width: maxSize; height: maxSize }

71+ sourceSize { width: maxSize; height: maxSize }

72− fillMode: Image.PreserveAspectCrop;

72+ fillMode: Image.PreserveAspectCrop;

73− horizontalAlignment: Image.AlignHCenter;

73+ horizontalAlignment: Image.AlignHCenter;

74− verticalAlignment: Image.AlignVCenter;

74+ verticalAlignment: Image.AlignVCenter;

75− visible: showHeader;

76− }

77−,

78−Column {

79− anchors.verticalCenter: parent.verticalCenter;

80− spacing: units.dp(2);

81− width: parent.width - x;

82− data: [ Label {

83− id: titleLabel;

84− objectName: "titleLabel";

85− anchors { left: parent.left; right: parent.right }

86− elide: Text.ElideRight;

87− fontSize: "small";

88− wrapMode: Text.Wrap;

89− maximumLineCount: 2;

90− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

92− visible: showHeader ;

75+ visible: showHeader;

93− text: root.title;

76+ }

94− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

95− horizontalAlignment: root.headerAlignment;

96− }

97−,

98−Label {

99− id: subtitleLabel;

100− objectName: "subtitleLabel";

101− anchors { left: parent.left; right: parent.right }

102

77

78+ ,

79+ Column {

80+ anchors.verticalCenter: parent.verticalCenter;

81+ spacing: units.dp(2);

82+ width: parent.width - x;

83+ data: [ Label {

84+ id: titleLabel;

85+ objectName: "titleLabel";

86+ anchors { left: parent.left; right: parent.right }

103 elide: Text.ElideRight;

87 elide: Text.ElideRight;

104 fontSize: "small";

88 fontSize: "small";

89+ wrapMode: Text.Wrap;

90+ maximumLineCount: 2;

105 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

106− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

92+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

107− visible: titleLabel.visible && titleLabel.text;

93+ visible: showHeader ;

108− text: cardData && cardData["subtitle"] || "";

94+ text: root.title;

109− font.weight: Font.Light;

95+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

110 horizontalAlignment: root.headerAlignment;

96 horizontalAlignment: root.headerAlignment;

111 }

97 }

98+

99+ ,

100+ Label {

101+ id: subtitleLabel;

102+ objectName: "subtitleLabel";

103+ anchors { left: parent.left; right: parent.right }

104+ elide: Text.ElideRight;

105+ fontSize: "small";

106+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

107+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

108+ visible: titleLabel.visible && titleLabel.text;

109+ text: cardData && cardData["subtitle"] || "";

110+ font.weight: Font.Light;

111+ horizontalAlignment: root.headerAlignment;

112+ }

113+

112−]

114+ ]

113−}

115+ }

116+

114−]

117+ ]

115−}

118+ }

116implicitHeight: row.y + row.height + units.gu(1);

119implicitHeight: row.y + row.height + units.gu(1);

117}

120}

tests/plugins/Dash/cardcreator/3.res+71−68

@@ -5,8 +5,8 @@ AbstractButton {

5 property var cardData;

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8− property var scopeStyle: null;

8+ property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int headerAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -16,83 +16,86 @@ AbstractButton {

16onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }

17readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

18Item {

19− id: artShapeHolder;

19+ id: artShapeHolder;

20− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

20+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

21− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

21+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

22− anchors { horizontalCenter: parent.horizontalCenter; }

22+ anchors { horizontalCenter: parent.horizontalCenter; }

23− Loader {

23+ Loader {

24− id: artShapeLoader;

24+ id: artShapeLoader;

25− objectName: "artShapeLoader";

25+ objectName: "artShapeLoader";

26− active: cardData && cardData["art"] || false;

26+ active: cardData && cardData["art"] || false;

27− asynchronous: root.asynchronous;

28− visible: status == Loader.Ready;

29− sourceComponent: UbuntuShape {

30− id: artShape;

31− objectName: "artShape";

32− radius: "medium";

33− visible: image.status == Image.Ready;

34− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

37− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

38− function updateWidthHeightBindings() {

39− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

40− width = root.fixedArtShapeSize.width;

41− height = root.fixedArtShapeSize.height;

42− } else {

43− width = Qt.binding(function() { return !visible ? 0 : image.width });

44− height = Qt.binding(function() { return !visible ? 0 : image.height });

45− }

46− }

47− image: Image {

48− objectName: "artImage";

49− source: cardData && cardData["art"] || "";

50− cache: true;

51 asynchronous: root.asynchronous;

27 asynchronous: root.asynchronous;

28+ visible: status == Loader.Ready;

29+ sourceComponent: UbuntuShape {

30+ id: artShape;

31+ objectName: "artShape";

32+ radius: "medium";

33+ visible: image.status == Image.Ready;

34+ readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35+ readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

37+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

38+ function updateWidthHeightBindings() {

39+ if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

40+ width = root.fixedArtShapeSize.width;

41+ height = root.fixedArtShapeSize.height;

42+ } else {

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

44+ height = Qt.binding(function() { return !visible ? 0 : image.height });

45+ }

46+ }

47+ image: Image {

48+ objectName: "artImage";

49+ source: cardData && cardData["art"] || "";

50+ cache: true;

51+ asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

53− width: root.width;

53+ width: root.width;

54− height: width / artShape.aspect;

54+ height: width / artShape.aspect;

55+ }

56+ }

55 }

57 }

56− }

58+ }

57− }

58− }

59readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;

60Label {

61− id: titleLabel;

61+ id: titleLabel;

62− objectName: "titleLabel";

62+ objectName: "titleLabel";

63− anchors { right: parent.right;left: parent.left;

63+ anchors { right: parent.right;

64+rightMargin: units.gu(1);

65+left: parent.left;

64top: artShapeHolder.bottom;

66top: artShapeHolder.bottom;

65 topMargin: units.gu(1);

67 topMargin: units.gu(1);

66leftMargin: units.gu(1);

68leftMargin: units.gu(1);

67−}

68− elide: Text.ElideRight;

69− fontSize: "small";

70− wrapMode: Text.Wrap;

71− maximumLineCount: 2;

72− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

74− visible: showHeader ;

75− text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

78− }

69+ }

79−Label {

80− id: subtitleLabel;

81− objectName: "subtitleLabel";

82− anchors { left: titleLabel.left;

83− leftMargin: titleLabel.leftMargin;

84− right: titleLabel.right;

85− top: titleLabel.bottom;

86− topMargin: units.dp(2);

87− }

88 elide: Text.ElideRight;

70 elide: Text.ElideRight;

89 fontSize: "small";

71 fontSize: "small";

72+ wrapMode: Text.Wrap;

73+ maximumLineCount: 2;

90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

74 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

75+ color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

92− visible: titleLabel.visible && titleLabel.text;

76+ visible: showHeader ;

93− text: cardData && cardData["subtitle"] || "";

77+ text: root.title;

94− font.weight: Font.Light;

78+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

95 horizontalAlignment: root.headerAlignment;

79 horizontalAlignment: root.headerAlignment;

96 }

80 }

81+Label {

82+ id: subtitleLabel;

83+ objectName: "subtitleLabel";

84+ anchors { left: titleLabel.left;

85+ leftMargin: titleLabel.leftMargin;

86+ right: titleLabel.right;

87+ rightMargin: titleLabel.rightMargin;

88+ top: titleLabel.bottom;

89+ topMargin: units.dp(2);

90+ }

91+ elide: Text.ElideRight;

92+ fontSize: "small";

93+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

94+ color: root.scopeStyle ? root.scopeStyle.foreground : "grey";

95+ visible: titleLabel.visible && titleLabel.text;

96+ text: cardData && cardData["subtitle"] || "";

97+ font.weight: Font.Light;

98+ horizontalAlignment: root.headerAlignment;

99+ }

97implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);

100implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);

98}

101}

tests/plugins/Dash/cardcreator/5.res+114−112

@@ -4,9 +4,9 @@ AbstractButton {

4 property var components;

5 property var cardData;

6 property var artShapeBorderSource: undefined;

7− property real fontScale: 1.0;

7+ property real fontScale: 1.0;

8− property var scopeStyle: null;

8+ property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int headerAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -16,124 +16,126 @@ AbstractButton {

16onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }

17readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

18Item {

19− id: artShapeHolder;

19+ id: artShapeHolder;

20− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

20+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

21− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

21+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

22− anchors { horizontalCenter: parent.horizontalCenter; }

22+ anchors { horizontalCenter: parent.horizontalCenter; }

23− Loader {

23+ Loader {

24− id: artShapeLoader;

24+ id: artShapeLoader;

25− objectName: "artShapeLoader";

25+ objectName: "artShapeLoader";

26− active: cardData && cardData["art"] || false;

26+ active: cardData && cardData["art"] || false;

27− asynchronous: root.asynchronous;

28− visible: status == Loader.Ready;

29− sourceComponent: UbuntuShape {

30− id: artShape;

31− objectName: "artShape";

32− radius: "medium";

33− visible: image.status == Image.Ready;

34− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

37− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

38− function updateWidthHeightBindings() {

39− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

40− width = root.fixedArtShapeSize.width;

41− height = root.fixedArtShapeSize.height;

42− } else {

43− width = Qt.binding(function() { return !visible ? 0 : image.width });

44− height = Qt.binding(function() { return !visible ? 0 : image.height });

45− }

46− }

47− image: Image {

48− objectName: "artImage";

49− source: cardData && cardData["art"] || "";

50− cache: true;

51 asynchronous: root.asynchronous;

27 asynchronous: root.asynchronous;

28+ visible: status == Loader.Ready;

29+ sourceComponent: UbuntuShape {

30+ id: artShape;

31+ objectName: "artShape";

32+ radius: "medium";

33+ visible: image.status == Image.Ready;

34+ readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35+ readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

37+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

38+ function updateWidthHeightBindings() {

39+ if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

40+ width = root.fixedArtShapeSize.width;

41+ height = root.fixedArtShapeSize.height;

42+ } else {

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

44+ height = Qt.binding(function() { return !visible ? 0 : image.height });

45+ }

46+ }

47+ image: Image {

48+ objectName: "artImage";

49+ source: cardData && cardData["art"] || "";

50+ cache: true;

51+ asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

53− width: root.width;

53+ width: root.width;

54− height: width / artShape.aspect;

54+ height: width / artShape.aspect;

55+ }

56+ }

55− }

57+ }

56− }

58+ }

57− }

58− }

59Loader {

60− id: overlayLoader;

60+ id: overlayLoader;

61− anchors {

61+ anchors {

62− left: artShapeHolder.left;

62+ left: artShapeHolder.left;

63− right: artShapeHolder.right;

63+ right: artShapeHolder.right;

64− bottom: artShapeHolder.bottom;

64+ bottom: artShapeHolder.bottom;

65− }

65+ }

66− active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;

66+ active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;

67− asynchronous: root.asynchronous;

67+ asynchronous: root.asynchronous;

68− visible: showHeader && status == Loader.Ready;

68+ visible: showHeader && status == Loader.Ready;

69− sourceComponent: ShaderEffect {

69+ sourceComponent: ShaderEffect {

70− id: overlay;

70+ id: overlay;

71− height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);

71+ height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);

72− opacity: 0.6;

72+ opacity: 0.6;

73− property var source: ShaderEffectSource {

73+ property var source: ShaderEffectSource {

74− id: shaderSource;

74+ id: shaderSource;

75− sourceItem: artShapeLoader.item;

75+ sourceItem: artShapeLoader.item;

76− onVisibleChanged: if (visible) scheduleUpdate();

76+ onVisibleChanged: if (visible) scheduleUpdate();

77− live: false;

77+ live: false;

78− sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height);

78+ sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height);

79− }

79+ }

80− vertexShader: "

80+ vertexShader: "

81− uniform highp mat4 qt_Matrix;

81+ uniform highp mat4 qt_Matrix;

82− attribute highp vec4 qt_Vertex;

82+ attribute highp vec4 qt_Vertex;

83− attribute highp vec2 qt_MultiTexCoord0;

83+ attribute highp vec2 qt_MultiTexCoord0;

84− varying highp vec2 coord;

84+ varying highp vec2 coord;

85− void main() {

85+ void main() {

86− coord = qt_MultiTexCoord0;

86+ coord = qt_MultiTexCoord0;

87− gl_Position = qt_Matrix * qt_Vertex;

87+ gl_Position = qt_Matrix * qt_Vertex;

88− }";

88+ }";

89− fragmentShader: "

89+ fragmentShader: "

90− varying highp vec2 coord;

90+ varying highp vec2 coord;

91− uniform sampler2D source;

91+ uniform sampler2D source;

92− uniform lowp float qt_Opacity;

92+ uniform lowp float qt_Opacity;

93− void main() {

93+ void main() {

94− lowp vec4 tex = texture2D(source, coord);

94+ lowp vec4 tex = texture2D(source, coord);

95− gl_FragColor = vec4(0, 0, 0, tex.a) * qt_Opacity;

95+ gl_FragColor = vec4(0, 0, 0, tex.a) * qt_Opacity;

96− }";

96+ }";

97− }

97+ }

98− }

98+ }

99readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;

100Label {

101− id: titleLabel;

101+ id: titleLabel;

102− objectName: "titleLabel";

102+ objectName: "titleLabel";

103− anchors { left: parent.left;

103+ anchors { left: parent.left;

104− leftMargin: units.gu(1);

104+ leftMargin: units.gu(1);

105− right: parent.right;

105+ right: parent.right;

106− top: overlayLoader.top;

107− topMargin: units.gu(1);

106+ rightMargin: units.gu(1);

108−}

109− elide: Text.ElideRight;

110− fontSize: "small";

111− wrapMode: Text.Wrap;

112− maximumLineCount: 2;

113− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

114− color: "white";

115− visible: showHeader && overlayLoader.active;

107+ top: overlayLoader.top;

116− text: root.title;

117− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

118− horizontalAlignment: root.headerAlignment;

119− }

120−Label {

121− id: subtitleLabel;

122− objectName: "subtitleLabel";

123− anchors { left: titleLabel.left;

124− leftMargin: titleLabel.leftMargin;

125− right: titleLabel.right;

126− top: titleLabel.bottom;

127− topMargin: units.dp(2);

108+ topMargin: units.gu(1);

128− }

109+ }

129 elide: Text.ElideRight;

110 elide: Text.ElideRight;

130 fontSize: "small";

111 fontSize: "small";

112+ wrapMode: Text.Wrap;

113+ maximumLineCount: 2;

131 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

132 color: "white";

115 color: "white";

133− visible: titleLabel.visible && titleLabel.text;

116+ visible: showHeader && overlayLoader.active;

134− text: cardData && cardData["subtitle"] || "";

117+ text: root.title;

135− font.weight: Font.Light;

118+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

136 horizontalAlignment: root.headerAlignment;

119 horizontalAlignment: root.headerAlignment;

137 }

120 }

121+Label {

122+ id: subtitleLabel;

123+ objectName: "subtitleLabel";

124+ anchors { left: titleLabel.left;

125+ leftMargin: titleLabel.leftMargin;

126+ right: titleLabel.right;

127+ rightMargin: titleLabel.rightMargin;

128+ top: titleLabel.bottom;

129+ topMargin: units.dp(2);

130+ }

131+ elide: Text.ElideRight;

132+ fontSize: "small";

133+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

134+ color: "white";

135+ visible: titleLabel.visible && titleLabel.text;

136+ text: cardData && cardData["subtitle"] || "";

137+ font.weight: Font.Light;

138+ horizontalAlignment: root.headerAlignment;

139+ }

138implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);

140implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);

139}

141}

tests/plugins/Dash/cardcreator/7.resnew file+128

@@ -0,0 +1,128 @@

1+AbstractButton {

2+ id: root;

3+ property var template;

4+ property var components;

5+ property var cardData;

6+ property var artShapeBorderSource: undefined;

7+ property real fontScale: 1.0;

8+ property var scopeStyle: null;

9+ property int headerAlignment: Text.AlignLeft;

10+ property int fixedHeaderHeight: -1;

11+ property size fixedArtShapeSize: Qt.size(-1, -1);

12+ readonly property string title: cardData && cardData["title"] || "";

13+ property bool asynchronous: true;

14+ property bool showHeader: true;

15+ implicitWidth: childrenRect.width;

16+Loader {

17+ id: backgroundLoader;

18+ objectName: "backgroundLoader";

19+ anchors.fill: parent;

20+ asynchronous: root.asynchronous;

21+ visible: status == Loader.Ready;

22+ sourceComponent: UbuntuShape {

23+ objectName: "background";

24+ radius: "medium";

25+ color: getColor(0) || "white";

26+ gradientColor: getColor(1) || color;

27+ anchors.fill: parent;

28+ image: backgroundImage.source ? backgroundImage : null;

29+ property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;

30+ property Image backgroundImage: Image {

31+ objectName: "backgroundImage";

32+ source: {

33+ if (cardData && typeof cardData["background"] === "string") return cardData["background"];

34+ else if (template && typeof template["card-background"] === "string") return template["card-background"];

35+ else return "";

36+ }

37+ }

38+ function getColor(index) {

39+ if (cardData && typeof cardData["background"] === "object"

40+ && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {

41+ return cardData["background"]["elements"][index];

42+ } else if (template && typeof template["card-background"] === "object"

43+ && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {

44+ return template["card-background"]["elements"][index];

45+ } else return undefined;

46+ }

47+ }

48+ }

49+readonly property size artShapeSize: Qt.size(-1, -1);

50+readonly property int headerHeight: row.height;

51+Row {

52+ id: row;

53+ objectName: "outerRow";

54+ property real margins: units.gu(1);

55+ spacing: margins;

56+ height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;

57+ anchors { top: parent.top;

58+ topMargin: units.gu(1);

59+left: parent.left;

60+ }

61+ anchors.right: parent.right;

62+ anchors.margins: margins;

63+ data: [ Image {

64+ id: mascotImage;

65+ objectName: "mascotImage";

66+ anchors { verticalCenter: parent.verticalCenter; }

67+ readonly property int maxSize: Math.max(width, height) * 4;

68+ source: cardData && cardData["mascot"];

69+ width: units.gu(6);

70+ height: units.gu(5.625);

71+ sourceSize { width: maxSize; height: maxSize }

72+ fillMode: Image.PreserveAspectCrop;

73+ horizontalAlignment: Image.AlignHCenter;

74+ verticalAlignment: Image.AlignVCenter;

75+ visible: showHeader;

76+ }

77+

78+ ,

79+ Column {

80+ anchors.verticalCenter: parent.verticalCenter;

81+ spacing: units.dp(2);

82+ width: parent.width - x;

83+ data: [

84+ Label {

85+ id: titleLabel;

86+ objectName: "titleLabel";

87+ anchors { left: parent.left; right: parent.right }

88+ elide: Text.ElideRight;

89+ fontSize: "small";

90+ wrapMode: Text.Wrap;

91+ maximumLineCount: 2;

92+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

93+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

94+ visible: showHeader ;

95+ text: root.title;

96+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

97+ horizontalAlignment: root.headerAlignment;

98+ }

99+,

100+Label {

101+ id: subtitleLabel;

102+ objectName: "subtitleLabel";

103+ anchors { left: parent.left; right: parent.right }

104+ elide: Text.ElideRight;

105+ fontSize: "small";

106+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

107+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

108+ visible: titleLabel.visible && titleLabel.text;

109+ text: cardData && cardData["subtitle"] || "";

110+ font.weight: Font.Light;

111+ horizontalAlignment: root.headerAlignment;

112+ }

113+,

114+CardAttributes {

115+ id: attributesRow;

116+ objectName: "attributesRow";

117+ anchors { left: parent.left; right: parent.right }

118+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");

119+ model: cardData["attributes"]

120+ }

121+

122+ ]

123+ }

124+

125+ ]

126+ }

127+implicitHeight: row.y + row.height + units.gu(1);

128+}

tests/plugins/Dash/cardcreator/7.tstnew file+3

@@ -0,0 +1,3 @@

1+template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}

2+components: {"art":{"aspect-ratio":1,"fill-mode":"crop"},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"},"attributes":{"field":"attributes","max-count":2}}

3+result: 7.res

tests/plugins/Dash/cardcreatortest.cpp+9−1

@@ -19,6 +19,7 @@

19#include <QQuickItem>

20#include <QQuickView>

21#include <QtTestGui>

22+#include <QTemporaryFile>

22

23

23class CardCreatorTest : public QObject

24class CardCreatorTest : public QObject

24{

25{

@@ -74,7 +75,14 @@ private Q_SLOTS:

74 QVERIFY(testResultFile.open(QIODevice::ReadOnly));

75 QVERIFY(testResultFile.open(QIODevice::ReadOnly));

75 QTextStream ts2(&testResultFile);

76 QTextStream ts2(&testResultFile);

76 const QString expectedResult = ts2.readAll();

77 const QString expectedResult = ts2.readAll();

78+ const QString executedResult = cardStringResult.toString();

79+ // Record failed results to /tmp

80+ QTemporaryFile tmpFile(QDir::tempPath() + QDir::separator() + "testCardCreatorFailedResultXXXXXX");

81+ tmpFile.open();

82+ tmpFile.setAutoRemove(false);

83+ tmpFile.write(executedResult.toUtf8().constData());

77− QCOMPARE(cardStringResult.toString().simplified(), expectedResult.simplified());

84+ QCOMPARE(executedResult.simplified(), expectedResult.simplified());

85+ tmpFile.setAutoRemove(true); // Remove the result if it passed

78

86

79 QVariant createCardComponentResult;

87 QVariant createCardComponentResult;

80 QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));

88 QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−1

@@ -40,7 +40,6 @@ private:

40 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->height(), height);

41 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_item)->culled, culled);

42 QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader);

43− QTRY_COMPARE(hasSectionHeaderProperty(lvwph->m_visibleItems[visibleIndex]->m_item), !sectionHeader.isNull());

44 if (!sectionHeader.isNull()) {

43 if (!sectionHeader.isNull()) {

45 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled);

44 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled);

46 QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_firstVisibleIndex + visibleIndex);

45 QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_firstVisibleIndex + visibleIndex);

tests/plugins/Dash/tst_CardAttributes.qmlnew file+54

@@ -0,0 +1,54 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import Dash 0.1

20+

21+Item {

22+ width: units.gu(40)

23+ height: units.gu(4.5)

24+

25+ property var testData: [

26+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}],

27+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"},{"value":"text3"}],

28+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"},{"value":"text3"},{"value":"text4"}],

29+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"},{"value":"text3","style":"highlighted"},{"value":"text4","icon":"image://theme/close","style":"highlighted"},{"value":"text5"}]

30+ ]

31+

32+ CardAttributes {

33+ id: cardAttributes

34+ model: testData[3]

35+ clip: true

36+ }

37+

38+ TestCase {

39+ name: "CardAttributesTest"

40+ when: windowShown

41+

42+ function init() {

43+ }

44+

45+ function test_columns_data() {

46+ return testData;

47+ }

48+

49+ function test_columns(data) {

50+ cardAttributes.model = data;

51+ compare(cardAttributes.columns, 2 + data.length % 2);

52+ }

53+ }

54+}

tests/qmltests/CMakeLists.txt−1

@@ -40,7 +40,6 @@ add_qml_test(Dash Card)

40add_qml_benchmark(Dash CardBenchmark 1000)

41add_qml_test(Dash CardTool)

42add_qml_test(Dash GenericScopeView)

43−add_qml_test(Dash/Apps RunningApplicationsGrid)

44add_qml_test(Dash/Previews Preview)

43add_qml_test(Dash/Previews Preview)

45add_qml_test(Dash/Previews PreviewActions)

44add_qml_test(Dash/Previews PreviewActions)

46add_qml_test(Dash/Previews PreviewAudioPlayback)

45add_qml_test(Dash/Previews PreviewAudioPlayback)

tests/qmltests/Components/tst_PageHeader.qml+36−6

@@ -36,6 +36,16 @@ Item {

36

37 function init() {

38 searchEnabled = true;

39+

40+ // Reset to initial state

41+ pageHeader.searchQuery = "";

42+ pageHeader.closePopup();

43+ pageHeader.searchHistory.clear();

44+

45+ // Check initial state

46+ var headerContainer = findChild(pageHeader, "headerContainer");

47+ tryCompareFunction(function() { return headerContainer.popover === null; }, true);

48+ compare(pageHeader.searchHistory.count, 0);

39 }

49 }

40

50

41 function test_search_disabled() {

51 function test_search_disabled() {

@@ -80,9 +90,6 @@ Item {

80 }

90 }

81

91

82 function test_history() {

92 function test_history() {

83− pageHeader.searchHistory.clear()

84− compare(pageHeader.searchHistory.count, 0)

85−

86 pageHeader.triggerSearch()

93 pageHeader.triggerSearch()

87 typeString("humppa1")

94 typeString("humppa1")

88 pageHeader.resetSearch()

95 pageHeader.resetSearch()

@@ -166,16 +173,26 @@ Item {

166 tryCompareFunction(function() { return headerContainer.popover !== null; }, true);

173 tryCompareFunction(function() { return headerContainer.popover !== null; }, true);

167

174

168 tryCompare(headerContainer.popover, "visible", true);

175 tryCompare(headerContainer.popover, "visible", true);

176+

177+ var searchTextField = findChild(pageHeader, "searchTextField");

178+ compare(searchTextField.focus, true);

179+

180+ var recentSearches = findChild(headerContainer.popover, "recentSearches");

181+ mouseClick(recentSearches.itemAt(0), 0, 0);

182+

183+ compare(pageHeader.searchQuery, "Search2");

184+ tryCompareFunction(function() { return headerContainer.popover === null; }, true);

185+ compare(searchTextField.focus, false);

169 }

186 }

170

187

171− function test_tap_outside_closes_popup_data() {

188+ function test_popup_closing_data() {

172 return [

189 return [

173 { tag: "with search text", searchText: "foobar", hideSearch: false },

190 { tag: "with search text", searchText: "foobar", hideSearch: false },

174 { tag: "without search text", searchText: "", hideSearch: true }

191 { tag: "without search text", searchText: "", hideSearch: true }

175 ];

192 ];

176 }

193 }

177

194

178− function test_tap_outside_closes_popup(data) {

195+ function test_popup_closing(data) {

179 searchEnabled = true;

196 searchEnabled = true;

180 pageHeader.searchHistory.clear();

197 pageHeader.searchHistory.clear();

181

198

@@ -191,13 +208,26 @@ Item {

191

208

192 pageHeader.searchQuery = data.searchText;

209 pageHeader.searchQuery = data.searchText;

193

210

211+ if (data.searchText == "") {

212+ // When the text is empty the user can also close the

213+ // popup by clicking outside the header instead of by starting a search

194− mouseClick(root, root.width / 2, root.height - 1);

214+ mouseClick(root, root.width / 2, root.height - 1);

215+ }

195

216

196 tryCompare(headerContainer, "showSearch", !data.hideSearch);

217 tryCompare(headerContainer, "showSearch", !data.hideSearch);

197 tryCompareFunction(function() { return headerContainer.popover === null; }, true);

218 tryCompareFunction(function() { return headerContainer.popover === null; }, true);

198

219

199 pageHeader.resetSearch();

220 pageHeader.resetSearch();

200 }

221 }

222+

223+ function test_search_change_shows_search() {

224+ var headerContainer = findChild(pageHeader, "headerContainer");

225+ compare(headerContainer.showSearch, false);

226+ compare(searchQuery, "");

227+

228+ searchQuery = "H";

229+ compare(headerContainer.showSearch, true);

230+ }

201 }

231 }

202

232

203 Column {

233 Column {

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qmldeleted−217

@@ -1,217 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−import QtTest 1.0

19−import "../../../../qml/Dash/Apps"

20−import Unity.Test 0.1 as UT

21−import Unity.Application 0.1

22−import Ubuntu.Components 1.1

23−

24−// Using Rectangle to have an opaque surface because AppManager paints app surfaces behind it.

25−Rectangle {

26− width: units.gu(70)

27− height: units.gu(40)

28−

29− function resetRunningApplications() {

30− while (ApplicationManager.count > 0) {

31− ApplicationManager.stopApplication(ApplicationManager.get(0).appId)

32− }

33−

34− ApplicationManager.startApplication("dialer-app");

35− ApplicationManager.startApplication("webbrowser-app");

36− }

37−

38− Component.onCompleted: {

39− resetRunningApplications()

40− }

41−

42− // The component under test

43− RunningApplicationsGrid {

44− id: runningApplicationsGrid

45− orientationAngle: orientationAngleSelector.selectedIndex * 90

46− anchors.left: parent.left

47− anchors.right: controlPanel.left

48− anchors.top: parent.top

49− anchors.bottom: parent.bottom

50− model: ApplicationManager

51− }

52−

53− Rectangle {

54− id: controlPanel

55− anchors.right: parent.right

56− anchors.top: parent.top

57− anchors.bottom: parent.bottom

58− width: units.gu(20)

59− color: "black"

60−

61− OptionSelector {

62− id: orientationAngleSelector

63− model: ["0","90","180","270"]

64− text: "Orientation Angle"

65− width: parent.width

66− }

67− }

68−

69− UT.UnityTestCase {

70− name: "RunningApplicationsGrid"

71− when: windowShown

72−

73− function init() {

74− runningApplicationsGrid.terminationModeEnabled = false

75− resetRunningApplications()

76− }

77−

78− property var browserTile

79− property var phoneTile

80−

81− property var isBrowserLongPressed: false

82− function onBrowserLongPressed() {isBrowserLongPressed = true}

83−

84− property var isPhoneLongPressed: false

85− function onPhoneLongPressed() {isPhoneLongPressed = true}

86−

87− // Tiles should go to termination mode when any one of them is long-pressed.

88− // Long-pressing when they're in termination mode brings them back to activation mode

89− function test_enterTerminationMode() {

90− browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")

91− verify(browserTile != undefined)

92− browserTile.onPressAndHold.connect(onBrowserLongPressed)

93−

94− phoneTile = findChild(runningApplicationsGrid, "runningAppTile Dialer")

95− verify(phoneTile != undefined)

96− phoneTile.onPressAndHold.connect(onPhoneLongPressed)

97−

98− compare(browserTile.terminationModeEnabled, false)

99− compare(phoneTile.terminationModeEnabled, false)

100− compare(runningApplicationsGrid.terminationModeEnabled, false)

101−

102− isBrowserLongPressed = false

103− mousePress(browserTile, browserTile.width/2, browserTile.height/2)

104− tryCompareFunction(checkSwitchToTerminationModeAfterLongPress, true)

105−

106− mouseRelease(browserTile, browserTile.width/2, browserTile.height/2)

107−

108− compare(browserTile.terminationModeEnabled, true)

109− compare(phoneTile.terminationModeEnabled, true)

110− compare(runningApplicationsGrid.terminationModeEnabled, true)

111−

112− isPhoneLongPressed = false

113− mousePress(phoneTile, phoneTile.width/2, phoneTile.height/2)

114− tryCompareFunction(checkSwitchToActivationModeAfterLongPress, true)

115−

116− mouseRelease(phoneTile, phoneTile.width/2, phoneTile.height/2)

117−

118− compare(browserTile.terminationModeEnabled, false)

119− compare(phoneTile.terminationModeEnabled, false)

120− compare(runningApplicationsGrid.terminationModeEnabled, false)

121−

122− browserTile.onPressAndHold.disconnect(onBrowserLongPressed)

123− phoneTile.onPressAndHold.disconnect(onPhoneLongPressed)

124− }

125−

126− // Checks that components swicth to termination mode after (and only after) a long

127− // press happens on Browser tile.

128− function checkSwitchToTerminationModeAfterLongPress() {

129− compare(browserTile.terminationModeEnabled, isBrowserLongPressed)

130− compare(phoneTile.terminationModeEnabled, isBrowserLongPressed)

131− compare(runningApplicationsGrid.terminationModeEnabled, isBrowserLongPressed)

132−

133− return isBrowserLongPressed &&

134− browserTile.terminationModeEnabled &&

135− phoneTile.terminationModeEnabled &&

136− runningApplicationsGrid.terminationModeEnabled

137− }

138−

139− // Checks that components swicth to activation mode after (and only after) a long

140− // press happens on Phone tile.

141− function checkSwitchToActivationModeAfterLongPress() {

142− compare(browserTile.terminationModeEnabled, !isPhoneLongPressed)

143− compare(phoneTile.terminationModeEnabled, !isPhoneLongPressed)

144− compare(runningApplicationsGrid.terminationModeEnabled, !isPhoneLongPressed)

145−

146− return isPhoneLongPressed &&

147− !browserTile.terminationModeEnabled &&

148− !phoneTile.terminationModeEnabled &&

149− !runningApplicationsGrid.terminationModeEnabled

150− }

151−

152− // While on termination mode, clicking a running application tile, outside of

153− // the close icon should do nothing

154− function test_clickTileNotClose() {

155− runningApplicationsGrid.terminationModeEnabled = true

156−

157− var browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")

158− verify(browserTile != undefined)

159−

160− verify(ApplicationManager.findApplication("webbrowser-app") !== null)

161−

162− mouseClick(browserTile, browserTile.width/2, browserTile.height/2)

163−

164− verify(ApplicationManager.findApplication("webbrowser-app") !== null)

165−

166− // The tile for the Browser app should stay there

167− tryCompareFunction(checkBrowserTileExists, true)

168− }

169−

170− // While in termination mode, clicking on a running application tile's close icon

171− // causes the corresponding application to be terminated

172− function test_clickCloseIconToTerminateApp() {

173− runningApplicationsGrid.terminationModeEnabled = true

174−

175− var browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")

176− var browserTileCloseButton = findChild(runningApplicationsGrid, "closeIcon Browser")

177−

178− verify(browserTile != undefined)

179− verify(browserTileCloseButton != undefined)

180− verify(ApplicationManager.findApplication("webbrowser-app") !== 0)

181−

182− mouseClick(browserTileCloseButton, browserTileCloseButton.width/2, browserTileCloseButton.height/2)

183− wait(0) // spin event loop to start any pending animation

184−

185− verify(ApplicationManager.findApplication("webbrowser-app") === null)

186−

187− // The tile for the Browser app should eventually vanish since the

188− // application has been terminated.

189− tryCompareFunction(checkBrowserTileExists, false)

190− }

191−

192− function checkBrowserTileExists() {

193− return findChild(runningApplicationsGrid, "runningAppTile Browser")

194− != undefined

195− }

196−

197− // While in termination mode, if you click outside any of the tiles, the

198− // termination mode is disabled (i.e. we switch back to activation mode).

199− function test_clickOutsideTilesDisablesTerminationMode() {

200− runningApplicationsGrid.terminationModeEnabled = true

201−

202− var browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")

203− verify(browserTile != undefined)

204−

205− verify(runningApplicationsGrid.terminationModeEnabled);

206−

207− // Click on the bottom right corner of the grid, where there's no

208− // RunningApplicationTile lying around

209− mouseClick(runningApplicationsGrid,

210− runningApplicationsGrid.width - 1, runningApplicationsGrid.height - 1);

211−

212− wait(0) // spin event loop to ensure that any pending signal emission went through

213−

214− verify(!runningApplicationsGrid.terminationModeEnabled);

215− }

216− }

217−}

tests/qmltests/Dash/CardHelpers.js+5−3

@@ -16,7 +16,7 @@

16

17.pragma library

18

19−var components = ["title", "art", "subtitle", "mascot", "emblem", "old-price", "price", "alt-price", "rating", "alt-rating", "summary"]

19+var components = ["title", "art", "subtitle", "mascot", "emblem", "old-price", "price", "alt-price", "rating", "alt-rating", "summary", "attributes"]

20

21var defaultLayout = ' \

22{ \

@@ -47,7 +47,8 @@ var defaultLayout = ' \

47 "empty": "image://theme/rating-star-empty" \

48 }, \

49 "alt-rating": null, \

50− "summary": null \

50+ "summary": null, \

51+ "attributes": { "max-count": 2 } \

51 }, \

52 }, \

52 "resources": {} \

53 "resources": {} \

53}'

54}'

@@ -58,7 +59,8 @@ var fullMapping = ' \

58 "art": "art", \

59 "art": "art", \

59 "subtitle": "subtitle", \

60 "subtitle": "subtitle", \

60 "mascot": "mascot", \

61 "mascot": "mascot", \

61− "summary": "summary" \

62+ "summary": "summary", \

63+ "attributes": "attributes" \

62}'

64}'

63

65

64

66

tests/qmltests/Dash/tst_Card.qml+4−2

@@ -33,7 +33,8 @@ Rectangle {

33 "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",

34 "title": "foo",

35 "subtitle": "bar",

36− "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."

36+ "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",

37+ "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]

37 }'

38 }'

38

39

39 property var cardsModel: [

40 property var cardsModel: [

@@ -110,6 +111,7 @@ Rectangle {

110 anchors { top: parent.top; left: parent.left; margins: units.gu(1) }

111 anchors { top: parent.top; left: parent.left; margins: units.gu(1) }

111

112

112 sourceComponent: cardTool.cardComponent

113 sourceComponent: cardTool.cardComponent

114+ clip: true

113 onLoaded: {

115 onLoaded: {

114 item.template = Qt.binding(function() { return cardTool.template; });

116 item.template = Qt.binding(function() { return cardTool.template; });

115 item.components = Qt.binding(function() { return cardTool.components; });

117 item.components = Qt.binding(function() { return cardTool.components; });

@@ -359,7 +361,7 @@ Rectangle {

359

361

360 waitForRendering(card);

362 waitForRendering(card);

361

363

362− tryCompareFunction(function() { return testCase.summary.y === data.top() }, true);

364+ tryCompareFunction(function() { return art.height > 0 && testCase.summary.y === data.top() }, true);

363 }

365 }

364

366

365 function test_art_visibility() {

367 function test_art_visibility() {

tests/qmltests/Greeter/tst_Lockscreen.qml+11−5

@@ -18,8 +18,9 @@ import QtQuick 2.0

18import QtTest 1.0

19import ".."

20import "../../../qml/Components"

21−import Ubuntu.Components 0.1

21+import AccountsService 0.1

22import LightDM 0.1 as LightDM

23+import Ubuntu.Components 0.1

23import Unity.Test 0.1 as UT

24import Unity.Test 0.1 as UT

24

25

25Rectangle {

26Rectangle {

@@ -53,11 +54,16 @@ Rectangle {

53 }

54 }

55 }

55

56

57+ function setUser(username) {

58+ AccountsService.user = username

59+ LightDM.Greeter.authenticate(username)

60+ }

61+

56 Connections {

62 Connections {

57 target: LightDM.Greeter

63 target: LightDM.Greeter

58

64

59 onShowPrompt: {

65 onShowPrompt: {

60− if (text === "PIN") {

66+ if (AccountsService.passwordDisplayHint === AccountsService.Numeric) {

61 pinPadCheckBox.checked = false

67 pinPadCheckBox.checked = false

62 } else {

68 } else {

63 pinPadCheckBox.checked = true

69 pinPadCheckBox.checked = true

@@ -139,12 +145,12 @@ Rectangle {

139 Button {

145 Button {

140 text: "start auth (1234)"

146 text: "start auth (1234)"

141 width: parent.width

147 width: parent.width

142− onClicked: LightDM.Greeter.authenticate("has-pin")

148+ onClicked: setUser("has-pin")

143 }

149 }

144 Button {

150 Button {

145 text: "start auth (password)"

151 text: "start auth (password)"

146 width: parent.width

152 width: parent.width

147− onClicked: LightDM.Greeter.authenticate("has-password")

153+ onClicked: setUser("has-password")

148 }

154 }

149

155

150 TextField {

156 TextField {

@@ -255,7 +261,7 @@ Rectangle {

255 enteredLabel.text = ""

261 enteredLabel.text = ""

256 minPinLengthTextField.text = data.minPinLength

262 minPinLengthTextField.text = data.minPinLength

257 maxPinLengthTextField.text = data.maxPinLength

263 maxPinLengthTextField.text = data.maxPinLength

258− LightDM.Greeter.authenticate(data.username)

264+ setUser(data.username)

259 waitForLockscreenReady();

265 waitForLockscreenReady();

260

266

261 var inputField = findChild(lockscreen, "pinentryField")

267 var inputField = findChild(lockscreen, "pinentryField")

tests/qmltests/tst_Shell.qml+2−6

@@ -313,9 +313,9 @@ Item {

313 - perform long left edge swipe to go minimize the app and go back to the dash.

314

315 Expected Results

316− - apps lens shown and Running Apps visible on screen

316+ - apps lens shown

317 */

318− function test_minimizingAppTakesToRunningApps() {

318+ function test_minimizingAppTakesToDashApps() {

319 var dashApps = findChild(shell, "clickscope");

320 swipeUntilScopeViewIsReached(dashApps);

321

@@ -353,10 +353,6 @@ Item {

353 tryCompare(appsCategoryListView, "moving", false);

354

355 verify(itemIsOnScreen(dashApps));

356−

357− var runningApplicationsGrid = findChild(appsCategoryListView, "running.apps.category");

358− verify(runningApplicationsGrid);

359− verify(itemIsOnScreen(runningApplicationsGrid));

360 }

356 }

361

357

362 function test_showInputMethod() {

358 function test_showInputMethod() {