diff --git a/src/external/dde-dock-plugins/disk-mount/diskmountplugin.cpp b/src/external/dde-dock-plugins/disk-mount/diskmountplugin.cpp index 3f34dc3ca6..023601fdb6 100644 --- a/src/external/dde-dock-plugins/disk-mount/diskmountplugin.cpp +++ b/src/external/dde-dock-plugins/disk-mount/diskmountplugin.cpp @@ -32,7 +32,7 @@ DiskMountPlugin::DiskMountPlugin(QObject *parent) diskPluginItem(new DiskPluginItem) { loadTranslator(); - diskPluginItem->setVisible(false); + diskPluginItem->setVisible(true); tipsLabel->setObjectName("diskmount"); tipsLabel->setVisible(false); tipsLabel->setText(tr("Disk")); @@ -180,19 +180,3 @@ std::once_flag &DiskMountPlugin::onceFlag() static std::once_flag flag; return flag; } - -#ifdef COMPILE_ON_V23 -QIcon DiskMountPlugin::icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType) -{ - if (dockPart == DockPart::SystemPanel) { - diskPluginItem->updateIcon(); - return diskPluginItem->getIcon(); - } - return QIcon(); -} - -PluginFlags DiskMountPlugin::flags() const -{ - return PluginFlag::Type_Tray | PluginFlag::Attribute_CanDrag | PluginFlag::Attribute_CanInsert; -} -#endif diff --git a/src/external/dde-dock-plugins/disk-mount/diskmountplugin.h b/src/external/dde-dock-plugins/disk-mount/diskmountplugin.h index 7d07c509b9..efae267aff 100644 --- a/src/external/dde-dock-plugins/disk-mount/diskmountplugin.h +++ b/src/external/dde-dock-plugins/disk-mount/diskmountplugin.h @@ -9,10 +9,8 @@ // `DOCK_API_VERSION` added after v2.0.0 #ifdef DOCK_API_VERSION -# ifdef COMPILE_ON_V20 -# if (DOCK_API_VERSION >= DOCK_API_VERSION_CHECK(2, 0, 0)) -# define USE_DOCK_NEW_INTERFACE -# endif +# if (DOCK_API_VERSION >= DOCK_API_VERSION_CHECK(2, 0, 0)) +# define USE_DOCK_NEW_INTERFACE # endif #endif @@ -64,11 +62,6 @@ class DiskMountPlugin : public QObject, PluginsItemInterface void setSortKey(const QString &itemKey, const int order) override; void refreshIcon(const QString &itemKey) override; -#ifdef COMPILE_ON_V23 - QIcon icon(const DockPart &dockPart, DGuiApplicationHelper::ColorType themeType = DGuiApplicationHelper::instance()->themeType()) override; - PluginFlags flags() const override; -#endif - public slots: void setDockEntryVisible(bool visible); diff --git a/src/external/dde-dock-plugins/disk-mount/widgets/diskpluginitem.cpp b/src/external/dde-dock-plugins/disk-mount/widgets/diskpluginitem.cpp index cd7e432a6d..baa2458431 100644 --- a/src/external/dde-dock-plugins/disk-mount/widgets/diskpluginitem.cpp +++ b/src/external/dde-dock-plugins/disk-mount/widgets/diskpluginitem.cpp @@ -43,7 +43,7 @@ void DiskPluginItem::updateIcon() { QString &&iconName = "drive-removable-dock-symbolic"; -#if defined(COMPILE_ON_V23) || defined(USE_DOCK_NEW_INTERFACE) +#if defined(USE_DOCK_NEW_INTERFACE) if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) iconName.append(PLUGIN_MIN_ICON_NAME); #else