kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.11'

Browse source
This commit is contained in:
Frank Reininghaus 2013-08-08 23:39:28 +02:00
parent 6524bf701a 87f8303023
commit 68520f55f0
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphinpart.cpp
View file

@ -356,7 +356,7 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
if (item.isNull()) {
updateStatusBar();
} else {
const QString escapedText = Qt::escape(item.getStatusBarInfo());
const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo());
ReadOnlyPart::setStatusBarText(QString("<qt>%1</qt>").arg(escapedText));
}
}

10
src/statusbar/dolphinstatusbar.cpp
View file

@ -34,6 +34,7 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QProgressBar>
#include <QTextDocument>
#include <QToolButton>
#include <QTime>
#include <QTimer>
@ -324,10 +325,17 @@ 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);
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::slotResetToDefaultText()