git.iko.soy/unity8
on xenial help sign in
Use Icon instead of StatusIcon

The latter is deprecated. Approved by: Albert Astals Cid

commita761c8204b47e6b5487007e823ebe8502e4243de authorLars Uebernickel <lars.uebernickel@canonical.com> dateTue 25 Nov 2014, 13:54 (12 years ago) parentc2f1939f494a32
5 files changed+7−10
compare with xenial
unifiedsplit
debian/control+3−3 plugins/Dash/CardAttributes.qml+1−3 plugins/Dash/CardCreator.js+1−1 qml/Panel/IndicatorItem.qml+1−2 tests/plugins/Dash/cardcreator/6.res+1−1
debian/control+3−3
@@ -44,7 +44,7 @@ Build-Depends: cmake,
4444 qtdeclarative5-private-dev (>= 5.2.1),
4545 qtdeclarative5-qtmultimedia-plugin,
4646 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),
4848 ttf-ubuntu-font-family,
4949Standards-Version: 3.9.4
5050Homepage: http://launchpad.net/unity
@@ -58,7 +58,7 @@ X-Ubuntu-Use-Langpack: yes
5858Package: indicators-client
5959Architecture: amd64 armhf i386
6060Depends: 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),
6262 unity8 (= ${binary:Version}),
6363 ${misc:Depends},
6464 ${shlibs:Depends},
@@ -108,7 +108,7 @@ Architecture: all
108108Depends: qml-module-qtquick-layouts,
109109 qtdeclarative5-ubuntu-settings-components (>= 0.4),
110110 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),
112112 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
113113 ubuntu-thumbnailer-impl-0,
114114 unity-application-impl-4,
plugins/Dash/CardAttributes.qml+1−3
@@ -17,7 +17,6 @@
1717import QtQuick 2.2
1818import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.1
20−import Ubuntu.Settings.Components 0.1
2120
2221GridLayout {
2322 id: grid
@@ -47,10 +46,9 @@ GridLayout {
4746 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
4847 Layout.fillWidth: true
4948 height: units.gu(2)
50− StatusIcon {
49+ Icon {
5150 id: icon
5251 height: units.gu(2)
53− sets: ["actions", "status", "apps"]
5452 source: "icon" in modelData && modelData["icon"] || ""
5553 color: grid.color
5654 }
plugins/Dash/CardCreator.js+1−1
@@ -225,7 +225,7 @@ var kTitleLabelCode = 'Label { \n\
225225
226226// %1 is used as extra anchors of emblemIcon
227227// %2 is used as color of emblemIcon
228−var kEmblemIconCode = 'StatusIcon { \n\
228+var kEmblemIconCode = 'Icon { \n\
229229 id: emblemIcon; \n\
230230 objectName: "emblemIcon"; \n\
231231 anchors { \n\
qml/Panel/IndicatorItem.qml+1−2
@@ -99,12 +99,11 @@ IndicatorDelegate {
9999
100100 model: d.useFallbackIcon ? [ "image://theme/settings" ] : root.icons
101101
102− StatusIcon {
102+ Icon {
103103 id: itemImage
104104 objectName: "icon"+index
105105 height: iconHeight
106106 source: modelData
107− sets: ["status", "actions"]
108107 color: root.color
109108 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
110109
tests/plugins/Dash/cardcreator/6.res+1−1
@@ -95,7 +95,7 @@ Item {
9595 text: cardData && cardData["subtitle"] || "";
9696 font.weight: Font.Light;
9797 }
98−,StatusIcon {
98+,Icon {
9999 id: emblemIcon;
100100 objectName: "emblemIcon";
101101 anchors {