X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/31ee4085c2b2c374158fb956ac376399ff375b5a..848abc5922167a467bb73107ee6b72e9af3c8317:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 61ca84e44..14672dff0 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -21,63 +21,70 @@ #include "dolphin_generalsettings.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "statusbarspaceinfo.h" #include -#include #include -#include #include #include -#include #include +#include +#include +#include #include #include +namespace { + const int ResetToDefaultTimeout = 1000; +} + 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_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->installEventFilter(this); + m_label->setTextFormat(Qt::PlainText); // Initialize zoom widget m_zoomSlider = new QSlider(Qt::Horizontal, this); - m_zoomSlider->setAccessibleName(i18n("Zoom slider")); + 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->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel()); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SIGNAL(zoomLevelChanged(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(); @@ -88,28 +95,39 @@ 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, &QTimer::timeout, this, &DolphinStatusBar::slotResetToDefaultText); // 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); - m_label->setMinimumHeight(contentHeight); - m_label->setMaximumHeight(contentHeight); + QFontMetrics fontMetrics(m_label->font()); + + m_label->setFixedHeight(contentHeight); m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - const QSize size(150, contentHeight); - applyFixedWidgetSize(m_spaceInfo, size); - applyFixedWidgetSize(m_progressBar, size); - applyFixedWidgetSize(m_zoomSlider, size); + m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25); + + m_spaceInfo->setFixedHeight(zoomSliderHeight); + m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25); + m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + 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); @@ -123,8 +141,23 @@ DolphinStatusBar::~DolphinStatusBar() void DolphinStatusBar::setText(const QString& text) { - if (m_text != text) { + if (m_text == text) { + return; + } + + 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(); } } @@ -174,8 +207,13 @@ int DolphinStatusBar::progress() const void DolphinStatusBar::resetToDefaultText() { - m_text.clear(); - updateLabelText(); + QTime currentTime; + if (currentTime.msecsTo(m_textTimestamp) < ResetToDefaultTimeout) { + m_resetToDefaultTextTimer->start(); + } else { + m_resetToDefaultTextTimer->stop(); + slotResetToDefaultText(); + } } void DolphinStatusBar::setDefaultText(const QString& text) @@ -189,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(); } @@ -203,7 +241,6 @@ void DolphinStatusBar::setZoomLevel(int zoomLevel) { if (zoomLevel != m_zoomSlider->value()) { m_zoomSlider->setValue(zoomLevel); - updateZoomSliderToolTip(zoomLevel); } } @@ -221,9 +258,8 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) { Q_UNUSED(event); - KMenu menu(this); + QMenu menu(this); - QAction* copyAction = menu.addAction(i18nc("@action:inmenu", "Copy Text")); QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); @@ -233,11 +269,7 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); const QAction* action = menu.exec(QCursor::pos()); - if (action == copyAction) { - QMimeData* mimeData = new QMimeData(); - mimeData->setText(text()); - QApplication::clipboard()->setMimeData(mimeData); - } else if (action == showZoomSliderAction) { + if (action == showZoomSliderAction) { const bool visible = showZoomSliderAction->isChecked(); GeneralSettings::setShowZoomSlider(visible); m_zoomSlider->setVisible(visible); @@ -248,14 +280,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); @@ -270,6 +294,9 @@ void DolphinStatusBar::updateProgressInfo() { if (m_progress < 100) { // Show the progress information and hide the extensions + m_stopButton->show(); + m_progressTextLabel->show(); + m_progressBar->show(); setExtensionsVisible(false); } else { // Hide the progress information and show the extensions @@ -283,11 +310,19 @@ void DolphinStatusBar::updateProgressInfo() void DolphinStatusBar::updateLabelText() { const QString text = m_text.isEmpty() ? m_defaultText : m_text; + m_label->setText(text); +} - QFontMetrics fontMetrics(m_label->font()); - const QString elidedText = fontMetrics.elidedText(text, Qt::ElideRight, m_label->width()); - m_label->setText(elidedText); - m_label->setToolTip(text == elidedText ? QString() : text); +void DolphinStatusBar::slotResetToDefaultText() +{ + m_text.clear(); + updateLabelText(); +} + +void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) +{ + const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); + m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); } void DolphinStatusBar::setExtensionsVisible(bool visible) @@ -302,17 +337,3 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) m_zoomSlider->setVisible(showZoomSlider); } -void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) -{ - const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); - m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); -} - -void DolphinStatusBar::applyFixedWidgetSize(QWidget* widget, const QSize& size) -{ - widget->setMinimumSize(size); - widget->setMaximumSize(size); - widget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); -} - -#include "dolphinstatusbar.moc"