[DolphinStatusBar] Fix free space info height with bigger fonts

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

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 9f17c8ecd864827df207bdb272cf220845829de8..a7585bed023632e3dadaa39c1e96e0369f0f2c7b 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -20,50 +20,46 @@
 #include "dolphinstatusbar.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphinstatusbar.h"
 
 #include "dolphin_generalsettings.h"

-
-#include <KIconLoader>
-#include <KIcon>
-#include <KLocale>
-#include <KMenu>
-#include <KVBox>
-

 #include "statusbarspaceinfo.h"
 #include "statusbarspaceinfo.h"

+#include "views/dolphinview.h"
+#include "views/zoomlevelinfo.h"
+
+#include <KLocalizedString>
+#include <KSqueezedTextLabel>

 
 #include <QApplication>
 #include <QHBoxLayout>
 
 #include <QApplication>
 #include <QHBoxLayout>

-#include <QLabel>
+#include <QHelpEvent>
+#include <QIcon>
+#include <QMenu>

 #include <QProgressBar>
 #include <QProgressBar>

+#include <QSlider>

 #include <QTextDocument>
 #include <QTextDocument>

-#include <QToolButton>
-#include <QTime>

 #include <QTimer>
 #include <QTimer>

-
-#include <views/dolphinview.h>
-#include <views/zoomlevelinfo.h>
+#include <QToolButton>

 
 namespace {
 
 namespace {

-    const int ResetToDefaultTimeout = 1000;
+    const int UpdateDelay = 50;

 }
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     QWidget(parent),
     m_text(),
     m_defaultText(),
 }
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     QWidget(parent),
     m_text(),
     m_defaultText(),

-    m_label(0),
-    m_spaceInfo(0),
-    m_zoomSlider(0),
-    m_progressBar(0),
-    m_stopButton(0),
+    m_label(nullptr),
+    m_spaceInfo(nullptr),
+    m_zoomSlider(nullptr),
+    m_progressBar(nullptr),
+    m_stopButton(nullptr),

     m_progress(100),
     m_progress(100),

-    m_showProgressBarTimer(0),
-    m_resetToDefaultTextTimer(0),
+    m_showProgressBarTimer(nullptr),
+    m_delayUpdateTimer(nullptr),

     m_textTimestamp()
 {
     // Initialize text label
     m_textTimestamp()
 {
     // Initialize text label

-    m_label = new QLabel(this);
+    m_label = new KSqueezedTextLabel(m_text, this);

     m_label->setWordWrap(true);
     m_label->setTextFormat(Qt::PlainText);
     m_label->setWordWrap(true);
     m_label->setTextFormat(Qt::PlainText);

-    m_label->installEventFilter(this);

 
     // Initialize zoom widget
     m_zoomSlider = new QSlider(Qt::Horizontal, this);
 
     // Initialize zoom widget
     m_zoomSlider = new QSlider(Qt::Horizontal, this);


@@ -81,7 +77,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
 
     // Initialize progress information
     m_stopButton = new QToolButton(this);
 
     // Initialize progress information
     m_stopButton = new QToolButton(this);

-    m_stopButton->setIcon(KIcon("process-stop"));
+    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->setAccessibleName(i18n("Stop"));
     m_stopButton->setAutoRaise(true);
     m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading"));


@@ -99,40 +95,53 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     m_showProgressBarTimer->setSingleShot(true);
     connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo);
 
     m_showProgressBarTimer->setSingleShot(true);
     connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo);
 

-    m_resetToDefaultTextTimer = new QTimer(this);
-    m_resetToDefaultTextTimer->setInterval(ResetToDefaultTimeout);
-    m_resetToDefaultTextTimer->setSingleShot(true);
-    connect(m_resetToDefaultTextTimer, &QTimer::timeout, this, &DolphinStatusBar::slotResetToDefaultText);
+    // 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();
 
     // Initialize top layout and size policies
     const int fontHeight = QFontMetrics(m_label->font()).height();
     const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height();

-    const int contentHeight = qMax(fontHeight, zoomSliderHeight);
+    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_label->setFixedHeight(contentHeight);
     m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 

-    m_zoomSlider->setFixedHeight(contentHeight);
-    m_zoomSlider->setMaximumWidth(150);
+    m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25);

 
     m_spaceInfo->setFixedHeight(contentHeight);
 
     m_spaceInfo->setFixedHeight(contentHeight);

-    m_spaceInfo->setMaximumWidth(150);
+    m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);

     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 

-    m_progressBar->setFixedHeight(contentHeight);
-    m_progressBar->setMaximumWidth(150);
+    m_progressBar->setFixedHeight(zoomSliderHeight);
+    m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25);

 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
 
     QHBoxLayout* topLayout = new QHBoxLayout(this);

-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(2, 0, 2, 0);

     topLayout->setSpacing(4);
     topLayout->setSpacing(4);

-    topLayout->addWidget(m_label);
-    topLayout->addWidget(m_zoomSlider);
-    topLayout->addWidget(m_spaceInfo);
+    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);
     topLayout->addWidget(m_stopButton);
     topLayout->addWidget(m_progressTextLabel);
     topLayout->addWidget(m_progressBar);
 
     setExtensionsVisible(true);

