mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge remote-tracking branch 'origin/KDE/4.10'
This commit is contained in:
commit
51b978f7fd
|
@ -249,7 +249,7 @@ QMimeData* KFileItemModel::createMimeData(const QSet<int>& indexes) const
|
||||||
const int index = it.next();
|
const int index = it.next();
|
||||||
const KFileItem item = fileItem(index);
|
const KFileItem item = fileItem(index);
|
||||||
if (!item.isNull()) {
|
if (!item.isNull()) {
|
||||||
urls << item.url();
|
urls << item.targetUrl();
|
||||||
|
|
||||||
bool isLocal;
|
bool isLocal;
|
||||||
mostLocalUrls << item.mostLocalUrl(isLocal);
|
mostLocalUrls << item.mostLocalUrl(isLocal);
|
||||||
|
|
|
@ -53,7 +53,7 @@ ViewProperties::ViewProperties(const KUrl& url) :
|
||||||
m_node(0)
|
m_node(0)
|
||||||
{
|
{
|
||||||
GeneralSettings* settings = GeneralSettings::self();
|
GeneralSettings* settings = GeneralSettings::self();
|
||||||
const bool useGlobalViewProps = settings->globalViewProps();
|
const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty();
|
||||||
bool useDetailsViewWithPath = false;
|
bool useDetailsViewWithPath = false;
|
||||||
|
|
||||||
// We try and save it to the file .directory in the directory being viewed.
|
// 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");
|
setVisibleRoles(QList<QByteArray>() << "path");
|
||||||
} else {
|
} else {
|
||||||
// The global view-properties act as default for directories without
|
// The global view-properties act as default for directories without
|
||||||
// any view-property configuration
|
// any view-property configuration. Constructing a ViewProperties
|
||||||
settings->setGlobalViewProps(true);
|
// instance for an empty KUrl ensures that the global view-properties
|
||||||
|
// are loaded.
|
||||||
ViewProperties defaultProps(url);
|
KUrl emptyUrl;
|
||||||
|
ViewProperties defaultProps(emptyUrl);
|
||||||
setDirProperties(defaultProps);
|
setDirProperties(defaultProps);
|
||||||
|
|
||||||
settings->setGlobalViewProps(false);
|
|
||||||
m_changedProps = false;
|
m_changedProps = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue