diff --git a/plugins/disk-mount/disk-mount.pro b/plugins/disk-mount/disk-mount.pro index 3a8fd4d61..6a06753f3 100644 --- a/plugins/disk-mount/disk-mount.pro +++ b/plugins/disk-mount/disk-mount.pro @@ -15,14 +15,16 @@ HEADERS += \ dbus/dbusdiskmount.h \ dbus/variant/diskinfo.h \ diskcontrolwidget.h \ - diskpluginitem.h + diskpluginitem.h \ + imageutil.h SOURCES += \ diskmountplugin.cpp \ dbus/dbusdiskmount.cpp \ dbus/variant/diskinfo.cpp \ diskcontrolwidget.cpp \ - diskpluginitem.cpp + diskpluginitem.cpp \ + imageutil.cpp target.path = $${PREFIX}/lib/dde-dock/plugins/ INSTALLS += target diff --git a/plugins/disk-mount/diskpluginitem.cpp b/plugins/disk-mount/diskpluginitem.cpp index e5c47ceec..3691656d4 100644 --- a/plugins/disk-mount/diskpluginitem.cpp +++ b/plugins/disk-mount/diskpluginitem.cpp @@ -1,4 +1,5 @@ #include "diskpluginitem.h" +#include "imageutil.h" #include #include @@ -39,9 +40,9 @@ QSize DiskPluginItem::sizeHint() const void DiskPluginItem::updateIcon() { if (m_displayMode == Dock::Efficient) - m_icon = QPixmap(":/icons/resources/icon_small.png"); + m_icon = ImageUtil::loadSvg(":/icons/resources/icon-small.svg", 16); else - m_icon = QPixmap(":/icons/resources/icon.png"); + m_icon = ImageUtil::loadSvg(":/icons/resources/icon.svg", std::min(width(), height()) * 0.8); update(); } diff --git a/plugins/disk-mount/imageutil.cpp b/plugins/disk-mount/imageutil.cpp new file mode 100644 index 000000000..2868b6bb7 --- /dev/null +++ b/plugins/disk-mount/imageutil.cpp @@ -0,0 +1,17 @@ +#include "imageutil.h" + +#include + +const QPixmap ImageUtil::loadSvg(const QString &path, const int size) +{ + QPixmap pixmap(size, size); + QSvgRenderer renderer(path); + pixmap.fill(Qt::transparent); + + QPainter painter; + painter.begin(&pixmap); + renderer.render(&painter); + painter.end(); + + return pixmap; +} diff --git a/plugins/disk-mount/imageutil.h b/plugins/disk-mount/imageutil.h new file mode 100644 index 000000000..263da68d3 --- /dev/null +++ b/plugins/disk-mount/imageutil.h @@ -0,0 +1,13 @@ +#ifndef IMAGEUTIL_H +#define IMAGEUTIL_H + +#include +#include + +class ImageUtil +{ +public: + static const QPixmap loadSvg(const QString &path, const int size); +}; + +#endif // IMAGEUTIL_H diff --git a/plugins/disk-mount/resources.qrc b/plugins/disk-mount/resources.qrc index 154936bc0..835a0a9be 100644 --- a/plugins/disk-mount/resources.qrc +++ b/plugins/disk-mount/resources.qrc @@ -1,6 +1,6 @@ - resources/icon_small.png - resources/icon.png + resources/icon-small.svg + resources/icon.svg diff --git a/plugins/disk-mount/resources/camera-photo.png b/plugins/disk-mount/resources/camera-photo.png deleted file mode 100644 index d1cb131a6..000000000 Binary files a/plugins/disk-mount/resources/camera-photo.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-harddisk-ieee1394.png b/plugins/disk-mount/resources/drive-harddisk-ieee1394.png deleted file mode 100644 index 15925b439..000000000 Binary files a/plugins/disk-mount/resources/drive-harddisk-ieee1394.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-harddisk-scsi.png b/plugins/disk-mount/resources/drive-harddisk-scsi.png deleted file mode 100644 index c274a417f..000000000 Binary files a/plugins/disk-mount/resources/drive-harddisk-scsi.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-harddisk-system.png b/plugins/disk-mount/resources/drive-harddisk-system.png deleted file mode 100644 index 607d5f7b3..000000000 Binary files a/plugins/disk-mount/resources/drive-harddisk-system.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-harddisk-usb.png b/plugins/disk-mount/resources/drive-harddisk-usb.png deleted file mode 100644 index c205dc169..000000000 Binary files a/plugins/disk-mount/resources/drive-harddisk-usb.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-harddisk.png b/plugins/disk-mount/resources/drive-harddisk.png deleted file mode 100644 index 3c669d935..000000000 Binary files a/plugins/disk-mount/resources/drive-harddisk.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-optical.png b/plugins/disk-mount/resources/drive-optical.png deleted file mode 100644 index 60fc7b134..000000000 Binary files a/plugins/disk-mount/resources/drive-optical.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-removable-media-ieee1394.png b/plugins/disk-mount/resources/drive-removable-media-ieee1394.png deleted file mode 100644 index 3fa90d2e8..000000000 Binary files a/plugins/disk-mount/resources/drive-removable-media-ieee1394.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-removable-media-mtp.png b/plugins/disk-mount/resources/drive-removable-media-mtp.png deleted file mode 100644 index 5fb7aa324..000000000 Binary files a/plugins/disk-mount/resources/drive-removable-media-mtp.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-removable-media-scsi.png b/plugins/disk-mount/resources/drive-removable-media-scsi.png deleted file mode 100644 index 6506982b4..000000000 Binary files a/plugins/disk-mount/resources/drive-removable-media-scsi.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-removable-media-usb.png b/plugins/disk-mount/resources/drive-removable-media-usb.png deleted file mode 100644 index a94015745..000000000 Binary files a/plugins/disk-mount/resources/drive-removable-media-usb.png and /dev/null differ diff --git a/plugins/disk-mount/resources/drive-removable-media.png b/plugins/disk-mount/resources/drive-removable-media.png deleted file mode 100644 index 4162721c5..000000000 Binary files a/plugins/disk-mount/resources/drive-removable-media.png and /dev/null differ diff --git a/plugins/disk-mount/resources/folder-remote.png b/plugins/disk-mount/resources/folder-remote.png deleted file mode 100644 index c754f0c51..000000000 Binary files a/plugins/disk-mount/resources/folder-remote.png and /dev/null differ diff --git a/plugins/disk-mount/resources/icon-small.svg b/plugins/disk-mount/resources/icon-small.svg new file mode 100644 index 000000000..549ca8a0e --- /dev/null +++ b/plugins/disk-mount/resources/icon-small.svg @@ -0,0 +1,13 @@ + + + + drive_harddisk_usb_symbolic_active_16px + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/plugins/disk-mount/resources/icon.png b/plugins/disk-mount/resources/icon.png deleted file mode 100644 index e30300e45..000000000 Binary files a/plugins/disk-mount/resources/icon.png and /dev/null differ diff --git a/plugins/disk-mount/resources/icon.svg b/plugins/disk-mount/resources/icon.svg new file mode 100644 index 000000000..952b644bf --- /dev/null +++ b/plugins/disk-mount/resources/icon.svg @@ -0,0 +1,28 @@ + + + + 磁盘挂载-48px + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/disk-mount/resources/icon_small.png b/plugins/disk-mount/resources/icon_small.png deleted file mode 100644 index a537ee416..000000000 Binary files a/plugins/disk-mount/resources/icon_small.png and /dev/null differ diff --git a/plugins/disk-mount/resources/input-tablet.png b/plugins/disk-mount/resources/input-tablet.png deleted file mode 100644 index 952a042ba..000000000 Binary files a/plugins/disk-mount/resources/input-tablet.png and /dev/null differ diff --git a/plugins/disk-mount/resources/media-optical.png b/plugins/disk-mount/resources/media-optical.png deleted file mode 100644 index 49d13a4d8..000000000 Binary files a/plugins/disk-mount/resources/media-optical.png and /dev/null differ diff --git a/plugins/disk-mount/resources/phone-apple-iphone.png b/plugins/disk-mount/resources/phone-apple-iphone.png deleted file mode 100644 index 021602849..000000000 Binary files a/plugins/disk-mount/resources/phone-apple-iphone.png and /dev/null differ diff --git a/plugins/disk-mount/resources/unmount_button_hover.png b/plugins/disk-mount/resources/unmount_button_hover.png deleted file mode 100644 index 3ae955ee5..000000000 Binary files a/plugins/disk-mount/resources/unmount_button_hover.png and /dev/null differ diff --git a/plugins/disk-mount/resources/unmount_button_hover_fail.png b/plugins/disk-mount/resources/unmount_button_hover_fail.png deleted file mode 100644 index 5b146cd01..000000000 Binary files a/plugins/disk-mount/resources/unmount_button_hover_fail.png and /dev/null differ diff --git a/plugins/disk-mount/resources/unmount_button_normal.png b/plugins/disk-mount/resources/unmount_button_normal.png deleted file mode 100644 index 478109ce4..000000000 Binary files a/plugins/disk-mount/resources/unmount_button_normal.png and /dev/null differ diff --git a/plugins/disk-mount/resources/unmount_button_normal_fail.png b/plugins/disk-mount/resources/unmount_button_normal_fail.png deleted file mode 100644 index e5cecfe9a..000000000 Binary files a/plugins/disk-mount/resources/unmount_button_normal_fail.png and /dev/null differ diff --git a/plugins/disk-mount/resources/unmount_button_press.png b/plugins/disk-mount/resources/unmount_button_press.png deleted file mode 100644 index 0feea3043..000000000 Binary files a/plugins/disk-mount/resources/unmount_button_press.png and /dev/null differ diff --git a/plugins/disk-mount/resources/unmount_button_press_fail.png b/plugins/disk-mount/resources/unmount_button_press_fail.png deleted file mode 100644 index 6fe985c7c..000000000 Binary files a/plugins/disk-mount/resources/unmount_button_press_fail.png and /dev/null differ diff --git a/plugins/disk-mount/resources/usb_disk.png b/plugins/disk-mount/resources/usb_disk.png deleted file mode 100644 index c28b73732..000000000 Binary files a/plugins/disk-mount/resources/usb_disk.png and /dev/null differ