diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index a7585bed0..6cd76bb60 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -1,338 +1,340 @@ /*************************************************************************** * Copyright (C) 2006-2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "dolphinstatusbar.h" #include "dolphin_generalsettings.h" #include "statusbarspaceinfo.h" #include "views/dolphinview.h" #include "views/zoomlevelinfo.h" #include #include #include #include #include #include #include #include #include #include #include #include namespace { const int UpdateDelay = 50; } DolphinStatusBar::DolphinStatusBar(QWidget* parent) : QWidget(parent), m_text(), m_defaultText(), m_label(nullptr), m_spaceInfo(nullptr), m_zoomSlider(nullptr), m_progressBar(nullptr), m_stopButton(nullptr), m_progress(100), m_showProgressBarTimer(nullptr), m_delayUpdateTimer(nullptr), m_textTimestamp() { // Initialize text label m_label = new KSqueezedTextLabel(m_text, this); m_label->setWordWrap(true); m_label->setTextFormat(Qt::PlainText); // Initialize zoom widget m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setAccessibleName(i18n("Zoom")); m_zoomSlider->setAccessibleDescription(i18nc("Description for zoom-slider (accessibility)", "Sets the size of the file icons.")); m_zoomSlider->setPageStep(1); m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel()); connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::zoomLevelChanged); connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::updateZoomSliderToolTip); connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip); // Initialize space information m_spaceInfo = new StatusBarSpaceInfo(this); // Initialize progress information m_stopButton = new QToolButton(this); m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop"))); m_stopButton->setAccessibleName(i18n("Stop")); m_stopButton->setAutoRaise(true); m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading")); m_stopButton->hide(); connect(m_stopButton, &QToolButton::clicked, this, &DolphinStatusBar::stopPressed); m_progressTextLabel = new QLabel(this); m_progressTextLabel->hide(); m_progressBar = new QProgressBar(this); m_progressBar->hide(); m_showProgressBarTimer = new QTimer(this); m_showProgressBarTimer->setInterval(500); m_showProgressBarTimer->setSingleShot(true); connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo); // initialize text updater delay timer m_delayUpdateTimer = new QTimer(this); m_delayUpdateTimer->setInterval(UpdateDelay); m_delayUpdateTimer->setSingleShot(true); connect(m_delayUpdateTimer, &QTimer::timeout, this, &DolphinStatusBar::updateLabelText); // Initialize top layout and size policies const int fontHeight = QFontMetrics(m_label->font()).height(); const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height(); const int buttonHeight = m_stopButton->height(); const int contentHeight = qMax(qMax(fontHeight, zoomSliderHeight), buttonHeight); QFontMetrics fontMetrics(m_label->font()); m_label->setFixedHeight(contentHeight); m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25); m_spaceInfo->setFixedHeight(contentHeight); m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25); m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); m_progressBar->setFixedHeight(zoomSliderHeight); m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25); QHBoxLayout* topLayout = new QHBoxLayout(this); topLayout->setContentsMargins(2, 0, 2, 0); topLayout->setSpacing(4); topLayout->addWidget(m_label, 1); topLayout->addWidget(m_zoomSlider, 1); topLayout->addWidget(m_spaceInfo, 1); topLayout->addWidget(m_stopButton); topLayout->addWidget(m_progressTextLabel); topLayout->addWidget(m_progressBar); setExtensionsVisible(true); setWhatsThis(xi18nc("@info:whatsthis Statusbar", "This is " "the Statusbar. It contains three elements " "by default (left to right):A text field" " that displays the size of selected items. If only " "one item is selected the name and type is shown as well." "A zoom slider that allows you " "to adjust the size of the icons in the view." "Space information about the " "current storage device.")); } DolphinStatusBar::~DolphinStatusBar() { } void DolphinStatusBar::setText(const QString& text) { if (m_text == text) { return; } m_textTimestamp = QTime::currentTime(); m_text = text; // will update status bar text in 50ms m_delayUpdateTimer->start(); } QString DolphinStatusBar::text() const { return m_text; } void DolphinStatusBar::setProgressText(const QString& text) { m_progressTextLabel->setText(text); } QString DolphinStatusBar::progressText() const { return m_progressTextLabel->text(); } void DolphinStatusBar::setProgress(int percent) { // Show a busy indicator if a value < 0 is provided: m_progressBar->setMaximum((percent < 0) ? 0 : 100); percent = qBound(0, percent, 100); const bool progressRestarted = (percent < 100) && (percent < m_progress); m_progress = percent; if (progressRestarted && !m_progressBar->isVisible()) { // Show the progress bar delayed: In the case if 100 % are reached within // a short time, no progress bar will be shown at all. m_showProgressBarTimer->start(); } m_progressBar->setValue(m_progress); if (percent == 100) { // The end of the progress has been reached. Assure that the progress bar // gets hidden and the extensions widgets get visible again. m_showProgressBarTimer->stop(); updateProgressInfo(); } } int DolphinStatusBar::progress() const { return m_progress; } void DolphinStatusBar::resetToDefaultText() { m_text.clear(); QTime currentTime; if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) { m_delayUpdateTimer->start(); } else { updateLabelText(); } } void DolphinStatusBar::setDefaultText(const QString& text) { m_defaultText = text; updateLabelText(); } QString DolphinStatusBar::defaultText() const { return m_defaultText; } void DolphinStatusBar::setUrl(const QUrl& url) { - m_spaceInfo->setUrl(url); + if (GeneralSettings::showSpaceInfo()) { + m_spaceInfo->setUrl(url); + } } QUrl DolphinStatusBar::url() const { return m_spaceInfo->url(); } void DolphinStatusBar::setZoomLevel(int zoomLevel) { if (zoomLevel != m_zoomSlider->value()) { m_zoomSlider->setValue(zoomLevel); } } int DolphinStatusBar::zoomLevel() const { return m_zoomSlider->value(); } void DolphinStatusBar::readSettings() { setExtensionsVisible(true); } void DolphinStatusBar::updateSpaceInfo() { m_spaceInfo->update(); } void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) { Q_UNUSED(event) QMenu menu(this); QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); showSpaceInfoAction->setCheckable(true); showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); const QAction* action = menu.exec(QCursor::pos()); if (action == showZoomSliderAction) { const bool visible = showZoomSliderAction->isChecked(); GeneralSettings::setShowZoomSlider(visible); m_zoomSlider->setVisible(visible); } else if (action == showSpaceInfoAction) { const bool visible = showSpaceInfoAction->isChecked(); GeneralSettings::setShowSpaceInfo(visible); m_spaceInfo->setVisible(visible); } } void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) { updateZoomSliderToolTip(zoomLevel); QPoint global = m_zoomSlider->rect().topLeft(); global.ry() += m_zoomSlider->height() / 2; QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global)); QApplication::sendEvent(m_zoomSlider, &toolTipEvent); } void DolphinStatusBar::updateProgressInfo() { if (m_progress < 100) { // Show the progress information and hide the extensions m_stopButton->show(); m_progressTextLabel->show(); m_progressBar->show(); setExtensionsVisible(false); } else { // Hide the progress information and show the extensions m_stopButton->hide(); m_progressTextLabel->hide(); m_progressBar->hide(); setExtensionsVisible(true); } } void DolphinStatusBar::updateLabelText() { const QString text = m_text.isEmpty() ? m_defaultText : m_text; m_label->setText(text); } void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) { const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); } void DolphinStatusBar::setExtensionsVisible(bool visible) { bool showSpaceInfo = visible; bool showZoomSlider = visible; if (visible) { showSpaceInfo = GeneralSettings::showSpaceInfo(); showZoomSlider = GeneralSettings::showZoomSlider(); } - m_spaceInfo->setVisible(showSpaceInfo); + m_spaceInfo->setShown(showSpaceInfo); m_zoomSlider->setVisible(showZoomSlider); } diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp index 692eba7e7..0d8f5f2fe 100644 --- a/src/statusbar/spaceinfoobserver.cpp +++ b/src/statusbar/spaceinfoobserver.cpp @@ -1,90 +1,92 @@ /*************************************************************************** * Copyright (C) 2014 by Frank Reininghaus * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "spaceinfoobserver.h" #include "mountpointobserver.h" SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) : QObject(parent), m_mountPointObserver(nullptr), + m_hasData(false), m_dataSize(0), m_dataAvailable(0) { m_mountPointObserver = MountPointObserver::observerForUrl(url); m_mountPointObserver->ref(); connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged); m_mountPointObserver->update(); } SpaceInfoObserver::~SpaceInfoObserver() { if (m_mountPointObserver) { m_mountPointObserver->deref(); m_mountPointObserver = nullptr; } } quint64 SpaceInfoObserver::size() const { return m_dataSize; } quint64 SpaceInfoObserver::available() const { return m_dataAvailable; } void SpaceInfoObserver::setUrl(const QUrl& url) { MountPointObserver* newObserver = MountPointObserver::observerForUrl(url); if (newObserver != m_mountPointObserver) { if (m_mountPointObserver) { disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged); m_mountPointObserver->deref(); m_mountPointObserver = nullptr; } m_mountPointObserver = newObserver; m_mountPointObserver->ref(); connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged); // If newObserver is cached it won't call update until the next timer update, // so update the observer now. m_mountPointObserver->update(); } } void SpaceInfoObserver::update() { if (m_mountPointObserver) { m_mountPointObserver->update(); } } void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available) { // Make sure that the size has actually changed - if (m_dataSize != size || m_dataAvailable != available) { + if (m_dataSize != size || m_dataAvailable != available || !m_hasData) { + m_hasData = true; m_dataSize = size; m_dataAvailable = available; emit valuesChanged(); } } diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h index 93f4c8c91..67dbf15ec 100644 --- a/src/statusbar/spaceinfoobserver.h +++ b/src/statusbar/spaceinfoobserver.h @@ -1,62 +1,63 @@ /*************************************************************************** * Copyright (C) 2014 by Frank Reininghaus * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef SPACEINFOOBSERVER_H #define SPACEINFOOBSERVER_H #include #include class QUrl; class MountPointObserver; class SpaceInfoObserver : public QObject { Q_OBJECT public: explicit SpaceInfoObserver(const QUrl& url, QObject* parent = nullptr); ~SpaceInfoObserver() override; quint64 size() const; quint64 available() const; void setUrl(const QUrl& url); public slots: void update(); signals: /** * This signal is emitted when the size or available space changes. */ void valuesChanged(); private slots: void spaceInfoChanged(quint64 size, quint64 available); private: MountPointObserver* m_mountPointObserver; + bool m_hasData; quint64 m_dataSize; quint64 m_dataAvailable; }; #endif diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 3ac87925f..acffcf69d 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -1,114 +1,141 @@ /*************************************************************************** * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) and * * and Patrice Tremblay * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "statusbarspaceinfo.h" #include "spaceinfoobserver.h" #include #include #include StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) : KCapacityBar(KCapacityBar::DrawTextInline, parent), m_observer(nullptr) { setCursor(Qt::PointingHandCursor); } StatusBarSpaceInfo::~StatusBarSpaceInfo() { } +void StatusBarSpaceInfo::setShown(bool shown) +{ + m_shown = shown; + if (!m_shown) { + hide(); + m_ready = false; + } +} + void StatusBarSpaceInfo::setUrl(const QUrl& url) { if (m_url != url) { m_url = url; + m_ready = false; if (m_observer) { - m_observer->setUrl(url); + m_observer.reset(new SpaceInfoObserver(m_url, this)); + connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged); } } } QUrl StatusBarSpaceInfo::url() const { return m_url; } void StatusBarSpaceInfo::update() { if (m_observer) { m_observer->update(); } } void StatusBarSpaceInfo::showEvent(QShowEvent* event) { - KCapacityBar::showEvent(event); - m_observer.reset(new SpaceInfoObserver(m_url, this)); - slotValuesChanged(); - connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged); + 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); + } + } } void StatusBarSpaceInfo::hideEvent(QHideEvent* event) { - m_observer.reset(); + if (m_ready) { + m_observer.reset(); + m_ready = false; + } KCapacityBar::hideEvent(event); } void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event) { if (event->button() == Qt::LeftButton) { // Creates a menu with tools that help to find out more about free // disk space for the given url. // Note that this object must live long enough in case the user opens // the "Configure..." dialog KMoreToolsMenuFactory menuFactory(QStringLiteral("dolphin/statusbar-diskspace-menu")); menuFactory.setParentWidget(this); auto menu = menuFactory.createMenuFromGroupingNames( { "disk-usage", "more:", "disk-partitions" }, m_url); menu->exec(QCursor::pos()); } } void StatusBarSpaceInfo::slotValuesChanged() { Q_ASSERT(m_observer); const quint64 size = m_observer->size(); - if (size == 0) { - setText(i18nc("@info:status", "Unknown size")); - setValue(0); - update(); + + if (!m_shown || size == 0) { + hide(); + return; + } + + m_ready = 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))); + setUpdatesEnabled(false); + setValue(percentUsed); + setUpdatesEnabled(true); + + if (!isVisible()) { + show(); } else { - 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))); - setUpdatesEnabled(false); - setValue(percentUsed); - setUpdatesEnabled(true); update(); } } diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index 24f8b7f29..0b0d787dd 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -1,63 +1,69 @@ /*************************************************************************** * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) and * * and Patrice Tremblay * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef STATUSBARSPACEINFO_H #define STATUSBARSPACEINFO_H #include #include class QHideEvent; class QShowEvent; class QMouseEvent; class SpaceInfoObserver; /** * @short Shows the available space for the volume represented * by the given URL as part of the status bar. */ class StatusBarSpaceInfo : public KCapacityBar { Q_OBJECT public: explicit StatusBarSpaceInfo(QWidget* parent = nullptr); ~StatusBarSpaceInfo() override; + /** + * Use this to set the widget visibility as it can hide itself + */ + void setShown(bool); void setUrl(const QUrl& url); QUrl url() const; void update(); protected: void showEvent(QShowEvent* event) override; void hideEvent(QHideEvent* event) override; void mousePressEvent(QMouseEvent* event) override; private slots: void slotValuesChanged(); private: QScopedPointer m_observer; QUrl m_url; + bool m_ready; + bool m_shown; }; #endif