diff --git a/plugins/multitasking/icons/dcc-multitasking-view.svg b/plugins/multitasking/icons/dcc-multitasking-view.svg new file mode 100644 index 000000000..c228310a5 --- /dev/null +++ b/plugins/multitasking/icons/dcc-multitasking-view.svg @@ -0,0 +1,9 @@ + + + icon/dock-set/task + + + + + + \ No newline at end of file diff --git a/plugins/multitasking/multitaskingplugin.cpp b/plugins/multitasking/multitaskingplugin.cpp index 8a797d5bb..fdfb7e80c 100644 --- a/plugins/multitasking/multitaskingplugin.cpp +++ b/plugins/multitasking/multitaskingplugin.cpp @@ -139,6 +139,14 @@ void MultitaskingPlugin::invokedMenuItem(const QString &itemKey, const QString & } } +QIcon MultitaskingPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType) +{ + if (dockPart == DockPart::DCCSetting) + return QIcon::fromTheme("dcc-multitasking-view",QIcon(":/icons/icons/dcc-multitasking-view.svg")); + + return QIcon(); +} + void MultitaskingPlugin::refreshIcon(const QString &itemKey) { if (itemKey == PLUGIN_KEY) { diff --git a/plugins/multitasking/multitaskingplugin.h b/plugins/multitasking/multitaskingplugin.h index 2142cd3bf..8265a7138 100644 --- a/plugins/multitasking/multitaskingplugin.h +++ b/plugins/multitasking/multitaskingplugin.h @@ -37,6 +37,7 @@ public: void setSortKey(const QString &itemKey, const int order) override; PluginType type() override; PluginFlags flags() const override; + QIcon icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType) override; private: QScopedPointer m_multitaskingWidget; diff --git a/plugins/multitasking/resource.qrc b/plugins/multitasking/resource.qrc index d196c9e6c..a610c1e45 100644 --- a/plugins/multitasking/resource.qrc +++ b/plugins/multitasking/resource.qrc @@ -1,5 +1,6 @@ icons/deepin-multitasking-view.svg + icons/dcc-multitasking-view.svg diff --git a/plugins/show-desktop/icons/dcc-show-desktop.svg b/plugins/show-desktop/icons/dcc-show-desktop.svg new file mode 100644 index 000000000..e10fde82e --- /dev/null +++ b/plugins/show-desktop/icons/dcc-show-desktop.svg @@ -0,0 +1,9 @@ + + + icon/dock-set/desktop + + + + + + \ No newline at end of file diff --git a/plugins/show-desktop/resource.qrc b/plugins/show-desktop/resource.qrc new file mode 100644 index 000000000..c041ff2c2 --- /dev/null +++ b/plugins/show-desktop/resource.qrc @@ -0,0 +1,5 @@ + + + icons/dcc-show-desktop.svg + + diff --git a/plugins/show-desktop/showdesktopplugin.cpp b/plugins/show-desktop/showdesktopplugin.cpp index 3fd682177..b6d56e180 100644 --- a/plugins/show-desktop/showdesktopplugin.cpp +++ b/plugins/show-desktop/showdesktopplugin.cpp @@ -119,6 +119,16 @@ void ShowDesktopPlugin::refreshIcon(const QString &itemKey) } } +QIcon ShowDesktopPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType) +{ + + if (dockPart == DockPart::DCCSetting) { + return QIcon::fromTheme("dcc-show-desktop", QIcon(":/icons/icons/dcc-show-desktop.svg")); + } + + return QIcon(); +} + int ShowDesktopPlugin::itemSortKey(const QString &itemKey) { const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); diff --git a/plugins/show-desktop/showdesktopplugin.h b/plugins/show-desktop/showdesktopplugin.h index 10ae53095..6f942121b 100644 --- a/plugins/show-desktop/showdesktopplugin.h +++ b/plugins/show-desktop/showdesktopplugin.h @@ -36,6 +36,7 @@ public: void setSortKey(const QString &itemKey, const int order) override; PluginType type() override; PluginFlags flags() const override; + QIcon icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType) override; private: QScopedPointer m_showDesktopWidget;