git.iko.soy/unity8
on xenial help sign in
Use Icon instead of StatusIcon
a761c82Lars Uebernickel
debian/control+3−3
compare with xenial
unifiedsplit
@@ -44,7 +44,7 @@ Build-Depends: cmake,
44 qtdeclarative5-private-dev (>= 5.2.1),
44 qtdeclarative5-private-dev (>= 5.2.1),
45 qtdeclarative5-qtmultimedia-plugin,
45 qtdeclarative5-qtmultimedia-plugin,
46 qtdeclarative5-ubuntu-settings-components (>= 0.4),
46 qtdeclarative5-ubuntu-settings-components (>= 0.4),
47− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
47+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
48 ttf-ubuntu-font-family,
48 ttf-ubuntu-font-family,
49Standards-Version: 3.9.4
49Standards-Version: 3.9.4
50Homepage: http://launchpad.net/unity
50Homepage: http://launchpad.net/unity
@@ -58,7 +58,7 @@ X-Ubuntu-Use-Langpack: yes
58Package: indicators-client
58Package: indicators-client
59Architecture: amd64 armhf i386
59Architecture: amd64 armhf i386
60Depends: qmenumodel-qml (>= 0.2.8),
60Depends: qmenumodel-qml (>= 0.2.8),
61− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
61+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
62 unity8 (= ${binary:Version}),
62 unity8 (= ${binary:Version}),
63 ${misc:Depends},
63 ${misc:Depends},
64 ${shlibs:Depends},
64 ${shlibs:Depends},
@@ -108,7 +108,7 @@ Architecture: all
108Depends: qml-module-qtquick-layouts,
108Depends: qml-module-qtquick-layouts,
109 qtdeclarative5-ubuntu-settings-components (>= 0.4),
109 qtdeclarative5-ubuntu-settings-components (>= 0.4),
110 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
110 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
111− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
111+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
112 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
112 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
113 ubuntu-thumbnailer-impl-0,
113 ubuntu-thumbnailer-impl-0,
114 unity-application-impl-4,
114 unity-application-impl-4,
plugins/Dash/CardAttributes.qml+1−3
@@ -17,7 +17,6 @@
17import QtQuick 2.2
17import QtQuick 2.2
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.1
19import Ubuntu.Components 1.1
20−import Ubuntu.Settings.Components 0.1
21
20
22GridLayout {
21GridLayout {
23 id: grid
22 id: grid
@@ -47,10 +46,9 @@ GridLayout {
47 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
46 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
48 Layout.fillWidth: true
47 Layout.fillWidth: true
49 height: units.gu(2)
48 height: units.gu(2)
50− StatusIcon {
49+ Icon {
51 id: icon
50 id: icon
52 height: units.gu(2)
51 height: units.gu(2)
53− sets: ["actions", "status", "apps"]
54 source: "icon" in modelData && modelData["icon"] || ""
52 source: "icon" in modelData && modelData["icon"] || ""
55 color: grid.color
53 color: grid.color
56 }
54 }
plugins/Dash/CardCreator.js+1−1
@@ -225,7 +225,7 @@ var kTitleLabelCode = 'Label { \n\
225
225
226// %1 is used as extra anchors of emblemIcon
226// %1 is used as extra anchors of emblemIcon
227// %2 is used as color of emblemIcon
227// %2 is used as color of emblemIcon
228−var kEmblemIconCode = 'StatusIcon { \n\
228+var kEmblemIconCode = 'Icon { \n\
229 id: emblemIcon; \n\
229 id: emblemIcon; \n\
230 objectName: "emblemIcon"; \n\
230 objectName: "emblemIcon"; \n\
231 anchors { \n\
231 anchors { \n\
qml/Panel/IndicatorItem.qml+1−2
@@ -99,12 +99,11 @@ IndicatorDelegate {
99
99
100 model: d.useFallbackIcon ? [ "image://theme/settings" ] : root.icons
100 model: d.useFallbackIcon ? [ "image://theme/settings" ] : root.icons
101
101
102− StatusIcon {
102+ Icon {
103 id: itemImage
103 id: itemImage
104 objectName: "icon"+index
104 objectName: "icon"+index
105 height: iconHeight
105 height: iconHeight
106 source: modelData
106 source: modelData
107− sets: ["status", "actions"]
108 color: root.color
107 color: root.color
109 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
108 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
110
109
tests/plugins/Dash/cardcreator/6.res+1−1
@@ -95,7 +95,7 @@ Item {
95 text: cardData && cardData["subtitle"] || "";
95 text: cardData && cardData["subtitle"] || "";
96 font.weight: Font.Light;
96 font.weight: Font.Light;
97 }
97 }
98−,StatusIcon {
98+,Icon {
99 id: emblemIcon;
99 id: emblemIcon;
100 objectName: "emblemIcon";
100 objectName: "emblemIcon";
101 anchors {
101 anchors {