git.iko.soy/unity8
on xenial help sign in
Use Icon instead of StatusIcon
a9db4f3Lars Uebernickel
debian/control+3−3
compare with xenial
unifiedsplit
@@ -45,7 +45,7 @@ Build-Depends: cmake,
45 qtdeclarative5-private-dev (>= 5.2.1),
45 qtdeclarative5-private-dev (>= 5.2.1),
46 qtdeclarative5-qtmultimedia-plugin,
46 qtdeclarative5-qtmultimedia-plugin,
47 qtdeclarative5-ubuntu-settings-components (>= 0.3),
47 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),
49 ttf-ubuntu-font-family,
49 ttf-ubuntu-font-family,
50Standards-Version: 3.9.4
50Standards-Version: 3.9.4
51Homepage: http://launchpad.net/unity
51Homepage: http://launchpad.net/unity
@@ -59,7 +59,7 @@ X-Ubuntu-Use-Langpack: yes
59Package: indicators-client
59Package: indicators-client
60Architecture: amd64 armhf i386
60Architecture: amd64 armhf i386
61Depends: qmenumodel-qml (>= 0.2.8),
61Depends: 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),
63 unity8 (= ${binary:Version}),
63 unity8 (= ${binary:Version}),
64 ${misc:Depends},
64 ${misc:Depends},
65 ${shlibs:Depends},
65 ${shlibs:Depends},
@@ -109,7 +109,7 @@ Architecture: all
109Depends: qml-module-qtquick-layouts,
109Depends: qml-module-qtquick-layouts,
110 qtdeclarative5-ubuntu-settings-components (>= 0.3),
110 qtdeclarative5-ubuntu-settings-components (>= 0.3),
111 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
111 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),
113 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
113 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
114 ubuntu-thumbnailer-impl-0,
114 ubuntu-thumbnailer-impl-0,
115 unity-application-impl-3,
115 unity-application-impl-3,
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
@@ -45,10 +44,9 @@ GridLayout {
45 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
44 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
46 Layout.fillWidth: true
45 Layout.fillWidth: true
47 height: units.gu(2)
46 height: units.gu(2)
48− StatusIcon {
47+ Icon {
49 id: icon
48 id: icon
50 height: units.gu(2)
49 height: units.gu(2)
51− sets: ["actions", "status", "apps"]
52 source: "icon" in modelData && modelData["icon"] || ""
50 source: "icon" in modelData && modelData["icon"] || ""
53 color: grid.color
51 color: grid.color
54 }
52 }
qml/Panel/Indicators/DefaultIndicatorWidget.qml+1−3
@@ -19,7 +19,6 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22−import Ubuntu.Settings.Components 0.1
23
22
24IndicatorBase {
23IndicatorBase {
25 id: indicatorWidget
24 id: indicatorWidget
@@ -76,12 +75,11 @@ IndicatorBase {
76 width: itemImage.width + units.gu(1)
75 width: itemImage.width + units.gu(1)
77 height: iconRow.height
76 height: iconRow.height
78
77
79− StatusIcon {
78+ Icon {
80 id: itemImage
79 id: itemImage
81 height: indicatorWidget.iconSize
80 height: indicatorWidget.iconSize
82 anchors.centerIn: parent
81 anchors.centerIn: parent
83 source: modelData
82 source: modelData
84− sets: ["status", "actions"]
85 color: "#CCCCCC"
83 color: "#CCCCCC"
86 }
84 }
87 }
85 }