From d2a116dae2c651e230902c725e5ec11f4163a213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= Date: Tue, 9 Aug 2016 11:04:31 +0800 Subject: [PATCH] add unknown volume tips Change-Id: Idfb02c1c60a802c69092731d66a86c6492816950 --- plugins/disk-mount/diskcontrolitem.cpp | 6 ++-- plugins/disk-mount/resources.qrc | 2 +- plugins/disk-mount/resources/unknow.svg | 28 ----------------- plugins/disk-mount/resources/unknown.svg | 40 ++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 31 deletions(-) delete mode 100644 plugins/disk-mount/resources/unknow.svg create mode 100644 plugins/disk-mount/resources/unknown.svg diff --git a/plugins/disk-mount/diskcontrolitem.cpp b/plugins/disk-mount/diskcontrolitem.cpp index 95d04c0e9..32352cadd 100644 --- a/plugins/disk-mount/diskcontrolitem.cpp +++ b/plugins/disk-mount/diskcontrolitem.cpp @@ -8,7 +8,7 @@ DWIDGET_USE_NAMESPACE DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent) : QWidget(parent), - m_unknowIcon(":/icons/resources/unknow.svg"), + m_unknowIcon(":/icons/resources/unknown.svg"), m_diskIcon(new QLabel), m_diskName(new QLabel), @@ -79,8 +79,10 @@ void DiskControlItem::updateInfo(const DiskInfo &info) m_diskName->setText(tr("Unknown device")); if (info.m_totalSize) m_diskCapacity->setText(QString("%1/%2").arg(formatDiskSize(info.m_usedSize)).arg(formatDiskSize(info.m_totalSize))); - else + else if (info.m_name.isEmpty()) m_diskCapacity->clear(); + else + m_diskCapacity->setText(tr("Unknown volume")); m_capacityValueBar->setMinimum(0); m_capacityValueBar->setMaximum(std::max(1ull, info.m_totalSize)); m_capacityValueBar->setValue(info.m_usedSize); diff --git a/plugins/disk-mount/resources.qrc b/plugins/disk-mount/resources.qrc index c7905b653..f36bff8c2 100644 --- a/plugins/disk-mount/resources.qrc +++ b/plugins/disk-mount/resources.qrc @@ -5,6 +5,6 @@ resources/unmount-press.png resources/unmount-normal.png resources/unmount-hover.png - resources/unknow.svg + resources/unknown.svg diff --git a/plugins/disk-mount/resources/unknow.svg b/plugins/disk-mount/resources/unknow.svg deleted file mode 100644 index 952b644bf..000000000 --- a/plugins/disk-mount/resources/unknow.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - 磁盘挂载-48px - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/disk-mount/resources/unknown.svg b/plugins/disk-mount/resources/unknown.svg new file mode 100644 index 000000000..8156620ab --- /dev/null +++ b/plugins/disk-mount/resources/unknown.svg @@ -0,0 +1,40 @@ + + + + drive-unknown + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file