Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: adapt dde-dock icon() function #313

Merged
merged 1 commit into from
Jan 26, 2024
Merged

chore: adapt dde-dock icon() function #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions deepin-system-monitor-plugin/gui/monitor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,14 +445,6 @@ MonitorPlugin::~MonitorPlugin()
}
}

QIcon MonitorPlugin::icon(Dock::IconType iconType, Dock::ThemeType) const
{
QIcon fallbackIcon = QIcon(":/deepin-system-monitor.svg");
QString iconName = DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType ? "status-system-monitor-dark" : "status-system-monitor";

return( (iconType == Dock::IconType_DCC_Settings) ? QIcon::fromTheme(iconName, fallbackIcon) : QIcon());
}

void MonitorPlugin::onClickQuickPanel()
{
qInfo() << __FUNCTION__ << __LINE__ << "[-MonitorPlugin-] ClickQuickPanel";
Expand Down
5 changes: 0 additions & 5 deletions deepin-system-monitor-plugin/gui/monitor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,6 @@ class MonitorPlugin : public QObject, PLUGIN_INTERDACE
//! the flags for the plugin
//!
Dock::PluginFlags flags() const { return Dock::Type_Quick | Dock::Quick_Panel_Single | Dock::Attribute_Normal; }
//!
//! the icon for the plugin
//! themeType {0:UnknownType 1:LightType 2:DarkType}
//!
virtual QIcon icon(Dock::IconType, Dock::ThemeType) const ;
#endif

private slots:
Expand Down
Loading