}
DolphinStatusBar::DolphinStatusBar(QWidget *parent)
- : QWidget(parent)
+ : AnimatedHeightWidget(parent)
, m_text()
, m_defaultText()
, m_label(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 KSqueezedTextLabel(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);
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);
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);
m_progressBar->setFixedHeight(zoomSliderHeight);
m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20);
- QHBoxLayout *topLayout = new QHBoxLayout(this);
+ m_topLayout = new QHBoxLayout(contentsContainer);
updateContentsMargins();
- 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());
+ 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",
"<para>This is "
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
void DolphinStatusBar::readSettings()
{
- setVisible(GeneralSettings::showStatusBar());
+ setVisible(GeneralSettings::showStatusBar(), WithAnimation);
setExtensionsVisible(true);
}
} else if (action == showSpaceInfoAction) {
const bool visible = showSpaceInfoAction->isChecked();
GeneralSettings::setShowSpaceInfo(visible);
- m_spaceInfo->setVisible(visible);
+ m_spaceInfo->setShown(visible);
}
updateContentsMargins();
}
{
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);
}
m_spaceInfo->setShown(showSpaceInfo);
- m_spaceInfo->setVisible(showSpaceInfo);
m_zoomSlider->setVisible(showZoomSlider);
m_zoomLabel->setVisible(showZoomSlider);
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.
- layout()->setContentsMargins(6, 0, 2, 0);
+ m_topLayout->setContentsMargins(6, 0, 2, 0);
} else {
- layout()->setContentsMargins(6, 0, 6, 0);
+ m_topLayout->setContentsMargins(6, 0, 6, 0);
}
}
style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this);
}
+int DolphinStatusBar::preferredHeight() const
+{
+ return m_spaceInfo->height();
+}
+
#include "moc_dolphinstatusbar.cpp"
projects / dolphin.git / blobdiff