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

The latter is deprecated.

commita9db4f31a2f3c589aea3d58c74dd7c52fa3d734f authorLars Uebernickel <lars.uebernickel@canonical.com> dateFri 12 Sep 2014, 18:05 (12 years ago) parent1fbc843
3 files changed+5−9
compare with xenial
unifiedsplit
debian/control+3−3 plugins/Dash/CardAttributes.qml+1−3 qml/Panel/Indicators/DefaultIndicatorWidget.qml+1−3
debian/control+3−3
@@ -45,7 +45,7 @@ Build-Depends: cmake,
4545 qtdeclarative5-private-dev (>= 5.2.1),
4646 qtdeclarative5-qtmultimedia-plugin,
4747 qtdeclarative5-ubuntu-settings-components (>= 0.3),
48− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
48+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
4949 ttf-ubuntu-font-family,
5050Standards-Version: 3.9.4
5151Homepage: http://launchpad.net/unity
@@ -59,7 +59,7 @@ X-Ubuntu-Use-Langpack: yes
5959Package: indicators-client
6060Architecture: amd64 armhf i386
6161Depends: qmenumodel-qml (>= 0.2.8),
62− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
62+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
6363 unity8 (= ${binary:Version}),
6464 ${misc:Depends},
6565 ${shlibs:Depends},
@@ -109,7 +109,7 @@ Architecture: all
109109Depends: qml-module-qtquick-layouts,
110110 qtdeclarative5-ubuntu-settings-components (>= 0.3),
111111 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
112− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
112+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
113113 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
114114 ubuntu-thumbnailer-impl-0,
115115 unity-application-impl-3,
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
@@ -45,10 +44,9 @@ GridLayout {
4544 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
4645 Layout.fillWidth: true
4746 height: units.gu(2)
48− StatusIcon {
47+ Icon {
4948 id: icon
5049 height: units.gu(2)
51− sets: ["actions", "status", "apps"]
5250 source: "icon" in modelData && modelData["icon"] || ""
5351 color: grid.color
5452 }
qml/Panel/Indicators/DefaultIndicatorWidget.qml+1−3
@@ -19,7 +19,6 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import Ubuntu.Settings.Components 0.1
2322
2423IndicatorBase {
2524 id: indicatorWidget
@@ -76,12 +75,11 @@ IndicatorBase {
7675 width: itemImage.width + units.gu(1)
7776 height: iconRow.height
7877
79− StatusIcon {
78+ Icon {
8079 id: itemImage
8180 height: indicatorWidget.iconSize
8281 anchors.centerIn: parent
8382 source: modelData
84− sets: ["status", "actions"]
8583 color: "#CCCCCC"
8684 }
8785 }