git.iko.soy/unity8
on xenial help sign in
Switch from deprecated image://gicon/ to new image://theme/.

Approved by PS Jenkins bot, Michael Zanetti.

commitc33e7527e1de15e7892b4e443ae9f93fd2c4edac authorMichael Terry <michael.terry@canonical.com> dateWed 11 Sep 2013, 15:18 (13 years ago) parent6b8b30b74dbdb8
9 files changed+24−24
compare with xenial
unifiedsplit
Panel/Indicators/DefaultIndicatorWidget.qml+1−1 Panel/Indicators/MessagingIndicatorWidget.qml+1−1 Panel/Indicators/NetworkIndicatorWidget.qml+6−6 Panel/Indicators/SoundIndicatorWidget.qml+1−1 debian/control+2−2 plugins/Unity/Indicators/rootactionstate.cpp+8−8 plugins/Unity/IndicatorsLegacy/Messaging/qml/GroupedMessage.qml+1−1 plugins/Unity/IndicatorsLegacy/Messaging/qml/HeroMessage.qml+2−2 plugins/Unity/IndicatorsLegacy/Network/qml/AccessPoint.qml+2−2
Panel/Indicators/DefaultIndicatorWidget.qml+1−1
@@ -75,7 +75,7 @@ Indicators.IndicatorWidget {
7575 }
7676
7777 label = action.state[Indicators.ActionState.Label];
78− iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource];
78+ iconSource = "image://theme/" + action.state[Indicators.ActionState.IconSource];
7979 enabled = action.state[Indicators.ActionState.Visible];
8080 }
8181}
Panel/Indicators/MessagingIndicatorWidget.qml+1−1
@@ -21,5 +21,5 @@ import QtQuick 2.0
2121
2222DefaultIndicatorWidget {
2323 // default the icon so we have something to show when we don't have the bus.
24− iconSource: "image://gicon/indicator-messages"
24+ iconSource: "image://theme/indicator-messages"
2525}
Panel/Indicators/NetworkIndicatorWidget.qml+6−6
@@ -97,16 +97,16 @@ Indicators.IndicatorWidget {
9797 function get_icon_for_signal(con_state, value) {
9898 if (con_state >= Indicators.NetworkConnection.Activating && con_state <= Indicators.NetworkConnection.Deactivating) {
9999 if (value == 0) {
100− return "image://gicon/nm-signal-00";
100+ return "image://theme/nm-signal-00";
101101 } else if (value <= 25) {
102− return "image://gicon/nm-signal-25";
102+ return "image://theme/nm-signal-25";
103103 } else if (value <= 50) {
104− return "image://gicon/nm-signal-50";
104+ return "image://theme/nm-signal-50";
105105 } else if (value <= 75) {
106− return "image://gicon/nm-signal-75";
106+ return "image://theme/nm-signal-75";
107107 }
108− return "image://gicon/nm-signal-100";
108+ return "image://theme/nm-signal-100";
109109 }
110− return "image://gicon/wifi-none";
110+ return "image://theme/wifi-none";
111111 }
112112}
Panel/Indicators/SoundIndicatorWidget.qml+1−1
@@ -21,6 +21,6 @@ import QtQuick 2.0
2121
2222DefaultIndicatorWidget {
2323 // default the icon so we have something to show when we don't have the bus.
24− iconSource: "image://gicon/audio-volume-high"
24+ iconSource: "image://theme/audio-volume-high"
2525 enabled: true
2626}
debian/control+2−2
@@ -55,7 +55,7 @@ Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
5555Package: indicators-client
5656Architecture: amd64 armhf i386
5757Depends: qmenumodel-qml (>= 0.2.7),
58− qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
58+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+13.10.20130829.1-0ubuntu1),
5959 unity8 (= ${binary:Version}),
6060 ${misc:Depends},
6161 ${shlibs:Depends},
@@ -70,7 +70,7 @@ Depends: gsettings-desktop-schemas,
7070 qmenumodel-qml (>= 0.2.7),
7171 qtdeclarative5-dee-plugin,
7272 qtdeclarative5-gsettings1.0,
73− qtdeclarative5-ubuntu-ui-toolkit-plugin,
73+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+13.10.20130829.1-0ubuntu1),
7474 qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
7575 qtdeclarative5-xmllistmodel-plugin,
7676 unity-launcher-impl-2,
plugins/Unity/Indicators/rootactionstate.cpp+8−8
@@ -148,15 +148,15 @@ static QString iconUri(GIcon *icon)
148148 QString uri;
149149
150150 if (G_IS_THEMED_ICON (icon)) {
151−
152151 const gchar* const* iconNames = g_themed_icon_get_names (G_THEMED_ICON (icon));
153− guint index = 0;
154− while(iconNames[index] != NULL) {
155− if (QIcon::hasThemeIcon(iconNames[index])) {
156− uri = QString("image://theme/%1").arg(iconNames[index]);
157− break;
158− }
159− index++;
152+
153+ QStringList iconNameList;
154+ for (uint index = 0; iconNames[index] != NULL; index++) {
155+ iconNameList << iconNames[index];
156+ }
157+
158+ if (!iconNameList.empty()) {
159+ uri = QString("image://theme/%1").arg(iconNameList.join(","));
160160 }
161161 }
162162 else if (G_IS_FILE_ICON (icon)) {
plugins/Unity/IndicatorsLegacy/Messaging/qml/GroupedMessage.qml+1−1
@@ -44,7 +44,7 @@ Indicators.BasicMenuItem {
4444 height: units.gu(6)
4545 width: units.gu(6)
4646 image: Image {
47− source: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_app.svg"
47+ source: menu && (menu.extra.canonical_icon.length > 0) ? "image://theme/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_app.svg"
4848 fillMode: Image.PreserveAspectFit
4949 }
5050 }
plugins/Unity/IndicatorsLegacy/Messaging/qml/HeroMessage.qml+2−2
@@ -48,8 +48,8 @@ Indicators.BasicMenuItem {
4848 anchors.left: parent.left
4949 anchors.right: parent.right
5050
51− avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_contact.png"
52− icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
51+ avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://theme/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_contact.png"
52+ icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://theme/" + encodeURI(menu.extra.canonical_app_icon) : ""
5353 appIcon: icon
5454
5555 state: heroMessage.state
plugins/Unity/IndicatorsLegacy/Network/qml/AccessPoint.qml+2−2
@@ -47,10 +47,10 @@ Indicators.MenuItem {
4747 imageName += "-secure";
4848 }
4949
50− return "image://gicon/" + imageName;
50+ return "image://theme/" + imageName;
5151 }
5252
53− icon: menu && wifiApStrength ? getNetworkIcon(menu) : "image://gicon/wifi-none"
53+ icon: menu && wifiApStrength ? getNetworkIcon(menu) : "image://theme/wifi-none"
5454 iconFrame: false
5555 control: CheckBox {
5656 id: checkBoxActive