Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index f738dc078a63c65fa249392635a0a2cdf3655433..f0fad1976e81122444ed912a2c9c5ecc19faee4d 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -73,7 +73,7 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_NEPOMUK
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_NEPOMUK

-    #include <Nepomuk/ResourceManager>
+    #include <Nepomuk2/ResourceManager>

 #endif
 
 namespace {
 #endif
 
 namespace {


@@ -88,6 +88,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_isFolderWritable(true),
     m_dragging(false),
     m_url(url),
     m_isFolderWritable(true),
     m_dragging(false),
     m_url(url),

+    m_viewPropertiesContext(),

     m_mode(DolphinView::IconsView),
     m_visibleRoles(),
     m_topLayout(0),
     m_mode(DolphinView::IconsView),
     m_visibleRoles(),
     m_topLayout(0),


@@ -97,9 +98,10 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_toolTipManager(0),
     m_selectionChangedTimer(0),
     m_currentItemUrl(),
     m_toolTipManager(0),
     m_selectionChangedTimer(0),
     m_currentItemUrl(),

+    m_scrollToCurrentItem(false),

     m_restoredContentsPosition(),
     m_restoredContentsPosition(),

-    m_createdItemUrl(),

     m_selectedUrls(),
     m_selectedUrls(),

+    m_clearSelectionBeforeSelectingNewItems(false),

     m_versionControlObserver(0)
 {
     m_topLayout = new QVBoxLayout(this);
     m_versionControlObserver(0)
 {
     m_topLayout = new QVBoxLayout(this);


@@ -121,7 +123,6 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
     m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
     m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());

-    m_view->setEnlargeSmallPreviews(GeneralSettings::enlargeSmallPreviews());

     m_view->setVisibleRoles(QList<QByteArray>() << "text");
     applyModeToView();
 
     m_view->setVisibleRoles(QList<QByteArray>() << "text");
     applyModeToView();
 


@@ -129,6 +130,10 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
     controller->setAutoActivationDelay(delay);
 
     const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
     controller->setAutoActivationDelay(delay);
 

+    // The EnlargeSmallPreviews setting can only be changed after the model
+    // has been set in the view by KItemListController.
+    m_view->setEnlargeSmallPreviews(GeneralSettings::enlargeSmallPreviews());
+

     m_container = new KItemListContainer(controller, this);
     m_container->installEventFilter(this);
     setFocusProxy(m_container);
     m_container = new KItemListContainer(controller, this);
     m_container->installEventFilter(this);
     setFocusProxy(m_container);


@@ -150,6 +155,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
 
     connect(m_model, SIGNAL(directoryLoadingStarted()),       this, SLOT(slotDirectoryLoadingStarted()));
     connect(m_model, SIGNAL(directoryLoadingCompleted()),     this, SLOT(slotDirectoryLoadingCompleted()));
 
     connect(m_model, SIGNAL(directoryLoadingStarted()),       this, SLOT(slotDirectoryLoadingStarted()));
     connect(m_model, SIGNAL(directoryLoadingCompleted()),     this, SLOT(slotDirectoryLoadingCompleted()));

+    connect(m_model, SIGNAL(directoryLoadingCanceled()),      this, SIGNAL(directoryLoadingCanceled()));

     connect(m_model, SIGNAL(directoryLoadingProgress(int)),   this, SIGNAL(directoryLoadingProgress(int)));
     connect(m_model, SIGNAL(directorySortingProgress(int)),   this, SIGNAL(directorySortingProgress(int)));
     connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
     connect(m_model, SIGNAL(directoryLoadingProgress(int)),   this, SIGNAL(directoryLoadingProgress(int)));
     connect(m_model, SIGNAL(directorySortingProgress(int)),   this, SIGNAL(directorySortingProgress(int)));
     connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),


@@ -159,6 +165,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     connect(m_model, SIGNAL(infoMessage(QString)),            this, SIGNAL(infoMessage(QString)));
     connect(m_model, SIGNAL(errorMessage(QString)),           this, SIGNAL(errorMessage(QString)));
     connect(m_model, SIGNAL(directoryRedirection(KUrl,KUrl)), this, SLOT(slotDirectoryRedirection(KUrl,KUrl)));
     connect(m_model, SIGNAL(infoMessage(QString)),            this, SIGNAL(infoMessage(QString)));
     connect(m_model, SIGNAL(errorMessage(QString)),           this, SIGNAL(errorMessage(QString)));
     connect(m_model, SIGNAL(directoryRedirection(KUrl,KUrl)), this, SLOT(slotDirectoryRedirection(KUrl,KUrl)));

+    connect(m_model, SIGNAL(urlIsFileError(KUrl)),            this, SIGNAL(urlIsFileError(KUrl)));

 
     m_view->installEventFilter(this);
     connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
 
     m_view->installEventFilter(this);
     connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),


@@ -236,7 +243,7 @@ bool DolphinView::isActive() const
 void DolphinView::setMode(Mode mode)
 {
     if (mode != m_mode) {
 void DolphinView::setMode(Mode mode)
 {
     if (mode != m_mode) {

-        ViewProperties props(url());
+        ViewProperties props(viewPropertiesUrl());

         props.setViewMode(mode);
         props.save();
 
         props.setViewMode(mode);
         props.save();
 


@@ -255,11 +262,17 @@ void DolphinView::setPreviewsShown(bool show)
         return;
     }
 
         return;
     }
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setPreviewsShown(show);
 
     props.setPreviewsShown(show);
 

+    const int oldZoomLevel = m_view->zoomLevel();

     m_view->setPreviewsShown(show);
     emit previewsShownChanged(show);
     m_view->setPreviewsShown(show);
     emit previewsShownChanged(show);

+
+    const int newZoomLevel = m_view->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }

 }
 
 bool DolphinView::previewsShown() const
 }
 
 bool DolphinView::previewsShown() const


