X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ed2d352c42a6d517d4f29b3582c0e00aa34fe647..09a0a44a073cf6396f0a28dc3847d081c4dab24e:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 9c101b3fa..f81120a44 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -19,8 +19,11 @@ #include #include #include +#include +#include #include #include +#include #include #include @@ -30,7 +33,7 @@ const int UpdateDelay = 50; } DolphinStatusBar::DolphinStatusBar(QWidget *parent) - : QWidget(parent) + : AnimatedHeightWidget(parent) , m_text() , m_defaultText() , m_label(nullptr) @@ -44,16 +47,21 @@ DolphinStatusBar::DolphinStatusBar(QWidget *parent) , m_delayUpdateTimer(nullptr) , m_textTimestamp() { + setProperty("_breeze_statusbar_separator", true); + + QWidget *contentsContainer = prepareContentsContainer(); + contentsContainer->setContentsMargins(0, 0, 0, 0); + // 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 +72,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 +90,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); @@ -112,19 +127,18 @@ 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); - - setVisible(GeneralSettings::showStatusBar()); - setExtensionsVisible(true); + 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); + + readSettings(); setWhatsThis(xi18nc("@info:whatsthis Statusbar", "This is " "the Statusbar. It contains three elements " @@ -159,37 +173,43 @@ QString DolphinStatusBar::text() const return m_text; } -void DolphinStatusBar::setProgressText(const QString &text) -{ - m_progressTextLabel->setText(text); -} - -QString DolphinStatusBar::progressText() const +void DolphinStatusBar::showProgress(const QString ¤tlyRunningTaskTitle, int progressPercent, CancelLoading cancelLoading) { - return m_progressTextLabel->text(); -} + m_cancelLoading = cancelLoading; -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); + updateWidthToContent(); +} + +QString DolphinStatusBar::progressText() const +{ + return m_progressTextLabel->text(); } int DolphinStatusBar::progress() const @@ -222,8 +242,9 @@ QString DolphinStatusBar::defaultText() const void DolphinStatusBar::setUrl(const QUrl &url) { - if (GeneralSettings::showSpaceInfo()) { + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth && m_spaceInfo && m_spaceInfo->url() != url) { m_spaceInfo->setUrl(url); + Q_EMIT urlChanged(); } } @@ -246,7 +267,7 @@ int DolphinStatusBar::zoomLevel() const void DolphinStatusBar::readSettings() { - setVisible(GeneralSettings::showStatusBar()); + updateMode(); setExtensionsVisible(true); } @@ -255,31 +276,91 @@ void DolphinStatusBar::updateSpaceInfo() m_spaceInfo->update(); } +void DolphinStatusBar::updateWidthToContent() +{ + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + QStyleOptionSlider opt; + opt.initFrom(this); + opt.orientation = Qt::Vertical; + const QSize labelSize = QFontMetrics(font()).size(Qt::TextSingleLine, m_label->fullText()); + // Make sure minimum height takes clipping into account. + setMinimumHeight(m_label->height() + clippingAmount()); + const int scrollbarWidth = style()->pixelMetric(QStyle::PM_ScrollBarExtent, &opt, this); + // Make sure maximumViewWidth does not go below 0. + const int maximumViewWidth = qMax(0, parentWidget()->width() - scrollbarWidth); + if (m_stopButton->isVisible() || m_progressTextLabel->isVisible() || m_progressBar->isVisible()) { + // Use maximum width when interactable elements are shown, to keep them + // from "jumping around" when user tries to interact with them. + setFixedWidth(maximumViewWidth); + } else { + // Make sure we have room for the text + const int contentWidth = labelSize.width() + QFontMetrics(font()).averageCharWidth() + (clippingAmount() * 2); + setFixedWidth(qMin(contentWidth, maximumViewWidth)); + } + Q_EMIT widthUpdated(); + } else { + setMinimumHeight(0); + setFixedWidth(QWIDGETSIZE_MAX); + Q_EMIT widthUpdated(); + } +} + +int DolphinStatusBar::clippingAmount() const +{ + QStyleOption opt; + opt.initFrom(this); + // Add 2 for extra padding due to how QRect coordinates work. + const int val = 2 + style()->pixelMetric(QStyle::PM_SplitterWidth, &opt, this) * 2; + return val; +} + +void DolphinStatusBar::updateMode() +{ + switch (GeneralSettings::showStatusBar()) { + case GeneralSettings::EnumShowStatusBar::Small: + setEnabled(true); + m_spaceInfo->setShown(false); + m_zoomSlider->setVisible(false); + m_zoomLabel->setVisible(false); + setVisible(true, WithAnimation); + break; + case GeneralSettings::EnumShowStatusBar::FullWidth: + setEnabled(true); + m_spaceInfo->setShown(true); + setVisible(true, WithAnimation); + break; + case GeneralSettings::EnumShowStatusBar::Disabled: + setEnabled(false); + setVisible(false, WithoutAnimation); + break; + } + Q_EMIT modeUpdated(); + updateWidthToContent(); +} + void DolphinStatusBar::contextMenuEvent(QContextMenuEvent *event) { Q_UNUSED(event) + // Do not show the context menu on small statusbar. + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + return; + } + 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()); + 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); } + updateContentsMargins(); } void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) @@ -296,7 +377,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); @@ -307,12 +388,14 @@ void DolphinStatusBar::updateProgressInfo() m_progressBar->hide(); setExtensionsVisible(true); } + updateWidthToContent(); } void DolphinStatusBar::updateLabelText() { const QString text = m_text.isEmpty() ? m_defaultText : m_text; m_label->setText(text); + updateWidthToContent(); } void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) @@ -323,17 +406,66 @@ void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) void DolphinStatusBar::setExtensionsVisible(bool visible) { - bool showSpaceInfo = visible; bool showZoomSlider = visible; if (visible) { - showSpaceInfo = GeneralSettings::showSpaceInfo(); - showZoomSlider = GeneralSettings::showZoomSlider(); + showZoomSlider = GeneralSettings::showZoomSlider() && GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth; } - m_spaceInfo->setShown(showSpaceInfo); - m_spaceInfo->setVisible(showSpaceInfo); m_zoomSlider->setVisible(showZoomSlider); m_zoomLabel->setVisible(showZoomSlider); + updateContentsMargins(); +} + +void DolphinStatusBar::updateContentsMargins() +{ + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth) { + // 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 { + // Add extra margins to toplayout to avoid clipping too early. + m_topLayout->setContentsMargins(clippingAmount() * 2, 0, clippingAmount(), 0); + } + setContentsMargins(0, 0, 0, 0); +} + +void DolphinStatusBar::paintEvent(QPaintEvent *paintEvent) +{ + Q_UNUSED(paintEvent) + QPainter p(this); + QStyleOption opt; + opt.initFrom(this); + // Draw statusbar only if there is text. + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + if (m_label && !m_label->fullText().isEmpty()) { + opt.state = QStyle::State_Sunken; + QPainterPath path; + // Adjust the rectangle to be a bit larger, then clip the left and bottom border off. + QRect clipRect; + if (layoutDirection() == Qt::RightToLeft) { + opt.rect = rect().adjusted(0, 0, clippingAmount(), clippingAmount()); + clipRect = QRect(opt.rect.topLeft(), opt.rect.bottomRight()).adjusted(0, 0, -clippingAmount(), -clippingAmount()); + } else { + opt.rect = rect().adjusted(-clippingAmount(), 0, 0, clippingAmount()); + clipRect = QRect(opt.rect.topLeft(), opt.rect.bottomRight()).adjusted(clippingAmount(), 0, 0, -clippingAmount()); + } + path.addRect(clipRect); + p.setClipPath(path); + opt.palette.setColor(QPalette::Base, palette().window().color()); + p.setBrush(palette().window().color()); + p.setPen(Qt::transparent); + p.drawRoundedRect(opt.rect, 5, 5); // Radius is from Breeze style. + style()->drawPrimitive(QStyle::PE_Frame, &opt, &p, this); + } + } + // Draw regular statusbar. + else { + style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this); + } +} + +int DolphinStatusBar::preferredHeight() const +{ + return m_spaceInfo->height(); } #include "moc_dolphinstatusbar.cpp"