┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/statusbar
diff options
context:
space:
mode:
Diffstat (limited to 'src/statusbar')
-rw-r--r--src/statusbar/dolphinstatusbar.cpp45
-rw-r--r--src/statusbar/dolphinstatusbar.h10
-rw-r--r--src/statusbar/mountpointobserver.cpp4
-rw-r--r--src/statusbar/mountpointobserver.h4
-rw-r--r--src/statusbar/mountpointobservercache.cpp2
-rw-r--r--src/statusbar/mountpointobservercache.h2
-rw-r--r--src/statusbar/spaceinfoobserver.cpp6
-rw-r--r--src/statusbar/spaceinfoobserver.h4
-rw-r--r--src/statusbar/statusbarspaceinfo.cpp2
-rw-r--r--src/statusbar/statusbarspaceinfo.h10
10 files changed, 35 insertions, 54 deletions
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 31d4ab81a..16683309d 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -23,6 +23,7 @@
#include <QIcon>
#include <KLocalizedString>
+#include <KSqueezedTextLabel>
#include <QMenu>
#include "statusbarspaceinfo.h"
@@ -49,21 +50,20 @@ 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_showProgressBarTimer(0),
- m_resetToDefaultTextTimer(0),
+ m_showProgressBarTimer(nullptr),
+ m_resetToDefaultTextTimer(nullptr),
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->installEventFilter(this);
// Initialize zoom widget
m_zoomSlider = new QSlider(Qt::Horizontal, this);
@@ -127,9 +127,9 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
QHBoxLayout* topLayout = new QHBoxLayout(this);
topLayout->setContentsMargins(2, 0, 2, 0);
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);
@@ -282,14 +282,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);
@@ -320,18 +312,7 @@ void DolphinStatusBar::updateProgressInfo()
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());
- }
+ m_label->setText(text);
}
void DolphinStatusBar::slotResetToDefaultText()
diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h
index 1a4ccf682..8b872ace5 100644
--- a/src/statusbar/dolphinstatusbar.h
+++ b/src/statusbar/dolphinstatusbar.h
@@ -30,6 +30,7 @@ class QProgressBar;
class QToolButton;
class QSlider;
class QTimer;
+class KSqueezedTextLabel;
/**
* @brief Represents the statusbar of a Dolphin view.
@@ -42,8 +43,8 @@ class DolphinStatusBar : public QWidget
Q_OBJECT
public:
- DolphinStatusBar(QWidget* parent);
- virtual ~DolphinStatusBar();
+ explicit DolphinStatusBar(QWidget* parent);
+ ~DolphinStatusBar() override;
QString text() const;
@@ -101,8 +102,7 @@ signals:
void zoomLevelChanged(int zoomLevel);
protected:
- virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
- virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent* event) override;
private slots:
void showZoomSliderToolTip(int zoomLevel);
@@ -140,7 +140,7 @@ private:
private:
QString m_text;
QString m_defaultText;
- QLabel* m_label;
+ KSqueezedTextLabel* m_label;
StatusBarSpaceInfo* m_spaceInfo;
QSlider* m_zoomSlider;
diff --git a/src/statusbar/mountpointobserver.cpp b/src/statusbar/mountpointobserver.cpp
index df2a4898f..fa6472c0a 100644
--- a/src/statusbar/mountpointobserver.cpp
+++ b/src/statusbar/mountpointobserver.cpp
@@ -17,11 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include <KIO/FileSystemFreeSpaceJob>
-
#include "mountpointobserver.h"
#include "mountpointobservercache.h"
+#include <KIO/FileSystemFreeSpaceJob>
+
MountPointObserver::MountPointObserver(const QUrl& url, QObject* parent) :
QObject(parent),
m_url(url),
diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h
index c3d2aa677..ea24c4eea 100644
--- a/src/statusbar/mountpointobserver.h
+++ b/src/statusbar/mountpointobserver.h
@@ -53,8 +53,8 @@ class MountPointObserver : public QObject
{
Q_OBJECT
- explicit MountPointObserver(const QUrl& url, QObject* parent = 0);
- virtual ~MountPointObserver() {}
+ explicit MountPointObserver(const QUrl& url, QObject* parent = nullptr);
+ ~MountPointObserver() override {}
public:
/**
diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp
index 48796ac5a..bcdc0b61c 100644
--- a/src/statusbar/mountpointobservercache.cpp
+++ b/src/statusbar/mountpointobservercache.cpp
@@ -36,7 +36,7 @@ Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
MountPointObserverCache::MountPointObserverCache() :
m_observerForMountPoint(),
m_mountPointForObserver(),
- m_updateTimer(0)
+ m_updateTimer(nullptr)
{
m_updateTimer = new QTimer(this);
}
diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h
index 8a1496d89..74cef0674 100644
--- a/src/statusbar/mountpointobservercache.h
+++ b/src/statusbar/mountpointobservercache.h
@@ -31,7 +31,7 @@ class MountPointObserverCache : public QObject
Q_OBJECT
MountPointObserverCache();
- virtual ~MountPointObserverCache();
+ ~MountPointObserverCache() override;
public:
static MountPointObserverCache* instance();
diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 0fb018727..8f45c18f8 100644
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -25,7 +25,7 @@
SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
QObject(parent),
- m_mountPointObserver(0),
+ m_mountPointObserver(nullptr),
m_dataSize(0),
m_dataAvailable(0)
{
@@ -39,7 +39,7 @@ SpaceInfoObserver::~SpaceInfoObserver()
{
if (m_mountPointObserver) {
m_mountPointObserver->deref();
- m_mountPointObserver = 0;
+ m_mountPointObserver = nullptr;
}
}
@@ -60,7 +60,7 @@ void SpaceInfoObserver::setUrl(const QUrl& url)
if (m_mountPointObserver) {
disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
m_mountPointObserver->deref();
- m_mountPointObserver = 0;
+ m_mountPointObserver = nullptr;
}
m_mountPointObserver = newObserver;
diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index e1311abde..144d11fa7 100644
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -32,8 +32,8 @@ class SpaceInfoObserver : public QObject
Q_OBJECT
public:
- explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0);
- virtual ~SpaceInfoObserver();
+ explicit SpaceInfoObserver(const QUrl& url, QObject* parent = nullptr);
+ ~SpaceInfoObserver() override;
quint64 size() const;
quint64 available() const;
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index f364fcf5b..6b6a6d610 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -31,7 +31,7 @@
StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
KCapacityBar(KCapacityBar::DrawTextInline, parent),
- m_observer(0)
+ m_observer(nullptr)
{
setCursor(Qt::PointingHandCursor);
}
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 326c419ab..87e9f776b 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -40,16 +40,16 @@ class StatusBarSpaceInfo : public KCapacityBar
Q_OBJECT
public:
- explicit StatusBarSpaceInfo(QWidget* parent = 0);
- virtual ~StatusBarSpaceInfo();
+ explicit StatusBarSpaceInfo(QWidget* parent = nullptr);
+ ~StatusBarSpaceInfo() override;
void setUrl(const QUrl& url);
QUrl url() const;
protected:
- void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
- void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
- void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+ void showEvent(QShowEvent* event) override;
+ void hideEvent(QHideEvent* event) override;
+ void mousePressEvent(QMouseEvent* event) override;
private slots:
void slotValuesChanged();
generated by cgit v1.3.1 (git 2.54.0) at 2026-05-15 07:42:03 +0000