034dca7 · unity8 · git.iko.soy

CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.2 REQUIRED)

57find_package(Qt5Concurrent 5.2 REQUIRED)

58find_package(Qt5Sql 5.2 REQUIRED)

59

60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)

60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)

61

62# Standard install paths

63include(GNUInstallDirs)

data/CMakeLists.txt+3

@@ -11,5 +11,8 @@ install(FILES

11 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

12 )

13

14+add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)

15+

14install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

16install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

15install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)

17install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)

18+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)

debian/changelog+54

@@ -1,3 +1,57 @@

1+unity8 (8.11+15.10.20151009-0ubuntu1) wily; urgency=medium

2+

3+ [ CI Train Bot ]

4+ * New rebuild forced.

5+

6+ [ Pawel Stolowski ]

7+ * Store unity8 package version in /var/lib/.../version file for fast

8+ retrieval from the shell plugin.

9+

10+ -- Pawel Stolowski <ci-train-bot@canonical.com> Fri, 09 Oct 2015 09:13:03 +0000

11+

12+unity8 (8.11+15.10.20151008-0ubuntu1) wily; urgency=medium

13+

14+ [ Lukáš Tinkl ]

15+ * Revert to using plaintext instead of HTML-like markup for the

16+ notifications (LP: #1504256)

17+

18+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 08 Oct 2015 20:46:26 +0000

19+

20+unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium

21+

22+ [ CI Train Bot ]

23+ * Resync trunk.

24+

25+ [ Lukáš Tinkl ]

26+ * Wizard: skip the reporting page if the system is configured not to

27+ report crashes (LP: #1494442)

28+

29+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Oct 2015 13:24:03 +0000

30+

31+unity8 (8.11+15.10.20151001-0ubuntu1) wily; urgency=medium

32+

33+ [ Alexandros Frantzis ]

34+ * Use power state change reason SnapDecision to turn screen on when a

35+ SnapDecision arrives (LP: #1291455)

36+

37+ [ CI Train Bot ]

38+ * New rebuild forced.

39+

40+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 01 Oct 2015 12:04:04 +0000

41+

42+unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium

43+

44+ [ Albert Astals Cid ]

45+ * Make Launcher::test_quickListMenuOnRMB stable (LP: #1500359)

46+

47+ [ CI Train Bot ]

48+ * New rebuild forced.

49+

50+ [ Michael Zanetti ]

51+ * Stabilize Launcher DND test

52+

53+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 30 Sep 2015 10:09:33 +0000

54+

1unity8 (8.11+15.10.20150925-0ubuntu1) wily; urgency=medium

55unity8 (8.11+15.10.20150925-0ubuntu1) wily; urgency=medium

2

56

3 [ Albert Astals Cid ]

57 [ Albert Astals Cid ]

debian/control+1−1

@@ -49,7 +49,7 @@ Build-Depends: cmake,

49 qtdeclarative5-private-dev (>= 5.2.1),

50 qtdeclarative5-qtmultimedia-plugin,

51 qtdeclarative5-ubuntu-settings-components (>= 0.6),

52− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

52+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),

53 qtdeclarative5-ubuntu-web-plugin,

54 ttf-ubuntu-font-family,

55Standards-Version: 3.9.4

debian/unity8.install+1

@@ -1,3 +1,4 @@

1+var/lib/unity8/version

1data/unity8-dash.conf usr/share/upstart/sessions/

2data/unity8-dash.conf usr/share/upstart/sessions/

2data/unity8-filewatcher.conf usr/share/upstart/sessions/

3data/unity8-filewatcher.conf usr/share/upstart/sessions/

3data/unity8.conf usr/share/upstart/sessions/

4data/unity8.conf usr/share/upstart/sessions/

plugins/Dash/CardAttributes.qml+2−2

@@ -16,7 +16,7 @@

16

17import QtQuick 2.2

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20

21GridLayout {

22 id: grid

@@ -27,7 +27,7 @@ GridLayout {

27 columns: 2 + repeater.count % 2

28 rowSpacing: units.gu(.5)

29 property alias model: repeater.model

30− property color color: Theme.palette.normal.baseText

30+ property color color: theme.palette.normal.baseText

31 property real fontScale: 1.0

32

33 Repeater {

plugins/Dash/CardCreator.js+25−51

@@ -28,11 +28,12 @@ var kBackgroundLoaderCode = 'Loader {\n\

28 sourceComponent: UbuntuShape { \n\

29 objectName: "background"; \n\

30 radius: "medium"; \n\

31− color: getColor(0) || "white"; \n\

31+ backgroundColor: getColor(0) || "white"; \n\

32− gradientColor: getColor(1) || color; \n\

32+ secondaryBackgroundColor: getColor(1) || backgroundColor; \n\

33+ backgroundMode: UbuntuShape.VerticalGradient; \n\

33 anchors.fill: parent; \n\

34 anchors.fill: parent; \n\

34− image: backgroundImage.source ? backgroundImage : null; \n\

35+ source: backgroundImage.source ? backgroundImage : null; \n\

35− property real luminance: Style.luminance(color); \n\

36+ property real luminance: Style.luminance(backgroundColor); \n\

36 property Image backgroundImage: Image { \n\

37 property Image backgroundImage: Image { \n\

37 objectName: "backgroundImage"; \n\

38 objectName: "backgroundImage"; \n\

38 source: { \n\

39 source: { \n\

@@ -52,7 +53,7 @@ var kBackgroundLoaderCode = 'Loader {\n\

52// %1 is used as anchors of artShapeHolder

53// %1 is used as anchors of artShapeHolder

53// %2 is used as image width

54// %2 is used as image width

54// %3 is used as image height

55// %3 is used as image height

55−var kArtShapeHolderCode = 'Item { \n\

56+var kArtShapeHolderCode = 'Item { \n\

56 id: artShapeHolder; \n\

57 id: artShapeHolder; \n\

57 height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

58 height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

58 width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

59 width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

@@ -66,10 +67,9 @@ var kArtShapeHolderCode = 'Item { \n\

66 sourceComponent: Item { \n\

67 sourceComponent: Item { \n\

67 id: artShape; \n\

68 id: artShape; \n\

68 objectName: "artShape"; \n\

69 objectName: "artShape"; \n\

69− property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\

70+ readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\

70 visible: image.status == Image.Ready; \n\

71 visible: image.status == Image.Ready; \n\

71 readonly property alias image: artImage; \n\

72 readonly property alias image: artImage; \n\

72− property alias borderSource: artShapeShape.borderSource; \n\

73 ShaderEffectSource { \n\

74 id: artShapeSource; \n\

75 sourceItem: artImage; \n\

@@ -78,16 +78,17 @@ var kArtShapeHolderCode = 'Item { \n\

78 height: 1; \n\

79 hideSource: doShapeItem; \n\

80 } \n\

81− Shape { \n\

81+ UbuntuShape { \n\

82 id: artShapeShape; \n\

83− image: artShapeSource; \n\

83+ source: artShapeSource; \n\

84 anchors.fill: parent; \n\

85 visible: doShapeItem; \n\

86 radius: "medium"; \n\

87+ aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat; \n\

87 } \n\

88 } \n\

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

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

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

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

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

91+ Component.onCompleted: { updateWidthHeightBindings(); } \n\

91 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

92 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

92 function updateWidthHeightBindings() { \n\

93 function updateWidthHeightBindings() { \n\

93 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

94 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

@@ -112,44 +113,18 @@ var kArtShapeHolderCode = 'Item { \n\

112

113

113var kOverlayLoaderCode = 'Loader { \n\

114var kOverlayLoaderCode = 'Loader { \n\

114 id: overlayLoader; \n\

115 id: overlayLoader; \n\

115− anchors { \n\

116+ readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\

116− left: artShapeHolder.left; \n\

117− right: artShapeHolder.right; \n\

117+ anchors.fill: artShapeHolder; \n\

118− bottom: artShapeHolder.bottom; \n\

119− } \n\

120 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\

118 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\

121 asynchronous: root.asynchronous; \n\

119 asynchronous: root.asynchronous; \n\

122 visible: showHeader && status == Loader.Ready; \n\

120 visible: showHeader && status == Loader.Ready; \n\

123− sourceComponent: ShaderEffect { \n\

121+ sourceComponent: UbuntuShapeOverlay { \n\

124 id: overlay; \n\

122 id: overlay; \n\

125− height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\

126 property real luminance: Style.luminance(overlayColor); \n\

123 property real luminance: Style.luminance(overlayColor); \n\

124+ aspect: UbuntuShape.Flat; \n\

125+ radius: "medium"; \n\

127− property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\

126+ overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\

128− property var source: ShaderEffectSource { \n\

127+ overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\

129− id: shaderSource; \n\

130− sourceItem: artShapeLoader.item; \n\

131− onVisibleChanged: if (visible) scheduleUpdate(); \n\

132− live: false; \n\

133− sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height); \n\

134− } \n\

135− vertexShader: " \n\

136− uniform highp mat4 qt_Matrix; \n\

137− attribute highp vec4 qt_Vertex; \n\

138− attribute highp vec2 qt_MultiTexCoord0; \n\

139− varying highp vec2 coord; \n\

140− void main() { \n\

141− coord = qt_MultiTexCoord0; \n\

142− gl_Position = qt_Matrix * qt_Vertex; \n\

143− }"; \n\

144− fragmentShader: " \n\

145− varying highp vec2 coord; \n\

146− uniform sampler2D source; \n\

147− uniform lowp float qt_Opacity; \n\

148− uniform highp vec4 overlayColor; \n\

149− void main() { \n\

150− lowp vec4 tex = texture2D(source, coord); \n\

151− gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a; \n\

152− }"; \n\

153 } \n\

128 } \n\

154 }\n';

129 }\n';

155

130

@@ -325,7 +300,7 @@ function cardString(template, components) {

325 id: root; \n\

300 id: root; \n\

326 property var components; \n\

301 property var components; \n\

327 property var cardData; \n\

302 property var cardData; \n\

328− property var artShapeBorderSource: undefined; \n\

303+ property string artShapeStyle: "inset"; \n\

329 property real fontScale: 1.0; \n\

304 property real fontScale: 1.0; \n\

330 property var scopeStyle: null; \n\

305 property var scopeStyle: null; \n\

331 property int titleAlignment: Text.AlignLeft; \n\

306 property int titleAlignment: Text.AlignLeft; \n\

@@ -368,7 +343,6 @@ function cardString(template, components) {

368 }

343 }

369

344

370 if (hasArt) {

345 if (hasArt) {

371− code += 'onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } \n';

372 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';

346 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';

373

347

374 var widthCode, heightCode;

348 var widthCode, heightCode;

@@ -480,20 +454,20 @@ function cardString(template, components) {

480 }

454 }

481 }

455 }

482

456

483− var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';

457+ var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';

484

458

485 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));

459 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));

486 var titleSubtitleCode = '';

460 var titleSubtitleCode = '';

487 if (hasTitle) {

461 if (hasTitle) {

488 var titleColor;

462 var titleColor;

489 if (headerAsOverlay) {

463 if (headerAsOverlay) {

490− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';

464+ titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';

491 } else if (hasSummary) {

465 } else if (hasSummary) {

492 titleColor = 'summary.color';

466 titleColor = 'summary.color';

493 } else if (hasBackground) {

467 } else if (hasBackground) {

494 titleColor = summaryColorWithBackground;

468 titleColor = summaryColorWithBackground;

495 } else {

469 } else {

496− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';

470+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

497 }

471 }

498

472

499 var titleAnchors;

473 var titleAnchors;

@@ -555,7 +529,7 @@ function cardString(template, components) {

555 titleAnchors += 'left: parent.left; \n\

529 titleAnchors += 'left: parent.left; \n\

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

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

557 top: overlayLoader.top; \n\

531 top: overlayLoader.top; \n\

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

532+ topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; \n';

559 } else {

533 } else {

560 // Using anchors to the mascot/parent

534 // Using anchors to the mascot/parent

561 titleAnchors = titleRightAnchor;

535 titleAnchors = titleRightAnchor;

@@ -649,7 +623,7 @@ function cardString(template, components) {

649 if (hasBackground) {

623 if (hasBackground) {

650 summaryColor = summaryColorWithBackground;

624 summaryColor = summaryColorWithBackground;

651 } else {

625 } else {

652− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';

626+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

653 }

627 }

654

628

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

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

@@ -698,7 +672,7 @@ function cardString(template, components) {

698

672

699function createCardComponent(parent, template, components) {

673function createCardComponent(parent, template, components) {

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

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

701− import Ubuntu.Components 1.1; \n\

675+ import Ubuntu.Components 1.3; \n\

702 import Ubuntu.Settings.Components 0.1; \n\

676 import Ubuntu.Settings.Components 0.1; \n\

703 import Dash 0.1;\n\

677 import Dash 0.1;\n\

704 import Utils 0.1;\n';

678 import Utils 0.1;\n';

plugins/Dash/ScopeStyle.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.2

18import Utils 0.1

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20

21/*! \brief Helper for processing scope customization options.

22

plugins/Powerd/Powerd.h+2

@@ -38,6 +38,8 @@ public:

38 PowerKey = 2, // Display changed state due to user pressing power key

39 Proximity = 3, // Display changed state due to proximity events

40 Notification = 4, // Display changed state due to user notification

41+ SnapDecision = 5, // Display changed state due to snap decision prompt

42+ CallDone = 6, // Display changed state due to voice call end

41 };

43 };

42

44

43 enum Status {

45 enum Status {

po/ast.po+26−26

@@ -8,15 +8,15 @@ msgstr ""

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

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

10"POT-Creation-Date: 2015-09-16 00:49+0200\n"

11−"PO-Revision-Date: 2015-06-11 23:39+0000\n"

11+"PO-Revision-Date: 2015-10-06 12:07+0000\n"

12−"Last-Translator: enolp <enolp@softastur.org>\n"

12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"

13"Language-Team: Asturian <ast@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"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-30 05:42+0000\n"

18+"X-Launchpad-Export-Date: 2015-10-07 06:06+0000\n"

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

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

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -29,7 +29,7 @@ msgstr "Anclar atayu"

29

30#: plugins/Unity/Launcher/launcheritem.cpp:52

31msgid "Quit"

32−msgstr ""

32+msgstr "Colar"

33

34#: plugins/Unity/Launcher/launcheritem.cpp:106

35msgid "Unpin shortcut"

@@ -41,14 +41,14 @@ msgstr "Desanclar atayu"

41#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"

42#: plugins/Utils/relativetimeformatter.cpp:157

43msgid "Yesterday %l:%M %p"

44−msgstr ""

44+msgstr "Ayeri %l:%M %p"

45

46#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

47#. This format string is used for showing, on a 12-hour clock, times that happened today.

48#. en_US example: "%l:%M %p" --> "1:00 PM"

49#: plugins/Utils/relativetimeformatter.cpp:164

50msgid "%l:%M %p"

51−msgstr ""

51+msgstr "%l:%M %p"

52

53#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

54#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.

@@ -56,7 +56,7 @@ msgstr ""

56#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"

57#: plugins/Utils/relativetimeformatter.cpp:172

58msgid "Tomorrow %l:%M %p"

59−msgstr ""

59+msgstr "Mañana %l:%M %p"

60

61#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

62#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.

@@ -64,7 +64,7 @@ msgstr ""

64#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"

65#: plugins/Utils/relativetimeformatter.cpp:181

66msgid "%a %l:%M %p"

67−msgstr ""

67+msgstr "%a %l:%M %p"

68

69#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

70#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.

@@ -73,7 +73,7 @@ msgstr ""

73#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

74#: plugins/Utils/relativetimeformatter.cpp:190

75msgid "%a %d %b %l:%M %p"

76−msgstr ""

76+msgstr "%a %b %d %l:%M %p"

77

78#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

79#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -81,14 +81,14 @@ msgstr ""

81#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"

82#: plugins/Utils/relativetimeformatter.cpp:201

83msgid "Yesterday %H:%M"

84−msgstr ""

84+msgstr "Ayeri %H:%M"

85

86#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

87#. This format string is used for showing, on a 24-hour clock, times that happened today.

88#. en_US example: "%H:%M" --> "13:00"

89#: plugins/Utils/relativetimeformatter.cpp:208

90msgid "%H:%M"

91−msgstr ""

91+msgstr "%H:%M"

92

93#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

94#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.

@@ -96,7 +96,7 @@ msgstr ""

96#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"

97#: plugins/Utils/relativetimeformatter.cpp:216

98msgid "Tomorrow %H:%M"

99−msgstr ""

99+msgstr "Mañana %H:%M"

100

101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.

@@ -104,7 +104,7 @@ msgstr ""

104#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"

105#: plugins/Utils/relativetimeformatter.cpp:225

106msgid "%a %H:%M"

107−msgstr ""

107+msgstr "%a %H:%M"

108

109#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

110#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.

@@ -113,7 +113,7 @@ msgstr ""

113#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

114#: plugins/Utils/relativetimeformatter.cpp:234

115msgid "%a %d %b %H:%M"

116−msgstr ""

116+msgstr "%a %b %d %H:%M"

117

118#: qml/Components/DelayedLockscreen.qml:49

119msgid "Device Locked"

@@ -198,7 +198,7 @@ msgstr "Sí"

198#: qml/Components/Dialogs.qml:203

199msgctxt "Title: Power off/Restart dialog"

200msgid "Power"

201−msgstr ""

201+msgstr "Apagáu"

202

203#: qml/Components/Dialogs.qml:204

204msgid ""

@@ -378,7 +378,7 @@ msgstr "Sentímoslo, contraseña incorreuta"

378#: qml/Greeter/NarrowView.qml:121

379msgctxt "passphrase"

380msgid "Please re-enter"

381−msgstr ""

381+msgstr "Vuelve a escribila"

382

383#: qml/Greeter/NarrowView.qml:122

384msgid "Sorry, incorrect passcode"

@@ -404,32 +404,32 @@ msgstr "Nun ta reproduciéndose nada"

404#, qt-format

405msgid "%1 hour"

406msgid_plural "%1 hours"

407−msgstr[0] ""

407+msgstr[0] "%1 hora"

408−msgstr[1] ""

408+msgstr[1] "%1 hores"

409

410#: qml/Panel/Indicators/MenuItemFactory.qml:851

411#, qt-format

412msgid "%1 minute"

413msgid_plural "%1 minutes"

414−msgstr[0] ""

414+msgstr[0] "%1 minutu"

415−msgstr[1] ""

415+msgstr[1] "%1 minutos"

416

417#: qml/Panel/Indicators/MenuItemFactory.qml:856

418#, qt-format

419msgid "%1 second"

420msgid_plural "%1 seconds"

421−msgstr[0] ""

421+msgstr[0] "%1 segundu"

422−msgstr[1] ""

422+msgstr[1] "%1 segundos"

423

424#: qml/Panel/Indicators/MenuItemFactory.qml:859

425msgid "0 seconds"

426−msgstr ""

426+msgstr "0 segundos"

427

428#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

429#: qml/Panel/Indicators/MenuItemFactory.qml:861

430#, qt-format

431msgid "%1 remaining"

432−msgstr ""

432+msgstr "Queden %1"

433

434#: qml/Panel/Indicators/MenuItemFactory.qml:867

435msgid "In queue…"

@@ -462,7 +462,7 @@ msgstr "Responder"

462

463#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204

464msgid "Call back"

465−msgstr ""

465+msgstr "Devolver llamada"

466

467#: qml/Panel/Indicators/ModemInfoItem.qml:105

468msgid "Unlock SIM"

po/br.po+5−5

@@ -8,15 +8,15 @@ msgstr ""

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

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

10"POT-Creation-Date: 2015-09-16 00:49+0200\n"

11−"PO-Revision-Date: 2015-08-25 14:12+0000\n"

11+"PO-Revision-Date: 2015-10-05 06:47+0000\n"

12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

13"Language-Team: Breton <br@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"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2015-10-06 05:47+0000\n"

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

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

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -29,7 +29,7 @@ msgstr "Spilhennañ ar verradenn"

29

30#: plugins/Unity/Launcher/launcheritem.cpp:52

31msgid "Quit"

32−msgstr ""

32+msgstr "Mont kuit"

33

34#: plugins/Unity/Launcher/launcheritem.cpp:106

35msgid "Unpin shortcut"

@@ -465,7 +465,7 @@ msgstr "Respont"

465

466#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204

467msgid "Call back"

468−msgstr ""

468+msgstr "Gervel en-dro"

469

470#: qml/Panel/Indicators/ModemInfoItem.qml:105

471msgid "Unlock SIM"

po/ja.po+4−4

@@ -8,15 +8,15 @@ msgstr ""

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

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

10"POT-Creation-Date: 2015-09-16 00:49+0200\n"

11−"PO-Revision-Date: 2014-11-20 05:08+0000\n"

11+"PO-Revision-Date: 2015-10-05 10:05+0000\n"

12"Last-Translator: Kentaro Kazuhama <Unknown>\n"

13"Language-Team: Japanese <ja@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"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2015-10-06 05:47+0000\n"

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

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

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -390,7 +390,7 @@ msgstr "グループ通話"

390

391#: qml/Panel/Indicators/MenuItemFactory.qml:718

392msgid "Nothing is playing"

393−msgstr ""

393+msgstr "再生するものがありません"

394

395#: qml/Panel/Indicators/MenuItemFactory.qml:847

396#, qt-format

po/ug.po+4−4

@@ -8,15 +8,15 @@ msgstr ""

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

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

10"POT-Creation-Date: 2015-09-16 00:49+0200\n"

11−"PO-Revision-Date: 2015-09-24 05:59+0000\n"

11+"PO-Revision-Date: 2015-10-02 03:54+0000\n"

12"Last-Translator: eltikin <eltikinuyghur@hotmail.com>\n"

13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"

14"MIME-Version: 1.0\n"

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2015-10-03 05:40+0000\n"

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

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

20

21#: plugins/IntegratedLightDM/Greeter.cpp:112

22msgid "Password: "

@@ -96,7 +96,7 @@ msgstr ""

96#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"

97#: plugins/Utils/relativetimeformatter.cpp:216

98msgid "Tomorrow %H:%M"

99−msgstr ""

99+msgstr "ئەتە %H:%M"

100

101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.

qml/Components/Background.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Utils 0.1 as Utils

20

21Loader {

qml/Components/BaseCarouselDelegate.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20/*!

21 \brief Base delegate for use with the Carousel component

qml/Components/Carousel.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "carousel.js" as CarouselJS

20

21/*! The Carousel component presents the items of a model in a carousel view. It's similar to a

qml/Components/DelayedLockscreen.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21Item {

qml/Components/Dialogs.qml+1−1

@@ -18,8 +18,8 @@ import QtQuick 2.0

18

19import Unity.Application 0.1

20import Unity.Session 0.1

21−import Ubuntu.Components 1.1

22import GlobalShortcut 1.0

21import GlobalShortcut 1.0

22+import Ubuntu.Components 1.3

23import "../Greeter"

24

25Item {

qml/Components/DragHandle.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20

21/*

qml/Components/DraggingArea.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20MouseArea {

21 id: draggingArea

qml/Components/EdgeDragEvaluator.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20

21/*

qml/Components/Header.qml+2−2

@@ -14,8 +14,8 @@

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

15 */

16

17−import Ubuntu.Components 1.1

17+import Ubuntu.Components 1.3

18−import Ubuntu.Components.Themes.Ambiance 1.1

18+import Ubuntu.Components.Themes.Ambiance 1.3

19

20PageHeadStyle {

21 id: root

qml/Components/InputMethod.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Unity.Application 0.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21

22Item {

qml/Components/LazyImage.qml+11−11

@@ -18,7 +18,7 @@

18 */

19

20import QtQuick 2.0

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22

23Item {

24 id: root

@@ -31,14 +31,12 @@ Item {

31 property real initialHeight: scaleTo == "height" || scaleTo == "fit" ? height : units.gu(10)

32

33 property alias sourceSize: image.sourceSize

34− property alias fillMode: image.fillMode

35 property alias asynchronous: image.asynchronous

34 property alias asynchronous: image.asynchronous

36 property alias cache: image.cache

35 property alias cache: image.cache

37− property alias horizontalAlignment: image.horizontalAlignment

38− property alias verticalAlignment: image.verticalAlignment

39 property alias sourceImage: image

36 property alias sourceImage: image

37+

40 property bool useUbuntuShape: true

38 property bool useUbuntuShape: true

41− property string borderSource: "radius_idle.sci"

39+ property bool pressed: false

42

40

43 state: "default"

41 state: "default"

44

42

@@ -54,7 +52,7 @@ Item {

54 UbuntuShape {

52 UbuntuShape {

55 id: placeholder

53 id: placeholder

56 objectName: "placeholder"

54 objectName: "placeholder"

57− color: "#22FFFFFF"

55+ backgroundColor: "#22FFFFFF"

58 anchors.fill: shape

56 anchors.fill: shape

59 visible: opacity != 0

57 visible: opacity != 0

60

58

@@ -88,10 +86,14 @@ Item {

88 active: useUbuntuShape

86 active: useUbuntuShape

89 opacity: 0

87 opacity: 0

90 visible: opacity != 0

88 visible: opacity != 0

91− sourceComponent: UbuntuShape {}

89+ sourceComponent: UbuntuShapeOverlay {

90+ property bool pressed: false

91+ overlayColor: Qt.rgba(0, 0, 0, pressed ? 0.1 : 0)

92+ overlayRect: Qt.rect(0.0, 0.0, 1.0, 1.0)

93+ }

92 onLoaded: {

94 onLoaded: {

93− item.image = image;

95+ item.source = image;

94− item.borderSource = Qt.binding(function() { return root.borderSource })

96+ item.pressed = Qt.binding(function() { return shape.pressed; });

95 }

97 }

96

98

97 Image {

99 Image {

@@ -106,8 +108,6 @@ Item {

106 fillMode: Image.PreserveAspectFit

108 fillMode: Image.PreserveAspectFit

107 asynchronous: true

109 asynchronous: true

108 cache: false

110 cache: false

109− horizontalAlignment: Image.AlignHCenter

110− verticalAlignment: Image.AlignVCenter

111 sourceSize.width: root.scaleTo == "width" ? root.width

112 : root.scaleTo == "fit" && root.width <= root.height ? root.width

113 : 0

qml/Components/ListItems/Header.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21Item {

22 property alias text: label.text

qml/Components/Lockscreen.qml+2−2

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.0

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.Popups 1.0

19+import Ubuntu.Components.Popups 1.3

20import Ubuntu.Telephony 0.1 as Telephony

21

22Showable {

qml/Components/PassphraseLockscreen.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21Item {

qml/Components/PinLockscreen.qml+2−2

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 0.1

19+import Ubuntu.Components.ListItems 1.3

20import "../Components"

21

22Item {

qml/Components/PinPadButton.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20AbstractButton {

21 id: root

qml/Components/Rating.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20/*! Rating widget bar. */

21

qml/Components/RatingStyle.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20Row {

21 anchors.fill: parent

qml/Components/ResponsiveGridView.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20/*

21 Essentially a GridView where you can specify the maximum number of columns it can have.

qml/Components/ResponsiveVerticalJournal.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Components"

20import Dash 0.1

21

qml/Components/ScrollCalculator.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: scrollArea

qml/Components/ShellDialog.qml+2−2

@@ -16,8 +16,8 @@

16

17import QtQuick 2.0

18

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20−import Ubuntu.Components.Popups 0.1

20+import Ubuntu.Components.Popups 1.3

21

22/*

23 A Dialog configured for use as a proper in-scene Dialog

qml/Components/UbuntuShapeForItem.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more

21 * general (Item-based) components. This ability should be incorporated into the SDK's

qml/Components/UnityInputInfo/UnityInputInfo.qml+1−1

@@ -19,7 +19,7 @@ pragma Singleton

19import QtQuick 2.3

20import Unity.InputInfo 0.1

21// Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471

22−import Ubuntu.Components 1.2

22+import Ubuntu.Components 1.3

23

24Item {

25 id: root

qml/Components/WindowControlButtons.qml+1−1

@@ -17,7 +17,7 @@

17 */

18

19import QtQuick 2.3

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21

22Row {

23 id: root

qml/Components/ZoomableImage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21/*! \brief Zoomable for image.

qml/Dash/CardCarousel.qml+2−2

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21DashRenderer {

@@ -68,7 +68,7 @@ DashRenderer {

68 item.fontScale = Qt.binding(function() { return carousel.fontScale; });

69 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });

70 item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });

71− item.artShapeBorderSource = "none";

71+ item.artShapeStyle = "flat";

72 item.scopeStyle = cardCarousel.scopeStyle;

73 }

74

qml/Dash/CardHorizontalList.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21DashRenderer {

qml/Dash/CardVerticalJournal.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21DashRenderer {

qml/Dash/Dash.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import Unity 0.2

21import Utils 0.1

qml/Dash/DashApplication.qml+3−2

@@ -15,14 +15,15 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.0

18+import Ubuntu.Components 1.3

19import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/

20

21MainView {

22 implicitWidth: units.gu(40)

23 implicitHeight: units.gu(68)

24

25− useDeprecatedToolbar: false

25+ // Workaround bug #1475643

26+ headerColor: Qt.rgba(0, 0, 0, 0)

26

27

27 Dash {

28 Dash {

28 anchors.fill: parent

29 anchors.fill: parent

qml/Dash/DashCategoryBase.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20Item {

21 width: parent.width

qml/Dash/DashContent.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Unity 0.2

20import Utils 0.1

21import "../Components"

qml/Dash/DashContentTabBarStyle.qml+1−1

@@ -14,7 +14,7 @@

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

15 */

16

17−import Ubuntu.Components.Themes.Ambiance 0.1

17+import Ubuntu.Components.Themes.Ambiance 1.3

18

19TabBarStyle {

20 indicatorImageSource: "graphics/tabbarchevron.png"

qml/Dash/DashNavigation.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Dash 0.1

20import "../Components"

21

@@ -48,7 +48,7 @@ Item {

48 id: d

49 readonly property color foregroundColor: root.scopeStyle

50 ? root.scopeStyle.getTextColor(backgroundItem.luminance)

51− : Theme.palette.normal.baseText

51+ : theme.palette.normal.baseText

52 readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible

53 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width

54 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)

qml/Dash/DashNavigationButton.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20AbstractButton {

21 id: root

@@ -24,7 +24,7 @@ AbstractButton {

24 // Set by parent

25 property var scope: null

26 property var scopeStyle: null

27− property color foregroundColor: Theme.palette.normal.baseText

27+ property color foregroundColor: theme.palette.normal.baseText

28 property bool isAltNavigation: false

29 property bool showDivider: false

30

qml/Dash/DashNavigationList.qml+4−4

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

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

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 0.1 as ListItem

19+import Ubuntu.Components.ListItems 1.3 as ListItem

20import "../Components"

21

22Item {

@@ -24,7 +24,7 @@ Item {

24 property var navigation: null

25 property var currentNavigation: null

26 property var scopeStyle: null

27− property color foregroundColor: Theme.palette.normal.baseText

27+ property color foregroundColor: theme.palette.normal.baseText

28 signal enterNavigation(var newNavigationId, bool hasChildren)

29 signal goBackToParentClicked()

30 signal allNavigationClicked()

qml/Dash/PageHeader.qml → qml/Dash/DashPageHeader.qmlrenamed+11−15

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

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

@@ -15,10 +15,10 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.Themes.Ambiance 1.1

19+import Ubuntu.Components.Themes.Ambiance 1.3

20−import Ubuntu.Components.Popups 1.0

20+import Ubuntu.Components.Popups 1.3

21−import Ubuntu.Components.ListItems 1.0

21+import Ubuntu.Components.ListItems 1.3

22import "../Components"

23import "../Components/SearchHistoryModel"

24

@@ -136,7 +136,7 @@ Item {

136 objectName: "headerContainer"

137 clip: contentY < height

138 anchors { left: parent.left; top: parent.top; right: parent.right }

139− height: units.gu(7)

139+ height: header.contentHeight

140 contentHeight: headersColumn.height

141 interactive: false

142 contentY: showSearch ? 0 : height

@@ -171,18 +171,15 @@ Item {

171 PageHeadStyle {

172 id: searchHeader

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

174− height: headerContainer.height

175− contentHeight: height

176 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

174 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

177 __separator_visible: false

175 __separator_visible: false

178 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.

176 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.

179 property var styledItem: searchHeader

177 property var styledItem: searchHeader

180− property string title

181 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

178 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

182 property color panelColor: background.topColor

179 property color panelColor: background.topColor

183 panelForegroundColor: config.foregroundColor

180 panelForegroundColor: config.foregroundColor

184− property var config: PageHeadConfiguration {

181+ config: PageHeadConfiguration {

185− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText

182+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText

186 backAction: Action {

183 backAction: Action {

187 iconName: "back"

184 iconName: "back"

188 onTriggered: {

185 onTriggered: {

@@ -247,16 +244,15 @@ Item {

247 objectName: "innerPageHeader"

244 objectName: "innerPageHeader"

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

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

249 height: headerContainer.height

246 height: headerContainer.height

250− contentHeight: height

251 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

247 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

252 __separator_visible: false

248 __separator_visible: false

253 property var styledItem: header

249 property var styledItem: header

254− property string title: root.title

255 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

250 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections

256 property color panelColor: background.topColor

251 property color panelColor: background.topColor

257 panelForegroundColor: config.foregroundColor

252 panelForegroundColor: config.foregroundColor

258− property var config: PageHeadConfiguration {

253+ config: PageHeadConfiguration {

254+ title: root.title

259− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText

255+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText

260 backAction: Action {

256 backAction: Action {

261 iconName: backIsClose ? "close" : "back"

257 iconName: backIsClose ? "close" : "back"

262 visible: root.showBackButton

258 visible: root.showBackButton

qml/Dash/GenericScopeView.qml+5−5

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Utils 0.1

20import Unity 0.2

21import Dash 0.1

@@ -573,7 +573,7 @@ FocusScope {

573 }

574 fontSize: "small"

575 font.weight: Font.Bold

576− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

576+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

577 }

578 }

579

@@ -610,7 +610,7 @@ FocusScope {

610 width: categoryView.width

611 height: section != "" ? units.gu(5) : 0

612 text: section

613− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

613+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

614 iconName: delegate && delegate.headerLink ? "go-next" : ""

615 onClicked: {

616 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);

@@ -624,7 +624,7 @@ FocusScope {

624 sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined

625 Component {

626 id: pageHeaderComponent

627− PageHeader {

627+ DashPageHeader {

628 objectName: "scopePageHeader"

629 width: parent.width

630 title: scopeView.scope ? scopeView.scope.name : ""

@@ -731,7 +731,7 @@ FocusScope {

731 }

732 fontSize: "small"

733 font.weight: Font.Bold

734− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

734+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

735 }

736

737 Connections {

qml/Dash/PreviewListView.qml+2−2

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Unity 0.2

20import "../Components"

21import "Previews" as Previews

@@ -43,7 +43,7 @@ Item {

43

44 signal backClicked()

45

46− PageHeader {

46+ DashPageHeader {

47 id: header

48 objectName: "pageHeader"

49 width: parent.width

qml/Dash/Previews/Preview.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20/*! \brief This component constructs the Preview UI.

21 *

qml/Dash/Previews/PreviewActionButton.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Button {

21 signal triggeredAction(var actionData)

qml/Dash/Previews/PreviewActionCombo.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

@@ -33,7 +33,7 @@ Item {

33

34 objectName: "moreLessButton"

35 text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")

36− strokeColor: Theme.palette.normal.baseText

36+ strokeColor: theme.palette.normal.baseText

37 onClicked: expanded = !expanded

38 width: parent.width

39 }

qml/Dash/Previews/PreviewActions.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.1

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20/*! This preview widget shows either one button, two buttons or one button

21 * and a combo button depending on the number of items in widgetData["actions"].

@@ -50,7 +50,7 @@ PreviewWidget {

50 Binding {

51 target: loader.item

52 property: "strokeColor"

53− value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

53+ value: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

54 }

55 Connections {

56 target: loader.item

qml/Dash/Previews/PreviewAudioPlayback.qml+6−6

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtMultimedia 5.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21/*! \brief Preview widget for audio tracks.

22

@@ -139,7 +139,7 @@ PreviewWidget {

139 objectName: "trackTitleLabel"

140 anchors { top: parent.top; left: parent.left; right: parent.right }

141 opacity: 0.9

142− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

142+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

143 fontSize: "small"

144 horizontalAlignment: Text.AlignLeft

145 text: modelData["title"]

@@ -152,7 +152,7 @@ PreviewWidget {

152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }

153 visible: text !== ""

154 opacity: 0.9

155− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

155+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

156 font.weight: Font.Light

157 fontSize: "small"

158 horizontalAlignment: Text.AlignLeft

@@ -175,7 +175,7 @@ PreviewWidget {

175 }

176 height: units.dp(2)

177 visible: progressBarImage.visible

178− color: UbuntuColors.orange

178+ backgroundColor: UbuntuColors.orange

179 }

180

181 Image {

@@ -193,7 +193,7 @@ PreviewWidget {

193 anchors.verticalCenter: parent.verticalCenter

194 width: parent.column3Width

195 opacity: 0.9

196− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

196+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

197 fontSize: "small"

198 horizontalAlignment: Text.AlignRight

199 text: audio.lengthToString(modelData["length"])

qml/Dash/Previews/PreviewComment.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.2

18+import Ubuntu.Components 1.3

19

20/*! \brief Preview widget for comments.

21

qml/Dash/Previews/PreviewCommentInput.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for commenting.

qml/Dash/Previews/PreviewExpandable.qml+4−4

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for expandable widgets.

@@ -41,7 +41,7 @@ PreviewWidget {

41 right: expandButton.left

42 }

43 fontSize: "large"

44− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

44+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

45 visible: text !== ""

46 opacity: .8

47 text: widgetData["title"] || ""

@@ -62,7 +62,7 @@ PreviewWidget {

62 width: units.gu(3)

63 height: units.gu(3)

64 name: root.expanded ? "view-collapse" : "view-expand"

65− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

65+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

66 }

67 }

68

qml/Dash/Previews/PreviewHeader.qml+9−9

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Dash 0.1

20import "../"

21

@@ -40,10 +40,10 @@ PreviewWidget {

40 readonly property string title: root.widgetData["title"] || ""

41 readonly property string subtitle: root.widgetData["subtitle"] || ""

42 readonly property var attributes: root.widgetData["attributes"] || null

43− readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

43+ readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

44

45 // Rewire the source since we may have unwired it on onStatusChanged

46− onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;

46+ onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.source.source = mascot;

47

48 implicitHeight: row.height + row.margins * 2

49 width: parent.width

@@ -77,16 +77,16 @@ PreviewWidget {

77

78 sourceComponent: UbuntuShape {

79 objectName: "mascotShape"

80− visible: image.status === Image.Ready

80+ visible: source.status === Image.Ready

81+ sourceFillMode: UbuntuShape.PreserveAspectCrop

82+ sourceHorizontalAlignment: UbuntuShape.AlignHCenter

83+ sourceVerticalAlignment: UbuntuShape.AlignVCenter

81− image: Image {

84+ source: Image {

82 source: headerRoot.mascot

85 source: headerRoot.mascot

83 width: source ? mascotShapeLoader.width : 0

86 width: source ? mascotShapeLoader.width : 0

84 height: mascotShapeLoader.height

87 height: mascotShapeLoader.height

85

88

86 sourceSize { width: mascotShapeLoader.maxSize; height: mascotShapeLoader.maxSize }

89 sourceSize { width: mascotShapeLoader.maxSize; height: mascotShapeLoader.maxSize }

87− fillMode: Image.PreserveAspectCrop

88− horizontalAlignment: Image.AlignHCenter

89− verticalAlignment: Image.AlignVCenter

90 onStatusChanged: if (status === Image.Error) source = headerRoot.fallback;

91 }

92 }

qml/Dash/Previews/PreviewIconActions.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.1

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20/*! This preview widget icons+label for number of items in widgetData["actions"].

21 * For each of the items we recognize the fields "label", "icon", "temporaryIcon" and "id".

qml/Dash/Previews/PreviewImageGallery.qml+2−2

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! This preview widget shows a horizontal list of images.

@@ -62,7 +62,7 @@ PreviewWidget {

62 source: modelData ? modelData : ""

63 scaleTo: "height"

64 initialWidth: units.gu(13)

65− borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"

65+ pressed: mouseArea.pressed

66

67 MouseArea {

68 id: mouseArea

qml/Dash/Previews/PreviewOverlay.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21Rectangle {

@@ -158,7 +158,7 @@ Rectangle {

158 anchors.centerIn: parent

159 width: units.gu(2.5)

160 height: width

161− color: Theme.palette.normal.foregroundText

161+ color: theme.palette.normal.foregroundText

162 name: "close"

163 }

164 }

qml/Dash/Previews/PreviewPayments.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.1

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Payments 0.1

20

21/*! \brief Preview widget for a purchase button.

qml/Dash/Previews/PreviewProgress.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.1

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.DownloadDaemonListener 0.1

20

21/*! \brief Preview widget for a progress bar.

qml/Dash/Previews/PreviewRatingDisplay.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for rating display.

@@ -60,7 +60,7 @@ PreviewWidget {

60 urlIconEmpty: widgetData["rating-icon-empty"]

61 urlIconFull: widgetData["rating-icon-full"]

62 urlIconHalf: widgetData["rating-icon-half"]

63− labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

63+ labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

64 }

65 }

66 }

qml/Dash/Previews/PreviewRatingEdit.qml+2−2

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.4

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for editable rating.

@@ -56,7 +56,7 @@ PreviewWidget {

56 urlIconEmpty: widgetData["rating-icon-empty"]

57 urlIconFull: widgetData["rating-icon-full"]

58 urlIconHalf: widgetData["rating-icon-half"]

59− labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

59+ labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

60 }

61

62 PreviewRatingInput {

qml/Dash/Previews/PreviewRatingInput.qml+5−5

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for rating.

@@ -79,7 +79,7 @@ PreviewWidget {

79 verticalCenter: parent.verticalCenter

80 left: parent.left

81 }

82− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

82+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

83 opacity: .8

84 text: widgetData["rating-label"] || i18n.tr("Rate this")

85 }

@@ -124,7 +124,7 @@ PreviewWidget {

124 left: parent.left

125 right: parent.right

126 }

127− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

127+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

128 opacity: .8

129 text: widgetData["review-label"] || i18n.tr("Add a review")

130 }

@@ -170,7 +170,7 @@ PreviewWidget {

170 top: parent.top

171 right: parent.right

172 }

173− color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base

173+ color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base

174 text: widgetData["submit-label"] || i18n.tr("Send")

175 onClicked: {

176 if (readyToSubmit) root.submit()

qml/Dash/Previews/PreviewRatingSingleDisplay.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.4

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21Column {

qml/Dash/Previews/PreviewTable.qml+4−4

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../Components"

21

22/*! \brief Preview widget for table.

@@ -48,7 +48,7 @@ PreviewWidget {

48 }

49 height: visible ? implicitHeight : 0

50 fontSize: "large"

51− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

51+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

52 visible: text !== ""

53 opacity: .8

54 text: widgetData["title"] || ""

@@ -72,7 +72,7 @@ PreviewWidget {

72 fontSize: "small"

73 text: perRowRepeater.model[index]

74 visible: root.expanded || rowIndex < maximumCollapsedRowCount

75− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

75+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

76 font.bold: index == 0

77 wrapMode: Text.Wrap

78 Layout.alignment: Qt.AlignTop

qml/Dash/Previews/PreviewTextSummary.qml+4−4

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for text.

@@ -39,7 +39,7 @@ PreviewWidget {

39 }

40 height: visible ? implicitHeight : 0

41 fontSize: "large"

42− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

42+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

43 visible: text !== ""

44 opacity: .8

45 text: widgetData["title"] || ""

@@ -61,7 +61,7 @@ PreviewWidget {

61 clip: true

62 fontSize: "small"

63 lineHeight: 1.2

64− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

64+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText

65 opacity: .8

66 text: widgetData["text"] || ""

67 wrapMode: Text.Wrap

qml/Dash/Previews/PreviewVideoPlayback.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Thumbnailer 0.1

20import "../../Components"

21

qml/Dash/Previews/PreviewZoomableImage.qml+2−2

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../Components"

20

21/*! \brief Preview widget for image.

@@ -45,7 +45,7 @@ PreviewWidget {

45 source: widgetData["source"]

46 asynchronous: true

47 useUbuntuShape: false

48− borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"

48+ pressed: mouseArea.pressed

49

50 MouseArea {

51 id: mouseArea

qml/Dash/PullToRefreshScopeStyle.qml+2−2

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.Styles 1.1

19+import Ubuntu.Components.Styles 1.3

20

21/**

22 * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799

qml/Dash/ScopeSettings/ScopeSetting.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20/*! Interface for settings widgets. */

21

qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+4−4

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

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

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.0 as ListItem

19+import Ubuntu.Components.ListItems 1.3 as ListItem

20

21ScopeSetting {

22 id: root

@@ -44,7 +44,7 @@ ScopeSetting {

44 elide: Text.ElideMiddle

45 maximumLineCount: 2

46 wrapMode: Text.Wrap

47− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

47+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

48 }

49

50 CheckBox {

qml/Dash/ScopeSettings/ScopeSettingList.qml+2−2

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.0 as ListItem

19+import Ubuntu.Components.ListItems 1.3 as ListItem

20

21ScopeSetting {

22 id: root

qml/Dash/ScopeSettings/ScopeSettingString.qml+5−5

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

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

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.0 as ListItem

19+import Ubuntu.Components.ListItems 1.3 as ListItem

20

21ScopeSetting {

22 id: root

@@ -44,7 +44,7 @@ ScopeSetting {

44 elide: Text.ElideMiddle

45 maximumLineCount: 2

46 wrapMode: Text.Wrap

47− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

47+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

48 }

49

50 TextField {

@@ -57,7 +57,7 @@ ScopeSetting {

57 }

58 width: root.mode == "number" ? units.gu(8) : units.gu(12)

59 text: widgetData.value

60− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText

60+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.fieldText

61 validator: root.mode == "number" ? doubleValidator : null

62 hasClearButton: root.mode == "number" ? false : true

63

qml/Dash/ScopeSettingsPage.qml+2−2

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Unity 0.2

20import "../Components"

21import "ScopeSettings"

@@ -28,7 +28,7 @@ Item {

28

29 signal backClicked()

30

31− PageHeader {

31+ DashPageHeader {

32 id: header

33 objectName: "pageHeader"

34 width: parent.width

qml/Dash/ScopesList.qml+1−1

@@ -61,7 +61,7 @@ Item {

61 value: root.scope ? root.scope.searchQuery : ""

62 }

63

64− PageHeader {

64+ DashPageHeader {

65 id: header

66 objectName: "pageHeader"

67 title: i18n.tr("Manage")

qml/Dash/ScopesListCategory.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Dash 0.1

20import "../Components/ListItems" as ListItems

21

@@ -43,7 +43,7 @@ Item {

43 id: header

44 width: root.width

45 height: units.gu(5)

46− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

46+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText

47 }

48

49 readonly property double listItemHeight: units.gu(6)

qml/Dash/ScopesListCategoryItem.qml+3−3

@@ -16,7 +16,7 @@

16

17import QtQuick 2.3

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20

21MouseArea {

22 id: root

@@ -49,10 +49,10 @@ MouseArea {

49 width: units.gu(5)

50 height: units.gu(5)

51 visible: !hideChildren

52+ sourceFillMode: UbuntuShape.PreserveAspectCrop

52− image: Image {

53+ source: Image {

53 id: shapeImage

54 id: shapeImage

54 cache: true

55 cache: true

55− fillMode: Image.PreserveAspectCrop

56 sourceSize { width: shape.width; height: shape.height }

57 }

58 }

qml/Greeter/Clock.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../Panel/Indicators"

20import Unity.Indicators 0.1 as Indicators

21

qml/Greeter/CoverPage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import "../Components"

21

qml/Greeter/Greeter.qml+1−1

@@ -17,7 +17,7 @@

17import QtQuick 2.3

18import AccountsService 0.1

19import GSettings 1.0

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import Ubuntu.SystemImage 0.1

22import Unity.Launcher 0.1

23import "../Components"

qml/Greeter/Infographics.qml+1−1

@@ -17,7 +17,7 @@

17import "../Components"

18import "Gradient.js" as Gradient

19import QtQuick 2.0

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21

22Item {

23 id: infographic

qml/Greeter/LoginList.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21Item {

qml/Greeter/NarrowView.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21FocusScope {

qml/Greeter/ObjectPositioner.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20Item {

21 property int count

qml/Greeter/WideView.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20FocusScope {

21 id: root

qml/Launcher/FoldingLauncherDelegate.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20LauncherDelegate {

21 id: root

qml/Launcher/Launcher.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import "../Components"

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21import Unity.Launcher 0.1

22

qml/Launcher/LauncherDelegate.qml+6−7

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

@@ -130,13 +130,12 @@ Item {

130 anchors.fill: parent

131 anchors.margins: units.gu(1)

132 radius: "medium"

133− borderSource: "none"

133+ aspect: UbuntuShape.Flat

134−

134+ sourceFillMode: UbuntuShape.PreserveAspectCrop

135− image: Image {

135+ source: Image {

136 id: iconImage

137 sourceSize.width: iconShape.width

138 sourceSize.height: iconShape.height

139− fillMode: Image.PreserveAspectCrop

140 source: root.iconName

139 source: root.iconName

141 }

140 }

142 }

141 }

@@ -159,9 +158,9 @@ Item {

159 }

158 }

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

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

161 height: units.gu(2)

160 height: units.gu(2)

162− color: UbuntuColors.orange

161+ backgroundColor: UbuntuColors.orange

163 visible: root.countVisible

162 visible: root.countVisible

164− borderSource: "none"

163+ aspect: UbuntuShape.Flat

165

164

166 Label {

165 Label {

167 id: countLabel

166 id: countLabel

qml/Launcher/LauncherPanel.qml+5−5

@@ -15,10 +15,10 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.2

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.0 as ListItems

19+import Ubuntu.Components.ListItems 1.3 as ListItems

20import Unity.Launcher 0.1

21−import Ubuntu.Components.Popups 0.1

21+import Ubuntu.Components.Popups 1.3

22import "../Components/ListItems"

23import "../Components/"

24

@@ -61,8 +61,8 @@ Rectangle {

61 fill: parent

62 topMargin: -units.gu(2)

63 }

64− borderSource: "none"

64+ aspect: UbuntuShape.Flat

65− color: UbuntuColors.orange

65+ backgroundColor: UbuntuColors.orange

66 }

67

68 Image {

qml/Notifications/Notification.qml+14−14

@@ -17,11 +17,11 @@

17import QtQuick 2.0

18import QtMultimedia 5.0

19import Powerd 0.1

20−import Ubuntu.Components 1.2

20+import Ubuntu.Components 1.3

21+import Ubuntu.Components.ListItems 1.3 as ListItem

21import Unity.Notifications 1.0

22import Unity.Notifications 1.0

22import QMenuModel 0.1

23import QMenuModel 0.1

23import Utils 0.1

24import Utils 0.1

24−import Ubuntu.Components.ListItems 0.1 as ListItem

25

26Item {

27 id: notification

@@ -90,7 +90,7 @@ Item {

90 // Turn on screen as needed (Powerd.Notification means the screen

91 // stays on for a shorter amount of time)

92 if (type == Notification.SnapDecision) {

93− Powerd.setStatus(Powerd.On, Powerd.Unknown);

93+ Powerd.setStatus(Powerd.On, Powerd.SnapDecision);

94 } else if (type != Notification.Confirmation) {

95 Powerd.setStatus(Powerd.On, Powerd.Notification);

96 }

@@ -152,10 +152,10 @@ Item {

152 rightMargin: notification.margins

153 topMargin: type === Notification.Confirmation ? units.gu(.5) : 0

154 }

155− color: parent.color

155+ backgroundColor: parent.color

156 opacity: parent.opacity

157 radius: "medium"

158− borderSource: "none"

158+ aspect: UbuntuShape.Flat

159 }

160

161 Rectangle {

@@ -281,9 +281,9 @@ Item {

281 }

282 visible: type !== Notification.Confirmation

283 fontSize: "medium"

284− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText

284+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText

285 elide: Text.ElideRight

286− textFormat: Text.StyledText

286+ textFormat: Text.PlainText

287 }

288

289 Label {

@@ -296,11 +296,11 @@ Item {

296 }

297 visible: body != "" && type !== Notification.Confirmation

298 fontSize: "small"

299− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText

299+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText

300 wrapMode: Text.WordWrap

301 maximumLineCount: type == Notification.SnapDecision ? 12 : 2

302 elide: Text.ElideRight

303− textFormat: Text.StyledText

303+ textFormat: Text.PlainText

304 }

305 }

306

@@ -337,7 +337,7 @@ Item {

337 anchors.horizontalCenter: parent.horizontalCenter

338 visible: type === Notification.Confirmation && body !== ""

339 fontSize: "medium"

340− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText

340+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText

341 wrapMode: Text.WordWrap

342 maximumLineCount: 1

343 elide: Text.ElideRight

@@ -357,8 +357,8 @@ Item {

357 }

358

359 height: units.gu(1)

360− color: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey

360+ backgroundColor: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey

361− borderSource: "none"

361+ aspect: UbuntuShape.Flat

362 radius: "small"

363

364 UbuntuShape {

@@ -366,8 +366,8 @@ Item {

366 objectName: "innerBar"

367 width: valueIndicator.width * valueIndicator.value / 100

368 height: units.gu(1)

369− color: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"

369+ backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"

370− borderSource: "none"

370+ aspect: UbuntuShape.Flat

371 radius: "small"

372 }

373 }

qml/Notifications/NotificationMenuItemFactory.qml+1−1

@@ -18,7 +18,7 @@

18 */

19

20import QtQuick 2.0

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import QMenuModel 0.1

23import "../Components"

24

qml/Notifications/Notifications.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Unity.Notifications 1.0 as UnityNotifications

20import Utils 0.1

21import "../Components"

qml/Notifications/OptionToggle.qml+6−6

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

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

@@ -15,9 +15,9 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 0.1 as ListItem

19+import Ubuntu.Components.ListItems 1.3 as ListItem

20−import Ubuntu.Components.Popups 0.1

20+import Ubuntu.Components.Popups 1.3

21

22UbuntuShape {

23 id: optionToggle

@@ -29,8 +29,8 @@ UbuntuShape {

29

30 signal triggered(string id)

31

32− color: Theme.palette.normal.base

32+ backgroundColor: theme.palette.normal.base

33− borderSource: "none"

33+ aspect: UbuntuShape.Flat

34 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight

35 width: parent.width

36 radius: "medium"

qml/Notifications/ShapedIcon.qml+2−2

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.2

18+import Ubuntu.Components 1.3

19

20Item {

21 property string fileSource

qml/Notifications/SwipeToAct.qml+9−9

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.2

18+import Ubuntu.Components 1.3

19

20Item {

21 id: swipeToAct

@@ -98,8 +98,8 @@ Item {

98 id: row

99 width: parent.width

100 height: priv.sliderHeight

101− color: priv.sliderBGColor

101+ backgroundColor: priv.sliderBGColor

102− borderSource: "none"

102+ aspect: UbuntuShape.Flat

103 visible: !clickToAct

104

105 UbuntuShape {

@@ -108,8 +108,8 @@ Item {

108 anchors.top: parent.top

109 anchors.left: parent.left

110 anchors.margins: priv.gap

111− color: UbuntuColors.red

111+ backgroundColor: UbuntuColors.red

112− borderSource: "none"

112+ aspect: UbuntuShape.Flat

113

114 state: "normal"

115 height: units.gu(6)

@@ -187,10 +187,10 @@ Item {

187 }

188

189 z: 1

190− color: priv.sliderMainColor

190+ backgroundColor: priv.sliderMainColor

191 height: units.gu(6)

192 width: units.gu(6)

193− borderSource: "none"

193+ aspect: UbuntuShape.Flat

194 radius: "medium"

195 Icon {

196 anchors.fill: parent

@@ -226,8 +226,8 @@ Item {

226 anchors.top: parent.top

227 anchors.right: parent.right

228 anchors.margins: priv.gap

229− color: UbuntuColors.green

229+ backgroundColor: UbuntuColors.green

230− borderSource: "none"

230+ aspect: UbuntuShape.Flat

231

232 state: "normal"

233 height: units.gu(6)

qml/OrientedShell.qml+1−1

@@ -23,7 +23,7 @@ import "Components/UnityInputInfo"

23import "Rotation"

24// Backup Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471

25// in case we remove the UnityInputInfo import

26−import Ubuntu.Components 1.2

26+import Ubuntu.Components 1.3

27

28Rectangle {

29 id: root

qml/Panel/ActiveCallHint.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Telephony 0.1 as Telephony

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Application 0.1

21import "../Components"

22

qml/Panel/Handle.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Rectangle {

21 id: handle

qml/Panel/IndicatorItem.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Settings.Components 0.1

20import "Indicators"

21

qml/Panel/IndicatorItemRow.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

qml/Panel/IndicatorPage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1 as Components

18+import Ubuntu.Components 1.3 as Components

19import Unity.Indicators 0.1 as Indicators

20import "Indicators"

21

qml/Panel/Indicators/MenuItemFactory.qml+5−5

@@ -19,8 +19,8 @@ import Ubuntu.Settings.Menus 0.1 as Menus

19import Ubuntu.Settings.Components 0.1

20import QMenuModel 0.1

21import Utils 0.1 as Utils

22−import Ubuntu.Components.ListItems 0.1 as ListItems

22+import Ubuntu.Components.ListItems 1.3 as ListItems

23−import Ubuntu.Components 1.2

23+import Ubuntu.Components 1.3

24import Unity.Session 0.1

25

26Item {

@@ -249,7 +249,7 @@ Item {

249 name: "settings"

250 height: units.gu(3)

251 width: height

252− color: Theme.palette.selected.backgroundText

252+ color: theme.palette.selected.backgroundText

253 }

254 }

255 }

@@ -281,7 +281,7 @@ Item {

281 source: menuData.icon

282 height: units.gu(3)

283 width: height

284− color: Theme.palette.selected.backgroundText

284+ color: theme.palette.selected.backgroundText

285 }

286 }

287 }

@@ -924,7 +924,7 @@ Item {

924 enabled: menuData && menuData.sensitive || false

925 highlightWhenPressed: false

926 text: menuData && menuData.label || ""

927− foregroundColor: Theme.palette.normal.backgroundText

927+ foregroundColor: theme.palette.normal.backgroundText

928

929 onMenuModelChanged: {

930 loadAttributes();

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

@@ -19,7 +19,7 @@

19 */

20

21import QtQuick 2.0

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Ubuntu.Settings.Menus 0.1 as Menus

24import QMenuModel 0.1 as QMenuModel

25import Utils 0.1 as Utils

qml/Panel/Indicators/ModemInfoItem.qml+5−5

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

1/*

3 *

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

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

@@ -16,8 +16,8 @@

16

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20−import Ubuntu.Components.ListItems 0.1 as ListItem

20+import Ubuntu.Components.ListItems 1.3 as ListItem

21

22ListItem.Empty {

23 id: menu

@@ -65,7 +65,7 @@ ListItem.Empty {

65 height: parent.height

66 Icon {

67 id: statusIcon

68− color: Theme.palette.selected.backgroundText

68+ color: theme.palette.selected.backgroundText

69

70 Layout.preferredHeight: parent.height

71 Layout.preferredWidth: Layout.preferredHeight

@@ -75,7 +75,7 @@ ListItem.Empty {

75

76 Icon {

77 id: iconConnectivity

78− color: Theme.palette.selected.backgroundText

78+ color: theme.palette.selected.backgroundText

79

80 Layout.preferredHeight: parent.height

81 Layout.preferredWidth: Layout.preferredHeight

qml/Panel/Indicators/RoamingIndication.qml+3−3

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

1/*

3 *

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21RowLayout {

22 spacing: units.gu(0.5)

@@ -30,7 +30,7 @@ RowLayout {

30

31 Icon {

32 id: iconRoaming

33− color: Theme.palette.selected.backgroundText

33+ color: theme.palette.selected.backgroundText

34

35 Layout.preferredHeight: parent.height

36 Layout.preferredWidth: Layout.preferredHeight

qml/Panel/Indicators/client/IndicatorRepresentation.qml+2−2

@@ -19,8 +19,8 @@

19 */

20

21import QtQuick 2.0

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23−import Ubuntu.Components.ListItems 0.1 as ListItem

23+import Ubuntu.Components.ListItems 1.3 as ListItem

24import "../.."

25

26Page {

qml/Panel/Indicators/client/IndicatorsClient.qml+3−3

@@ -18,15 +18,15 @@

18 */

19

20import QtQuick 2.0

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22−import Ubuntu.Components.ListItems 0.1 as ListItem

22+import Ubuntu.Components.ListItems 1.3 as ListItem

23

24Rectangle {

25 color: "black"

26 id: root

27

28 Component.onCompleted: {

29− Theme.name = "Ubuntu.Components.Themes.SuruGradient"

29+ theme.name = "Ubuntu.Components.Themes.SuruGradient"

30 }

31

32 PageStack {

qml/Panel/Indicators/client/IndicatorsList.qml+2−2

@@ -18,8 +18,8 @@

18 */

19

20import QtQuick 2.0

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22−import Ubuntu.Components.ListItems 0.1 as ListItem

22+import Ubuntu.Components.ListItems 1.3 as ListItem

23import Unity.Indicators 0.1 as Indicators

24import "../.."

25

qml/Panel/Indicators/client/IndicatorsTree.qml+1−1

@@ -18,7 +18,7 @@

18 */

19

20import QtQuick 2.0

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Indicators 0.1 as Indicators

23import ".."

24

qml/Panel/IndicatorsBar.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21Item {

qml/Panel/IndicatorsMenu.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import "../Components"

21import "Indicators"

qml/Panel/MenuContent.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.2

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import Unity.Indicators 0.1 as Indicators

21import Utils 0.1

22import "../Components"

qml/Panel/Panel.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Unity.Application 0.1

20import "../Components"

21import "../Components/PanelState"

qml/Rotation/RotationStates.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Powerd 0.1

20

21// Why the state machine is done that way:

qml/ScopeTool.qml+2−2

@@ -15,8 +15,8 @@

15*/

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.Popups 0.1

19+import Ubuntu.Components.Popups 1.3

20import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/

21import Utils 0.1

22import Unity 0.2

qml/Shell.qml+3−3

@@ -19,8 +19,8 @@ import QtQuick.Window 2.0

19import AccountsService 0.1

20import GSettings 1.0

21import Unity.Application 0.1

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23−import Ubuntu.Components.Popups 1.0

23+import Ubuntu.Components.Popups 1.3

24import Ubuntu.Gestures 0.1

25import Ubuntu.Telephony 0.1 as Telephony

26import Unity.Connectivity 0.1

@@ -162,7 +162,7 @@ Item {

162 }

163

164 Component.onCompleted: {

165− Theme.name = "Ubuntu.Components.Themes.SuruGradient"

165+ theme.name = "Ubuntu.Components.Themes.SuruGradient"

166 if (ApplicationManager.count > 0) {

167 ApplicationManager.focusApplication(ApplicationManager.get(0).appId);

168 }

qml/Stages/Animations/SwipeFromBottomAnimation.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20BaseSessionAnimation {

21 id: animation

qml/Stages/ApplicationWindow.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Unity.Application 0.1

20

21FocusScope {

qml/Stages/DecoratedWindow.qml+1−1

@@ -17,7 +17,7 @@

17 */

18

19import QtQuick 2.3

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import Unity.Application 0.1

22

23FocusScope {

qml/Stages/DesktopSpread.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.4

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.2

19+import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21import Unity.Application 0.1

22

qml/Stages/DesktopSpreadDelegate.qml+1−1

@@ -17,7 +17,7 @@

17 */

18

19import QtQuick 2.3

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import Unity.Application 0.1

22

23Item {

qml/Stages/DesktopStage.qml+1−1

@@ -18,7 +18,7 @@

18

19import QtQuick 2.4

20import QtQuick.Layouts 1.1

21−import Ubuntu.Components 1.1

21+import Ubuntu.Components 1.3

22import Unity.Application 0.1

23import "../Components"

24import "../Components/PanelState"

qml/Stages/MainViewStyle.qml+35−27

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

1/*

3 *

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

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

@@ -13,51 +13,60 @@

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

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

15 */

16−import QtQuick 2.0

16+import QtQuick 2.4

17−import Ubuntu.Components 1.1

17+import Ubuntu.Components 1.3

18

19// FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme

20Item {

21− // styling properties

22 anchors.fill: parent

21 anchors.fill: parent

23 z: -1

22 z: -1

24 id: mainViewStyle

23 id: mainViewStyle

25

24

25+ property var theme

26+

27+ /*!

28+ Color of the header's background.

29+

30+ \sa backgroundColor, footerColor

31+ */

32+ property color headerColor: styledItem.headerColor

33+

26 /*!

34 /*!

27− The background texture of the main view. The image will be drawn over the background color,

35+ Color of the background.

28− so if it has (semi-)transparent pixels, in those pixels the background color will be visible.

36+

37+ The background is usually a single color. However if \l headerColor

38+ or \l footerColor are set then a gradient of colors will be drawn.

39+

40+ \sa footerColor, headerColor

29− */

41+ */

30− property url backgroundSource: "graphics/background_paper.png"

42+ property color backgroundColor: styledItem.backgroundColor

31− property var theme

43+

44+ /*!

45+ Color of the footer's background.

46+

47+ \sa backgroundColor, headerColor

48+ */

49+ property color footerColor: styledItem.footerColor

32

50

33 Gradient {

51 Gradient {

34 id: backgroundGradient

52 id: backgroundGradient

35− GradientStop { position: 0.0; color: styledItem.headerColor }

53+ GradientStop { position: 0.0; color: mainViewStyle.headerColor }

36− GradientStop { position: 0.83; color: styledItem.backgroundColor }

54+ GradientStop { position: 0.83; color: mainViewStyle.backgroundColor }

37− GradientStop { position: 1.0; color: styledItem.footerColor }

55+ GradientStop { position: 1.0; color: mainViewStyle.footerColor }

38 }

56 }

39

57

40 Rectangle {

58 Rectangle {

41 id: backgroundColor

59 id: backgroundColor

42 anchors.fill: parent

60 anchors.fill: parent

43− color: styledItem.backgroundColor

61+ color: mainViewStyle.backgroundColor

44 gradient: internals.isGradient ? backgroundGradient : null

62 gradient: internals.isGradient ? backgroundGradient : null

45 }

63 }

46

64

47− Image {

48− id: backgroundTexture

49− anchors.fill: parent

50− source: mainViewStyle.theme.name === "Ambiance" ? mainViewStyle.backgroundSource : ""

51− fillMode: Image.Tile

52− asynchronous: true

53− cache: false

54− visible: status === Image.Ready

55− }

56−

57 QtObject {

65 QtObject {

58 id: internals

66 id: internals

59− property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||

67+ property bool isGradient: mainViewStyle.backgroundColor != mainViewStyle.headerColor ||

60− styledItem.backgroundColor != styledItem.footerColor

68+ mainViewStyle.backgroundColor != mainViewStyle.footerColor

69+

61 /*

70 /*

62 As we don't know the order the property bindings and onXXXChanged signals are evaluated

71 As we don't know the order the property bindings and onXXXChanged signals are evaluated

63 we should rely only on one property when changing the theme to avoid intermediate

72 we should rely only on one property when changing the theme to avoid intermediate

@@ -65,8 +74,7 @@ Item {

65

74

66 Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712

75 Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712

67 */

76 */

68− property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :

77+ property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" : "SuruDark"

69− (isGradient ? "SuruGradient" : "SuruDark")

70 }

78 }

71

79

72 // automatically select the appropriate theme depending on the background colors

80 // automatically select the appropriate theme depending on the background colors

qml/Stages/PageHeadStyle.qml+2−2

@@ -14,8 +14,8 @@

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

15 */

16import QtQuick 2.2

17−import Ubuntu.Components 1.1

17+import Ubuntu.Components 1.3

18−import Ubuntu.Components.Styles 1.1 as Style

18+import Ubuntu.Components.Styles 1.3 as Style

19

20// FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme

21Style.PageHeadStyle {

qml/Stages/PhoneStage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import Unity.Application 0.1

21import Unity.Session 0.1

qml/Stages/ShimStage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19

20Rectangle {

21 id: shimStage

qml/Stages/Splash.qml+13−14

@@ -15,11 +15,11 @@

15*/

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.Themes 0.1

19+import Ubuntu.Components.Themes 1.3

20import "../Components"

21

22−import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance

22+import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance

23

24Item {

25 id: root

@@ -62,17 +62,17 @@ Item {

62 : root.footerColor

63

64 // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)

65− property var theme: QtObject {

65+ readonly property var fakeTheme: QtObject {

66 property string name

67 property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\

68− import Ubuntu.Components.Themes.%1 1.1;\

68+ import Ubuntu.Components.Themes.%1 1.3;\

69− Palette {}".arg(styledItem.theme.name),

69+ Palette {}".arg(styledItem.fakeTheme.name),

70 styledItem, "dynamicPalette");

71 }

72

73 // FIXME: should instead use future toolkit API:

74 // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)

75− style: Component { MainViewStyle {theme: styledItem.theme} }

75+ style: Component { MainViewStyle {theme: styledItem.fakeTheme} }

76 }

77

78 StyledItem {

@@ -89,13 +89,13 @@ Item {

89 property string title

90 property var tabsModel

91 property var config: QtObject {

92− property color foregroundColor: styledItem.theme.palette.selected.backgroundText

92+ property color foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText

93 property var sections: QtObject {}

94 }

95

96 // FIXME: should instead use future toolkit API:

97 // style: theme.createStyleComponent("PageHeadStyle.qml", header)

98− style: Component { PageHeadStyle {theme: styledItem.theme} }

98+ style: Component { PageHeadStyle {theme: styledItem.fakeTheme} }

99 }

100

101 Image {

@@ -121,14 +121,13 @@ Item {

121 visible: d.showIcon

122

123 radius: "medium"

124− borderSource: "none"

124+ aspect: UbuntuShape.Flat

125−

125+ sourceFillMode: Image.PreserveAspectCrop

126− image: Image {

126+ source: Image {

127 id: iconImage

128 sourceSize.width: iconShape.width

129 sourceSize.height: iconShape.height

130 source: d.showIcon ? root.icon : ""

131− fillMode: Image.PreserveAspectCrop

132 }

131 }

133 }

132 }

134

133

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

139 anchors.topMargin: units.gu(2)

138 anchors.topMargin: units.gu(2)

140 fontSize: "large"

139 fontSize: "large"

141

140

142− color: styledItem.theme.palette.selected.backgroundText

141+ color: styledItem.fakeTheme.palette.selected.backgroundText

143 visible: d.showIcon

142 visible: d.showIcon

144 }

143 }

145

144

qml/Stages/SpreadDelegate.qml+1−1

@@ -19,7 +19,7 @@

19

20import QtQuick 2.0

21import QtQuick.Window 2.0

22−import Ubuntu.Components 1.1

22+import Ubuntu.Components 1.3

23import "../Components"

24

25FocusScope {

qml/Stages/SpreadMaths.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Utils 0.1

20

21Item {

qml/Stages/SurfaceContainer.qml+1−1

@@ -15,7 +15,7 @@

15*/

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1 // For TouchGate

20import Utils 0.1 // for InputWatcher

21import Unity.Application 0.1 // for MirSurfaceItem

qml/Stages/TabletStage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import Unity.Application 0.1

21import Utils 0.1

qml/Stages/TransformedSpreadDelegate.qml+1−1

@@ -18,7 +18,7 @@

18

19import QtQuick 2.0

20import Utils 0.1

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22

23SpreadDelegate {

24 id: root

qml/Stages/TransformedTabletSpreadDelegate.qml+1−1

@@ -18,7 +18,7 @@

18

19import QtQuick 2.0

20import Utils 0.1

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Application 0.1

23

24SpreadDelegate {

qml/Stages/WindowDecoration.qml+1−1

@@ -17,7 +17,7 @@

17 */

18

19import QtQuick 2.3

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import "../Components"

22

23Item {

qml/Stages/WindowMoveResizeArea.qml+1−1

@@ -17,7 +17,7 @@

17 */

18

19import QtQuick 2.3

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import Utils 0.1

22

23MouseArea {

qml/Stages/graphics/background_paper@27.pngdeleted

Binary file not shown.

qml/Tutorial/Arrow.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

qml/Tutorial/Slider.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

qml/Tutorial/Tick.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20MouseArea {

21 implicitHeight: tick.height

qml/Tutorial/Tutorial.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

qml/Tutorial/TutorialBottom.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import "../Components"

21import "." as LocalComponents

qml/Tutorial/TutorialBottomFinish.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "." as LocalComponents

20

21TutorialPage {

qml/Tutorial/TutorialContent.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 id: root

qml/Tutorial/TutorialLeft.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "." as LocalComponents

20

21TutorialPage {

qml/Tutorial/TutorialLeftFinish.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "." as LocalComponents

20

21TutorialPage {

qml/Tutorial/TutorialPage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21Showable {

qml/Tutorial/TutorialRight.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import Unity.Application 0.1

21import "../Components"

qml/Wizard/CheckableSetting.qml+4−4

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

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

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.0 as ListItem

19+import Ubuntu.Components.ListItems 1.3 as ListItem

20

21ListItem.Empty {

22 id: listItem

@@ -77,7 +77,7 @@ ListItem.Empty {

77 rightMargin: listItem.rightMargin

78 }

79 wrapMode: Text.Wrap

80− linkColor: Theme.palette.normal.foregroundText

80+ linkColor: theme.palette.normal.foregroundText

81 onLinkActivated: listItem.linkActivated(link)

82 }

83 }

qml/Wizard/Page.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20Item {

21 readonly property real buttonMargin: units.gu(2)

@@ -57,7 +57,7 @@ Item {

57 }

58 wrapMode: Text.Wrap

59 text: title

60− color: Theme.palette.normal.baseText

60+ color: theme.palette.normal.baseText

61 font.pixelSize: units.gu(4)

62 }

63

qml/Wizard/Pages.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.SystemSettings.SecurityPrivacy 1.0

20import Wizard 0.1

21import "../Components"

qml/Wizard/Pages/10-welcome.qml+2−2

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 0.1

19+import Ubuntu.Components.ListItems 1.3

20import Ubuntu.SystemSettings.LanguagePlugin 1.0

21import Wizard 0.1

22import ".." as LocalComponents

qml/Wizard/Pages/20-sim.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import MeeGo.QOfono 0.2

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import ".." as LocalComponents

21

22LocalComponents.Page {

qml/Wizard/Pages/30-passwd-type.qml+6−6

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

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

@@ -15,8 +15,8 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19−import Ubuntu.Components.ListItems 1.0

19+import Ubuntu.Components.ListItems 1.3

20import Ubuntu.SystemSettings.SecurityPrivacy 1.0

21import ".." as LocalComponents

22

@@ -111,13 +111,13 @@ LocalComponents.Page {

111

112 Component.onCompleted: {

113 // A visible selected background looks bad in ListItem widgets with our theme

114− originalBackground = Theme.palette.selected.background

114+ originalBackground = theme.palette.selected.background

115− Theme.palette.selected.background = "transparent"

115+ theme.palette.selected.background = "transparent"

116 }

117

118 Component.onDestruction: {

119 // Restore original theme background

120− Theme.palette.selected.background = originalBackground

120+ theme.palette.selected.background = originalBackground

121 }

122 }

123 }

qml/Wizard/Pages/40-wifi.qml+2−2

@@ -17,8 +17,8 @@

17import QtQuick 2.0

18import QMenuModel 0.1 as QMenuModel

19import QtSystemInfo 5.0

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21−import Ubuntu.Components.ListItems 0.1 as ListItem

21+import Ubuntu.Components.ListItems 1.3 as ListItem

22import Ubuntu.Settings.Menus 0.1 as Menus

23import ".." as LocalComponents

24

qml/Wizard/Pages/50-location.qml+3−3

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

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

@@ -18,7 +18,7 @@ import QtQuick 2.3

18import AccountsService 0.1

19import QMenuModel 0.1 as QMenuModel

20import Qt.labs.folderlistmodel 2.1

21−import Ubuntu.Components 1.1

21+import Ubuntu.Components 1.3

22import ".." as LocalComponents

23

24LocalComponents.Page {

@@ -98,7 +98,7 @@ LocalComponents.Page {

98 anchors.leftMargin: hereCheck.labelOffset

99 anchors.right: parent.right

100 wrapMode: Text.Wrap

101− linkColor: Theme.palette.normal.foregroundText

101+ linkColor: theme.palette.normal.foregroundText

102 // Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

103 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")

104 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))

qml/Wizard/Pages/60-reporting.qml+11−1

@@ -15,15 +15,25 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19+import Ubuntu.SystemSettings.Diagnostics 1.0

19import ".." as LocalComponents

20import ".." as LocalComponents

20

21

21LocalComponents.Page {

22LocalComponents.Page {

23+ id: reportingPage

22 objectName: "reportingPage"

24 objectName: "reportingPage"

23

25

24 title: i18n.tr("Improving your experience")

26 title: i18n.tr("Improving your experience")

25 forwardButtonSourceComponent: forwardButton

27 forwardButtonSourceComponent: forwardButton

26

28

29+ skipValid: false

30+ skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes

31+

32+ UbuntuDiagnostics {

33+ id: diagnostics

34+ Component.onCompleted: reportingPage.skipValid = true;

35+ }

36+

27 Column {

37 Column {

28 id: column

38 id: column

29 anchors.fill: content

39 anchors.fill: content

qml/Wizard/Pages/80-finished.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import ".." as LocalComponents

20

21LocalComponents.Page {

qml/Wizard/Pages/here-terms.qml+3−3

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

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

@@ -17,7 +17,7 @@

17import QtQuick 2.3

18import AccountsService 0.1

19import Qt.labs.folderlistmodel 2.1

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import Ubuntu.Web 0.2

22import ".." as LocalComponents

23

@@ -102,7 +102,7 @@ LocalComponents.Page {

102 anchors.left: parent.left

103 anchors.right: parent.right

104 wrapMode: Text.Wrap

105− linkColor: Theme.palette.normal.foregroundText

105+ linkColor: theme.palette.normal.foregroundText

106 onLinkActivated: {

107 webview.url = link

108 termsLabel.visible = false

qml/Wizard/Pages/passwd-confirm.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.SystemSettings.SecurityPrivacy 1.0

20import ".." as LocalComponents

21import "../../Components" as UnityComponents

qml/Wizard/Pages/passwd-set.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Ubuntu.SystemSettings.SecurityPrivacy 1.0

20import ".." as LocalComponents

21import "../../Components" as UnityComponents

qml/Wizard/StackButton.qml+3−3

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

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

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19

20AbstractButton {

21 id: stackButton

@@ -32,7 +32,7 @@ AbstractButton {

32 anchors.verticalCenter: parent.verticalCenter

33 anchors.left: parent.left

34 anchors.right: parent.right

35− color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)

35+ color: enabled ? theme.palette.selected.backgroundText : Qt.darker(theme.palette.selected.backgroundText, 1.5)

36 text: {

37 if (backArrow) {

38 // Translators: This is the arrow for "Back" buttons

qml/Wizard/Wizard.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import Wizard 0.1

20import "../Components"

21

tests/CMakeLists.txt+1

@@ -132,3 +132,4 @@ add_subdirectory(libs)

132add_subdirectory(plugins)

133add_subdirectory(qmltests)

134add_subdirectory(whitespace)

135+add_subdirectory(sdk)

tests/autopilot/unity8/dash.py+3−3

@@ -158,7 +158,7 @@ class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

158 def enter_search_query(self, query, keyboard):

159 current_header = self._get_current_page_header()

160 search_button = \

161− current_header.select_single(objectName="search_header_button")

161+ current_header.select_single(objectName="search_action_button")

162 self.pointing_device.move(

163 search_button.globalRect.x + search_button.width / 2,

164 search_button.globalRect.y + search_button.height / 2)

@@ -224,7 +224,7 @@ class GenericScopeView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

224 """

225 category_element = self._get_category_element(category)

226 icon = category_element.wait_select_single(

227− 'AbstractButton', title=title)

227+ 'UCAbstractButton', title=title)

228 list_view = self.select_single(

229 ListViewWithPageHeader, objectName='categoryListView')

230 list_view.swipe_child_into_view(icon)

@@ -247,7 +247,7 @@ class GenericScopeView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

247 """

248 category_element = self._get_category_element(category)

249 see_all = category_element.select_single(objectName='seeAll')

250− application_cards = category_element.select_many('AbstractButton')

250+ application_cards = category_element.select_many('UCAbstractButton')

251

252 application_cards = sorted(

253 (card for card in application_cards

tests/plugins/Dash/cardcreator/1.res+7−8

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -14,7 +14,6 @@ AbstractButton {

14 implicitWidth: childrenRect.width;

15 enabled: true;

16

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

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

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

19Item {

18Item {

20 id: artShapeHolder;

19 id: artShapeHolder;

@@ -30,10 +29,9 @@ Item {

30 sourceComponent: Item {

29 sourceComponent: Item {

31 id: artShape;

30 id: artShape;

32 objectName: "artShape";

31 objectName: "artShape";

33− property bool doShapeItem: components["art"]["conciergeMode"] !== true;

32+ readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true;

34 visible: image.status == Image.Ready;

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

35 readonly property alias image: artImage;

34 readonly property alias image: artImage;

36− property alias borderSource: artShapeShape.borderSource;

37 ShaderEffectSource {

35 ShaderEffectSource {

38 id: artShapeSource;

36 id: artShapeSource;

39 sourceItem: artImage;

37 sourceItem: artImage;

@@ -42,16 +40,17 @@ Item {

42 height: 1;

40 height: 1;

43 hideSource: doShapeItem;

41 hideSource: doShapeItem;

44 }

42 }

45− Shape {

43+ UbuntuShape {

46 id: artShapeShape;

44 id: artShapeShape;

47− image: artShapeSource;

45+ source: artShapeSource;

48 anchors.fill: parent;

46 anchors.fill: parent;

49 visible: doShapeItem;

47 visible: doShapeItem;

50 radius: "medium";

48 radius: "medium";

49+ aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat;

51 }

50 }

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

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

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

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

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

53+ Component.onCompleted: { updateWidthHeightBindings(); }

55 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

54 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

56 function updateWidthHeightBindings() {

55 function updateWidthHeightBindings() {

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

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

@@ -87,7 +86,7 @@ Label {

87 wrapMode: Text.Wrap;

86 wrapMode: Text.Wrap;

88 maximumLineCount: 2;

87 maximumLineCount: 2;

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

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

90− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

89+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

91 visible: showHeader ;

90 visible: showHeader ;

92 width: undefined;

91 width: undefined;

93 text: root.title;

92 text: root.title;

tests/plugins/Dash/cardcreator/2.res+9−8

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -23,11 +23,12 @@ Loader {

23 sourceComponent: UbuntuShape {

24 objectName: "background";

25 radius: "medium";

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

26+ backgroundColor: getColor(0) || "white";

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

27+ secondaryBackgroundColor: getColor(1) || backgroundColor;

28+ backgroundMode: UbuntuShape.VerticalGradient;

28− anchors.fill: parent;

29+ anchors.fill: parent;

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

30+ source: backgroundImage.source ? backgroundImage : null;

30− property real luminance: Style.luminance(color);

31+ property real luminance: Style.luminance(backgroundColor);

31 property Image backgroundImage: Image {

32 property Image backgroundImage: Image {

32 objectName: "backgroundImage";

33 objectName: "backgroundImage";

33 source: {

34 source: {

@@ -88,7 +89,7 @@ CroppedImageMinimumSourceSize {

88 wrapMode: Text.Wrap;

89 wrapMode: Text.Wrap;

89 maximumLineCount: 2;

90 maximumLineCount: 2;

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

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

91− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

92+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

92 visible: showHeader ;

93 visible: showHeader ;

93 width: undefined;

94 width: undefined;

94 text: root.title;

95 text: root.title;

@@ -108,7 +109,7 @@ CroppedImageMinimumSourceSize {

108 maximumLineCount: 1;

109 maximumLineCount: 1;

109 fontSize: "x-small";

110 fontSize: "x-small";

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

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

111− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

112+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

112 visible: titleLabel.visible && titleLabel.text;

113 visible: titleLabel.visible && titleLabel.text;

113 text: cardData && cardData["subtitle"] || "";

114 text: cardData && cardData["subtitle"] || "";

114 font.weight: Font.Light;

115 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/3.res+8−9

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -14,7 +14,6 @@ AbstractButton {

14 implicitWidth: childrenRect.width;

15 enabled: true;

16

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

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

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

19Item {

18Item {

20 id: artShapeHolder;

19 id: artShapeHolder;

@@ -30,10 +29,9 @@ Item {

30 sourceComponent: Item {

29 sourceComponent: Item {

31 id: artShape;

30 id: artShape;

32 objectName: "artShape";

31 objectName: "artShape";

33− property bool doShapeItem: components["art"]["conciergeMode"] !== true;

32+ readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true;

34 visible: image.status == Image.Ready;

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

35 readonly property alias image: artImage;

34 readonly property alias image: artImage;

36− property alias borderSource: artShapeShape.borderSource;

37 ShaderEffectSource {

35 ShaderEffectSource {

38 id: artShapeSource;

36 id: artShapeSource;

39 sourceItem: artImage;

37 sourceItem: artImage;

@@ -42,16 +40,17 @@ Item {

42 height: 1;

40 height: 1;

43 hideSource: doShapeItem;

41 hideSource: doShapeItem;

44 }

42 }

45− Shape {

43+ UbuntuShape {

46 id: artShapeShape;

44 id: artShapeShape;

47− image: artShapeSource;

45+ source: artShapeSource;

48 anchors.fill: parent;

46 anchors.fill: parent;

49 visible: doShapeItem;

47 visible: doShapeItem;

50 radius: "medium";

48 radius: "medium";

49+ aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat;

51 }

50 }

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

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

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

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

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

53+ Component.onCompleted: { updateWidthHeightBindings(); }

55 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

54 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

56 function updateWidthHeightBindings() {

55 function updateWidthHeightBindings() {

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

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

@@ -87,7 +86,7 @@ Label {

87 wrapMode: Text.Wrap;

86 wrapMode: Text.Wrap;

88 maximumLineCount: 2;

87 maximumLineCount: 2;

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

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

90− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

89+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

91 visible: showHeader ;

90 visible: showHeader ;

92 width: undefined;

91 width: undefined;

93 text: root.title;

92 text: root.title;

@@ -107,7 +106,7 @@ Label {

107 maximumLineCount: 1;

106 maximumLineCount: 1;

108 fontSize: "x-small";

107 fontSize: "x-small";

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

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

110− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

109+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

111 visible: titleLabel.visible && titleLabel.text;

110 visible: titleLabel.visible && titleLabel.text;

112 text: cardData && cardData["subtitle"] || "";

111 text: cardData && cardData["subtitle"] || "";

113 font.weight: Font.Light;

112 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/4.res+3−3

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -72,7 +72,7 @@ Label {

72 wrapMode: Text.Wrap;

73 maximumLineCount: 2;

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

75− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

75+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

76 visible: showHeader ;

77 width: undefined;

78 text: root.title;

@@ -92,7 +92,7 @@ Label {

92 maximumLineCount: 1;

93 fontSize: "x-small";

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

95− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

95+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;

96 visible: titleLabel.visible && titleLabel.text;

97 text: cardData && cardData["subtitle"] || "";

98 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/5.res+18−45

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -14,7 +14,6 @@ AbstractButton {

14 implicitWidth: childrenRect.width;

15 enabled: false;

16

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

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

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

19Item {

18Item {

20 id: artShapeHolder;

19 id: artShapeHolder;

@@ -30,10 +29,9 @@ Item {

30 sourceComponent: Item {

29 sourceComponent: Item {

31 id: artShape;

30 id: artShape;

32 objectName: "artShape";

31 objectName: "artShape";

33− property bool doShapeItem: components["art"]["conciergeMode"] !== true;

32+ readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true;

34 visible: image.status == Image.Ready;

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

35 readonly property alias image: artImage;

34 readonly property alias image: artImage;

36− property alias borderSource: artShapeShape.borderSource;

37 ShaderEffectSource {

35 ShaderEffectSource {

38 id: artShapeSource;

36 id: artShapeSource;

39 sourceItem: artImage;

37 sourceItem: artImage;

@@ -42,16 +40,17 @@ Item {

42 height: 1;

40 height: 1;

43 hideSource: doShapeItem;

41 hideSource: doShapeItem;

44 }

42 }

45− Shape {

43+ UbuntuShape {

46 id: artShapeShape;

44 id: artShapeShape;

47− image: artShapeSource;

45+ source: artShapeSource;

48 anchors.fill: parent;

46 anchors.fill: parent;

49 visible: doShapeItem;

47 visible: doShapeItem;

50 radius: "medium";

48 radius: "medium";

49+ aspect: root.artShapeStyle === "inset" ? UbuntuShape.Inset : UbuntuShape.Flat;

51 }

50 }

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

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

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

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

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

53+ Component.onCompleted: { updateWidthHeightBindings(); }

55 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

54 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

56 function updateWidthHeightBindings() {

55 function updateWidthHeightBindings() {

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

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

@@ -75,44 +74,18 @@ Item {

75 }

74 }

76Loader {

75Loader {

77 id: overlayLoader;

76 id: overlayLoader;

78− anchors {

77+ readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);

79− left: artShapeHolder.left;

80− right: artShapeHolder.right;

78+ anchors.fill: artShapeHolder;

81− bottom: artShapeHolder.bottom;

82− }

83− active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;

79+ active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;

84 asynchronous: root.asynchronous;

80 asynchronous: root.asynchronous;

85 visible: showHeader && status == Loader.Ready;

81 visible: showHeader && status == Loader.Ready;

86− sourceComponent: ShaderEffect {

82+ sourceComponent: UbuntuShapeOverlay {

87 id: overlay;

83 id: overlay;

88− height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);

89− property real luminance: Style.luminance(overlayColor);

84+ property real luminance: Style.luminance(overlayColor);

85+ aspect: UbuntuShape.Flat;

86+ radius: "medium";

90− property color overlayColor: cardData && cardData["overlayColor"] || "#99000000";

87+ overlayColor: cardData && cardData["overlayColor"] || "#99000000";

91− property var source: ShaderEffectSource {

88+ overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1);

92− id: shaderSource;

93− sourceItem: artShapeLoader.item;

94− onVisibleChanged: if (visible) scheduleUpdate();

95− live: false;

96− sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height);

97− }

98− vertexShader: "

99− uniform highp mat4 qt_Matrix;

100− attribute highp vec4 qt_Vertex;

101− attribute highp vec2 qt_MultiTexCoord0;

102− varying highp vec2 coord;

103− void main() {

104− coord = qt_MultiTexCoord0;

105− gl_Position = qt_Matrix * qt_Vertex;

106− }";

107− fragmentShader: "

108− varying highp vec2 coord;

109− uniform sampler2D source;

110− uniform lowp float qt_Opacity;

111− uniform highp vec4 overlayColor;

112− void main() {

113− lowp vec4 tex = texture2D(source, coord);

114− gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a;

115− }";

116 }

89 }

117 }

90 }

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

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

@@ -124,14 +97,14 @@ Label {

124 left: parent.left;

97 left: parent.left;

125 leftMargin: units.gu(1);

98 leftMargin: units.gu(1);

126 top: overlayLoader.top;

99 top: overlayLoader.top;

127− topMargin: units.gu(1);

100+ topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight;

128 }

101 }

129 elide: Text.ElideRight;

102 elide: Text.ElideRight;

130 fontSize: "small";

103 fontSize: "small";

131 wrapMode: Text.Wrap;

104 wrapMode: Text.Wrap;

132 maximumLineCount: 2;

105 maximumLineCount: 2;

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

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

134− color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

107+ color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

135 visible: showHeader && overlayLoader.active;

108 visible: showHeader && overlayLoader.active;

136 width: undefined;

109 width: undefined;

137 text: root.title;

110 text: root.title;

@@ -152,7 +125,7 @@ Label {

152 maximumLineCount: 1;

125 maximumLineCount: 1;

153 fontSize: "x-small";

126 fontSize: "x-small";

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

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

155− color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

128+ color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

156 visible: titleLabel.visible && titleLabel.text;

129 visible: titleLabel.visible && titleLabel.text;

157 text: cardData && cardData["subtitle"] || "";

130 text: cardData && cardData["subtitle"] || "";

158 font.weight: Font.Light;

131 font.weight: Font.Light;

tests/plugins/Dash/cardcreator/6.res+10−9

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -23,11 +23,12 @@ Loader {

23 sourceComponent: UbuntuShape {

24 objectName: "background";

25 radius: "medium";

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

26+ backgroundColor: getColor(0) || "white";

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

27+ secondaryBackgroundColor: getColor(1) || backgroundColor;

28+ backgroundMode: UbuntuShape.VerticalGradient;

28− anchors.fill: parent;

29+ anchors.fill: parent;

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

30+ source: backgroundImage.source ? backgroundImage : null;

30− property real luminance: Style.luminance(color);

31+ property real luminance: Style.luminance(backgroundColor);

31 property Image backgroundImage: Image {

32 property Image backgroundImage: Image {

32 objectName: "backgroundImage";

33 objectName: "backgroundImage";

33 source: {

34 source: {

@@ -67,7 +68,7 @@ Item {

67 wrapMode: Text.Wrap;

68 wrapMode: Text.Wrap;

68 maximumLineCount: 2;

69 maximumLineCount: 2;

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

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

70− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

71+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

71 visible: showHeader ;

72 visible: showHeader ;

72 width: undefined;

73 width: undefined;

73 text: root.title;

74 text: root.title;

@@ -87,7 +88,7 @@ Item {

87 maximumLineCount: 1;

88 maximumLineCount: 1;

88 fontSize: "x-small";

89 fontSize: "x-small";

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

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

90− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

91+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

91 visible: titleLabel.visible && titleLabel.text;

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

92 text: cardData && cardData["subtitle"] || "";

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

93 font.weight: Font.Light;

94 font.weight: Font.Light;

@@ -101,7 +102,7 @@ Item {

101 rightMargin: units.gu(1);

102 rightMargin: units.gu(1);

102 }

103 }

103 source: cardData && cardData["emblem"] || "";

104 source: cardData && cardData["emblem"] || "";

104− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

105+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

105 height: source != "" ? titleLabel.font.pixelSize : 0;

106 height: source != "" ? titleLabel.font.pixelSize : 0;

106 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;

107 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;

107 }

108 }

tests/plugins/Dash/cardcreator/7.res+10−9

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -23,11 +23,12 @@ Loader {

23 sourceComponent: UbuntuShape {

24 objectName: "background";

25 radius: "medium";

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

26+ backgroundColor: getColor(0) || "white";

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

27+ secondaryBackgroundColor: getColor(1) || backgroundColor;

28+ backgroundMode: UbuntuShape.VerticalGradient;

28− anchors.fill: parent;

29+ anchors.fill: parent;

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

30+ source: backgroundImage.source ? backgroundImage : null;

30− property real luminance: Style.luminance(color);

31+ property real luminance: Style.luminance(backgroundColor);

31 property Image backgroundImage: Image {

32 property Image backgroundImage: Image {

32 objectName: "backgroundImage";

33 objectName: "backgroundImage";

33 source: {

34 source: {

@@ -89,7 +90,7 @@ CroppedImageMinimumSourceSize {

89 wrapMode: Text.Wrap;

90 wrapMode: Text.Wrap;

90 maximumLineCount: 2;

91 maximumLineCount: 2;

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

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

92− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

93+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

93 visible: showHeader ;

94 visible: showHeader ;

94 width: undefined;

95 width: undefined;

95 text: root.title;

96 text: root.title;

@@ -109,7 +110,7 @@ CroppedImageMinimumSourceSize {

109 maximumLineCount: 1;

110 maximumLineCount: 1;

110 fontSize: "x-small";

111 fontSize: "x-small";

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

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

112− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

113+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

113 visible: titleLabel.visible && titleLabel.text;

114 visible: titleLabel.visible && titleLabel.text;

114 text: cardData && cardData["subtitle"] || "";

115 text: cardData && cardData["subtitle"] || "";

115 font.weight: Font.Light;

116 font.weight: Font.Light;

@@ -122,7 +123,7 @@ CroppedImageMinimumSourceSize {

122 rightMargin: units.gu(1);

123 rightMargin: units.gu(1);

123 top: subtitleLabel.bottom;

124 top: subtitleLabel.bottom;

124 }

125 }

125− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

126+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

126 fontScale: root.fontScale;

127 fontScale: root.fontScale;

127 model: cardData && cardData["attributes"];

128 model: cardData && cardData["attributes"];

128 }

129 }

tests/plugins/Dash/cardcreator/8.res+7−6

@@ -2,7 +2,7 @@ AbstractButton {

2 id: root;

3 property var components;

4 property var cardData;

5− property var artShapeBorderSource: undefined;

5+ property string artShapeStyle: "inset";

6 property real fontScale: 1.0;

7 property var scopeStyle: null;

8 property int titleAlignment: Text.AlignLeft;

@@ -23,11 +23,12 @@ Loader {

23 sourceComponent: UbuntuShape {

24 objectName: "background";

25 radius: "medium";

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

26+ backgroundColor: getColor(0) || "white";

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

27+ secondaryBackgroundColor: getColor(1) || backgroundColor;

28+ backgroundMode: UbuntuShape.VerticalGradient;

28 anchors.fill: parent;

29 anchors.fill: parent;

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

30+ source: backgroundImage.source ? backgroundImage : null;

30− property real luminance: Style.luminance(color);

31+ property real luminance: Style.luminance(backgroundColor);

31 property Image backgroundImage: Image {

32 property Image backgroundImage: Image {

32 objectName: "backgroundImage";

33 objectName: "backgroundImage";

33 source: {

34 source: {

@@ -80,7 +81,7 @@ left: parent.left;

80 wrapMode: Text.Wrap;

81 wrapMode: Text.Wrap;

81 maximumLineCount: 2;

82 maximumLineCount: 2;

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

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

83− color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

84+ color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");

84 visible: showHeader ;

85 visible: showHeader ;

85 width: parent.width - x;

86 width: parent.width - x;

86 text: root.title;

87 text: root.title;

tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.3

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import Dash 0.1

21

22Rectangle {

tests/plugins/Dash/tst_ScopeStyle.qml+1−1

@@ -17,7 +17,7 @@

17import QtQuick 2.2

18import QtTest 1.0

19import Dash 0.1

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21import Utils 0.1

22

23Rectangle {

tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Gestures 0.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21Item {

22

tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Gestures 0.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21Item {

22 id: root

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Gestures 0.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21Item {

22 objectName: "rightwardsLauncher"

tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Gestures 0.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20

21Item {

22 id: root

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Unity.Test 0.1

20

21Rectangle {

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20import Unity.Test 0.1

21

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1

20

21/*

tests/qmltests/CMakeLists.txt+1−1

@@ -24,7 +24,7 @@ add_unity8_qmltest(Dash CardCarousel)

24add_unity8_qmlbenchmark(Dash CardBenchmark 1000)

25add_unity8_qmltest(Dash CardTool)

26add_unity8_qmltest(Dash GenericScopeView)

27−add_unity8_qmltest(Dash PageHeader)

27+add_unity8_qmltest(Dash DashPageHeader)

28add_unity8_qmltest(Dash PreviewListView)

29add_unity8_qmltest(Dash/Previews Preview)

30add_unity8_qmltest(Dash/Previews PreviewActions)

tests/qmltests/Components/tst_Dialogs.qml+2−2

@@ -16,7 +16,7 @@

16

17import QtQuick 2.2

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1

21

22import "../../../qml/Components"

@@ -105,7 +105,7 @@ Rectangle {

105 var dialogsPrivate = findInvisibleChild(dialogs, "dialogsPrivate");

106 dialogsPrivate.showPowerDialog();

107 var dialogLoader = findInvisibleChild(dialogs, "dialogLoader");

108− tryCompare(dialogLoader.item, "focus", true);

108+ tryCompare(dialogLoader.item.__foreground, "focus", true);

109 }

110 }

111}

tests/qmltests/Components/tst_DragHandle.qml+1−1

@@ -17,7 +17,7 @@

17import QtQuick 2.0

18import "../../../qml/Components"

19import "tst_DragHandle"

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21import Ubuntu.Gestures 0.1

22import Unity.Test 0.1

23

tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import "../../../../qml/Components"

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21

22Item {

tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import "../../../../qml/Components"

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21

22Showable {

tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import "../../../../qml/Components"

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Ubuntu.Gestures 0.1

21

22Showable {

tests/qmltests/Components/tst_LazyImage.qml+3−3

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

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

@@ -17,7 +17,7 @@

17import QtQuick 2.0

18import QtTest 1.0

19import "../../../qml/Components"

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21import Unity.Test 0.1 as UT

22import "tst_LazyImage"

23

@@ -32,7 +32,7 @@ Rectangle {

32 rightMargin: 2 * parent.width / 3

33 }

34

35− color: Theme.palette.normal.baseText

35+ color: theme.palette.normal.baseText

36

37 Column {

38 anchors { fill: parent; margins: units.gu(5) }

tests/qmltests/Components/tst_LazyImage/ImageControls.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.3

19import "../../../../qml/Components"

20

21Row {

tests/qmltests/Components/tst_Lockscreen.qml+1−1

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

18import QtTest 1.0

19import ".."

20import "../../../qml/Components"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1 as UT

23

24Rectangle {

tests/qmltests/Components/tst_Rating.qml+3−3

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

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

@@ -17,14 +17,14 @@

17import QtQuick 2.0

18import QtTest 1.0

19import "../../../qml/Components"

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21import Unity.Test 0.1 as UT

22

23Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(10)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 Rating {

30 id: rating

tests/qmltests/Components/tst_ResponsiveGridView.qml+2−2

@@ -18,8 +18,8 @@ import QtQuick 2.0

18import QtTest 1.0

19import ".."

20import "../../../qml/Components"

21−import Ubuntu.Components.ListItems 0.1 as ListItem

21+import Ubuntu.Components.ListItems 1.3 as ListItem

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Unity.Test 0.1 as UT

24

25Item {

tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+2−2

@@ -18,8 +18,8 @@ import QtQuick 2.0

18import QtTest 1.0

19import ".."

20import "../../../qml/Components"

21−import Ubuntu.Components.ListItems 0.1 as ListItem

21+import Ubuntu.Components.ListItems 1.3 as ListItem

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Utils 0.1

24import Unity.Test 0.1 as UT

25

tests/qmltests/Components/tst_Showable.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1 as UT

21import ".."

22import "../../../qml/Components"

tests/qmltests/Dash/Previews/tst_Preview.qml+2−2

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

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

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(60)

26 height: units.gu(60)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 Item {

30 id: shell

tests/qmltests/Dash/Previews/tst_PreviewActions.qml+1−1

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

18import QtTest 1.0

19import "../../../../qml/Dash/Previews"

20import Unity.Test 0.1 as UT

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22

23

24Rectangle {

tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22import QtMultimedia 5.0

@@ -25,7 +25,7 @@ Rectangle {

25 id: root

26 width: units.gu(60)

27 height: units.gu(80)

28− color: Theme.palette.selected.background

28+ color: theme.palette.selected.background

29

30 property var tracksModel0: {

31 "tracks": [ ]

tests/qmltests/Dash/Previews/tst_PreviewComment.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(80)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 property string longText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."

30 property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."

tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+1−1

@@ -149,7 +149,7 @@ Rectangle {

149 tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);

150 var mascot = findChild(previewHeader, "mascotShape");

151 tryCompare(mascot, "visible", true);

152− tryCompare(mascot.image, "status", Image.Ready);

152+ tryCompare(mascot.source, "status", Image.Ready);

153 }

154 }

155}

tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml+2−2

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

18import QtTest 1.0

19import "../../../../qml/Dash/Previews"

20import Unity.Test 0.1 as UT

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22

23

24Rectangle {

@@ -104,7 +104,7 @@ Rectangle {

104

105 var button = findChild(root, "button" + buttonId);

106 var image = findChildsByType(button, "QQuickImage")[0];

107− var label = findChildsByType(button, "Label")[0];

107+ var label = findChildsByType(button, "UCLabel")[0];

108

109 compare(image.source, buttonIcon);

110 compare(label.text, buttonLabel);

tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+1−1

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

18import QtTest 1.0

19import "../../../../qml/Dash/Previews"

20import Unity.Test 0.1 as UT

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22

23Rectangle {

24 id: root

tests/qmltests/Dash/Previews/tst_PreviewProgress.qml+1−1

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

18import QtTest 1.0

19import "../../../../qml/Dash/Previews"

20import Unity.Test 0.1 as UT

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22

23Rectangle {

24 id: root

tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(80)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 property var reviewsModel0: {

30 "reviews": [ ]

tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(80)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }

30

tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(80)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 property real validInputRating: 1

30 property real invalidInputRating: -1

tests/qmltests/Dash/Previews/tst_PreviewTable.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(80)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 property var widgetDataComplete: {

30 "title": "Title here longa long long long long long long long long long long",

tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+3−3

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import "../../../../qml/Dash/Previews"

21import Unity.Test 0.1 as UT

22

@@ -24,7 +24,7 @@ Rectangle {

24 id: root

25 width: units.gu(40)

26 height: units.gu(80)

27− color: Theme.palette.selected.background

27+ color: theme.palette.selected.background

28

29 property var widgetDataComplete: {

30 "title": "Title here",

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2

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

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

@@ -23,7 +23,7 @@ Rectangle {

23 id: root

24 width: units.gu(60)

25 height: units.gu(80)

26− color: Theme.palette.selected.background

26+ color: theme.palette.selected.background

27

28 PreviewWidgetFactory {

29 id: factory

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import QtTest 1.0

20import "../../../../qml/Dash/ScopeSettings"

21import Unity.Test 0.1 as UT

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import QtTest 1.0

20import "../../../../qml/Dash/ScopeSettings"

21import Unity.Test 0.1 as UT

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import QtTest 1.0

20import "../../../../qml/Dash/ScopeSettings"

21import Unity.Test 0.1 as UT

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import QtTest 1.0

20import "../../../../qml/Dash/ScopeSettings"

21import Unity.Test 0.1 as UT

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import QtTest 1.0

20import "../../../../qml/Dash/ScopeSettings"

21import Unity.Test 0.1 as UT

tests/qmltests/Dash/tst_Card.qml+6−6

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1 as UT

21import "../../../qml/Dash"

22import "CardHelpers.js" as Helpers

@@ -443,11 +443,11 @@ Rectangle {

443 }

444

445 if (data.hasOwnProperty("color")) {

446− tryCompare(background, "color", data.color);

446+ tryCompare(background, "backgroundColor", data.color);

447 }

448

449 if (data.hasOwnProperty("gradientColor")) {

450− tryCompare(background, "gradientColor", data.gradientColor);

450+ tryCompare(background, "secondaryBackgroundColor", data.gradientColor);

451 }

452

453 if (data.hasOwnProperty("image")) {

@@ -520,9 +520,9 @@ Rectangle {

520 waitForRendering(selector);

521 waitForRendering(card);

522

523− background.color = data.tag;

523+ background.backgroundColor = data.tag;

524

525− var fontColor = data.dark ? Theme.palette.normal.baseText : "white";

525+ var fontColor = data.dark ? theme.palette.normal.baseText : "white";

526

527 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);

528 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1 as UT

21import "../../../qml/Dash"

22import "CardHelpers.js" as Helpers

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1 as UT

21import "../../../qml/Dash"

22import "CardHelpers.js" as Helpers

tests/qmltests/Dash/tst_Dash.qml+2−2

@@ -17,7 +17,7 @@

17import QtQuick 2.0

18import QtTest 1.0

19import "../../../qml/Dash"

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21import Unity.Test 0.1 as UT

22

23Item {

@@ -319,7 +319,7 @@ Item {

319

320 // Click on the store

321 var scopesListPageHeader = findChild(scopesList, "pageHeader");

322− var searchButton = findChild(scopesListPageHeader, "store_header_button");

322+ var searchButton = findChild(scopesListPageHeader, "store_action_button");

323 mouseClick(searchButton);

324

325 spy.wait();

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

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

18import QtTest 1.0

19import "../../../qml/Dash"

20import "../../../qml/Components"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity 0.2

23import Unity.Test 0.1 as UT

24import Utils 0.1

@@ -215,7 +215,7 @@ Item {

215 verify(pageHeader, "Could not find the scope page header.");

216 var innerHeader = findChild(pageHeader, "innerPageHeader");

217 verify(innerHeader, "Could not find the scope page header.");

218− compare(innerHeader.title, scopesModel.getScope(data.index).name);

218+ compare(innerHeader.config.title, scopesModel.getScope(data.index).name);

219 }

220

221 function test_is_active_data() {

@@ -552,13 +552,13 @@ Item {

552 }

553

554 function getSettledButtons() {

555− var buttons = findChildsByType(dashContent, "AbstractButton");

555+ var buttons = findChildsByType(dashContent, "UCAbstractButton");

556 wait(2500);

557− var aux = findChildsByType(dashContent, "AbstractButton");

557+ var aux = findChildsByType(dashContent, "UCAbstractButton");

558 while (!compareArrays(aux, buttons)) {

559 buttons = aux;

560 wait(2500);

561− aux = findChildsByType(dashContent, "AbstractButton");

561+ aux = findChildsByType(dashContent, "UCAbstractButton");

562 }

563 return buttons;

564 }

tests/qmltests/Dash/tst_PageHeader.qml → tests/qmltests/Dash/tst_DashPageHeader.qmlrenamed+4−4

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

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

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

18import QtTest 1.0

19import ".."

20import "../../../qml/Dash"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity 0.2

23import Unity.Test 0.1 as UT

24

@@ -244,7 +244,7 @@ Item {

244 anchors.fill: parent

245 spacing: units.gu(1)

246

247− PageHeader {

247+ DashPageHeader {

248 id: pageHeader

249 anchors {

250 left: parent.left

@@ -254,7 +254,7 @@ Item {

254 searchEntryEnabled: true

255 title: "%^$%^%^&%^&%^$%GHR%"

256 scopeStyle: QtObject {

257− readonly property color foreground: Theme.palette.normal.baseText

257+ readonly property color foreground: theme.palette.normal.baseText

258 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""

259 }

260 showBackButton: showBackButtonCheckBox.checked

tests/qmltests/Dash/tst_GenericScopeView.qml+4−4

@@ -20,7 +20,7 @@ import Unity 0.2

20import ".."

21import "../../../qml/Dash"

22import "../../../qml/Components"

23−import Ubuntu.Components 1.1

23+import Ubuntu.Components 1.3

24import Unity.Test 0.1 as UT

25

26Item {

@@ -429,7 +429,7 @@ Item {

429 // open

430 tryCompare(testCase.subPageLoader, "open", false);

431 tryCompare(testCase.subPageLoader, "visible", false);

432− var settings = findChild(innerHeader, "settings_header_button");

432+ var settings = findChild(innerHeader, "settings_action_button");

433 mouseClick(settings);

434 tryCompare(testCase.subPageLoader, "open", true);

435 tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);

@@ -500,7 +500,7 @@ Item {

500 mouseClick(seeAll0);

501 verify(category0.expanded);

502 tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);

503− tryCompare(genericScopeView.categoryView, "contentY", units.gu(14));

503+ tryCompare(genericScopeView.categoryView, "contentY", units.gu(13));

504

505 scrollToEnd();

506

@@ -577,7 +577,7 @@ Item {

577 verify(innerHeader, "Could not find the inner header");

578

579 expectFail("Apps", "Click scope should not have a favorite button");

580− var favoriteAction = findChild(innerHeader, "favorite_header_button");

580+ var favoriteAction = findChild(innerHeader, "favorite_action_button");

581 verify(favoriteAction, "Could not find the favorite action.");

582 mouseClick(favoriteAction);

583

tests/qmltests/Dash/tst_PreviewListView.qml+4−4

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

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

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import "../../../qml/Dash"

21import Unity.Test 0.1 as UT

22import Unity 0.2 as Unity

@@ -26,7 +26,7 @@ Rectangle {

26 id: root

27 width: units.gu(60)

28 height: units.gu(60)

29− color: Theme.palette.selected.background

29+ color: theme.palette.selected.background

30

31 Unity.MockScope {

32 id: mockScope

@@ -91,7 +91,7 @@ Rectangle {

91 var header = findChild(listView, "innerPageHeader");

92 verify(header, "Could not find the preview header");

93

94− compare(header.title, "Mock Scope");

94+ compare(header.config.title, "Mock Scope");

95 }

96

97 function test_header_style() {

tests/qmltests/Greeter/TestView.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.3

18−import Ubuntu.Components 1.1

18+import Ubuntu.Components 1.3

19import "../Components"

20

21Item {

tests/qmltests/Greeter/tst_Clock.qml+1−1

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

18import QtTest 1.0

19import ".."

20import "../../../qml/Greeter"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Indicators 0.1 as Indicators

23import Unity.Test 0.1 as UT

24

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

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

18import QtTest 1.0

19import ".."

20import "../../../qml/Greeter"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import AccountsService 0.1

23import GSettings 1.0

24import IntegratedLightDM 0.1 as LightDM

tests/qmltests/Greeter/tst_Infographics.qml+1−1

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

18import QtTest 1.0

19import ".."

20import "../../../qml/Greeter"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1 as UT

23import IntegratedLightDM 0.1 as LightDM

24

tests/qmltests/Greeter/tst_NarrowView.qml+1−1

@@ -19,7 +19,7 @@ import QtTest 1.0

19import ".."

20import "../../../qml/Greeter"

21import IntegratedLightDM 0.1 as LightDM

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Unity.Test 0.1 as UT

24

25Item {

tests/qmltests/Greeter/tst_WideView.qml+1−1

@@ -19,7 +19,7 @@ import QtTest 1.0

19import ".."

20import "../../../qml/Greeter"

21import IntegratedLightDM 0.1 as LightDM

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Unity.Test 0.1 as UT

24

25Item {

tests/qmltests/Launcher/tst_Launcher.qml+25−14

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

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import Unity.Test 0.1

21−import Ubuntu.Components 1.1

21+import Ubuntu.Components 1.3

22import ".."

23import "../../../qml/Launcher"

24import Unity.Launcher 0.1

@@ -200,7 +200,10 @@ Item {

200 verify(!!panel);

201

202 // wait until it gets fully extended

203− tryCompare(panel, "x", 0);

203+ // a tryCompare doesn't work since

204+ // compare(-0.000005917593600024418, 0);

205+ // is true and in this case we want exactly 0 or will have pain later on

206+ tryCompareFunction( function(){ return panel.x === 0; }, true );

204 tryCompare(launcher, "state", "visible");

207 tryCompare(launcher, "state", "visible");

205 }

208 }

206

209

@@ -479,16 +482,21 @@ Item {

479 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

482 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

480

483

481 // Doing longpress

484 // Doing longpress

482− var currentMouseX = draggedItem.width / 2

485+ var mouseOnLauncher = launcher.mapFromItem(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

483− var currentMouseY = draggedItem.height / 2

486+ var currentMouseX = mouseOnLauncher.x

487+ var currentMouseY = mouseOnLauncher.y

488+ var newMouseX = currentMouseX

489+ var newMouseY = currentMouseY

484− mousePress(draggedItem, currentMouseX, currentMouseY)

490+ mousePress(launcher, currentMouseX, currentMouseY)

485 // DraggedItem needs to hide and fakeDragItem become visible

491 // DraggedItem needs to hide and fakeDragItem become visible

486 tryCompare(draggedItem, "itemOpacity", 0)

492 tryCompare(draggedItem, "itemOpacity", 0)

487 tryCompare(fakeDragItem, "visible", true)

493 tryCompare(fakeDragItem, "visible", true)

488

494

489 // Dragging a bit (> 1.5 gu)

495 // Dragging a bit (> 1.5 gu)

490− currentMouseX -= units.gu(2)

496+ newMouseX -= units.gu(2)

491− mouseMove(draggedItem, currentMouseX, currentMouseY)

497+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)

498+ currentMouseX = newMouseX

499+

492 // Other items need to expand and become 0.6 opaque

500 // Other items need to expand and become 0.6 opaque

493 tryCompare(item0, "angle", 0)

501 tryCompare(item0, "angle", 0)

494 tryCompare(item0, "itemOpacity", 0.6)

502 tryCompare(item0, "itemOpacity", 0.6)

@@ -496,18 +504,21 @@ Item {

496 if (data.fullDrag) {

504 if (data.fullDrag) {

497 // Dragging a bit more

505 // Dragging a bit more

498 if (data.orientation == ListView.Horizontal) {

506 if (data.orientation == ListView.Horizontal) {

499− currentMouseX -= units.gu(15)

507+ newMouseX += units.gu(15)

500− mouseMove(draggedItem, currentMouseX, currentMouseY, 100)

508+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)

509+ currentMouseX = newMouseX

501

510

502 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

511 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

503 tryCompare(draggedItem, "height", units.gu(1))

512 tryCompare(draggedItem, "height", units.gu(1))

504

513

505 // Dragging downwards. Item needs to move in the model

514 // Dragging downwards. Item needs to move in the model

506− currentMouseY -= initialItemHeight * 1.5

515+ newMouseY -= initialItemHeight * 1.5

507− mouseMove(draggedItem, currentMouseX, currentMouseY)

516+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)

517+ currentMouseY = newMouseY

508 } else if (data.orientation == ListView.Vertical) {

518 } else if (data.orientation == ListView.Vertical) {

509− currentMouseY -= initialItemHeight * 1.5

519+ newMouseY -= initialItemHeight * 1.5

510− mouseMove(draggedItem, currentMouseX, currentMouseY, 100)

520+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)

521+ currentMouseY = newMouseY

511

522

512 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

523 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

513 tryCompare(draggedItem, "height", units.gu(1))

524 tryCompare(draggedItem, "height", units.gu(1))

@@ -519,7 +530,7 @@ Item {

519 }

530 }

520

531

521 // Releasing and checking if initial values are restored

532 // Releasing and checking if initial values are restored

522− mouseRelease(draggedItem)

533+ mouseRelease(launcher)

523 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

534 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

524 tryCompare(draggedItem, "itemOpacity", 1)

535 tryCompare(draggedItem, "itemOpacity", 1)

525 tryCompare(fakeDragItem, "visible", false)

536 tryCompare(fakeDragItem, "visible", false)

tests/qmltests/Notifications/tst_Notifications.qml+1−1

@@ -20,7 +20,7 @@ import QtTest 1.0

20import ".."

21import "../../../qml/Notifications"

22import "../../../qml/Components/UnityInputInfo"

23−import Ubuntu.Components 1.2

23+import Ubuntu.Components 1.3

24import Unity.Test 0.1

25import Unity.Notifications 1.0

26import QtMultimedia 5.0

tests/qmltests/Notifications/tst_OptionToggle.qml+1−1

@@ -21,7 +21,7 @@ import QtQuick 2.0

21import QtTest 1.0

22import ".."

23import "../../../qml/Notifications"

24−import Ubuntu.Components 0.1

24+import Ubuntu.Components 1.3

25import Unity.Test 0.1

26import Unity.Notifications 1.0

27import QtMultimedia 5.0

tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1

@@ -20,7 +20,7 @@ import QtTest 1.0

20import ".."

21import "../../../qml/Notifications"

22import "../../../qml/Components/UnityInputInfo"

23−import Ubuntu.Components 0.1

23+import Ubuntu.Components 1.3

24import Unity.Test 0.1

25import Unity.Notifications 1.0

26

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+1−1

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

18import QtTest 1.0

19import ".."

20import "../../../qml/Notifications"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1

23import Unity.Notifications 1.0

24

tests/qmltests/Panel/IndicatorTest.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import "../../../qml/Panel"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1 as UT

23import Unity.Indicators 0.1 as Indicators

24

tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+1−1

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

18import QtQuick.Layouts 1.1

19import Unity.Test 0.1 as UT

20import Unity.Indicators 0.1 as Indicators

21−import Ubuntu.Components 1.1

21+import Ubuntu.Components 1.3

22import Powerd 0.1

23import Lights 0.1

24import QMenuModel 0.1

tests/qmltests/Panel/tst_IndicatorItem.qml+1−1

@@ -17,7 +17,7 @@

17import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20−import Ubuntu.Components 0.1

20+import Ubuntu.Components 1.3

21import Unity.Test 0.1 as UT

22import "../../../qml/Panel"

23

tests/qmltests/Panel/tst_IndicatorItemRow.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import "../../../qml/Panel"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1 as UT

23import Unity.Indicators 0.1 as Indicators

24

tests/qmltests/Panel/tst_IndicatorsBar.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import "../../../qml/Panel"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1 as UT

23import Unity.Indicators 0.1 as Indicators

24

tests/qmltests/Panel/tst_IndicatorsMenu.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import "../../../qml/Panel"

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Test 0.1 as UT

23import Unity.Indicators 0.1 as Indicators

24

tests/qmltests/Panel/tst_Panel.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import Unity.Test 0.1

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Application 0.1

23import Unity.Indicators 0.1 as Indicators

24import Ubuntu.Telephony 0.1 as Telephony

tests/qmltests/Stages/ApplicationCheckBox.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import Unity.Application 0.1

21

22RowLayout {

tests/qmltests/Stages/RecursingChildSessionControl.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.1

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Application 0.1

21

22ColumnLayout {

tests/qmltests/Stages/tst_ApplicationWindow.qml+2−2

@@ -20,8 +20,8 @@ import QtTest 1.0

20import Unity.Test 0.1 as UT

21import ".."

22import "../../../qml/Stages"

23−import Ubuntu.Components 0.1

23+import Ubuntu.Components 1.3

24−import Ubuntu.Components.ListItems 1.0 as ListItem

24+import Ubuntu.Components.ListItems 1.3 as ListItem

25import Unity.Application 0.1

26

27Rectangle {

tests/qmltests/Stages/tst_DesktopStage.qml+2−2

@@ -16,8 +16,8 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20−import Ubuntu.Components.ListItems 1.0 as ListItem

20+import Ubuntu.Components.ListItems 1.3 as ListItem

21import Unity.Application 0.1

22import Unity.Test 0.1

23import Utils 0.1

tests/qmltests/Stages/tst_PhoneStage.qml+1−1

@@ -19,7 +19,7 @@ import QtTest 1.0

19import Unity.Test 0.1 as UT

20import ".."

21import "../../../qml/Stages"

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Unity.Application 0.1

24

25Item {

tests/qmltests/Stages/tst_SessionContainer.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.1

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20import Unity.Test 0.1 as UT

21−import Ubuntu.Components 0.1

21+import Ubuntu.Components 1.3

22import Unity.Application 0.1

23import "../../../qml/Stages"

24

tests/qmltests/Stages/tst_Splash.qml+1−1

@@ -19,7 +19,7 @@ import QtTest 1.0

19import Unity.Test 0.1 as UT

20import ".."

21import "../../../qml/Stages"

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Unity.Application 0.1

24

25Rectangle {

tests/qmltests/Stages/tst_SpreadDelegate.qml+2−2

@@ -19,8 +19,8 @@ import QtTest 1.0

19import Unity.Test 0.1 as UT

20import ".."

21import "../../../qml/Stages"

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23−import Ubuntu.Components.ListItems 1.0 as ListItem

23+import Ubuntu.Components.ListItems 1.3 as ListItem

24import Unity.Application 0.1

25

26Rectangle {

tests/qmltests/Stages/tst_SurfaceContainer.qml+1−1

@@ -19,7 +19,7 @@ import QtTest 1.0

19import Unity.Test 0.1

20import ".."

21import "../../../qml/Stages"

22−import Ubuntu.Components 0.1

22+import Ubuntu.Components 1.3

23import Unity.Application 0.1

24

25Rectangle {

tests/qmltests/Stages/tst_TabletStage.qml+2−2

@@ -16,8 +16,8 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20−import Ubuntu.Components.ListItems 1.0 as ListItem

20+import Ubuntu.Components.ListItems 1.3 as ListItem

21import Unity.Application 0.1

22import Unity.Test 0.1

23

tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+2−2

@@ -20,8 +20,8 @@ import QtTest 1.0

20import Unity.Test 0.1 as UT

21import ".."

22import "../../../qml/Stages"

23−import Ubuntu.Components 0.1

23+import Ubuntu.Components 1.3

24−import Ubuntu.Components.ListItems 1.0 as ListItem

24+import Ubuntu.Components.ListItems 1.3 as ListItem

25import Unity.Application 0.1

26

27Item {

tests/qmltests/Tutorial/tst_Tutorial.qml+1−1

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

18import QtTest 1.0

19import AccountsService 0.1

20import IntegratedLightDM 0.1 as LightDM

21−import Ubuntu.Components 1.1

21+import Ubuntu.Components 1.3

22import Unity.Application 0.1

23import Unity.Test 0.1 as UT

24

tests/qmltests/Wizard/tst_Wizard.qml+15−14

@@ -19,7 +19,7 @@ import QtTest 1.0

19import AccountsService 0.1

20import MeeGo.QOfono 0.2

21import QMenuModel 0.1

22−import Ubuntu.Components 1.1

22+import Ubuntu.Components 1.3

23import Ubuntu.SystemSettings.SecurityPrivacy 1.0

24import Unity.Test 0.1 as UT

25import Wizard 0.1

@@ -96,7 +96,7 @@ Item {

96 }

97

98 Component.onCompleted: {

99− Theme.name = "Ubuntu.Components.Themes.SuruGradient";

99+ theme.name = "Ubuntu.Components.Themes.SuruGradient";

100 setup();

101 }

102

@@ -158,13 +158,16 @@ Item {

158 return stack.currentPage;

159 }

160

161− function goToPage(name, skipSim, skipLocation) {

161+ function goToPage(name, skipSim, skipLocation, skipReporting) {

162 if (skipSim === undefined) {

163 skipSim = false;

164 }

165 if (skipLocation === undefined) {

166 skipLocation = false;

167 }

168+ if (skipReporting === undefined) {

169+ skipReporting = false;

170+ }

168

171

169 var page = waitForPage("languagePage");

172 var page = waitForPage("languagePage");

170 if (name === page.objectName) return page;

173 if (name === page.objectName) return page;

@@ -191,9 +194,11 @@ Item {

191 tap(findChild(page, "forwardButton"));

194 tap(findChild(page, "forwardButton"));

192 }

195 }

193

196

197+ if (!skipReporting) {

194− page = waitForPage("reportingPage");

198+ page = waitForPage("reportingPage");

195− if (name === page.objectName) return page;

199+ if (name === page.objectName) return page;

196− tap(findChild(page, "forwardButton"));

200+ tap(findChild(page, "forwardButton"));

201+ }

197

202

198 page = waitForPage("finishedPage");

203 page = waitForPage("finishedPage");

199 if (name === page.objectName) return page;

204 if (name === page.objectName) return page;

@@ -337,8 +342,6 @@ Item {

337 tap(findChild(page, "forwardButton"));

342 tap(findChild(page, "forwardButton"));

338 page = waitForPage("locationPage");

343 page = waitForPage("locationPage");

339 tap(findChild(page, "forwardButton"));

344 tap(findChild(page, "forwardButton"));

340− page = waitForPage("reportingPage");

341− tap(findChild(page, "forwardButton"));

342 page = waitForPage("finishedPage");

345 page = waitForPage("finishedPage");

343 tap(findChild(page, "forwardButton"));

346 tap(findChild(page, "forwardButton"));

344

347

@@ -390,8 +393,6 @@ Item {

390 tap(findChild(page, "forwardButton"));

393 tap(findChild(page, "forwardButton"));

391 page = waitForPage("locationPage");

394 page = waitForPage("locationPage");

392 tap(findChild(page, "forwardButton"));

395 tap(findChild(page, "forwardButton"));

393− page = waitForPage("reportingPage");

394− tap(findChild(page, "forwardButton"));

395 page = waitForPage("finishedPage");

396 page = waitForPage("finishedPage");

396 tap(findChild(page, "forwardButton"));

397 tap(findChild(page, "forwardButton"));

397

398

@@ -402,7 +403,7 @@ Item {

402 }

403 }

403

404

404 function test_passwdSwipe() {

405 function test_passwdSwipe() {

405− goToPage(null);

406+ goToPage(null, false, false, true);

406

407

407 tryCompare(setSecuritySpy, "count", 1);

408 tryCompare(setSecuritySpy, "count", 1);

408 compare(setSecuritySpy.signalArguments[0][0], "");

409 compare(setSecuritySpy.signalArguments[0][0], "");

@@ -412,12 +413,12 @@ Item {

412

413

413 function test_locationSkipNoPath() {

414 function test_locationSkipNoPath() {

414 AccountsService.hereLicensePath = "";

415 AccountsService.hereLicensePath = "";

415− goToPage("reportingPage", false, true);

416+ goToPage("finishedPage", false, true, true);

416 }

417 }

417

418

418 function test_locationSkipNoFiles() {

419 function test_locationSkipNoFiles() {

419 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");

420 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");

420− goToPage("reportingPage", false, true);

421+ goToPage("finishedPage", false, true, true);

421 }

422 }

422

423

423 function test_locationWaitOnPath() {

424 function test_locationWaitOnPath() {

@@ -434,7 +435,7 @@ Item {

434 compare(stack.currentPage.skipValid, false);

435 compare(stack.currentPage.skipValid, false);

435

436

436 AccountsService.hereLicensePath = "";

437 AccountsService.hereLicensePath = "";

437− waitForPage("reportingPage");

438+ waitForPage("finishedPage", false, false, true);

438 }

439 }

439

440

440 function test_locationGpsOnly() {

441 function test_locationGpsOnly() {

tests/qmltests/tst_OrientedShell.qml+2−2

@@ -17,8 +17,8 @@

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19import QtTest 1.0

20−import Ubuntu.Components 1.1

20+import Ubuntu.Components 1.3

21−import Ubuntu.Components.ListItems 1.0 as ListItem

21+import Ubuntu.Components.ListItems 1.3 as ListItem

22import Unity.Application 0.1

23import Unity.Test 0.1

24import IntegratedLightDM 0.1 as LightDM

tests/qmltests/tst_Shell.qml+2−2

@@ -19,8 +19,8 @@ import QtTest 1.0

19import AccountsService 0.1

20import GSettings 1.0

21import IntegratedLightDM 0.1 as LightDM

22−import Ubuntu.Components 1.1

22+import Ubuntu.Components 1.3

23−import Ubuntu.Components.ListItems 1.0 as ListItem

23+import Ubuntu.Components.ListItems 1.3 as ListItem

24import Ubuntu.Telephony 0.1 as Telephony

25import Unity.Application 0.1

26import Unity.Connectivity 0.1

tests/qmltests/tst_ShellWithPin.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 1.0

18+import Ubuntu.Components 1.3

19import QtTest 1.0

20import AccountsService 0.1

21import GSettings 1.0

tests/sdk/CMakeLists.txtnew file+6

@@ -0,0 +1,6 @@

1+

2+#

3+# Test that all imports for Ubuntu.Components use the wanted version

4+#

5+

6+add_test(SDK ${CMAKE_CURRENT_SOURCE_DIR}/check_sdk.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

tests/sdk/check_sdk.pynew file+114

@@ -0,0 +1,114 @@

1+#! /usr/bin/env python3

2+

3+#

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License version 3 as

8+# published by the Free Software Foundation.

9+#

10+# This program is distributed in the hope that it will be useful,

11+# but WITHOUT ANY WARRANTY; without even the implied warranty of

12+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13+# GNU General Public License for more details.

14+#

15+# You should have received a copy of the GNU General Public License

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

17+#

18+# Authored by: Michi Henning <michi.henning@canonical.com>

19+#

20+

21+#

22+# Little helper program to test that all source files import

23+# the wanted SDK version

24+#

25+# Usage: check_sdk.py directory [ignore_prefix]

26+#

27+# The directory specifies the (recursive) location of the source files. Any

28+# files with a path that starts with ignore_prefix are not checked. This is

29+# useful to exclude files that are generated into the build directory.

30+#

31+# See the file_pat definition below for a list of files that are checked.

32+#

33+

34+from __future__ import print_function

35+

36+import argparse

37+import os

38+import re

39+import sys

40+

41+

42+# Print msg on stderr, preceded by program name and followed by newline

43+def error(msg):

44+ print(os.path.basename(sys.argv[0]) + ": " + msg, file=sys.stderr)

45+

46+

47+# Function to raise errors encountered by os.walk

48+def raise_error(e):

49+ raise e

50+

51+# Scan lines in file_path for bad SDK version. For each file,

52+# print the line numbers that have SDK version issues

53+

54+ubuntu_components_pat = re.compile(r'.*import Ubuntu.Components.*')

55+ubuntu_good_components_pat = re.compile(r'.*import Ubuntu.Components.*1\.3.*')

56+

57+def scan_for_bad_sdk(file_path):

58+ global ubuntu_components_pat

59+ errors = []

60+ with open(file_path, 'rt', encoding='utf-8') as ifile:

61+ for lino, line in enumerate(ifile, start=1):

62+ if ubuntu_components_pat.match(line) and not ubuntu_good_components_pat.match(line):

63+ errors.append(lino)

64+ if 0 < len(errors) <= 10:

65+ if len(errors) > 1:

66+ plural = 's'

67+ else:

68+ plural = ''

69+ print(

70+ "%s: bad SDK Version in line%s %s" % (

71+ file_path, plural, ", ".join((str(i) for i in errors))))

72+ elif errors:

73+ print("%s: bad SDK Version in multiple lines" % file_path)

74+ return bool(errors)

75+

76+# Parse args

77+

78+parser = argparse.ArgumentParser(

79+ description='Test that source files contain the wanted SDK version.')

80+parser.add_argument(

81+ 'dir', nargs=1,

82+ help='The directory to (recursively) search for source files')

83+parser.add_argument(

84+ 'ignore_prefix', nargs='?', default=None,

85+ help='Ignore source files with a path that starts with the given prefix.')

86+args = parser.parse_args()

87+

88+# Files we want to check for SDK version.

89+

90+file_pat = (

91+ r'(.*\.(js|qml)$)')

92+pat = re.compile(file_pat)

93+

94+# Find all the files with matching file extension in the specified

95+# directory and check them

96+

97+directory = os.path.abspath(args.dir[0])

98+ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None

99+

100+found_bad_sdk = False

101+try:

102+ for root, dirs, files in os.walk(directory, onerror=raise_error):

103+ for file in files:

104+ path = os.path.join(root, file)

105+ if not (ignore and path.startswith(ignore)) and pat.match(file):

106+ if scan_for_bad_sdk(path):

107+ found_bad_sdk = True

108+

109+except OSError as e:

110+ error("cannot create file list for \"" + dir + "\": " + e.strerror)

111+ sys.exit(1)

112+

113+if found_bad_sdk:

114+ sys.exit(1)

tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1

21

22RowLayout {

tests/utils/modules/Unity/Test/UnityTestCase.qml+1−1

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Components 0.1

19+import Ubuntu.Components 1.3

20import Unity.Test 0.1 as UT

21

22TestCase {