X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2cd3d58eec5695899c26ca66a631fb79867b6584..e018ecafca79a73f1e9d76c577b9529fc3a7ae03:/src/statusbar/statusbarspaceinfo.cpp diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 546c217a7..4fb1f311e 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -6,22 +6,39 @@ #include "statusbarspaceinfo.h" +#include "config-dolphin.h" +#include "diskspaceusagemenu.h" #include "spaceinfoobserver.h" -#include +#include #include #include -#include -#include -#include -#include +#include +#include StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget *parent) - : KCapacityBar(KCapacityBar::DrawTextInline, parent) + : QWidget(parent) , m_observer(nullptr) + , m_hasSpaceInfo{false} + , m_shown{false} { - setCursor(Qt::PointingHandCursor); + hide(); // Only become visible when we have space info to show. @see StatusBarSpaceInfo::setShown(). + + m_capacityBar = new KCapacityBar(KCapacityBar::DrawTextInline, this); + m_textInfoButton = new QToolButton(this); + m_textInfoButton->setAutoRaise(true); + m_textInfoButton->setPopupMode(QToolButton::InstantPopup); + auto menu = new DiskSpaceUsageMenu{this}; + connect(menu, &DiskSpaceUsageMenu::showMessage, this, &StatusBarSpaceInfo::showMessage); + connect(menu, &DiskSpaceUsageMenu::showInstallationProgress, this, &StatusBarSpaceInfo::showInstallationProgress); + m_textInfoButton->setMenu(menu); + + auto layout = new QHBoxLayout(this); + // We reduce the outside margin of the flat button so it visually has the same margin as the status bar text label on the other end of the bar. + layout->setContentsMargins(2, -1, 0, -1); // "-1" makes it so the fixed height won't be ignored. + layout->addWidget(m_capacityBar); + layout->addWidget(m_textInfoButton); } StatusBarSpaceInfo::~StatusBarSpaceInfo() @@ -33,7 +50,17 @@ void StatusBarSpaceInfo::setShown(bool shown) m_shown = shown; if (!m_shown) { hide(); - m_ready = false; + return; + } + + // We only show() this widget in slotValueChanged() when it m_hasSpaceInfo. + if (m_observer.isNull()) { + m_observer.reset(new SpaceInfoObserver(m_url, this)); + connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged); + } + + if (m_hasSpaceInfo) { + slotValuesChanged(); } } @@ -41,7 +68,8 @@ void StatusBarSpaceInfo::setUrl(const QUrl &url) { if (m_url != url) { m_url = url; - m_ready = false; + static_cast(m_textInfoButton->menu())->setUrl(url); + m_hasSpaceInfo = false; if (m_observer) { m_observer.reset(new SpaceInfoObserver(m_url, this)); connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged); @@ -63,90 +91,25 @@ void StatusBarSpaceInfo::update() void StatusBarSpaceInfo::showEvent(QShowEvent *event) { - if (m_shown) { - if (m_ready) { - KCapacityBar::showEvent(event); - } - - if (m_observer.isNull()) { - m_observer.reset(new SpaceInfoObserver(m_url, this)); - connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged); - } + if (m_shown && m_observer.isNull()) { + m_observer.reset(new SpaceInfoObserver(m_url, this)); + connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged); } + QWidget::showEvent(event); } void StatusBarSpaceInfo::hideEvent(QHideEvent *event) { - if (m_ready) { + if (m_hasSpaceInfo) { m_observer.reset(); - m_ready = false; + m_hasSpaceInfo = false; } - KCapacityBar::hideEvent(event); + QWidget::hideEvent(event); } -void StatusBarSpaceInfo::mousePressEvent(QMouseEvent *event) +QSize StatusBarSpaceInfo::minimumSizeHint() const { - if (event->button() == Qt::LeftButton) { - // Creates a menu with tools that help to find out more about free - // disk space for the given url. - - const KService::Ptr filelight = KService::serviceByDesktopName(QStringLiteral("org.kde.filelight")); - const KService::Ptr kdiskfree = KService::serviceByDesktopName(QStringLiteral("org.kde.kdf")); - - if (!filelight && !kdiskfree) { - // nothing to show - return; - } - - QMenu *menu = new QMenu(this); - - if (filelight) { - QAction *filelightFolderAction = menu->addAction(QIcon::fromTheme(QStringLiteral("filelight")), i18n("Disk Usage Statistics - current folder")); - - menu->connect(filelightFolderAction, &QAction::triggered, menu, [this, filelight](bool) { - auto *job = new KIO::ApplicationLauncherJob(filelight); - job->setUrls({m_url}); - job->start(); - }); - - // For remote URLs like FTP analyzing the device makes no sense - if (m_url.isLocalFile()) { - QAction *filelightDiskAction = menu->addAction(QIcon::fromTheme(QStringLiteral("filelight")), i18n("Disk Usage Statistics - current device")); - - menu->connect(filelightDiskAction, &QAction::triggered, menu, [this, filelight](bool) { - const QStorageInfo info(m_url.toLocalFile()); - - if (info.isValid() && info.isReady()) { - auto *job = new KIO::ApplicationLauncherJob(filelight); - job->setUrls({QUrl::fromLocalFile(info.rootPath())}); - job->start(); - } - }); - } - - QAction *filelightAllAction = menu->addAction(QIcon::fromTheme(QStringLiteral("filelight")), i18n("Disk Usage Statistics - all devices")); - - menu->connect(filelightAllAction, &QAction::triggered, menu, [this, filelight](bool) { - const QStorageInfo info(m_url.toLocalFile()); - - if (info.isValid() && info.isReady()) { - auto *job = new KIO::ApplicationLauncherJob(filelight); - job->start(); - } - }); - } - - if (kdiskfree) { - QAction *kdiskfreeAction = menu->addAction(QIcon::fromTheme(QStringLiteral("kdf")), i18n("KDiskFree")); - - connect(kdiskfreeAction, &QAction::triggered, this, [kdiskfree] { - auto *job = new KIO::ApplicationLauncherJob(kdiskfree); - job->start(); - }); - } - - menu->exec(QCursor::pos()); - } + return QSize(); } void StatusBarSpaceInfo::slotValuesChanged() @@ -159,16 +122,21 @@ void StatusBarSpaceInfo::slotValuesChanged() return; } - m_ready = true; + m_hasSpaceInfo = true; const quint64 available = m_observer->available(); const quint64 used = size - available; const int percentUsed = qRound(100.0 * qreal(used) / qreal(size)); - setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(available))); + m_textInfoButton->setText(i18nc("@info:status Free disk space", "%1 free", KIO::convertSize(available))); setToolTip(i18nc("tooltip:status Free disk space", "%1 free out of %2 (%3% used)", KIO::convertSize(available), KIO::convertSize(size), percentUsed)); + m_textInfoButton->setToolTip(i18nc("@info:tooltip for the free disk space button", + "%1 free out of %2 (%3% used)\nPress to manage disk space usage.", + KIO::convertSize(available), + KIO::convertSize(size), + percentUsed)); setUpdatesEnabled(false); - setValue(percentUsed); + m_capacityBar->setValue(percentUsed); setUpdatesEnabled(true); if (!isVisible()) {