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.10'

Browse source
This commit is contained in:
Frank Reininghaus 2013-06-24 22:02:04 +02:00
parent e715b9a8a4 aebe7a9010
commit 51b978f7fd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kitemviews/kfileitemmodel.cpp
View file

@ -249,7 +249,7 @@ QMimeData* KFileItemModel::createMimeData(const QSet<int>& indexes) const
const int index = it.next();
const KFileItem item = fileItem(index);
if (!item.isNull()) {
urls << item.url();
urls << item.targetUrl();
bool isLocal;
mostLocalUrls << item.mostLocalUrl(isLocal);

12
src/views/viewproperties.cpp
View file

@ -53,7 +53,7 @@ ViewProperties::ViewProperties(const KUrl& url) :
m_node(0)
{
GeneralSettings* settings = GeneralSettings::self();
const bool useGlobalViewProps = settings->globalViewProps();
const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty();
bool useDetailsViewWithPath = false;
// We try and save it to the file .directory in the directory being viewed.
@ -100,13 +100,13 @@ ViewProperties::ViewProperties(const KUrl& url) :
setVisibleRoles(QList<QByteArray>() << "path");
} else {
// The global view-properties act as default for directories without
// any view-property configuration
settings->setGlobalViewProps(true);
ViewProperties defaultProps(url);
// any view-property configuration. Constructing a ViewProperties
// instance for an empty KUrl ensures that the global view-properties
// are loaded.
KUrl emptyUrl;
ViewProperties defaultProps(emptyUrl);
setDirProperties(defaultProps);
settings->setGlobalViewProps(false);
m_changedProps = false;
}
}