Overhaul main view accessibility

[dolphin.git] / src / statusbar / dolphinstatusbar.cpp

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 9bc6210dc5f468cc0d3f8afa79928e6951674627..99affde6fa2821d17d161ad042389a1c572327c0 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -32,7 +32,7 @@ const int UpdateDelay = 50;
 }
 
 DolphinStatusBar::DolphinStatusBar(QWidget *parent)
 }
 
 DolphinStatusBar::DolphinStatusBar(QWidget *parent)

-    : QWidget(parent)
+    : AnimatedHeightWidget(parent)

     , m_text()
     , m_defaultText()
     , m_label(nullptr)
     , m_text()
     , m_defaultText()
     , m_label(nullptr)


@@ -46,16 +46,20 @@ DolphinStatusBar::DolphinStatusBar(QWidget *parent)
     , m_delayUpdateTimer(nullptr)
     , m_textTimestamp()
 {
     , m_delayUpdateTimer(nullptr)
     , m_textTimestamp()
 {

+    setProperty("_breeze_statusbar_separator", true);
+
+    QWidget *contentsContainer = prepareContentsContainer();
+

     // Initialize text label
     // 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->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
 
     // 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
 
     // 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);
     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);


@@ -66,10 +70,17 @@ DolphinStatusBar::DolphinStatusBar(QWidget *parent)
     connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip);
 
     // Initialize space information
     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 &currentlyRunningTaskTitle, int installationProgressPercent) {
+                showProgress(currentlyRunningTaskTitle, installationProgressPercent, CancelLoading::Disallowed);
+            });

 
     // Initialize progress information
 
     // 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->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
     m_stopButton->setAccessibleName(i18n("Stop"));
     m_stopButton->setAutoRaise(true);


@@ -77,10 +88,10 @@ DolphinStatusBar::DolphinStatusBar(QWidget *parent)
     m_stopButton->hide();
     connect(m_stopButton, &QToolButton::clicked, this, &DolphinStatusBar::stopPressed);
 
     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_progressTextLabel->hide();
 

-    m_progressBar = new QProgressBar(this);
+    m_progressBar = new QProgressBar(contentsContainer);

     m_progressBar->hide();
 
     m_showProgressBarTimer = new QTimer(this);
     m_progressBar->hide();
 
     m_showProgressBarTimer = new QTimer(this);


@@ -114,18 +125,18 @@ DolphinStatusBar::DolphinStatusBar(QWidget *parent)
     m_progressBar->setFixedHeight(zoomSliderHeight);
     m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20);
 
     m_progressBar->setFixedHeight(zoomSliderHeight);
     m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20);
 

-    QHBoxLayout *topLayout = new QHBoxLayout(this);
+    m_topLayout = new QHBoxLayout(contentsContainer);

     updateContentsMargins();
     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 "
     setExtensionsVisible(true);
     setWhatsThis(xi18nc("@info:whatsthis Statusbar",
                         "<para>This is "


@@ -161,37 +172,42 @@ QString DolphinStatusBar::text() const
     return m_text;
 }
 
     return m_text;
 }
 

-void DolphinStatusBar::setProgressText(const QString &text)
+void DolphinStatusBar::showProgress(const QString &currentlyRunningTaskTitle, 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:
     // 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.
         // 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);
 
     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();
     }
         // 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
 }
 
 int DolphinStatusBar::progress() const


@@ -248,7 +264,7 @@ int DolphinStatusBar::zoomLevel() const
 
 void DolphinStatusBar::readSettings()
 {
 
 void DolphinStatusBar::readSettings()
 {

-    setVisible(GeneralSettings::showStatusBar());
+    setVisible(GeneralSettings::showStatusBar(), WithAnimation);

     setExtensionsVisible(true);
 }
 
     setExtensionsVisible(true);
 }
 


@@ -299,7 +315,7 @@ void DolphinStatusBar::updateProgressInfo()
 {
     if (m_progress < 100) {
         // Show the progress information and hide the extensions
 {
     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_progressTextLabel->show();
         m_progressBar->show();
         setExtensionsVisible(false);


@@ -344,9 +360,9 @@ 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.
 {
     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 {
     } else {

-        layout()->setContentsMargins(6, 0, 6, 0);
+        m_topLayout->setContentsMargins(6, 0, 6, 0);

     }
 }
 
     }
 }
 


@@ -359,4 +375,9 @@ void DolphinStatusBar::paintEvent(QPaintEvent *paintEvent)
     style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this);
 }
 
     style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this);
 }
 

+int DolphinStatusBar::preferredHeight() const
+{
+    return m_spaceInfo->height();
+}
+

 #include "moc_dolphinstatusbar.cpp"
 #include "moc_dolphinstatusbar.cpp"