git.iko.soy/unity8
on xenial help sign in
s/Theme.palette/theme.palette

Stop using the deprecated Theme.palette API and start using "theme" context property from Ubuntu.Components 1.3

commit586c3485f747fa30168af4b03df50efa87019b28 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 18 Jun 2015, 06:30 (11 years ago) parent73102bf
53 files changed+167−167
compare with xenial
unifiedsplit
plugins/Dash/CardAttributes.qml+2−2 plugins/Dash/CardCreator.js+5−5 qml/Dash/DashNavigation.qml+3−3 qml/Dash/DashNavigationButton.qml+3−3 qml/Dash/DashNavigationList.qml+3−3 qml/Dash/GenericScopeView.qml+4−4 qml/Dash/PageHeader.qml+4−4 qml/Dash/Previews/PreviewActionCombo.qml+3−3 qml/Dash/Previews/PreviewActions.qml+3−3 qml/Dash/Previews/PreviewAudioPlayback.qml+5−5 qml/Dash/Previews/PreviewExpandable.qml+4−4 qml/Dash/Previews/PreviewHeader.qml+3−3 qml/Dash/Previews/PreviewOverlay.qml+3−3 qml/Dash/Previews/PreviewRatingDisplay.qml+3−3 qml/Dash/Previews/PreviewRatingEdit.qml+2−2 qml/Dash/Previews/PreviewRatingInput.qml+5−5 qml/Dash/Previews/PreviewTable.qml+4−4 qml/Dash/Previews/PreviewTextSummary.qml+3−3 qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+3−3 qml/Dash/ScopeSettings/ScopeSettingString.qml+4−4 qml/Dash/ScopesListCategory.qml+3−3 qml/Notifications/Notification.qml+5−5 qml/Notifications/OptionToggle.qml+3−3 qml/Panel/Indicators/MenuItemFactory.qml+5−5 qml/Panel/Indicators/ModemInfoItem.qml+4−4 qml/Panel/Indicators/RoamingIndication.qml+3−3 qml/Wizard/CheckableSetting.qml+3−3 qml/Wizard/Page.qml+3−3 qml/Wizard/Pages/30-passwd-type.qml+5−5 qml/Wizard/Pages/50-location.qml+3−3 qml/Wizard/Pages/here-terms.qml+3−3 qml/Wizard/StackButton.qml+3−3 tests/plugins/Dash/cardcreator/1.res+1−1 tests/plugins/Dash/cardcreator/2.res+2−2 tests/plugins/Dash/cardcreator/3.res+2−2 tests/plugins/Dash/cardcreator/4.res+2−2 tests/plugins/Dash/cardcreator/5.res+2−2 tests/plugins/Dash/cardcreator/6.res+3−3 tests/plugins/Dash/cardcreator/7.res+3−3 tests/qmltests/Components/tst_LazyImage.qml+3−3 tests/qmltests/Components/tst_Rating.qml+3−3 tests/qmltests/Dash/Previews/tst_Preview.qml+2−2 tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2 tests/qmltests/Dash/tst_Card.qml+3−3 tests/qmltests/Dash/tst_PageHeader.qml+3−3 tests/qmltests/Dash/tst_PreviewListView.qml+3−3
plugins/Dash/CardAttributes.qml+2−2
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.2
1818import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.1
19+import Ubuntu.Components 1.3
2020
2121GridLayout {
2222 id: grid
@@ -27,7 +27,7 @@ GridLayout {
2727 columns: 2 + repeater.count % 2
2828 rowSpacing: units.gu(.5)
2929 property alias model: repeater.model
30− property color color: Theme.palette.normal.baseText
30+ property color color: theme.palette.normal.baseText
3131 property real fontScale: 1.0
3232
3333 Repeater {
plugins/Dash/CardCreator.js+5−5
@@ -456,20 +456,20 @@ function cardString(template, components) {
456456 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
457457 }
458458
459− 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")';
459+ 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")';
460460
461461 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
462462 var titleSubtitleCode = '';
463463 if (hasTitle) {
464464 var titleColor;
465465 if (headerAsOverlay) {
466− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
466+ titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
467467 } else if (hasSummary) {
468468 titleColor = 'summary.color';
469469 } else if (hasBackground) {
470470 titleColor = summaryColorWithBackground;
471471 } else {
472− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
472+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
473473 }
474474
475475 var titleAnchors;
@@ -623,7 +623,7 @@ function cardString(template, components) {
623623 if (hasBackground) {
624624 summaryColor = summaryColorWithBackground;
625625 } else {
626− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
626+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
627627 }
628628
629629 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
@@ -672,7 +672,7 @@ function cardString(template, components) {
672672
673673function createCardComponent(parent, template, components) {
674674 var imports = 'import QtQuick 2.2; \n\
675− import Ubuntu.Components 1.1; \n\
675+ import Ubuntu.Components 1.3; \n\
676676 import Ubuntu.Settings.Components 0.1; \n\
677677 import Dash 0.1;\n\
678678 import Utils 0.1;\n';
qml/Dash/DashNavigation.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Dash 0.1
2020import "../Components"
2121
@@ -48,7 +48,7 @@ Item {
4848 id: d
4949 readonly property color foregroundColor: root.scopeStyle
5050 ? root.scopeStyle.getTextColor(backgroundItem.luminance)
51− : Theme.palette.normal.baseText
51+ : theme.palette.normal.baseText
5252 readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
5353 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
5454 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
qml/Dash/DashNavigationButton.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919
2020AbstractButton {
2121 id: root
@@ -24,7 +24,7 @@ AbstractButton {
2424 // Set by parent
2525 property var scope: null
2626 property var scopeStyle: null
27− property color foregroundColor: Theme.palette.normal.baseText
27+ property color foregroundColor: theme.palette.normal.baseText
2828 property bool isAltNavigation: false
2929 property bool showDivider: false
3030
qml/Dash/DashNavigationList.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import "../Components"
2020
2121Item {
@@ -23,7 +23,7 @@ Item {
2323 property var navigation: null
2424 property var currentNavigation: null
2525 property var scopeStyle: null
26− property color foregroundColor: Theme.palette.normal.baseText
26+ property color foregroundColor: theme.palette.normal.baseText
2727 signal enterNavigation(var newNavigationId, bool hasChildren)
2828 signal goBackToParentClicked()
2929 signal allNavigationClicked()
qml/Dash/GenericScopeView.qml+4−4
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Utils 0.1
2020import Unity 0.2
2121import Dash 0.1
@@ -536,7 +536,7 @@ FocusScope {
536536 }
537537 fontSize: "small"
538538 font.weight: Font.Bold
539− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
539+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
540540 }
541541 }
542542
@@ -573,7 +573,7 @@ FocusScope {
573573 width: categoryView.width
574574 height: section != "" ? units.gu(5) : 0
575575 text: section
576− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
576+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
577577 iconName: delegate && delegate.headerLink ? "go-next" : ""
578578 onClicked: {
579579 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
@@ -694,7 +694,7 @@ FocusScope {
694694 }
695695 fontSize: "small"
696696 font.weight: Font.Bold
697− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
697+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
698698 }
699699
700700 Connections {
qml/Dash/PageHeader.qml+4−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Ubuntu.Components.Themes.Ambiance 1.1
2020import Ubuntu.Components.Popups 1.0
2121import Ubuntu.Components.ListItems 1.0
@@ -182,7 +182,7 @@ Item {
182182 property color panelColor: background.topColor
183183 panelForegroundColor: config.foregroundColor
184184 property var config: PageHeadConfiguration {
185− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
185+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
186186 backAction: Action {
187187 iconName: "back"
188188 onTriggered: {
@@ -256,7 +256,7 @@ Item {
256256 property color panelColor: background.topColor
257257 panelForegroundColor: config.foregroundColor
258258 property var config: PageHeadConfiguration {
259− foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
259+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
260260 backAction: Action {
261261 iconName: backIsClose ? "close" : "back"
262262 visible: root.showBackButton
qml/Dash/Previews/PreviewActionCombo.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919
2020Item {
2121 id: root
@@ -33,7 +33,7 @@ Item {
3333
3434 objectName: "moreLessButton"
3535 text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
36− strokeColor: Theme.palette.normal.baseText
36+ strokeColor: theme.palette.normal.baseText
3737 onClicked: expanded = !expanded
3838 width: parent.width
3939 }
qml/Dash/Previews/PreviewActions.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.1
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919
2020/*! This preview widget shows either one button, two buttons or one button
2121 * and a combo button depending on the number of items in widgetData["actions"].
@@ -50,7 +50,7 @@ PreviewWidget {
5050 Binding {
5151 target: loader.item
5252 property: "strokeColor"
53− value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
53+ value: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
5454 }
5555 Connections {
5656 target: loader.item
qml/Dash/Previews/PreviewAudioPlayback.qml+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020
2121/*! \brief Preview widget for audio tracks.
2222
@@ -139,7 +139,7 @@ PreviewWidget {
139139 objectName: "trackTitleLabel"
140140 anchors { top: parent.top; left: parent.left; right: parent.right }
141141 opacity: 0.9
142− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
142+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
143143 fontSize: "small"
144144 horizontalAlignment: Text.AlignLeft
145145 text: modelData["title"]
@@ -152,7 +152,7 @@ PreviewWidget {
152152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
153153 visible: text !== ""
154154 opacity: 0.9
155− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
155+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
156156 font.weight: Font.Light
157157 fontSize: "small"
158158 horizontalAlignment: Text.AlignLeft
@@ -193,7 +193,7 @@ PreviewWidget {
193193 anchors.verticalCenter: parent.verticalCenter
194194 width: parent.column3Width
195195 opacity: 0.9
196− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
196+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
197197 fontSize: "small"
198198 horizontalAlignment: Text.AlignRight
199199 text: audio.lengthToString(modelData["length"])
qml/Dash/Previews/PreviewExpandable.qml+4−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import "../../Components"
2020
2121/*! \brief Preview widget for expandable widgets.
@@ -41,7 +41,7 @@ PreviewWidget {
4141 right: expandButton.left
4242 }
4343 fontSize: "large"
44− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
44+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
4545 visible: text !== ""
4646 opacity: .8
4747 text: widgetData["title"] || ""
@@ -62,7 +62,7 @@ PreviewWidget {
6262 width: units.gu(3)
6363 height: units.gu(3)
6464 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
6666 }
6767 }
6868
qml/Dash/Previews/PreviewHeader.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
1919import Dash 0.1
2020import "../"
2121
@@ -38,7 +38,7 @@ PreviewWidget {
3838 readonly property string title: root.widgetData["title"] || ""
3939 readonly property string subtitle: root.widgetData["subtitle"] || ""
4040 readonly property var attributes: root.widgetData["attributes"] || null
41− readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
41+ readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
4242
4343 implicitHeight: row.height + row.margins * 2
4444 width: parent.width
qml/Dash/Previews/PreviewOverlay.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import "../../Components"
2020
2121Rectangle {
@@ -158,7 +158,7 @@ Rectangle {
158158 anchors.centerIn: parent
159159 width: units.gu(2.5)
160160 height: width
161− color: Theme.palette.normal.foregroundText
161+ color: theme.palette.normal.foregroundText
162162 name: "close"
163163 }
164164 }
qml/Dash/Previews/PreviewRatingDisplay.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
1919import "../../Components"
2020
2121/*! \brief Preview widget for rating display.
@@ -60,7 +60,7 @@ PreviewWidget {
6060 urlIconEmpty: widgetData["rating-icon-empty"]
6161 urlIconFull: widgetData["rating-icon-full"]
6262 urlIconHalf: widgetData["rating-icon-half"]
63− labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
63+ labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
6464 }
6565 }
6666 }
qml/Dash/Previews/PreviewRatingEdit.qml+2−2
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.4
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
1919import "../../Components"
2020
2121/*! \brief Preview widget for editable rating.
@@ -56,7 +56,7 @@ PreviewWidget {
5656 urlIconEmpty: widgetData["rating-icon-empty"]
5757 urlIconFull: widgetData["rating-icon-full"]
5858 urlIconHalf: widgetData["rating-icon-half"]
59− labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
59+ labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
6060 }
6161
6262 PreviewRatingInput {
qml/Dash/Previews/PreviewRatingInput.qml+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
1919import "../../Components"
2020
2121/*! \brief Preview widget for rating.
@@ -79,7 +79,7 @@ PreviewWidget {
7979 verticalCenter: parent.verticalCenter
8080 left: parent.left
8181 }
82− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
82+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
8383 opacity: .8
8484 text: widgetData["rating-label"] || i18n.tr("Rate this")
8585 }
@@ -124,7 +124,7 @@ PreviewWidget {
124124 left: parent.left
125125 right: parent.right
126126 }
127− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
127+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
128128 opacity: .8
129129 text: widgetData["review-label"] || i18n.tr("Add a review")
130130 }
@@ -165,7 +165,7 @@ PreviewWidget {
165165 top: parent.top
166166 right: parent.right
167167 }
168− color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base
168+ color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
169169 text: widgetData["submit-label"] || i18n.tr("Send")
170170 onClicked: {
171171 if (readyToSubmit) root.submit()
qml/Dash/Previews/PreviewTable.qml+4−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtQuick.Layouts 1.1
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../Components"
2121
2222/*! \brief Preview widget for table.
@@ -48,7 +48,7 @@ PreviewWidget {
4848 }
4949 height: visible ? implicitHeight : 0
5050 fontSize: "large"
51− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
51+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
5252 visible: text !== ""
5353 opacity: .8
5454 text: widgetData["title"] || ""
@@ -72,7 +72,7 @@ PreviewWidget {
7272 fontSize: "small"
7373 text: perRowRepeater.model[index]
7474 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
7676 font.bold: index == 0
7777 wrapMode: Text.Wrap
7878 Layout.alignment: Qt.AlignTop
qml/Dash/Previews/PreviewTextSummary.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ PreviewWidget {
3939 }
4040 height: visible ? implicitHeight : 0
4141 fontSize: "large"
42− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
42+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
4343 visible: text !== ""
4444 opacity: .8
4545 text: widgetData["title"] || ""
@@ -61,7 +61,7 @@ PreviewWidget {
6161 clip: true
6262 fontSize: "small"
6363 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
6565 opacity: .8
6666 text: widgetData["text"] || ""
6767 wrapMode: Text.Wrap
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121ScopeSetting {
@@ -44,7 +44,7 @@ ScopeSetting {
4444 elide: Text.ElideMiddle
4545 maximumLineCount: 2
4646 wrapMode: Text.Wrap
47− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
47+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
4848 }
4949
5050 CheckBox {
qml/Dash/ScopeSettings/ScopeSettingString.qml+4−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121ScopeSetting {
@@ -44,7 +44,7 @@ ScopeSetting {
4444 elide: Text.ElideMiddle
4545 maximumLineCount: 2
4646 wrapMode: Text.Wrap
47− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
47+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
4848 }
4949
5050 TextField {
@@ -57,7 +57,7 @@ ScopeSetting {
5757 }
5858 width: root.mode == "number" ? units.gu(8) : units.gu(12)
5959 text: widgetData.value
60− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
60+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.fieldText
6161 validator: root.mode == "number" ? doubleValidator : null
6262 hasClearButton: root.mode == "number" ? false : true
6363
qml/Dash/ScopesListCategory.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Dash 0.1
2020import "../Components/ListItems" as ListItems
2121
@@ -43,7 +43,7 @@ Item {
4343 id: header
4444 width: root.width
4545 height: units.gu(5)
46− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
46+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
4747 }
4848
4949 readonly property double listItemHeight: units.gu(6)
qml/Notifications/Notification.qml+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtMultimedia 5.0
19−import Ubuntu.Components 1.1
19+import Ubuntu.Components 1.3
2020import Unity.Notifications 1.0
2121import QMenuModel 0.1
2222import Utils 0.1
@@ -269,7 +269,7 @@ Item {
269269 }
270270 visible: type !== Notification.Confirmation
271271 fontSize: "medium"
272− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
272+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
273273 elide: Text.ElideRight
274274 textFormat: Text.PlainText
275275 }
@@ -284,7 +284,7 @@ Item {
284284 }
285285 visible: body != "" && type !== Notification.Confirmation
286286 fontSize: "small"
287− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
287+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
288288 wrapMode: Text.WordWrap
289289 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
290290 elide: Text.ElideRight
@@ -325,7 +325,7 @@ Item {
325325 anchors.horizontalCenter: parent.horizontalCenter
326326 visible: type === Notification.Confirmation && body !== ""
327327 fontSize: "medium"
328− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
328+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
329329 wrapMode: Text.WordWrap
330330 maximumLineCount: 1
331331 elide: Text.ElideRight
qml/Notifications/OptionToggle.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 0.1 as ListItem
2020import Ubuntu.Components.Popups 0.1
2121
@@ -29,7 +29,7 @@ UbuntuShape {
2929
3030 signal triggered(string id)
3131
32− color: Theme.palette.normal.base
32+ color: theme.palette.normal.base
3333 borderSource: "none"
3434 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
3535 width: parent.width
qml/Panel/Indicators/MenuItemFactory.qml+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,7 @@ import Ubuntu.Settings.Components 0.1
2323import QMenuModel 0.1
2424import Utils 0.1 as Utils
2525import Ubuntu.Components.ListItems 0.1 as ListItems
26−import Ubuntu.Components 1.1
26+import Ubuntu.Components 1.3
2727
2828Item {
2929 id: menuFactory
@@ -245,7 +245,7 @@ Item {
245245 name: "settings"
246246 height: units.gu(3)
247247 width: height
248− color: Theme.palette.selected.backgroundText
248+ color: theme.palette.selected.backgroundText
249249 }
250250 }
251251 }
@@ -277,7 +277,7 @@ Item {
277277 source: menuData.icon
278278 height: units.gu(3)
279279 width: height
280− color: Theme.palette.selected.backgroundText
280+ color: theme.palette.selected.backgroundText
281281 }
282282 }
283283 }
@@ -835,7 +835,7 @@ Item {
835835 enabled: menuData && menuData.sensitive || false
836836 highlightWhenPressed: false
837837 text: menuData && menuData.label || ""
838− foregroundColor: Theme.palette.normal.backgroundText
838+ foregroundColor: theme.palette.normal.backgroundText
839839
840840 onMenuModelChanged: {
841841 loadAttributes();
qml/Panel/Indicators/ModemInfoItem.qml+4−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtQuick.Layouts 1.1
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import Ubuntu.Components.ListItems 0.1 as ListItem
2121
2222ListItem.Empty {
@@ -65,7 +65,7 @@ ListItem.Empty {
6565 height: parent.height
6666 Icon {
6767 id: statusIcon
68− color: Theme.palette.selected.backgroundText
68+ color: theme.palette.selected.backgroundText
6969
7070 Layout.preferredHeight: parent.height
7171 Layout.preferredWidth: Layout.preferredHeight
@@ -75,7 +75,7 @@ ListItem.Empty {
7575
7676 Icon {
7777 id: iconConnectivity
78− color: Theme.palette.selected.backgroundText
78+ color: theme.palette.selected.backgroundText
7979
8080 Layout.preferredHeight: parent.height
8181 Layout.preferredWidth: Layout.preferredHeight
qml/Panel/Indicators/RoamingIndication.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtQuick.Layouts 1.1
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020
2121RowLayout {
2222 spacing: units.gu(0.5)
@@ -30,7 +30,7 @@ RowLayout {
3030
3131 Icon {
3232 id: iconRoaming
33− color: Theme.palette.selected.backgroundText
33+ color: theme.palette.selected.backgroundText
3434
3535 Layout.preferredHeight: parent.height
3636 Layout.preferredWidth: Layout.preferredHeight
qml/Wizard/CheckableSetting.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121ListItem.Empty {
@@ -77,7 +77,7 @@ ListItem.Empty {
7777 rightMargin: listItem.rightMargin
7878 }
7979 wrapMode: Text.Wrap
80− linkColor: Theme.palette.normal.foregroundText
80+ linkColor: theme.palette.normal.foregroundText
8181 onLinkActivated: listItem.linkActivated(link)
8282 }
8383 }
qml/Wizard/Page.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919
2020Item {
2121 readonly property real buttonMargin: units.gu(2)
@@ -57,7 +57,7 @@ Item {
5757 }
5858 wrapMode: Text.Wrap
5959 text: title
60− color: Theme.palette.normal.baseText
60+ color: theme.palette.normal.baseText
6161 font.pixelSize: units.gu(4)
6262 }
6363
qml/Wizard/Pages/30-passwd-type.qml+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.0
2020import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2121import ".." as LocalComponents
@@ -111,13 +111,13 @@ LocalComponents.Page {
111111
112112 Component.onCompleted: {
113113 // A visible selected background looks bad in ListItem widgets with our theme
114− originalBackground = Theme.palette.selected.background
115− Theme.palette.selected.background = "transparent"
114+ originalBackground = theme.palette.selected.background
115+ theme.palette.selected.background = "transparent"
116116 }
117117
118118 Component.onDestruction: {
119119 // Restore original theme background
120− Theme.palette.selected.background = originalBackground
120+ theme.palette.selected.background = originalBackground
121121 }
122122 }
123123 }
qml/Wizard/Pages/50-location.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013,2014 Canonical, Ltd.
2+ * Copyright (C) 2013-2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ import QtQuick 2.3
1818import AccountsService 0.1
1919import QMenuModel 0.1 as QMenuModel
2020import Qt.labs.folderlistmodel 2.1
21−import Ubuntu.Components 1.1
21+import Ubuntu.Components 1.3
2222import ".." as LocalComponents
2323
2424LocalComponents.Page {
@@ -98,7 +98,7 @@ LocalComponents.Page {
9898 anchors.leftMargin: hereCheck.labelOffset
9999 anchors.right: parent.right
100100 wrapMode: Text.Wrap
101− linkColor: Theme.palette.normal.foregroundText
101+ linkColor: theme.palette.normal.foregroundText
102102 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
103103 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
104104 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
qml/Wizard/Pages/here-terms.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
1717import QtQuick 2.3
1818import AccountsService 0.1
1919import Qt.labs.folderlistmodel 2.1
20−import Ubuntu.Components 1.1
20+import Ubuntu.Components 1.3
2121import Ubuntu.Web 0.2
2222import ".." as LocalComponents
2323
@@ -102,7 +102,7 @@ LocalComponents.Page {
102102 anchors.left: parent.left
103103 anchors.right: parent.right
104104 wrapMode: Text.Wrap
105− linkColor: Theme.palette.normal.foregroundText
105+ linkColor: theme.palette.normal.foregroundText
106106 onLinkActivated: {
107107 webview.url = link
108108 termsLabel.visible = false
qml/Wizard/StackButton.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
1919
2020AbstractButton {
2121 id: stackButton
@@ -32,7 +32,7 @@ AbstractButton {
3232 anchors.verticalCenter: parent.verticalCenter
3333 anchors.left: parent.left
3434 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)
3636 text: {
3737 if (backArrow) {
3838 // Translators: This is the arrow for "Back" buttons
tests/plugins/Dash/cardcreator/1.res+1−1
@@ -86,7 +86,7 @@ Label {
8686 wrapMode: Text.Wrap;
8787 maximumLineCount: 2;
8888 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
89− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
89+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
9090 visible: showHeader ;
9191 text: root.title;
9292 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
tests/plugins/Dash/cardcreator/2.res+2−2
@@ -93,7 +93,7 @@ CroppedImageMinimumSourceSize {
9393 wrapMode: Text.Wrap;
9494 maximumLineCount: 2;
9595 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
96− 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");
96+ 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");
9797 visible: showHeader ;
9898 text: root.title;
9999 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -112,7 +112,7 @@ CroppedImageMinimumSourceSize {
112112 maximumLineCount: 1;
113113 fontSize: "x-small";
114114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115− 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");
115+ 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");
116116 visible: titleLabel.visible && titleLabel.text;
117117 text: cardData && cardData["subtitle"] || "";
118118 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/3.res+2−2
@@ -86,7 +86,7 @@ Label {
8686 wrapMode: Text.Wrap;
8787 maximumLineCount: 2;
8888 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
89− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
89+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
9090 visible: showHeader ;
9191 text: root.title;
9292 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -105,7 +105,7 @@ Label {
105105 maximumLineCount: 1;
106106 fontSize: "x-small";
107107 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
108− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
108+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
109109 visible: titleLabel.visible && titleLabel.text;
110110 text: cardData && cardData["subtitle"] || "";
111111 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/4.res+2−2
@@ -73,7 +73,7 @@ Label {
7373 wrapMode: Text.Wrap;
7474 maximumLineCount: 2;
7575 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
76− color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
76+ color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
7777 visible: showHeader ;
7878 text: root.title;
7979 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -92,7 +92,7 @@ Label {
9292 maximumLineCount: 1;
9393 fontSize: "x-small";
9494 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;
9696 visible: titleLabel.visible && titleLabel.text;
9797 text: cardData && cardData["subtitle"] || "";
9898 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/5.res+2−2
@@ -130,7 +130,7 @@ Label {
130130 wrapMode: Text.Wrap;
131131 maximumLineCount: 2;
132132 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
133− color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
133+ color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
134134 visible: showHeader && overlayLoader.active;
135135 text: root.title;
136136 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -150,7 +150,7 @@ Label {
150150 maximumLineCount: 1;
151151 fontSize: "x-small";
152152 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
153− color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
153+ color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
154154 visible: titleLabel.visible && titleLabel.text;
155155 text: cardData && cardData["subtitle"] || "";
156156 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/6.res+3−3
@@ -72,7 +72,7 @@ Item {
7272 wrapMode: Text.Wrap;
7373 maximumLineCount: 2;
7474 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
75− 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");
75+ 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");
7676 visible: showHeader ;
7777 text: root.title;
7878 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -91,7 +91,7 @@ Item {
9191 maximumLineCount: 1;
9292 fontSize: "x-small";
9393 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
94− 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");
94+ 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");
9595 visible: titleLabel.visible && titleLabel.text;
9696 text: cardData && cardData["subtitle"] || "";
9797 font.weight: Font.Light;
@@ -105,7 +105,7 @@ Item {
105105 rightMargin: units.gu(1);
106106 }
107107 source: cardData && cardData["emblem"] || "";
108− 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");
108+ 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");
109109 height: source != "" ? titleLabel.font.pixelSize : 0;
110110 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
111111 }
tests/plugins/Dash/cardcreator/7.res+3−3
@@ -94,7 +94,7 @@ CroppedImageMinimumSourceSize {
9494 wrapMode: Text.Wrap;
9595 maximumLineCount: 2;
9696 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
97− 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");
97+ 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");
9898 visible: showHeader ;
9999 text: root.title;
100100 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -113,7 +113,7 @@ CroppedImageMinimumSourceSize {
113113 maximumLineCount: 1;
114114 fontSize: "x-small";
115115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
116− 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");
116+ 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");
117117 visible: titleLabel.visible && titleLabel.text;
118118 text: cardData && cardData["subtitle"] || "";
119119 font.weight: Font.Light;
@@ -126,7 +126,7 @@ CroppedImageMinimumSourceSize {
126126 rightMargin: units.gu(1);
127127 top: subtitleLabel.bottom;
128128 }
129− 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");
129+ 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");
130130 fontScale: root.fontScale;
131131 model: cardData && cardData["attributes"];
132132 }
tests/qmltests/Components/tst_LazyImage.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import "../../../qml/Components"
20−import Ubuntu.Components 0.1
20+import Ubuntu.Components 1.3
2121import Unity.Test 0.1 as UT
2222import "tst_LazyImage"
2323
@@ -32,7 +32,7 @@ Rectangle {
3232 rightMargin: 2 * parent.width / 3
3333 }
3434
35− color: Theme.palette.normal.baseText
35+ color: theme.palette.normal.baseText
3636
3737 Column {
3838 anchors { fill: parent; margins: units.gu(5) }
tests/qmltests/Components/tst_Rating.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -17,14 +17,14 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import "../../../qml/Components"
20−import Ubuntu.Components 0.1
20+import Ubuntu.Components 1.3
2121import Unity.Test 0.1 as UT
2222
2323Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(10)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 Rating {
3030 id: rating
tests/qmltests/Dash/Previews/tst_Preview.qml+2−2
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(60)
2626 height: units.gu(60)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 Item {
3030 id: shell
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222import QtMultimedia 5.0
@@ -25,7 +25,7 @@ Rectangle {
2525 id: root
2626 width: units.gu(60)
2727 height: units.gu(80)
28− color: Theme.palette.selected.background
28+ color: theme.palette.selected.background
2929
3030 property var tracksModel0: {
3131 "tracks": [ ]
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 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."
3030 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_PreviewRatingDisplay.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 property var reviewsModel0: {
3030 "reviews": [ ]
tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
3030
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 property real validInputRating: 1
3030 property real invalidInputRating: -1
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 property var widgetDataComplete: {
3030 "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 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
2121import Unity.Test 0.1 as UT
2222
@@ -24,7 +24,7 @@ Rectangle {
2424 id: root
2525 width: units.gu(40)
2626 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
2828
2929 property var widgetDataComplete: {
3030 "title": "Title here",
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ Rectangle {
2323 id: root
2424 width: units.gu(60)
2525 height: units.gu(80)
26− color: Theme.palette.selected.background
26+ color: theme.palette.selected.background
2727
2828 PreviewWidgetFactory {
2929 id: factory
tests/qmltests/Dash/tst_Card.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT
2121import "../../../qml/Dash"
2222import "CardHelpers.js" as Helpers
@@ -493,7 +493,7 @@ Rectangle {
493493
494494 background.color = data.tag;
495495
496− var fontColor = data.dark ? Theme.palette.normal.baseText : "white";
496+ var fontColor = data.dark ? theme.palette.normal.baseText : "white";
497497
498498 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
499499 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
tests/qmltests/Dash/tst_PageHeader.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Dash"
21−import Ubuntu.Components 0.1
21+import Ubuntu.Components 1.3
2222import Unity 0.2
2323import Unity.Test 0.1 as UT
2424
@@ -244,7 +244,7 @@ Item {
244244 searchEntryEnabled: true
245245 title: "%^$%^%^&%^&%^$%GHR%"
246246 scopeStyle: QtObject {
247− readonly property color foreground: Theme.palette.normal.baseText
247+ readonly property color foreground: theme.palette.normal.baseText
248248 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
249249 }
250250 showBackButton: showBackButtonCheckBox.checked
tests/qmltests/Dash/tst_PreviewListView.qml+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import Ubuntu.Components 1.1
19+import Ubuntu.Components 1.3
2020import "../../../qml/Dash"
2121import Unity.Test 0.1 as UT
2222import Unity 0.2 as Unity
@@ -26,7 +26,7 @@ Rectangle {
2626 id: root
2727 width: units.gu(60)
2828 height: units.gu(60)
29− color: Theme.palette.selected.background
29+ color: theme.palette.selected.background
3030
3131 Unity.MockScope {
3232 id: mockScope