#include "dolphin_generalsettings.h"
#include <KIconLoader>
-#include <KIcon>
+#include <QIcon>
#include <KLocale>
-#include <KMenu>
+#include <QMenu>
#include <KVBox>
#include "statusbarspaceinfo.h"
#include <QApplication>
-#include <QClipboard>
#include <QHBoxLayout>
#include <QLabel>
#include <QProgressBar>
+#include <QTextDocument>
#include <QToolButton>
#include <QTime>
#include <QTimer>
#include <views/dolphinview.h>
#include <views/zoomlevelinfo.h>
+namespace {
+ const int ResetToDefaultTimeout = 1000;
+}
+
DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
QWidget(parent),
m_text(),
m_progressBar(0),
m_stopButton(0),
m_progress(100),
- m_showProgressBarTimer(0)
+ m_showProgressBarTimer(0),
+ m_resetToDefaultTextTimer(0),
+ m_textTimestamp()
{
// Initialize text label
m_label = new QLabel(this);
m_label->setWordWrap(true);
+ m_label->setTextFormat(Qt::PlainText);
m_label->installEventFilter(this);
// 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("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();
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);
- 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(contentHeight);
+ m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
+ m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+ m_progressBar->setFixedHeight(contentHeight);
+ m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
QHBoxLayout* topLayout = new QHBoxLayout(this);
topLayout->setMargin(0);
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();
}
}
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)
{
if (zoomLevel != m_zoomSlider->value()) {
m_zoomSlider->setValue(zoomLevel);
- updateZoomSliderToolTip(zoomLevel);
}
}
{
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());
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);
{
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
{
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);
- m_label->setToolTip(text == elidedText ? QString() : text);
+
+ // 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::setExtensionsVisible(bool visible)
+void DolphinStatusBar::slotResetToDefaultText()
{
- bool showSpaceInfo = visible;
- bool showZoomSlider = visible;
- if (visible) {
- showSpaceInfo = GeneralSettings::showSpaceInfo();
- showZoomSlider = GeneralSettings::showZoomSlider();
- }
- m_spaceInfo->setVisible(showSpaceInfo);
- m_zoomSlider->setVisible(showZoomSlider);
+ m_text.clear();
+ updateLabelText();
}
void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
}
-void DolphinStatusBar::applyFixedWidgetSize(QWidget* widget, const QSize& size)
+void DolphinStatusBar::setExtensionsVisible(bool visible)
{
- widget->setMinimumSize(size);
- widget->setMaximumSize(size);
- widget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ bool showSpaceInfo = visible;
+ bool showZoomSlider = visible;
+ if (visible) {
+ showSpaceInfo = GeneralSettings::showSpaceInfo();
+ showZoomSlider = GeneralSettings::showZoomSlider();
+ }
+ m_spaceInfo->setVisible(showSpaceInfo);
+ m_zoomSlider->setVisible(showZoomSlider);
}
-#include "dolphinstatusbar.moc"
projects / dolphin.git / blobdiff