X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/006f667ab14aff2d067373e7e88bde4800b2d9c2..664f97ff0d1c70f7df4f4fa32303949ee7a6e8fb:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 169395e63..a7585bed0 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -20,50 +20,46 @@ #include "dolphinstatusbar.h" #include "dolphin_generalsettings.h" - -#include -#include -#include -#include -#include - #include "statusbarspaceinfo.h" +#include "views/dolphinview.h" +#include "views/zoomlevelinfo.h" + +#include +#include #include #include -#include +#include +#include +#include #include +#include #include -#include -#include #include - -#include -#include +#include namespace { - const int ResetToDefaultTimeout = 1000; + const int UpdateDelay = 50; } 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_delayUpdateTimer(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); @@ -72,21 +68,21 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_zoomSlider->setPageStep(1); m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel()); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SIGNAL(zoomLevelChanged(int))); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(updateZoomSliderToolTip(int))); - connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int))); + connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::zoomLevelChanged); + connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::updateZoomSliderToolTip); + connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip); // Initialize space information m_spaceInfo = new StatusBarSpaceInfo(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->hide(); - connect(m_stopButton, SIGNAL(clicked()), this, SIGNAL(stopPressed())); + connect(m_stopButton, &QToolButton::clicked, this, &DolphinStatusBar::stopPressed); m_progressTextLabel = new QLabel(this); m_progressTextLabel->hide(); @@ -97,42 +93,55 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_showProgressBarTimer = new QTimer(this); m_showProgressBarTimer->setInterval(500); m_showProgressBarTimer->setSingleShot(true); - connect(m_showProgressBarTimer, SIGNAL(timeout()), this, SLOT(updateProgressInfo())); + connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo); - m_resetToDefaultTextTimer = new QTimer(this); - m_resetToDefaultTextTimer->setInterval(ResetToDefaultTimeout); - m_resetToDefaultTextTimer->setSingleShot(true); - connect(m_resetToDefaultTextTimer, SIGNAL(timeout()), this, SLOT(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(); - 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_zoomSlider->setFixedHeight(contentHeight); - m_zoomSlider->setMaximumWidth(150); + m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25); m_spaceInfo->setFixedHeight(contentHeight); - m_spaceInfo->setMaximumWidth(150); + m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25); 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); - topLayout->setMargin(0); + 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); setExtensionsVisible(true); + setWhatsThis(xi18nc("@info:whatsthis Statusbar", "This is " + "the Statusbar. It contains three elements " + "by default (left to right):A text field" + " that displays the size of selected items. If only " + "one item is selected the name and type is shown as well." + "A zoom slider that allows you " + "to adjust the size of the icons in the view." + "Space information about the " + "current storage device.")); } DolphinStatusBar::~DolphinStatusBar() @@ -147,19 +156,9 @@ void DolphinStatusBar::setText(const QString& text) 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 @@ -207,12 +206,13 @@ int DolphinStatusBar::progress() const void DolphinStatusBar::resetToDefaultText() { + m_text.clear(); + QTime currentTime; - if (currentTime.msecsTo(m_textTimestamp) < ResetToDefaultTimeout) { - m_resetToDefaultTextTimer->start(); + if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) { + m_delayUpdateTimer->start(); } else { - m_resetToDefaultTextTimer->stop(); - slotResetToDefaultText(); + updateLabelText(); } } @@ -227,12 +227,12 @@ QString DolphinStatusBar::defaultText() const return m_defaultText; } -void DolphinStatusBar::setUrl(const KUrl& url) +void DolphinStatusBar::setUrl(const QUrl& url) { m_spaceInfo->setUrl(url); } -KUrl DolphinStatusBar::url() const +QUrl DolphinStatusBar::url() const { return m_spaceInfo->url(); } @@ -254,11 +254,16 @@ void DolphinStatusBar::readSettings() setExtensionsVisible(true); } +void DolphinStatusBar::updateSpaceInfo() +{ + m_spaceInfo->update(); +} + 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); @@ -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); @@ -318,24 +315,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()); - } -} - -void DolphinStatusBar::slotResetToDefaultText() -{ - m_text.clear(); - updateLabelText(); + m_label->setText(text); } void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) @@ -356,4 +336,3 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) m_zoomSlider->setVisible(showZoomSlider); } -#include "dolphinstatusbar.moc"