@@ -277,7 +290,7 @@ void DolphinView::setHiddenFilesShown(bool show)
     m_selectedUrls.clear();
     m_selectedUrls = itemList.urlList();
 
     m_selectedUrls.clear();
     m_selectedUrls = itemList.urlList();
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setHiddenFilesShown(show);
 
     m_model->setShowHiddenFiles(show);
     props.setHiddenFilesShown(show);
 
     m_model->setShowHiddenFiles(show);


@@ -295,7 +308,7 @@ void DolphinView::setGroupedSorting(bool grouped)
         return;
     }
 
         return;
     }
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setGroupedSorting(grouped);
     props.save();
 
     props.setGroupedSorting(grouped);
     props.save();
 


@@ -330,10 +343,12 @@ int DolphinView::itemsCount() const
 KFileItemList DolphinView::selectedItems() const
 {
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 KFileItemList DolphinView::selectedItems() const
 {
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

-    const QSet<int> selectedIndexes = selectionManager->selectedItems();
+    QList<int> selectedIndexes = selectionManager->selectedItems().toList();
+
+    qSort(selectedIndexes);

 
     KFileItemList selectedItems;
 
     KFileItemList selectedItems;

-    QSetIterator<int> it(selectedIndexes);
+    QListIterator<int> it(selectedIndexes);

     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(m_model->fileItem(index));
     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(m_model->fileItem(index));


@@ -355,6 +370,7 @@ void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
 void DolphinView::markUrlAsCurrent(const KUrl& url)
 {
     m_currentItemUrl = url;
 void DolphinView::markUrlAsCurrent(const KUrl& url)
 {
     m_currentItemUrl = url;

+    m_scrollToCurrentItem = true;

 }
 
 void DolphinView::selectItems(const QRegExp& pattern, bool enabled)
 }
 
 void DolphinView::selectItems(const QRegExp& pattern, bool enabled)


@@ -381,6 +397,7 @@ void DolphinView::setZoomLevel(int level)
     const int oldZoomLevel = zoomLevel();
     m_view->setZoomLevel(level);
     if (zoomLevel() != oldZoomLevel) {
     const int oldZoomLevel = zoomLevel();
     m_view->setZoomLevel(level);
     if (zoomLevel() != oldZoomLevel) {

+        hideToolTip();

         emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
     }
 }
         emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
     }
 }


