mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge remote-tracking branch 'origin/KDE/4.11'
This commit is contained in:
commit
8552eb5d75
|
@ -58,6 +58,7 @@
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QTextDocument>
|
||||||
|
|
||||||
K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
|
K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
|
||||||
K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
|
K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
|
||||||
|
@ -355,7 +356,8 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
|
||||||
if (item.isNull()) {
|
if (item.isNull()) {
|
||||||
updateStatusBar();
|
updateStatusBar();
|
||||||
} else {
|
} else {
|
||||||
ReadOnlyPart::setStatusBarText(item.getStatusBarInfo());
|
const QString escapedText = Qt::escape(item.getStatusBarInfo());
|
||||||
|
ReadOnlyPart::setStatusBarText(QString("<qt>%1</qt>").arg(escapedText));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -702,7 +702,7 @@ void KFileItemModel::resortAllItems()
|
||||||
QList<int> movedToIndexes;
|
QList<int> movedToIndexes;
|
||||||
movedToIndexes.reserve(itemCount);
|
movedToIndexes.reserve(itemCount);
|
||||||
for (int i = 0; i < itemCount; i++) {
|
for (int i = 0; i < itemCount; i++) {
|
||||||
const int newIndex = m_items.value(oldUrls.at(i).url());
|
const int newIndex = m_items.value(oldUrls.at(i));
|
||||||
movedToIndexes.append(newIndex);
|
movedToIndexes.append(newIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
|
||||||
// Initialize text label
|
// Initialize text label
|
||||||
m_label = new QLabel(this);
|
m_label = new QLabel(this);
|
||||||
m_label->setWordWrap(true);
|
m_label->setWordWrap(true);
|
||||||
|
m_label->setTextFormat(Qt::PlainText);
|
||||||
m_label->installEventFilter(this);
|
m_label->installEventFilter(this);
|
||||||
|
|
||||||
// Initialize zoom widget
|
// Initialize zoom widget
|
||||||
|
|
|
@ -1099,7 +1099,7 @@ void DolphinView::slotAboutToCreate(const KUrl::List& urls)
|
||||||
markUrlAsCurrent(urls.first());
|
markUrlAsCurrent(urls.first());
|
||||||
m_markFirstNewlySelectedItemAsCurrent = false;
|
m_markFirstNewlySelectedItemAsCurrent = false;
|
||||||
}
|
}
|
||||||
m_selectedUrls << urls;
|
m_selectedUrls << KDirModel::simplifiedUrlList(urls);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1254,10 +1254,13 @@ KUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mimetype == QLatin1String("application/x-desktop")) {
|
if (mimetype == QLatin1String("application/x-desktop")) {
|
||||||
// Redirect to the URL in Type=Link desktop files
|
// Redirect to the URL in Type=Link desktop files, unless it is a http(s) URL.
|
||||||
KDesktopFile desktopFile(url.toLocalFile());
|
KDesktopFile desktopFile(url.toLocalFile());
|
||||||
if (desktopFile.hasLinkType()) {
|
if (desktopFile.hasLinkType()) {
|
||||||
return desktopFile.readUrl();
|
const QString linkUrl = desktopFile.readUrl();
|
||||||
|
if (!linkUrl.startsWith(QLatin1String("http"))) {
|
||||||
|
return linkUrl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue