X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c161b895ffd8d62371ec288cf4105386350a8a3c..6c73f7912b6fb0327b9fd0ca7a3fff3b2fb4d5e9:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 7cba8e346..6da4b4ddf 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -19,41 +19,47 @@ #include #include #include +#include #include #include -#include +#include #include #include -namespace { - const int UpdateDelay = 50; +namespace +{ +const int UpdateDelay = 50; } -DolphinStatusBar::DolphinStatusBar(QWidget* parent) : - QWidget(parent), - m_text(), - m_defaultText(), - m_label(nullptr), - m_zoomLabel(nullptr), - m_spaceInfo(nullptr), - m_zoomSlider(nullptr), - m_progressBar(nullptr), - m_stopButton(nullptr), - m_progress(100), - m_showProgressBarTimer(nullptr), - m_delayUpdateTimer(nullptr), - m_textTimestamp() +DolphinStatusBar::DolphinStatusBar(QWidget *parent) + : AnimatedHeightWidget(parent) + , m_text() + , m_defaultText() + , m_label(nullptr) + , m_zoomLabel(nullptr) + , m_spaceInfo(nullptr) + , m_zoomSlider(nullptr) + , m_progressBar(nullptr) + , m_stopButton(nullptr) + , m_progress(100) + , m_showProgressBarTimer(nullptr) + , m_delayUpdateTimer(nullptr) + , m_textTimestamp() { + setProperty("_breeze_statusbar_separator", true); + + QWidget *contentsContainer = prepareContentsContainer(); + // Initialize text label - m_label = new KSqueezedTextLabel(m_text, this); - m_label->setWordWrap(true); + m_label = new KSqueezedTextLabel(m_text, contentsContainer); m_label->setTextFormat(Qt::PlainText); + m_label->setTextInteractionFlags(Qt::TextBrowserInteraction | Qt::TextSelectableByKeyboard); // for accessibility but also to allow copy-pasting this text. // Initialize zoom slider's explanatory label - m_zoomLabel = new QLabel(i18nc("Used as a noun, i.e. 'Here is the zoom level:'","Zoom:"), this); + m_zoomLabel = new KSqueezedTextLabel(i18nc("Used as a noun, i.e. 'Here is the zoom level:'", "Zoom:"), contentsContainer); // Initialize zoom widget - m_zoomSlider = new QSlider(Qt::Horizontal, this); + m_zoomSlider = new QSlider(Qt::Horizontal, contentsContainer); 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); @@ -64,10 +70,17 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip); // Initialize space information - m_spaceInfo = new StatusBarSpaceInfo(this); + m_spaceInfo = new StatusBarSpaceInfo(contentsContainer); + connect(m_spaceInfo, &StatusBarSpaceInfo::showMessage, this, &DolphinStatusBar::showMessage); + connect(m_spaceInfo, + &StatusBarSpaceInfo::showInstallationProgress, + this, + [this](const QString ¤tlyRunningTaskTitle, int installationProgressPercent) { + showProgress(currentlyRunningTaskTitle, installationProgressPercent, CancelLoading::Disallowed); + }); // Initialize progress information - m_stopButton = new QToolButton(this); + m_stopButton = new QToolButton(contentsContainer); m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop"))); m_stopButton->setAccessibleName(i18n("Stop")); m_stopButton->setAutoRaise(true); @@ -75,10 +88,10 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_stopButton->hide(); connect(m_stopButton, &QToolButton::clicked, this, &DolphinStatusBar::stopPressed); - m_progressTextLabel = new QLabel(this); + m_progressTextLabel = new QLabel(contentsContainer); m_progressTextLabel->hide(); - m_progressBar = new QProgressBar(this); + m_progressBar = new QProgressBar(contentsContainer); m_progressBar->hide(); m_showProgressBarTimer = new QTimer(this); @@ -90,8 +103,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_delayUpdateTimer = new QTimer(this); m_delayUpdateTimer->setInterval(UpdateDelay); m_delayUpdateTimer->setSingleShot(true); - connect(m_delayUpdateTimer, &QTimer::timeout, - this, &DolphinStatusBar::updateLabelText); + connect(m_delayUpdateTimer, &QTimer::timeout, this, &DolphinStatusBar::updateLabelText); // Initialize top layout and size policies const int fontHeight = QFontMetrics(m_label->font()).height(); @@ -113,34 +125,36 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_progressBar->setFixedHeight(zoomSliderHeight); m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20); - QHBoxLayout* topLayout = new QHBoxLayout(this); - topLayout->setContentsMargins(2, 0, 2, 0); - topLayout->setSpacing(4); - topLayout->addWidget(m_label, 1); - topLayout->addWidget(m_zoomLabel); - topLayout->addWidget(m_zoomSlider, 1); - topLayout->addWidget(m_spaceInfo, 1); - topLayout->addWidget(m_stopButton); - topLayout->addWidget(m_progressTextLabel); - topLayout->addWidget(m_progressBar); - + m_topLayout = new QHBoxLayout(contentsContainer); + updateContentsMargins(); + m_topLayout->setSpacing(4); + m_topLayout->addWidget(m_label, 1); + m_topLayout->addWidget(m_zoomLabel); + m_topLayout->addWidget(m_zoomSlider, 1); + m_topLayout->addWidget(m_spaceInfo, 1); + m_topLayout->addWidget(m_stopButton); + m_topLayout->addWidget(m_progressTextLabel); + m_topLayout->addWidget(m_progressBar); + + setVisible(GeneralSettings::showStatusBar(), WithoutAnimation); 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.")); + 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) +void DolphinStatusBar::setText(const QString &text) { if (m_text == text) { return; @@ -158,37 +172,42 @@ QString DolphinStatusBar::text() const return m_text; } -void DolphinStatusBar::setProgressText(const QString& text) +void DolphinStatusBar::showProgress(const QString ¤tlyRunningTaskTitle, int progressPercent, CancelLoading cancelLoading) { - m_progressTextLabel->setText(text); -} + m_cancelLoading = cancelLoading; -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); + m_progressBar->setMaximum((progressPercent < 0) ? 0 : 100); - percent = qBound(0, percent, 100); - const bool progressRestarted = (percent < 100) && (percent < m_progress); - m_progress = percent; - if (progressRestarted && !m_progressBar->isVisible()) { + progressPercent = qBound(0, progressPercent, 100); + if (!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(); + if (!m_showProgressBarTimer->isActive()) { + m_showProgressBarTimer->start(); + } else { + // The timer is already running. Should we restart it or keep it running? + if (m_progressTextLabel->text() != currentlyRunningTaskTitle || (progressPercent < 100 && progressPercent < m_progress)) { + m_showProgressBarTimer->start(); + } + } } + m_progress = progressPercent; m_progressBar->setValue(m_progress); - if (percent == 100) { + if (progressPercent == 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(); } + + m_progressTextLabel->setText(currentlyRunningTaskTitle); +} + +QString DolphinStatusBar::progressText() const +{ + return m_progressTextLabel->text(); } int DolphinStatusBar::progress() const @@ -208,7 +227,7 @@ void DolphinStatusBar::resetToDefaultText() } } -void DolphinStatusBar::setDefaultText(const QString& text) +void DolphinStatusBar::setDefaultText(const QString &text) { m_defaultText = text; updateLabelText(); @@ -219,7 +238,7 @@ QString DolphinStatusBar::defaultText() const return m_defaultText; } -void DolphinStatusBar::setUrl(const QUrl& url) +void DolphinStatusBar::setUrl(const QUrl &url) { if (GeneralSettings::showSpaceInfo()) { m_spaceInfo->setUrl(url); @@ -245,6 +264,7 @@ int DolphinStatusBar::zoomLevel() const void DolphinStatusBar::readSettings() { + setVisible(GeneralSettings::showStatusBar(), WithAnimation); setExtensionsVisible(true); } @@ -253,30 +273,32 @@ void DolphinStatusBar::updateSpaceInfo() m_spaceInfo->update(); } -void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) +void DolphinStatusBar::contextMenuEvent(QContextMenuEvent *event) { Q_UNUSED(event) QMenu menu(this); - QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); + 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")); + QAction *showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); showSpaceInfoAction->setCheckable(true); showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); - const QAction* action = menu.exec(QCursor::pos()); + const QAction *action = menu.exec(event->reason() == QContextMenuEvent::Reason::Mouse ? QCursor::pos() : mapToGlobal(QPoint(width() / 2, height() / 2))); if (action == showZoomSliderAction) { const bool visible = showZoomSliderAction->isChecked(); GeneralSettings::setShowZoomSlider(visible); m_zoomSlider->setVisible(visible); + m_zoomLabel->setVisible(visible); } else if (action == showSpaceInfoAction) { const bool visible = showSpaceInfoAction->isChecked(); GeneralSettings::setShowSpaceInfo(visible); - m_spaceInfo->setVisible(visible); + m_spaceInfo->setShown(visible); } + updateContentsMargins(); } void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) @@ -293,7 +315,7 @@ void DolphinStatusBar::updateProgressInfo() { if (m_progress < 100) { // Show the progress information and hide the extensions - m_stopButton->show(); + m_stopButton->setVisible(m_cancelLoading == CancelLoading::Allowed); m_progressTextLabel->show(); m_progressBar->show(); setExtensionsVisible(false); @@ -326,9 +348,35 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) showSpaceInfo = GeneralSettings::showSpaceInfo(); showZoomSlider = GeneralSettings::showZoomSlider(); } + m_spaceInfo->setShown(showSpaceInfo); - m_spaceInfo->setVisible(showSpaceInfo); m_zoomSlider->setVisible(showZoomSlider); m_zoomLabel->setVisible(showZoomSlider); + updateContentsMargins(); +} + +void DolphinStatusBar::updateContentsMargins() +{ + if (GeneralSettings::showSpaceInfo()) { + // We reduce the outside margin for the flat button so it visually has the same margin as the status bar text label on the other end of the bar. + m_topLayout->setContentsMargins(6, 0, 2, 0); + } else { + m_topLayout->setContentsMargins(6, 0, 6, 0); + } +} + +void DolphinStatusBar::paintEvent(QPaintEvent *paintEvent) +{ + Q_UNUSED(paintEvent) + QPainter p(this); + QStyleOption opt; + opt.initFrom(this); + style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this); +} + +int DolphinStatusBar::preferredHeight() const +{ + return m_spaceInfo->height(); } +#include "moc_dolphinstatusbar.cpp"