@@ -431,7 +448,7 @@ void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)
 {
     const QList<QByteArray> previousRoles = roles;
 
 {
     const QList<QByteArray> previousRoles = roles;
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setVisibleRoles(roles);
 
     m_visibleRoles = roles;
     props.setVisibleRoles(roles);
 
     m_visibleRoles = roles;


@@ -500,6 +517,16 @@ QString DolphinView::nameFilter() const
     return m_model->nameFilter();
 }
 
     return m_model->nameFilter();
 }
 

+void DolphinView::setMimeTypeFilters(const QStringList& filters)
+{
+    return m_model->setMimeTypeFilters(filters);
+}
+
+QStringList DolphinView::mimeTypeFilters() const
+{
+    return m_model->mimeTypeFilters();
+}
+

 QString DolphinView::statusBarText() const
 {
     QString summary;
 QString DolphinView::statusBarText() const
 {
     QString summary;


@@ -575,6 +602,8 @@ void DolphinView::setUrl(const KUrl& url)
         return;
     }
 
         return;
     }
 

+    clearSelection();
+

     emit urlAboutToBeChanged(url);
     m_url = url;
 
     emit urlAboutToBeChanged(url);
     m_url = url;
 


@@ -605,31 +634,32 @@ void DolphinView::invertSelection()
 
 void DolphinView::clearSelection()
 {
 
 void DolphinView::clearSelection()
 {

+    m_selectedUrls.clear();

     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {
     const KFileItemList items = selectedItems();
     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {
     const KFileItemList items = selectedItems();

-     if (items.isEmpty()) {
-         return;
-     }
-
-     if (items.count() == 1) {
-         const int index = m_model->index(items.first());
-         m_container->controller()->view()->editRole(index, "text");
-     } else {
-         RenameDialog* dialog = new RenameDialog(this, items);
-         dialog->setAttribute(Qt::WA_DeleteOnClose);
-         dialog->show();
-         dialog->raise();
-         dialog->activateWindow();
-     }
-
-     // Assure that the current index remains visible when KFileItemModel
-     // will notify the view about changed items (which might result in
-     // a changed sorting).
-     m_assureVisibleCurrentIndex = true;
+    if (items.isEmpty()) {
+        return;
+    }
+
+    if (items.count() == 1 && GeneralSettings::renameInline()) {
+        const int index = m_model->index(items.first());
+        m_view->editRole(index, "text");
+    } else {
+        RenameDialog* dialog = new RenameDialog(this, items);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+        dialog->raise();
+        dialog->activateWindow();
+    }
+
+    // Assure that the current index remains visible when KFileItemModel
+    // will notify the view about changed items (which might result in
+    // a changed sorting).
+    m_assureVisibleCurrentIndex = true;

 }
 
 void DolphinView::trashSelectedItems()
 }
 
 void DolphinView::trashSelectedItems()


@@ -733,6 +763,20 @@ void DolphinView::hideEvent(QHideEvent* event)
     QWidget::hideEvent(event);
 }
 
     QWidget::hideEvent(event);
 }
 

