git.iko.soy/unity8
on xenial help sign in
s/Theme.palette/theme.palette
586c348Daniel d'Andrada
plugins/Dash/CardAttributes.qml+2−2
compare with xenial
unifiedsplit
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.1
19+import Ubuntu.Components 1.3
20
20
21GridLayout {
21GridLayout {
22 id: grid
22 id: grid
@@ -27,7 +27,7 @@ GridLayout {
27 columns: 2 + repeater.count % 2
27 columns: 2 + repeater.count % 2
28 rowSpacing: units.gu(.5)
28 rowSpacing: units.gu(.5)
29 property alias model: repeater.model
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
31 property real fontScale: 1.0
32
32
33 Repeater {
33 Repeater {
plugins/Dash/CardCreator.js+5−5
@@ -456,20 +456,20 @@ function cardString(template, components) {
456 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
456 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
457 }
457 }
458
458
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")';
460
460
461 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
461 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
462 var titleSubtitleCode = '';
462 var titleSubtitleCode = '';
463 if (hasTitle) {
463 if (hasTitle) {
464 var titleColor;
464 var titleColor;
465 if (headerAsOverlay) {
465 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")';
467 } else if (hasSummary) {
467 } else if (hasSummary) {
468 titleColor = 'summary.color';
468 titleColor = 'summary.color';
469 } else if (hasBackground) {
469 } else if (hasBackground) {
470 titleColor = summaryColorWithBackground;
470 titleColor = summaryColorWithBackground;
471 } else {
471 } else {
472− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
472+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
473 }
473 }
474
474
475 var titleAnchors;
475 var titleAnchors;
@@ -623,7 +623,7 @@ function cardString(template, components) {
623 if (hasBackground) {
623 if (hasBackground) {
624 summaryColor = summaryColorWithBackground;
624 summaryColor = summaryColorWithBackground;
625 } else {
625 } else {
626− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
626+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
627 }
627 }
628
628
629 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
629 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
@@ -672,7 +672,7 @@ function cardString(template, components) {
672
672
673function createCardComponent(parent, template, components) {
673function createCardComponent(parent, template, components) {
674 var imports = 'import QtQuick 2.2; \n\
674 var imports = 'import QtQuick 2.2; \n\
675− import Ubuntu.Components 1.1; \n\
675+ import Ubuntu.Components 1.3; \n\
676 import Ubuntu.Settings.Components 0.1; \n\
676 import Ubuntu.Settings.Components 0.1; \n\
677 import Dash 0.1;\n\
677 import Dash 0.1;\n\
678 import Utils 0.1;\n';
678 import Utils 0.1;\n';
qml/Dash/DashNavigation.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Dash 0.1
19import Dash 0.1
20import "../Components"
20import "../Components"
21
21
@@ -48,7 +48,7 @@ Item {
48 id: d
48 id: d
49 readonly property color foregroundColor: root.scopeStyle
49 readonly property color foregroundColor: root.scopeStyle
50 ? root.scopeStyle.getTextColor(backgroundItem.luminance)
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
52 readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
53 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
53 readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
54 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
54 readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
qml/Dash/DashNavigationButton.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19
19
20AbstractButton {
20AbstractButton {
21 id: root
21 id: root
@@ -24,7 +24,7 @@ AbstractButton {
24 // Set by parent
24 // Set by parent
25 property var scope: null
25 property var scope: null
26 property var scopeStyle: 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
28 property bool isAltNavigation: false
29 property bool showDivider: false
29 property bool showDivider: false
30
30
qml/Dash/DashNavigationList.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import "../Components"
19import "../Components"
20
20
21Item {
21Item {
@@ -23,7 +23,7 @@ Item {
23 property var navigation: null
23 property var navigation: null
24 property var currentNavigation: null
24 property var currentNavigation: null
25 property var scopeStyle: null
25 property var scopeStyle: null
26− property color foregroundColor: Theme.palette.normal.baseText
26+ property color foregroundColor: theme.palette.normal.baseText
27 signal enterNavigation(var newNavigationId, bool hasChildren)
27 signal enterNavigation(var newNavigationId, bool hasChildren)
28 signal goBackToParentClicked()
28 signal goBackToParentClicked()
29 signal allNavigationClicked()
29 signal allNavigationClicked()
qml/Dash/GenericScopeView.qml+4−4
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Utils 0.1
19import Utils 0.1
20import Unity 0.2
20import Unity 0.2
21import Dash 0.1
21import Dash 0.1
@@ -536,7 +536,7 @@ FocusScope {
536 }
536 }
537 fontSize: "small"
537 fontSize: "small"
538 font.weight: Font.Bold
538 font.weight: Font.Bold
539− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
539+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
540 }
540 }
541 }
541 }
542
542
@@ -573,7 +573,7 @@ FocusScope {
573 width: categoryView.width
573 width: categoryView.width
574 height: section != "" ? units.gu(5) : 0
574 height: section != "" ? units.gu(5) : 0
575 text: section
575 text: section
576− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
576+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
577 iconName: delegate && delegate.headerLink ? "go-next" : ""
577 iconName: delegate && delegate.headerLink ? "go-next" : ""
578 onClicked: {
578 onClicked: {
579 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
579 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
@@ -694,7 +694,7 @@ FocusScope {
694 }
694 }
695 fontSize: "small"
695 fontSize: "small"
696 font.weight: Font.Bold
696 font.weight: Font.Bold
697− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
697+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
698 }
698 }
699
699
700 Connections {
700 Connections {
qml/Dash/PageHeader.qml+4−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Ubuntu.Components.Themes.Ambiance 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
20import Ubuntu.Components.Popups 1.0
20import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0
21import Ubuntu.Components.ListItems 1.0
@@ -182,7 +182,7 @@ Item {
182 property color panelColor: background.topColor
182 property color panelColor: background.topColor
183 panelForegroundColor: config.foregroundColor
183 panelForegroundColor: config.foregroundColor
184 property var config: PageHeadConfiguration {
184 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
186 backAction: Action {
186 backAction: Action {
187 iconName: "back"
187 iconName: "back"
188 onTriggered: {
188 onTriggered: {
@@ -256,7 +256,7 @@ Item {
256 property color panelColor: background.topColor
256 property color panelColor: background.topColor
257 panelForegroundColor: config.foregroundColor
257 panelForegroundColor: config.foregroundColor
258 property var config: PageHeadConfiguration {
258 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
260 backAction: Action {
260 backAction: Action {
261 iconName: backIsClose ? "close" : "back"
261 iconName: backIsClose ? "close" : "back"
262 visible: root.showBackButton
262 visible: root.showBackButton
qml/Dash/Previews/PreviewActionCombo.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19
19
20Item {
20Item {
21 id: root
21 id: root
@@ -33,7 +33,7 @@ Item {
33
33
34 objectName: "moreLessButton"
34 objectName: "moreLessButton"
35 text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
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
37 onClicked: expanded = !expanded
38 width: parent.width
38 width: parent.width
39 }
39 }
qml/Dash/Previews/PreviewActions.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.1
17import QtQuick 2.1
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19
19
20/*! This preview widget shows either one button, two buttons or one button
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"].
21 * and a combo button depending on the number of items in widgetData["actions"].
@@ -50,7 +50,7 @@ PreviewWidget {
50 Binding {
50 Binding {
51 target: loader.item
51 target: loader.item
52 property: "strokeColor"
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 }
54 }
55 Connections {
55 Connections {
56 target: loader.item
56 target: loader.item
qml/Dash/Previews/PreviewAudioPlayback.qml+5−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20
20
21/*! \brief Preview widget for audio tracks.
21/*! \brief Preview widget for audio tracks.
22
22
@@ -139,7 +139,7 @@ PreviewWidget {
139 objectName: "trackTitleLabel"
139 objectName: "trackTitleLabel"
140 anchors { top: parent.top; left: parent.left; right: parent.right }
140 anchors { top: parent.top; left: parent.left; right: parent.right }
141 opacity: 0.9
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"
143 fontSize: "small"
144 horizontalAlignment: Text.AlignLeft
144 horizontalAlignment: Text.AlignLeft
145 text: modelData["title"]
145 text: modelData["title"]
@@ -152,7 +152,7 @@ PreviewWidget {
152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
152 anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
153 visible: text !== ""
153 visible: text !== ""
154 opacity: 0.9
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
156 font.weight: Font.Light
157 fontSize: "small"
157 fontSize: "small"
158 horizontalAlignment: Text.AlignLeft
158 horizontalAlignment: Text.AlignLeft
@@ -193,7 +193,7 @@ PreviewWidget {
193 anchors.verticalCenter: parent.verticalCenter
193 anchors.verticalCenter: parent.verticalCenter
194 width: parent.column3Width
194 width: parent.column3Width
195 opacity: 0.9
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"
197 fontSize: "small"
198 horizontalAlignment: Text.AlignRight
198 horizontalAlignment: Text.AlignRight
199 text: audio.lengthToString(modelData["length"])
199 text: audio.lengthToString(modelData["length"])
qml/Dash/Previews/PreviewExpandable.qml+4−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import "../../Components"
19import "../../Components"
20
20
21/*! \brief Preview widget for expandable widgets.
21/*! \brief Preview widget for expandable widgets.
@@ -41,7 +41,7 @@ PreviewWidget {
41 right: expandButton.left
41 right: expandButton.left
42 }
42 }
43 fontSize: "large"
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 !== ""
45 visible: text !== ""
46 opacity: .8
46 opacity: .8
47 text: widgetData["title"] || ""
47 text: widgetData["title"] || ""
@@ -62,7 +62,7 @@ PreviewWidget {
62 width: units.gu(3)
62 width: units.gu(3)
63 height: units.gu(3)
63 height: units.gu(3)
64 name: root.expanded ? "view-collapse" : "view-expand"
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 }
66 }
67 }
67 }
68
68
qml/Dash/Previews/PreviewHeader.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
19import Dash 0.1
19import Dash 0.1
20import "../"
20import "../"
21
21
@@ -38,7 +38,7 @@ PreviewWidget {
38 readonly property string title: root.widgetData["title"] || ""
38 readonly property string title: root.widgetData["title"] || ""
39 readonly property string subtitle: root.widgetData["subtitle"] || ""
39 readonly property string subtitle: root.widgetData["subtitle"] || ""
40 readonly property var attributes: root.widgetData["attributes"] || null
40 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
42
42
43 implicitHeight: row.height + row.margins * 2
43 implicitHeight: row.height + row.margins * 2
44 width: parent.width
44 width: parent.width
qml/Dash/Previews/PreviewOverlay.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import "../../Components"
19import "../../Components"
20
20
21Rectangle {
21Rectangle {
@@ -158,7 +158,7 @@ Rectangle {
158 anchors.centerIn: parent
158 anchors.centerIn: parent
159 width: units.gu(2.5)
159 width: units.gu(2.5)
160 height: width
160 height: width
161− color: Theme.palette.normal.foregroundText
161+ color: theme.palette.normal.foregroundText
162 name: "close"
162 name: "close"
163 }
163 }
164 }
164 }
qml/Dash/Previews/PreviewRatingDisplay.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
19import "../../Components"
19import "../../Components"
20
20
21/*! \brief Preview widget for rating display.
21/*! \brief Preview widget for rating display.
@@ -60,7 +60,7 @@ PreviewWidget {
60 urlIconEmpty: widgetData["rating-icon-empty"]
60 urlIconEmpty: widgetData["rating-icon-empty"]
61 urlIconFull: widgetData["rating-icon-full"]
61 urlIconFull: widgetData["rating-icon-full"]
62 urlIconHalf: widgetData["rating-icon-half"]
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 }
64 }
65 }
65 }
66 }
66 }
qml/Dash/Previews/PreviewRatingEdit.qml+2−2
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
19import "../../Components"
19import "../../Components"
20
20
21/*! \brief Preview widget for editable rating.
21/*! \brief Preview widget for editable rating.
@@ -56,7 +56,7 @@ PreviewWidget {
56 urlIconEmpty: widgetData["rating-icon-empty"]
56 urlIconEmpty: widgetData["rating-icon-empty"]
57 urlIconFull: widgetData["rating-icon-full"]
57 urlIconFull: widgetData["rating-icon-full"]
58 urlIconHalf: widgetData["rating-icon-half"]
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 }
60 }
61
61
62 PreviewRatingInput {
62 PreviewRatingInput {
qml/Dash/Previews/PreviewRatingInput.qml+5−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
19import "../../Components"
19import "../../Components"
20
20
21/*! \brief Preview widget for rating.
21/*! \brief Preview widget for rating.
@@ -79,7 +79,7 @@ PreviewWidget {
79 verticalCenter: parent.verticalCenter
79 verticalCenter: parent.verticalCenter
80 left: parent.left
80 left: parent.left
81 }
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
83 opacity: .8
84 text: widgetData["rating-label"] || i18n.tr("Rate this")
84 text: widgetData["rating-label"] || i18n.tr("Rate this")
85 }
85 }
@@ -124,7 +124,7 @@ PreviewWidget {
124 left: parent.left
124 left: parent.left
125 right: parent.right
125 right: parent.right
126 }
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
128 opacity: .8
129 text: widgetData["review-label"] || i18n.tr("Add a review")
129 text: widgetData["review-label"] || i18n.tr("Add a review")
130 }
130 }
@@ -165,7 +165,7 @@ PreviewWidget {
165 top: parent.top
165 top: parent.top
166 right: parent.right
166 right: parent.right
167 }
167 }
168− color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base
168+ color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
169 text: widgetData["submit-label"] || i18n.tr("Send")
169 text: widgetData["submit-label"] || i18n.tr("Send")
170 onClicked: {
170 onClicked: {
171 if (readyToSubmit) root.submit()
171 if (readyToSubmit) root.submit()
qml/Dash/Previews/PreviewTable.qml+4−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../Components"
20import "../../Components"
21
21
22/*! \brief Preview widget for table.
22/*! \brief Preview widget for table.
@@ -48,7 +48,7 @@ PreviewWidget {
48 }
48 }
49 height: visible ? implicitHeight : 0
49 height: visible ? implicitHeight : 0
50 fontSize: "large"
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 !== ""
52 visible: text !== ""
53 opacity: .8
53 opacity: .8
54 text: widgetData["title"] || ""
54 text: widgetData["title"] || ""
@@ -72,7 +72,7 @@ PreviewWidget {
72 fontSize: "small"
72 fontSize: "small"
73 text: perRowRepeater.model[index]
73 text: perRowRepeater.model[index]
74 visible: root.expanded || rowIndex < maximumCollapsedRowCount
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
76 font.bold: index == 0
77 wrapMode: Text.Wrap
77 wrapMode: Text.Wrap
78 Layout.alignment: Qt.AlignTop
78 Layout.alignment: Qt.AlignTop
qml/Dash/Previews/PreviewTextSummary.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ PreviewWidget {
39 }
39 }
40 height: visible ? implicitHeight : 0
40 height: visible ? implicitHeight : 0
41 fontSize: "large"
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 !== ""
43 visible: text !== ""
44 opacity: .8
44 opacity: .8
45 text: widgetData["title"] || ""
45 text: widgetData["title"] || ""
@@ -61,7 +61,7 @@ PreviewWidget {
61 clip: true
61 clip: true
62 fontSize: "small"
62 fontSize: "small"
63 lineHeight: 1.2
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
65 opacity: .8
66 text: widgetData["text"] || ""
66 text: widgetData["text"] || ""
67 wrapMode: Text.Wrap
67 wrapMode: Text.Wrap
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItem
19import Ubuntu.Components.ListItems 1.0 as ListItem
20
20
21ScopeSetting {
21ScopeSetting {
@@ -44,7 +44,7 @@ ScopeSetting {
44 elide: Text.ElideMiddle
44 elide: Text.ElideMiddle
45 maximumLineCount: 2
45 maximumLineCount: 2
46 wrapMode: Text.Wrap
46 wrapMode: Text.Wrap
47− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
47+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
48 }
48 }
49
49
50 CheckBox {
50 CheckBox {
qml/Dash/ScopeSettings/ScopeSettingString.qml+4−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItem
19import Ubuntu.Components.ListItems 1.0 as ListItem
20
20
21ScopeSetting {
21ScopeSetting {
@@ -44,7 +44,7 @@ ScopeSetting {
44 elide: Text.ElideMiddle
44 elide: Text.ElideMiddle
45 maximumLineCount: 2
45 maximumLineCount: 2
46 wrapMode: Text.Wrap
46 wrapMode: Text.Wrap
47− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
47+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
48 }
48 }
49
49
50 TextField {
50 TextField {
@@ -57,7 +57,7 @@ ScopeSetting {
57 }
57 }
58 width: root.mode == "number" ? units.gu(8) : units.gu(12)
58 width: root.mode == "number" ? units.gu(8) : units.gu(12)
59 text: widgetData.value
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
61 validator: root.mode == "number" ? doubleValidator : null
62 hasClearButton: root.mode == "number" ? false : true
62 hasClearButton: root.mode == "number" ? false : true
63
63
qml/Dash/ScopesListCategory.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Dash 0.1
19import Dash 0.1
20import "../Components/ListItems" as ListItems
20import "../Components/ListItems" as ListItems
21
21
@@ -43,7 +43,7 @@ Item {
43 id: header
43 id: header
44 width: root.width
44 width: root.width
45 height: units.gu(5)
45 height: units.gu(5)
46− color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
46+ color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
47 }
47 }
48
48
49 readonly property double listItemHeight: units.gu(6)
49 readonly property double listItemHeight: units.gu(6)
qml/Notifications/Notification.qml+5−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 1.1
19+import Ubuntu.Components 1.3
20import Unity.Notifications 1.0
20import Unity.Notifications 1.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Utils 0.1
22import Utils 0.1
@@ -269,7 +269,7 @@ Item {
269 }
269 }
270 visible: type !== Notification.Confirmation
270 visible: type !== Notification.Confirmation
271 fontSize: "medium"
271 fontSize: "medium"
272− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
272+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
273 elide: Text.ElideRight
273 elide: Text.ElideRight
274 textFormat: Text.PlainText
274 textFormat: Text.PlainText
275 }
275 }
@@ -284,7 +284,7 @@ Item {
284 }
284 }
285 visible: body != "" && type !== Notification.Confirmation
285 visible: body != "" && type !== Notification.Confirmation
286 fontSize: "small"
286 fontSize: "small"
287− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
287+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
288 wrapMode: Text.WordWrap
288 wrapMode: Text.WordWrap
289 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
289 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
290 elide: Text.ElideRight
290 elide: Text.ElideRight
@@ -325,7 +325,7 @@ Item {
325 anchors.horizontalCenter: parent.horizontalCenter
325 anchors.horizontalCenter: parent.horizontalCenter
326 visible: type === Notification.Confirmation && body !== ""
326 visible: type === Notification.Confirmation && body !== ""
327 fontSize: "medium"
327 fontSize: "medium"
328− color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
328+ color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
329 wrapMode: Text.WordWrap
329 wrapMode: Text.WordWrap
330 maximumLineCount: 1
330 maximumLineCount: 1
331 elide: Text.ElideRight
331 elide: Text.ElideRight
qml/Notifications/OptionToggle.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 0.1 as ListItem
19import Ubuntu.Components.ListItems 0.1 as ListItem
20import Ubuntu.Components.Popups 0.1
20import Ubuntu.Components.Popups 0.1
21
21
@@ -29,7 +29,7 @@ UbuntuShape {
29
29
30 signal triggered(string id)
30 signal triggered(string id)
31
31
32− color: Theme.palette.normal.base
32+ color: theme.palette.normal.base
33 borderSource: "none"
33 borderSource: "none"
34 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
34 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
35 width: parent.width
35 width: parent.width
qml/Panel/Indicators/MenuItemFactory.qml+5−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,7 @@ import Ubuntu.Settings.Components 0.1
23import QMenuModel 0.1
23import QMenuModel 0.1
24import Utils 0.1 as Utils
24import Utils 0.1 as Utils
25import Ubuntu.Components.ListItems 0.1 as ListItems
25import Ubuntu.Components.ListItems 0.1 as ListItems
26−import Ubuntu.Components 1.1
26+import Ubuntu.Components 1.3
27
27
28Item {
28Item {
29 id: menuFactory
29 id: menuFactory
@@ -245,7 +245,7 @@ Item {
245 name: "settings"
245 name: "settings"
246 height: units.gu(3)
246 height: units.gu(3)
247 width: height
247 width: height
248− color: Theme.palette.selected.backgroundText
248+ color: theme.palette.selected.backgroundText
249 }
249 }
250 }
250 }
251 }
251 }
@@ -277,7 +277,7 @@ Item {
277 source: menuData.icon
277 source: menuData.icon
278 height: units.gu(3)
278 height: units.gu(3)
279 width: height
279 width: height
280− color: Theme.palette.selected.backgroundText
280+ color: theme.palette.selected.backgroundText
281 }
281 }
282 }
282 }
283 }
283 }
@@ -835,7 +835,7 @@ Item {
835 enabled: menuData && menuData.sensitive || false
835 enabled: menuData && menuData.sensitive || false
836 highlightWhenPressed: false
836 highlightWhenPressed: false
837 text: menuData && menuData.label || ""
837 text: menuData && menuData.label || ""
838− foregroundColor: Theme.palette.normal.backgroundText
838+ foregroundColor: theme.palette.normal.backgroundText
839
839
840 onMenuModelChanged: {
840 onMenuModelChanged: {
841 loadAttributes();
841 loadAttributes();
qml/Panel/Indicators/ModemInfoItem.qml+4−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 0.1 as ListItem
20import Ubuntu.Components.ListItems 0.1 as ListItem
21
21
22ListItem.Empty {
22ListItem.Empty {
@@ -65,7 +65,7 @@ ListItem.Empty {
65 height: parent.height
65 height: parent.height
66 Icon {
66 Icon {
67 id: statusIcon
67 id: statusIcon
68− color: Theme.palette.selected.backgroundText
68+ color: theme.palette.selected.backgroundText
69
69
70 Layout.preferredHeight: parent.height
70 Layout.preferredHeight: parent.height
71 Layout.preferredWidth: Layout.preferredHeight
71 Layout.preferredWidth: Layout.preferredHeight
@@ -75,7 +75,7 @@ ListItem.Empty {
75
75
76 Icon {
76 Icon {
77 id: iconConnectivity
77 id: iconConnectivity
78− color: Theme.palette.selected.backgroundText
78+ color: theme.palette.selected.backgroundText
79
79
80 Layout.preferredHeight: parent.height
80 Layout.preferredHeight: parent.height
81 Layout.preferredWidth: Layout.preferredHeight
81 Layout.preferredWidth: Layout.preferredHeight
qml/Panel/Indicators/RoamingIndication.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20
20
21RowLayout {
21RowLayout {
22 spacing: units.gu(0.5)
22 spacing: units.gu(0.5)
@@ -30,7 +30,7 @@ RowLayout {
30
30
31 Icon {
31 Icon {
32 id: iconRoaming
32 id: iconRoaming
33− color: Theme.palette.selected.backgroundText
33+ color: theme.palette.selected.backgroundText
34
34
35 Layout.preferredHeight: parent.height
35 Layout.preferredHeight: parent.height
36 Layout.preferredWidth: Layout.preferredHeight
36 Layout.preferredWidth: Layout.preferredHeight
qml/Wizard/CheckableSetting.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItem
19import Ubuntu.Components.ListItems 1.0 as ListItem
20
20
21ListItem.Empty {
21ListItem.Empty {
@@ -77,7 +77,7 @@ ListItem.Empty {
77 rightMargin: listItem.rightMargin
77 rightMargin: listItem.rightMargin
78 }
78 }
79 wrapMode: Text.Wrap
79 wrapMode: Text.Wrap
80− linkColor: Theme.palette.normal.foregroundText
80+ linkColor: theme.palette.normal.foregroundText
81 onLinkActivated: listItem.linkActivated(link)
81 onLinkActivated: listItem.linkActivated(link)
82 }
82 }
83 }
83 }
qml/Wizard/Page.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19
19
20Item {
20Item {
21 readonly property real buttonMargin: units.gu(2)
21 readonly property real buttonMargin: units.gu(2)
@@ -57,7 +57,7 @@ Item {
57 }
57 }
58 wrapMode: Text.Wrap
58 wrapMode: Text.Wrap
59 text: title
59 text: title
60− color: Theme.palette.normal.baseText
60+ color: theme.palette.normal.baseText
61 font.pixelSize: units.gu(4)
61 font.pixelSize: units.gu(4)
62 }
62 }
63
63
qml/Wizard/Pages/30-passwd-type.qml+5−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0
19import Ubuntu.Components.ListItems 1.0
20import Ubuntu.SystemSettings.SecurityPrivacy 1.0
20import Ubuntu.SystemSettings.SecurityPrivacy 1.0
21import ".." as LocalComponents
21import ".." as LocalComponents
@@ -111,13 +111,13 @@ LocalComponents.Page {
111
111
112 Component.onCompleted: {
112 Component.onCompleted: {
113 // A visible selected background looks bad in ListItem widgets with our theme
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 }
116 }
117
117
118 Component.onDestruction: {
118 Component.onDestruction: {
119 // Restore original theme background
119 // Restore original theme background
120− Theme.palette.selected.background = originalBackground
120+ theme.palette.selected.background = originalBackground
121 }
121 }
122 }
122 }
123 }
123 }
qml/Wizard/Pages/50-location.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013,2014 Canonical, Ltd.
2+ * Copyright (C) 2013-2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
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
18import AccountsService 0.1
19import QMenuModel 0.1 as QMenuModel
19import QMenuModel 0.1 as QMenuModel
20import Qt.labs.folderlistmodel 2.1
20import Qt.labs.folderlistmodel 2.1
21−import Ubuntu.Components 1.1
21+import Ubuntu.Components 1.3
22import ".." as LocalComponents
22import ".." as LocalComponents
23
23
24LocalComponents.Page {
24LocalComponents.Page {
@@ -98,7 +98,7 @@ LocalComponents.Page {
98 anchors.leftMargin: hereCheck.labelOffset
98 anchors.leftMargin: hereCheck.labelOffset
99 anchors.right: parent.right
99 anchors.right: parent.right
100 wrapMode: Text.Wrap
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
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>.")
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"))
104 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
qml/Wizard/Pages/here-terms.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
17import QtQuick 2.3
17import QtQuick 2.3
18import AccountsService 0.1
18import AccountsService 0.1
19import Qt.labs.folderlistmodel 2.1
19import Qt.labs.folderlistmodel 2.1
20−import Ubuntu.Components 1.1
20+import Ubuntu.Components 1.3
21import Ubuntu.Web 0.2
21import Ubuntu.Web 0.2
22import ".." as LocalComponents
22import ".." as LocalComponents
23
23
@@ -102,7 +102,7 @@ LocalComponents.Page {
102 anchors.left: parent.left
102 anchors.left: parent.left
103 anchors.right: parent.right
103 anchors.right: parent.right
104 wrapMode: Text.Wrap
104 wrapMode: Text.Wrap
105− linkColor: Theme.palette.normal.foregroundText
105+ linkColor: theme.palette.normal.foregroundText
106 onLinkActivated: {
106 onLinkActivated: {
107 webview.url = link
107 webview.url = link
108 termsLabel.visible = false
108 termsLabel.visible = false
qml/Wizard/StackButton.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.3
19
19
20AbstractButton {
20AbstractButton {
21 id: stackButton
21 id: stackButton
@@ -32,7 +32,7 @@ AbstractButton {
32 anchors.verticalCenter: parent.verticalCenter
32 anchors.verticalCenter: parent.verticalCenter
33 anchors.left: parent.left
33 anchors.left: parent.left
34 anchors.right: parent.right
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: {
36 text: {
37 if (backArrow) {
37 if (backArrow) {
38 // Translators: This is the arrow for "Back" buttons
38 // Translators: This is the arrow for "Back" buttons
tests/plugins/Dash/cardcreator/1.res+1−1
@@ -86,7 +86,7 @@ Label {
86 wrapMode: Text.Wrap;
86 wrapMode: Text.Wrap;
87 maximumLineCount: 2;
87 maximumLineCount: 2;
88 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
88 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;
90 visible: showHeader ;
90 visible: showHeader ;
91 text: root.title;
91 text: root.title;
92 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
92 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
tests/plugins/Dash/cardcreator/2.res+2−2
@@ -93,7 +93,7 @@ CroppedImageMinimumSourceSize {
93 wrapMode: Text.Wrap;
93 wrapMode: Text.Wrap;
94 maximumLineCount: 2;
94 maximumLineCount: 2;
95 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
95 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");
97 visible: showHeader ;
97 visible: showHeader ;
98 text: root.title;
98 text: root.title;
99 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
99 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -112,7 +112,7 @@ CroppedImageMinimumSourceSize {
112 maximumLineCount: 1;
112 maximumLineCount: 1;
113 fontSize: "x-small";
113 fontSize: "x-small";
114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
114 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");
116 visible: titleLabel.visible && titleLabel.text;
116 visible: titleLabel.visible && titleLabel.text;
117 text: cardData && cardData["subtitle"] || "";
117 text: cardData && cardData["subtitle"] || "";
118 font.weight: Font.Light;
118 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/3.res+2−2
@@ -86,7 +86,7 @@ Label {
86 wrapMode: Text.Wrap;
86 wrapMode: Text.Wrap;
87 maximumLineCount: 2;
87 maximumLineCount: 2;
88 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
88 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;
90 visible: showHeader ;
90 visible: showHeader ;
91 text: root.title;
91 text: root.title;
92 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
92 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -105,7 +105,7 @@ Label {
105 maximumLineCount: 1;
105 maximumLineCount: 1;
106 fontSize: "x-small";
106 fontSize: "x-small";
107 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
107 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;
109 visible: titleLabel.visible && titleLabel.text;
109 visible: titleLabel.visible && titleLabel.text;
110 text: cardData && cardData["subtitle"] || "";
110 text: cardData && cardData["subtitle"] || "";
111 font.weight: Font.Light;
111 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/4.res+2−2
@@ -73,7 +73,7 @@ Label {
73 wrapMode: Text.Wrap;
73 wrapMode: Text.Wrap;
74 maximumLineCount: 2;
74 maximumLineCount: 2;
75 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
75 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;
77 visible: showHeader ;
77 visible: showHeader ;
78 text: root.title;
78 text: root.title;
79 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
79 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -92,7 +92,7 @@ Label {
92 maximumLineCount: 1;
92 maximumLineCount: 1;
93 fontSize: "x-small";
93 fontSize: "x-small";
94 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
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;
96 visible: titleLabel.visible && titleLabel.text;
97 text: cardData && cardData["subtitle"] || "";
97 text: cardData && cardData["subtitle"] || "";
98 font.weight: Font.Light;
98 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/5.res+2−2
@@ -130,7 +130,7 @@ Label {
130 wrapMode: Text.Wrap;
130 wrapMode: Text.Wrap;
131 maximumLineCount: 2;
131 maximumLineCount: 2;
132 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
132 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");
134 visible: showHeader && overlayLoader.active;
134 visible: showHeader && overlayLoader.active;
135 text: root.title;
135 text: root.title;
136 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
136 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -150,7 +150,7 @@ Label {
150 maximumLineCount: 1;
150 maximumLineCount: 1;
151 fontSize: "x-small";
151 fontSize: "x-small";
152 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
152 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");
154 visible: titleLabel.visible && titleLabel.text;
154 visible: titleLabel.visible && titleLabel.text;
155 text: cardData && cardData["subtitle"] || "";
155 text: cardData && cardData["subtitle"] || "";
156 font.weight: Font.Light;
156 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/6.res+3−3
@@ -72,7 +72,7 @@ Item {
72 wrapMode: Text.Wrap;
72 wrapMode: Text.Wrap;
73 maximumLineCount: 2;
73 maximumLineCount: 2;
74 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
74 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");
76 visible: showHeader ;
76 visible: showHeader ;
77 text: root.title;
77 text: root.title;
78 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
78 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -91,7 +91,7 @@ Item {
91 maximumLineCount: 1;
91 maximumLineCount: 1;
92 fontSize: "x-small";
92 fontSize: "x-small";
93 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
93 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");
95 visible: titleLabel.visible && titleLabel.text;
95 visible: titleLabel.visible && titleLabel.text;
96 text: cardData && cardData["subtitle"] || "";
96 text: cardData && cardData["subtitle"] || "";
97 font.weight: Font.Light;
97 font.weight: Font.Light;
@@ -105,7 +105,7 @@ Item {
105 rightMargin: units.gu(1);
105 rightMargin: units.gu(1);
106 }
106 }
107 source: cardData && cardData["emblem"] || "";
107 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");
109 height: source != "" ? titleLabel.font.pixelSize : 0;
109 height: source != "" ? titleLabel.font.pixelSize : 0;
110 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
110 width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
111 }
111 }
tests/plugins/Dash/cardcreator/7.res+3−3
@@ -94,7 +94,7 @@ CroppedImageMinimumSourceSize {
94 wrapMode: Text.Wrap;
94 wrapMode: Text.Wrap;
95 maximumLineCount: 2;
95 maximumLineCount: 2;
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
96 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");
98 visible: showHeader ;
98 visible: showHeader ;
99 text: root.title;
99 text: root.title;
100 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
100 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -113,7 +113,7 @@ CroppedImageMinimumSourceSize {
113 maximumLineCount: 1;
113 maximumLineCount: 1;
114 fontSize: "x-small";
114 fontSize: "x-small";
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115 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");
117 visible: titleLabel.visible && titleLabel.text;
117 visible: titleLabel.visible && titleLabel.text;
118 text: cardData && cardData["subtitle"] || "";
118 text: cardData && cardData["subtitle"] || "";
119 font.weight: Font.Light;
119 font.weight: Font.Light;
@@ -126,7 +126,7 @@ CroppedImageMinimumSourceSize {
126 rightMargin: units.gu(1);
126 rightMargin: units.gu(1);
127 top: subtitleLabel.bottom;
127 top: subtitleLabel.bottom;
128 }
128 }
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");
130 fontScale: root.fontScale;
130 fontScale: root.fontScale;
131 model: cardData && cardData["attributes"];
131 model: cardData && cardData["attributes"];
132 }
132 }
tests/qmltests/Components/tst_LazyImage.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import "../../../qml/Components"
19import "../../../qml/Components"
20−import Ubuntu.Components 0.1
20+import Ubuntu.Components 1.3
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22import "tst_LazyImage"
22import "tst_LazyImage"
23
23
@@ -32,7 +32,7 @@ Rectangle {
32 rightMargin: 2 * parent.width / 3
32 rightMargin: 2 * parent.width / 3
33 }
33 }
34
34
35− color: Theme.palette.normal.baseText
35+ color: theme.palette.normal.baseText
36
36
37 Column {
37 Column {
38 anchors { fill: parent; margins: units.gu(5) }
38 anchors { fill: parent; margins: units.gu(5) }
tests/qmltests/Components/tst_Rating.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -17,14 +17,14 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import "../../../qml/Components"
19import "../../../qml/Components"
20−import Ubuntu.Components 0.1
20+import Ubuntu.Components 1.3
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
23Rectangle {
23Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(10)
26 height: units.gu(10)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 Rating {
29 Rating {
30 id: rating
30 id: rating
tests/qmltests/Dash/Previews/tst_Preview.qml+2−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(60)
25 width: units.gu(60)
26 height: units.gu(60)
26 height: units.gu(60)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 Item {
29 Item {
30 id: shell
30 id: shell
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22import QtMultimedia 5.0
22import QtMultimedia 5.0
@@ -25,7 +25,7 @@ Rectangle {
25 id: root
25 id: root
26 width: units.gu(60)
26 width: units.gu(60)
27 height: units.gu(80)
27 height: units.gu(80)
28− color: Theme.palette.selected.background
28+ color: theme.palette.selected.background
29
29
30 property var tracksModel0: {
30 property var tracksModel0: {
31 "tracks": [ ]
31 "tracks": [ ]
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(80)
26 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
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."
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."
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_PreviewRatingDisplay.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(80)
26 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 property var reviewsModel0: {
29 property var reviewsModel0: {
30 "reviews": [ ]
30 "reviews": [ ]
tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(80)
26 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
29 property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
30
30
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(80)
26 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 property real validInputRating: 1
29 property real validInputRating: 1
30 property real invalidInputRating: -1
30 property real invalidInputRating: -1
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(80)
26 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 property var widgetDataComplete: {
29 property var widgetDataComplete: {
30 "title": "Title here longa long long long long long long long long long long",
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/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import "../../../../qml/Dash/Previews"
20import "../../../../qml/Dash/Previews"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22
22
@@ -24,7 +24,7 @@ Rectangle {
24 id: root
24 id: root
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(80)
26 height: units.gu(80)
27− color: Theme.palette.selected.background
27+ color: theme.palette.selected.background
28
28
29 property var widgetDataComplete: {
29 property var widgetDataComplete: {
30 "title": "Title here",
30 "title": "Title here",
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ Rectangle {
23 id: root
23 id: root
24 width: units.gu(60)
24 width: units.gu(60)
25 height: units.gu(80)
25 height: units.gu(80)
26− color: Theme.palette.selected.background
26+ color: theme.palette.selected.background
27
27
28 PreviewWidgetFactory {
28 PreviewWidgetFactory {
29 id: factory
29 id: factory
tests/qmltests/Dash/tst_Card.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21import "../../../qml/Dash"
21import "../../../qml/Dash"
22import "CardHelpers.js" as Helpers
22import "CardHelpers.js" as Helpers
@@ -493,7 +493,7 @@ Rectangle {
493
493
494 background.color = data.tag;
494 background.color = data.tag;
495
495
496− var fontColor = data.dark ? Theme.palette.normal.baseText : "white";
496+ var fontColor = data.dark ? theme.palette.normal.baseText : "white";
497
497
498 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
498 tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
499 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
499 tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
tests/qmltests/Dash/tst_PageHeader.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
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
18import QtTest 1.0
19import ".."
19import ".."
20import "../../../qml/Dash"
20import "../../../qml/Dash"
21−import Ubuntu.Components 0.1
21+import Ubuntu.Components 1.3
22import Unity 0.2
22import Unity 0.2
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
24
24
@@ -244,7 +244,7 @@ Item {
244 searchEntryEnabled: true
244 searchEntryEnabled: true
245 title: "%^$%^%^&%^&%^$%GHR%"
245 title: "%^$%^%^&%^&%^$%GHR%"
246 scopeStyle: QtObject {
246 scopeStyle: QtObject {
247− readonly property color foreground: Theme.palette.normal.baseText
247+ readonly property color foreground: theme.palette.normal.baseText
248 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
248 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
249 }
249 }
250 showBackButton: showBackButtonCheckBox.checked
250 showBackButton: showBackButtonCheckBox.checked
tests/qmltests/Dash/tst_PreviewListView.qml+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014,2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19−import Ubuntu.Components 1.1
19+import Ubuntu.Components 1.3
20import "../../../qml/Dash"
20import "../../../qml/Dash"
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
22import Unity 0.2 as Unity
22import Unity 0.2 as Unity
@@ -26,7 +26,7 @@ Rectangle {
26 id: root
26 id: root
27 width: units.gu(60)
27 width: units.gu(60)
28 height: units.gu(60)
28 height: units.gu(60)
29− color: Theme.palette.selected.background
29+ color: theme.palette.selected.background
30
30
31 Unity.MockScope {
31 Unity.MockScope {
32 id: mockScope
32 id: mockScope