X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/38cf4f8f43108ab3d14066cbcd836f01ccb36708..664f97ff0d1c70f7df4f4fa32303949ee7a6e8fb:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 2433d7364..a7585bed0 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -1,6 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * - * peter.penz@gmx.at * + * Copyright (C) 2006-2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -21,201 +20,160 @@ #include "dolphinstatusbar.h" #include "dolphin_generalsettings.h" - -#include -#include -#include -#include -#include - -#include "settings/dolphinsettings.h" #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 -#include +namespace { + const int UpdateDelay = 50; +} -DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : +DolphinStatusBar::DolphinStatusBar(QWidget* parent) : QWidget(parent), - m_view(view), - m_messageLabel(0), - m_spaceInfo(0), - m_zoomWidget(0), - m_zoomOut(0), - m_zoomSlider(0), - m_zoomIn(0), - m_progressBar(0), - m_stopButton(0), + m_text(), + m_defaultText(), + m_label(nullptr), + m_spaceInfo(nullptr), + m_zoomSlider(nullptr), + m_progressBar(nullptr), + m_stopButton(nullptr), m_progress(100), - m_showProgressBarTimer(0), - m_messageTimeStamp() + m_showProgressBarTimer(nullptr), + m_delayUpdateTimer(nullptr), + m_textTimestamp() { - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(updateSpaceInfoContent(const KUrl&))); - - // Initialize message label - m_messageLabel = new KonqStatusBarMessageLabel(this); - - // Initialize zoom slider - m_zoomWidget = new QWidget(this); - - m_zoomOut = new QToolButton(m_zoomWidget); - m_zoomOut->setIcon(KIcon("file-zoom-out")); - m_zoomOut->setAutoRaise(true); - - m_zoomSlider = new QSlider(Qt::Horizontal, m_zoomWidget); + // Initialize text label + m_label = new KSqueezedTextLabel(m_text, this); + m_label->setWordWrap(true); + m_label->setTextFormat(Qt::PlainText); + + // Initialize zoom widget + m_zoomSlider = new QSlider(Qt::Horizontal, this); + 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()); - const int min = ZoomLevelInfo::minimumLevel(); - const int max = ZoomLevelInfo::maximumLevel(); - m_zoomSlider->setRange(min, max); - m_zoomSlider->setValue(view->zoomLevel()); - updateZoomSliderToolTip(view->zoomLevel()); - - m_zoomIn = new QToolButton(m_zoomWidget); - m_zoomIn->setIcon(KIcon("file-zoom-in")); - m_zoomIn->setAutoRaise(true); - - // Initialize zoom widget layout - QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(m_zoomWidget); - zoomWidgetLayout->setSpacing(0); - zoomWidgetLayout->setMargin(0); - zoomWidgetLayout->addWidget(m_zoomOut); - zoomWidgetLayout->addWidget(m_zoomSlider); - zoomWidgetLayout->addWidget(m_zoomIn); - - connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int))); - connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int))); - connect(m_view, SIGNAL(zoomLevelChanged(int)), m_zoomSlider, SLOT(setValue(int))); - connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut())); - connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn())); + 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); - m_spaceInfo->setUrl(m_view->url()); // Initialize progress information m_stopButton = new QToolButton(this); - m_stopButton->setIcon(KIcon("process-stop")); - // TODO: Add tooltip for KDE SC 4.7.0, if new strings are allowed again + 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_progressText = new QLabel(this); - m_progressText->hide(); + m_progressTextLabel = new QLabel(this); + m_progressTextLabel->hide(); m_progressBar = new QProgressBar(this); m_progressBar->hide(); m_showProgressBarTimer = new QTimer(this); - m_showProgressBarTimer->setInterval(1000); + m_showProgressBarTimer->setInterval(500); m_showProgressBarTimer->setSingleShot(true); - connect(m_showProgressBarTimer, SIGNAL(timeout()), this, SLOT(updateProgressInfo())); + connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo); + + // 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_messageLabel->font()).height(); - const int zoomWidgetHeight = m_zoomWidget->minimumSizeHint().height(); - const int contentHeight = qMax(fontHeight, zoomWidgetHeight); + const int fontHeight = QFontMetrics(m_label->font()).height(); + const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height(); + const int buttonHeight = m_stopButton->height(); + const int contentHeight = qMax(qMax(fontHeight, zoomSliderHeight), buttonHeight); - m_messageLabel->setMinimumTextHeight(contentHeight); + QFontMetrics fontMetrics(m_label->font()); - m_spaceInfo->setMaximumSize(200, contentHeight - 5); + m_label->setFixedHeight(contentHeight); + m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25); + + m_spaceInfo->setFixedHeight(contentHeight); + m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25); m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - m_progressBar->setMaximumSize(200, contentHeight); - m_zoomWidget->setMaximumSize(150, contentHeight); - m_zoomSlider->setMinimumWidth(30); + 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_messageLabel); - topLayout->addWidget(m_zoomWidget); - 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_progressText); + 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() { } -void DolphinStatusBar::setMessage(const QString& msg, - Type type) +void DolphinStatusBar::setText(const QString& text) { - int timeout = 1000; // Timeout in milliseconds until default - // messages may overwrite other messages. - - QString message = msg; - if (message.isEmpty()) { - // Show the default text as fallback. An empty text indicates - // a clearing of the information message. - if (m_messageLabel->defaultText().isEmpty()) { - return; - } - message = m_messageLabel->defaultText(); - type = Default; - timeout = 0; - } - - KonqStatusBarMessageLabel::Type konqType = static_cast(type); - if ((message == m_messageLabel->text()) && (konqType == m_messageLabel->type())) { - // the message is already shown + if (m_text == text) { return; } - const QTime currentTime = QTime::currentTime(); - const bool skipMessage = (type == Default) && - m_messageTimeStamp.isValid() && - (m_messageTimeStamp.msecsTo(currentTime) < timeout); - if (skipMessage) { - // A non-default message is shown just for a very short time. Don't hide - // the message by a default message, so that the user gets the chance to - // read the information. - return; - } + m_textTimestamp = QTime::currentTime(); - m_messageLabel->setMessage(message, konqType); - if (type != Default) { - m_messageTimeStamp = currentTime; - } + m_text = text; + // will update status bar text in 50ms + m_delayUpdateTimer->start(); } -DolphinStatusBar::Type DolphinStatusBar::type() const +QString DolphinStatusBar::text() const { - return static_cast(m_messageLabel->type()); -} - -QString DolphinStatusBar::message() const -{ - return m_messageLabel->text(); + return m_text; } void DolphinStatusBar::setProgressText(const QString& text) { - m_progressText->setText(text); -} - -int DolphinStatusBar::progress() const -{ - return m_progress; + m_progressTextLabel->setText(text); } QString DolphinStatusBar::progressText() const { - return m_progressText->text(); + return m_progressTextLabel->text(); } void DolphinStatusBar::setProgress(int percent) @@ -223,20 +181,9 @@ void DolphinStatusBar::setProgress(int percent) // Show a busy indicator if a value < 0 is provided: m_progressBar->setMaximum((percent < 0) ? 0 : 100); - if (percent < 0) { - percent = 0; - } else if (percent > 100) { - percent = 100; - } - + percent = qBound(0, percent, 100); const bool progressRestarted = (percent < 100) && (percent < m_progress); m_progress = percent; - if (m_messageLabel->type() == KonqStatusBarMessageLabel::Error) { - // Don't update any widget or status bar text if an - // error message is shown - return; - } - if (progressRestarted && !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. @@ -250,106 +197,94 @@ void DolphinStatusBar::setProgress(int percent) m_showProgressBarTimer->stop(); updateProgressInfo(); } +} - const QString defaultText = m_messageLabel->defaultText(); - const QString msg(m_messageLabel->text()); - if ((percent == 0) && !msg.isEmpty()) { - setMessage(QString(), Default); - } else if ((percent == 100) && (msg != defaultText)) { - setMessage(defaultText, Default); - } +int DolphinStatusBar::progress() const +{ + return m_progress; } -void DolphinStatusBar::clear() +void DolphinStatusBar::resetToDefaultText() { - setMessage(m_messageLabel->defaultText(), Default); + m_text.clear(); + + QTime currentTime; + if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) { + m_delayUpdateTimer->start(); + } else { + updateLabelText(); + } } void DolphinStatusBar::setDefaultText(const QString& text) { - m_messageLabel->setDefaultText(text); + m_defaultText = text; + updateLabelText(); } QString DolphinStatusBar::defaultText() const { - return m_messageLabel->defaultText(); + return m_defaultText; +} + +void DolphinStatusBar::setUrl(const QUrl& url) +{ + m_spaceInfo->setUrl(url); +} + +QUrl DolphinStatusBar::url() const +{ + return m_spaceInfo->url(); +} + +void DolphinStatusBar::setZoomLevel(int zoomLevel) +{ + if (zoomLevel != m_zoomSlider->value()) { + m_zoomSlider->setValue(zoomLevel); + } +} + +int DolphinStatusBar::zoomLevel() const +{ + return m_zoomSlider->value(); } -void DolphinStatusBar::refresh() +void DolphinStatusBar::readSettings() { setExtensionsVisible(true); } +void DolphinStatusBar::updateSpaceInfo() +{ + m_spaceInfo->update(); +} + void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) { - Q_UNUSED(event); - - KMenu menu(this); - - QAction* copyAction = 0; - switch (type()) { - case Default: - case OperationCompleted: - case Information: - copyAction = menu.addAction(i18nc("@action:inmenu", "Copy Information Message")); - break; - case Error: - copyAction = menu.addAction(i18nc("@action:inmenu", "Copy Error Message")); - break; - default: break; - } + Q_UNUSED(event) - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + QMenu menu(this); QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); - showZoomSliderAction->setChecked(settings->showZoomSlider()); + showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); showSpaceInfoAction->setCheckable(true); - showSpaceInfoAction->setChecked(settings->showSpaceInfo()); + showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); const QAction* action = menu.exec(QCursor::pos()); - if (action == copyAction) { - QMimeData* mimeData = new QMimeData(); - mimeData->setText(message()); - QApplication::clipboard()->setMimeData(mimeData); - } else if (action == showZoomSliderAction) { + if (action == showZoomSliderAction) { const bool visible = showZoomSliderAction->isChecked(); - settings->setShowZoomSlider(visible); - m_zoomWidget->setVisible(visible); + GeneralSettings::setShowZoomSlider(visible); + m_zoomSlider->setVisible(visible); } else if (action == showSpaceInfoAction) { const bool visible = showSpaceInfoAction->isChecked(); - settings->setShowSpaceInfo(visible); + GeneralSettings::setShowSpaceInfo(visible); m_spaceInfo->setVisible(visible); } } -void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url) -{ - m_spaceInfo->setUrl(url); -} - -void DolphinStatusBar::setZoomLevel(int zoomLevel) -{ - m_zoomOut->setEnabled(zoomLevel > m_zoomSlider->minimum()); - m_zoomIn->setEnabled(zoomLevel < m_zoomSlider->maximum()); - m_view->setZoomLevel(zoomLevel); - updateZoomSliderToolTip(zoomLevel); -} - -void DolphinStatusBar::zoomOut() -{ - const int value = m_zoomSlider->value(); - m_zoomSlider->setValue(value - 1); -} - -void DolphinStatusBar::zoomIn() -{ - const int value = m_zoomSlider->value(); - m_zoomSlider->setValue(value + 1); -} - void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) { updateZoomSliderToolTip(zoomLevel); @@ -362,35 +297,25 @@ void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) void DolphinStatusBar::updateProgressInfo() { - const bool isErrorShown = (m_messageLabel->type() == KonqStatusBarMessageLabel::Error); if (m_progress < 100) { // Show the progress information and hide the extensions + m_stopButton->show(); + m_progressTextLabel->show(); + m_progressBar->show(); setExtensionsVisible(false); - if (!isErrorShown) { - m_stopButton->show(); - m_progressText->show(); - m_progressBar->show(); - } } else { // Hide the progress information and show the extensions m_stopButton->hide(); - m_progressText->hide(); + m_progressTextLabel->hide(); m_progressBar->hide(); setExtensionsVisible(true); } } -void DolphinStatusBar::setExtensionsVisible(bool visible) +void DolphinStatusBar::updateLabelText() { - bool showSpaceInfo = visible; - bool showZoomWidget = visible; - if (visible) { - const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - showSpaceInfo = settings->showSpaceInfo(); - showZoomWidget = settings->showZoomSlider(); - } - m_spaceInfo->setVisible(showSpaceInfo); - m_zoomWidget->setVisible(showZoomWidget); + const QString text = m_text.isEmpty() ? m_defaultText : m_text; + m_label->setText(text); } void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) @@ -399,4 +324,15 @@ void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); } -#include "dolphinstatusbar.moc" +void DolphinStatusBar::setExtensionsVisible(bool visible) +{ + bool showSpaceInfo = visible; + bool showZoomSlider = visible; + if (visible) { + showSpaceInfo = GeneralSettings::showSpaceInfo(); + showZoomSlider = GeneralSettings::showZoomSlider(); + } + m_spaceInfo->setVisible(showSpaceInfo); + m_zoomSlider->setVisible(showZoomSlider); +} +