+bool DolphinView::event(QEvent* event)
+{
+    /* See Bug 297355
+     * Dolphin leaves file preview tooltips open even when is not visible.
+     *
+     * Hide tool-tip when Dolphin loses focus.
+     */
+    if (event->type() == QEvent::WindowDeactivate) {
+        hideToolTip();
+    }
+
+    return QWidget::event(event);
+}
+

 void DolphinView::activate()
 {
     setActive(true);
 void DolphinView::activate()
 {
     setActive(true);


@@ -750,21 +794,34 @@ void DolphinView::slotItemsActivated(const QSet<int>& indexes)
 {
     Q_ASSERT(indexes.count() >= 2);
 
 {
     Q_ASSERT(indexes.count() >= 2);
 

+    if (indexes.count() > 5) {
+        QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
+        const int answer = KMessageBox::warningYesNo(this, question);
+        if (answer != KMessageBox::Yes) {
+            return;
+        }
+    }
+

     KFileItemList items;
     KFileItemList items;

+    items.reserve(indexes.count());

 
     QSetIterator<int> it(indexes);
     while (it.hasNext()) {
         const int index = it.next();
 
     QSetIterator<int> it(indexes);
     while (it.hasNext()) {
         const int index = it.next();

-        items.append(m_model->fileItem(index));
-    }
+        KFileItem item = m_model->fileItem(index);

 
 

-    foreach (const KFileItem& item, items) {
-        if (item.isDir()) {
+        if (item.isDir()) { // Open folders in new tabs

             emit tabRequested(item.url());
         } else {
             emit tabRequested(item.url());
         } else {

-            emit itemActivated(item);
+            items.append(item);

         }
     }
         }
     }

+
+    if (items.count() == 1) {
+        emit itemActivated(items.first());
+    } else if (items.count() > 1) {
+        emit itemsActivated(items);
+    }

 }
 
 void DolphinView::slotItemMiddleClicked(int index)
 }
 
 void DolphinView::slotItemMiddleClicked(int index)


@@ -788,7 +845,7 @@ void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

 
     QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
 
 
     QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
 


@@ -798,10 +855,10 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     bool nepomukRunning = false;
     bool indexingEnabled = false;
 #ifdef HAVE_NEPOMUK
     bool nepomukRunning = false;
     bool indexingEnabled = false;
 #ifdef HAVE_NEPOMUK

-    nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
+    nepomukRunning = (Nepomuk2::ResourceManager::instance()->initialized());

     if (nepomukRunning) {
         KConfig config("nepomukserverrc");
     if (nepomukRunning) {
         KConfig config("nepomukserverrc");

-        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
+        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", true);

     }
 #endif
 
     }
 #endif
 


@@ -905,7 +962,7 @@ void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal cur
 
     const QList<QByteArray> visibleRoles = m_view->visibleRoles();
 
 
     const QList<QByteArray> visibleRoles = m_view->visibleRoles();
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     QList<int> columnWidths = props.headerColumnWidths();
     if (columnWidths.count() != visibleRoles.count()) {
         columnWidths.clear();
     QList<int> columnWidths = props.headerColumnWidths();
     if (columnWidths.count() != visibleRoles.count()) {
         columnWidths.clear();


@@ -1031,7 +1088,7 @@ void DolphinView::emitSelectionChangedSignal()
 
 void DolphinView::updateSortRole(const QByteArray& role)
 {
 
 void DolphinView::updateSortRole(const QByteArray& role)
 {

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setSortRole(role);
 
     KItemModelBase* model = m_container->controller()->model();
     props.setSortRole(role);
 
     KItemModelBase* model = m_container->controller()->model();


@@ -1042,7 +1099,7 @@ void DolphinView::updateSortRole(const QByteArray& role)
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setSortOrder(order);
 
     m_model->setSortOrder(order);
     props.setSortOrder(order);
 
     m_model->setSortOrder(order);


@@ -1052,7 +1109,7 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::updateSortFoldersFirst(bool foldersFirst)
 {
 
 void DolphinView::updateSortFoldersFirst(bool foldersFirst)
 {

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setSortFoldersFirst(foldersFirst);
 
     m_model->setSortDirectoriesFirst(foldersFirst);
     props.setSortFoldersFirst(foldersFirst);
 
     m_model->setSortDirectoriesFirst(foldersFirst);


@@ -1121,27 +1178,23 @@ KFileItem DolphinView::rootItem() const
     return m_model->rootItem();
 }
 
     return m_model->rootItem();
 }
 

-void DolphinView::observeCreatedItem(const KUrl& url)
+void DolphinView::setViewPropertiesContext(const QString& context)

 {
 {

-    m_createdItemUrl = url;
-    connect(m_model, SIGNAL(directoryLoadingCompleted()),
-            this, SLOT(selectAndScrollToCreatedItem()));
+    m_viewPropertiesContext = context;

 }
 
 }
 

-void DolphinView::selectAndScrollToCreatedItem()
+QString DolphinView::viewPropertiesContext() const

 {
 {

-    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    const int index = m_model->index(m_createdItemUrl);
-    if (index != -1) {
-        selectionManager->setCurrentItem(index);
-        selectionManager->clearSelection();
-        selectionManager->setSelected(index);
-        m_view->scrollToItem(index);
-    }
+    return m_viewPropertiesContext;
+}

 
 

-    disconnect(m_model, SIGNAL(directoryLoadingCompleted()),
-               this, SLOT(selectAndScrollToCreatedItem()));
-    m_createdItemUrl = KUrl();
+void DolphinView::observeCreatedItem(const KUrl& url)
+{
+    if (m_active) {
+        clearSelection();
+        markUrlAsCurrent(url);
+        markUrlsAsSelected(QList<KUrl>() << url);
+    }

 }
 
 void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 }
 
 void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)


@@ -1159,6 +1212,12 @@ void DolphinView::updateViewState()
         const int currentIndex = m_model->index(m_currentItemUrl);
         if (currentIndex != -1) {
             selectionManager->setCurrentItem(currentIndex);
         const int currentIndex = m_model->index(m_currentItemUrl);
         if (currentIndex != -1) {
             selectionManager->setCurrentItem(currentIndex);

+
+            // scroll to current item and reset the state
+            if (m_scrollToCurrentItem) {
+                m_view->scrollToItem(currentIndex);
+                m_scrollToCurrentItem = false;
+            }

         } else {
             selectionManager->setCurrentItem(0);
         }
         } else {
             selectionManager->setCurrentItem(0);
         }


@@ -1175,20 +1234,27 @@ void DolphinView::updateViewState()
     }
 
     if (!m_selectedUrls.isEmpty()) {
     }
 
     if (!m_selectedUrls.isEmpty()) {

-        clearSelection();
-

         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

+
+        if (m_clearSelectionBeforeSelectingNewItems) {
+            selectionManager->clearSelection();
+            m_clearSelectionBeforeSelectingNewItems = false;
+        }
+

         QSet<int> selectedItems = selectionManager->selectedItems();
 
         QSet<int> selectedItems = selectionManager->selectedItems();
 

-        foreach (const KUrl& url, m_selectedUrls) {
-            const int index = m_model->index(url);
+        QList<KUrl>::iterator it = m_selectedUrls.begin();
+        while (it != m_selectedUrls.end()) {
+            const int index = m_model->index(*it);

             if (index >= 0) {
                 selectedItems.insert(index);
             if (index >= 0) {
                 selectedItems.insert(index);

+                it = m_selectedUrls.erase(it);
+            } else {
+                 ++it;

             }
         }
 
         selectionManager->setSelectedItems(selectedItems);
             }
         }
 
         selectionManager->setSelectedItems(selectedItems);

-        m_selectedUrls.clear();

     }
 }
 
     }
 }
 


@@ -1267,7 +1333,7 @@ void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOr
     Q_UNUSED(previous);
     Q_ASSERT(m_model->sortOrder() == current);
 
     Q_UNUSED(previous);
     Q_ASSERT(m_model->sortOrder() == current);
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setSortOrder(current);
 
     emit sortOrderChanged(current);
     props.setSortOrder(current);
 
     emit sortOrderChanged(current);


@@ -1278,7 +1344,7 @@ void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const Q
     Q_UNUSED(previous);
     Q_ASSERT(m_model->sortRole() == current);
 
     Q_UNUSED(previous);
     Q_ASSERT(m_model->sortRole() == current);
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setSortRole(current);
 
     emit sortRoleChanged(current);
     props.setSortRole(current);
 
     emit sortRoleChanged(current);


@@ -1294,7 +1360,7 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& curre
 
     m_visibleRoles = current;
 
 
     m_visibleRoles = current;
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setVisibleRoles(m_visibleRoles);
 
     emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
     props.setVisibleRoles(m_visibleRoles);
 
     emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);