+    setWhatsThis(xi18nc("@info:whatsthis Statusbar", "<para>This is "
+        "the <emphasis>Statusbar</emphasis>. It contains three elements "
+        "by default (left to right):<list><item>A <emphasis>text field"
+        "</emphasis> that displays the size of selected items. If only "
+        "one item is selected the name and type is shown as well.</item>"
+        "<item>A <emphasis>zoom slider</emphasis> that allows you "
+        "to adjust the size of the icons in the view.</item>"
+        "<item><emphasis>Space information</emphasis> about the "
+        "current storage device.</item></list></para>"));

 }
 
 DolphinStatusBar::~DolphinStatusBar()
 }
 
 DolphinStatusBar::~DolphinStatusBar()


@@ -147,19 +156,9 @@ void DolphinStatusBar::setText(const QString& text)
 
     m_textTimestamp = QTime::currentTime();
 
 
     m_textTimestamp = QTime::currentTime();
 

-    if (text.isEmpty()) {
-        // Assure that the previous set text won't get
-        // cleared immediatelly.
-        m_resetToDefaultTextTimer->start();
-    } else {
-        m_text = text;
-
-        if (m_resetToDefaultTextTimer->isActive()) {
-            m_resetToDefaultTextTimer->start();
-        }
-
-        updateLabelText();
-    }
+    m_text = text;
+    // will update status bar text in 50ms
+    m_delayUpdateTimer->start();

 }
 
 QString DolphinStatusBar::text() const
 }
 
 QString DolphinStatusBar::text() const


@@ -207,12 +206,13 @@ int DolphinStatusBar::progress() const
 
 void DolphinStatusBar::resetToDefaultText()
 {
 
 void DolphinStatusBar::resetToDefaultText()
 {

+    m_text.clear();
+

     QTime currentTime;
     QTime currentTime;

-    if (currentTime.msecsTo(m_textTimestamp) < ResetToDefaultTimeout) {
-        m_resetToDefaultTextTimer->start();
+    if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) {
+        m_delayUpdateTimer->start();

     } else {
     } else {

-        m_resetToDefaultTextTimer->stop();
-        slotResetToDefaultText();
+        updateLabelText();

     }
 }
 
     }
 }
 


@@ -227,12 +227,12 @@ QString DolphinStatusBar::defaultText() const
     return m_defaultText;
 }
 
     return m_defaultText;
 }
 

-void DolphinStatusBar::setUrl(const KUrl& url)
+void DolphinStatusBar::setUrl(const QUrl& url)

 {
     m_spaceInfo->setUrl(url);
 }
 
 {
     m_spaceInfo->setUrl(url);
 }
 

-KUrl DolphinStatusBar::url() const
+QUrl DolphinStatusBar::url() const

 {
     return m_spaceInfo->url();
 }
 {
     return m_spaceInfo->url();
 }


@@ -254,11 +254,16 @@ void DolphinStatusBar::readSettings()
     setExtensionsVisible(true);
 }
 
     setExtensionsVisible(true);
 }
 

+void DolphinStatusBar::updateSpaceInfo()
+{
+    m_spaceInfo->update();
+}
+

 void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {
 void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {

-    Q_UNUSED(event);
+    Q_UNUSED(event)

 
 

-    KMenu menu(this);
+    QMenu menu(this);

 
     QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
     showZoomSliderAction->setCheckable(true);
 
     QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
     showZoomSliderAction->setCheckable(true);


@@ -280,14 +285,6 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
     }
 }
 
     }
 }
 

-bool DolphinStatusBar::eventFilter(QObject* obj, QEvent* event)
-{
-    if (obj == m_label && event->type() == QEvent::Resize) {
-        updateLabelText();
-    }
-    return QWidget::eventFilter(obj, event);
-}
-

 void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
 {
     updateZoomSliderToolTip(zoomLevel);
 void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
 {
     updateZoomSliderToolTip(zoomLevel);


@@ -318,24 +315,7 @@ void DolphinStatusBar::updateProgressInfo()
 void DolphinStatusBar::updateLabelText()
 {
     const QString text = m_text.isEmpty() ? m_defaultText : m_text;
 void DolphinStatusBar::updateLabelText()
 {
     const QString text = m_text.isEmpty() ? m_defaultText : m_text;

-
-    // Set status bar text and elide it if too long
-    QFontMetrics fontMetrics(m_label->font());
-    const QString elidedText = fontMetrics.elidedText(text, Qt::ElideRight, m_label->width());
-    m_label->setText(elidedText);
-
-    // If the text has been elided, set the original text as tooltip
-    if (text != elidedText) {
-        m_label->setToolTip(Qt::convertFromPlainText(text));
-    } else {
-        m_label->setToolTip(QString());
-    }
-}
-
-void DolphinStatusBar::slotResetToDefaultText()
-{
-    m_text.clear();
-    updateLabelText();
+    m_label->setText(text);

 }
 
 void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
 }
 
 void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)


@@ -356,4 +336,3 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
     m_zoomSlider->setVisible(showZoomSlider);
 }
 
     m_zoomSlider->setVisible(showZoomSlider);
 }
 

-#include "dolphinstatusbar.moc"