change icon name

Change-Id: I4a2cad57b7ec9f4a6e5e30024c8e95231904775d
Verified+1: Anonymous Coward #1000004 Code-Review+2: 石博文 <sbw@sbw.so> Submitted-by: 石博文 <sbw@sbw.so> Submitted-at: Wed, 29 Nov 2017 10:37:32 +0800 Reviewed-on: https://cr.deepin.io/28991 Project: dde/dde-dock Branch: refs/heads/master
2025-06-04 17:33:05 +00:00 · 2017-11-29 10:10:47 +08:00 · 2017-11-29 10:10:47 +08:00 · 74348228d9 · 2017-11-29 10:37:32 +08:00
commit 74348228d9
parent 8414376269
10 changed files with 13 additions and 11 deletions
--- a/plugins/network/item/wirelessitem.cpp
+++ b/plugins/network/item/wirelessitem.cpp
@ -167,9 +167,11 @@ const QPixmap WirelessItem::iconPix(const Dock::DisplayMode displayMode, const i
        }

        if (strength == 100)
-            type = "8";
+            type = "80";
+        else if (strength == 0)
+            type = "0";
        else
-            type = QString::number(strength / 10 & ~0x1);
+            type = QString::number(strength / 10 & ~0x1) + "0";
    }

    const QString key = QString("wireless-%1%2")
@ -187,7 +189,7 @@ const QPixmap WirelessItem::backgroundPix(const int size)
 const QPixmap WirelessItem::cachedPix(const QString &key, const int size)
 {
    if (!m_icons.contains(key))
-        m_icons.insert(key, QIcon::fromTheme(key + ".svg",
+        m_icons.insert(key, QIcon::fromTheme(key,
                                             QIcon(":/wireless/resources/wireless/" + key + ".svg")).pixmap(size));

    return m_icons.value(key);
--- a/plugins/network/resources.qrc
+++ b/plugins/network/resources.qrc
@ -14,17 +14,17 @@
    </qresource>
    <qresource prefix="/wireless">
        <file>resources/wireless/wireless-0.svg</file>
-        <file>resources/wireless/wireless-2.svg</file>
-        <file>resources/wireless/wireless-4.svg</file>
-        <file>resources/wireless/wireless-6.svg</file>
-        <file>resources/wireless/wireless-8.svg</file>
+        <file>resources/wireless/wireless-20.svg</file>
+        <file>resources/wireless/wireless-40.svg</file>
+        <file>resources/wireless/wireless-60.svg</file>
+        <file>resources/wireless/wireless-80.svg</file>
        <file>resources/wireless/wireless-background.svg</file>
        <file>resources/wireless/wireless-disconnect.svg</file>
        <file>resources/wireless/wireless-0-symbolic.svg</file>
-        <file>resources/wireless/wireless-2-symbolic.svg</file>
-        <file>resources/wireless/wireless-4-symbolic.svg</file>
-        <file>resources/wireless/wireless-6-symbolic.svg</file>
-        <file>resources/wireless/wireless-8-symbolic.svg</file>
+        <file>resources/wireless/wireless-20-symbolic.svg</file>
+        <file>resources/wireless/wireless-40-symbolic.svg</file>
+        <file>resources/wireless/wireless-60-symbolic.svg</file>
+        <file>resources/wireless/wireless-80-symbolic.svg</file>
        <file>resources/wireless/wireless-disconnect-symbolic.svg</file>
        <file>resources/wireless/security.svg</file>
        <file>resources/wireless/refresh_press.svg</file>
--- a/plugins/network/resources/wireless/wireless-20-symbolic.svg
+++ b/plugins/network/resources/wireless/wireless-20-symbolic.svg
--- a/plugins/network/resources/wireless/wireless-20.svg
+++ b/plugins/network/resources/wireless/wireless-20.svg
--- a/plugins/network/resources/wireless/wireless-40-symbolic.svg
+++ b/plugins/network/resources/wireless/wireless-40-symbolic.svg
--- a/plugins/network/resources/wireless/wireless-40.svg
+++ b/plugins/network/resources/wireless/wireless-40.svg
--- a/plugins/network/resources/wireless/wireless-60-symbolic.svg
+++ b/plugins/network/resources/wireless/wireless-60-symbolic.svg
--- a/plugins/network/resources/wireless/wireless-60.svg
+++ b/plugins/network/resources/wireless/wireless-60.svg
--- a/plugins/network/resources/wireless/wireless-80-symbolic.svg
+++ b/plugins/network/resources/wireless/wireless-80-symbolic.svg
--- a/plugins/network/resources/wireless/wireless-80.svg
+++ b/plugins/network/resources/wireless/wireless-80.svg