@@ -1302,11 +1368,30 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& curre
 
 void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
 {
 
 void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
 {

+    if (index < 0 || index >= m_model->count()) {
+        return;
+    }
+

     if (role == "text") {
     if (role == "text") {

-        const KFileItem item = m_model->fileItem(index);
+        const KFileItem oldItem = m_model->fileItem(index);

         const QString newName = value.toString();
         const QString newName = value.toString();

-        if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
-            KonqOperations::rename(this, item.url(), newName);
+        if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+            const KUrl oldUrl = oldItem.url();
+
+            const KUrl newUrl(url().path(KUrl::AddTrailingSlash) + newName);
+            const bool newNameExistsAlready = (m_model->index(newUrl) >= 0);
+            if (!newNameExistsAlready) {
+                // Only change the data in the model if no item with the new name
+                // is in the model yet. If there is an item with the new name
+                // already, calling KonqOperations::rename() will open a dialog
+                // asking for a new name, and KFileItemModel will update the
+                // data when the dir lister signals that the file name has changed.
+                QHash<QByteArray, QVariant> data;
+                data.insert(role, value);
+                m_model->setData(index, data);
+            }
+
+            KonqOperations::rename(this, oldUrl, newName);

         }
     }
 }
         }
     }
 }


@@ -1334,7 +1419,7 @@ void DolphinView::applyViewProperties()
 {
     m_view->beginTransaction();
 
 {
     m_view->beginTransaction();
 

-    const ViewProperties props(url());
+    const ViewProperties props(viewPropertiesUrl());

 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {


@@ -1447,7 +1532,7 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
     KUrl::List urls;
 
     const KFileItemList items = selectedItems();
     KUrl::List urls;
 
     const KFileItemList items = selectedItems();

-    foreach (const KFileItem &item, items) {
+    foreach (const KFileItem& item, items) {

         urls.append(item.url());
     }
 
         urls.append(item.url());
     }
 


@@ -1472,10 +1557,11 @@ void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
     const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
     KUrl::List destUrls;
     foreach (const KUrl& source, sourceUrls) {
     const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
     KUrl::List destUrls;
     foreach (const KUrl& source, sourceUrls) {

-        KUrl destination(url().url() + "/" + source.fileName());
+        KUrl destination(url().url() + '/' + source.fileName());

         destUrls << destination;
     }
     markUrlsAsSelected(destUrls);
         destUrls << destination;
     }
     markUrlsAsSelected(destUrls);

+    m_clearSelectionBeforeSelectingNewItems = true;

 }
 
 void DolphinView::updateWritableState()
 }
 
 void DolphinView::updateWritableState()


@@ -1493,4 +1579,16 @@ void DolphinView::updateWritableState()
     }
 }
 
     }
 }
 

+KUrl DolphinView::viewPropertiesUrl() const
+{
+    if (m_viewPropertiesContext.isEmpty()) {
+        return m_url;
+    }
+
+    KUrl url;
+    url.setProtocol(m_url.protocol());
+    url.setPath(m_viewPropertiesContext);
+    return url;
+}
+

 #include "dolphinview.moc"
 #include "dolphinview.moc"