kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Frank Reininghaus 2014-02-07 10:26:00 +01:00
commit 016cf47c53
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/dolphinmainwindow.cpp
View file

@ -677,6 +677,13 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
Q_ASSERT(cont); Q_ASSERT(cont);
} }
// The right view must be activated before the URL is set. Changing
// the URL in the right view will emit the right URL navigator's
// urlChanged(KUrl) signal, which is connected to the changeUrl(KUrl)
// slot. That slot will change the URL in the left view if it is still
// active. See https://bugs.kde.org/show_bug.cgi?id=330047.
setActiveViewContainer(cont);
cont->setUrl(secondaryUrl); cont->setUrl(secondaryUrl);
const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false); const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
cont->urlNavigator()->setUrlEditable(editable); cont->urlNavigator()->setUrlEditable(editable);

11
src/views/dolphinview.cpp
View file

@ -1662,11 +1662,16 @@ void DolphinView::updateWritableState()
const bool wasFolderWritable = m_isFolderWritable; const bool wasFolderWritable = m_isFolderWritable;
m_isFolderWritable = false; m_isFolderWritable = false;
const KFileItem item = m_model->rootItem(); KFileItem item = m_model->rootItem();
if (!item.isNull()) { if (item.isNull()) {
// Try to find out if the URL is writable even if the "root item" is
// null, see https://bugs.kde.org/show_bug.cgi?id=330001
item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url(), true);
}
KFileItemListProperties capabilities(KFileItemList() << item); KFileItemListProperties capabilities(KFileItemList() << item);
m_isFolderWritable = capabilities.supportsWriting(); m_isFolderWritable = capabilities.supportsWriting();
}
if (m_isFolderWritable != wasFolderWritable) { if (m_isFolderWritable != wasFolderWritable) {
emit writeStateChanged(m_isFolderWritable); emit writeStateChanged(m_isFolderWritable);
} }