Do not show an incorrect file name after a failed rename operation

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 12932c7099d886c0ee110f4fd2a6c823cbbbe65c..8e1a191082dece7997388f05469b434a589fcded 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -88,6 +88,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_isFolderWritable(true),
     m_dragging(false),
     m_url(url),
+    m_viewPropertiesContext(),
     m_mode(DolphinView::IconsView),
     m_visibleRoles(),
     m_topLayout(0),
@@ -97,8 +98,8 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_toolTipManager(0),
     m_selectionChangedTimer(0),
     m_currentItemUrl(),
+    m_scrollToCurrentItem(false),
     m_restoredContentsPosition(),
-    m_createdItemUrl(),
     m_selectedUrls(),
     m_versionControlObserver(0)
 {
@@ -121,7 +122,6 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     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();
 
@@ -129,6 +129,10 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     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);
@@ -159,6 +163,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(urlIsFileError(KUrl)),            this, SIGNAL(urlIsFileError(KUrl)));
 
     m_view->installEventFilter(this);
     connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
@@ -236,7 +241,7 @@ bool DolphinView::isActive() const
 void DolphinView::setMode(Mode mode)
 {
     if (mode != m_mode) {
-        ViewProperties props(url());
+        ViewProperties props(viewPropertiesUrl());
         props.setViewMode(mode);
         props.save();
 
@@ -255,11 +260,17 @@ void DolphinView::setPreviewsShown(bool show)
         return;
     }
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setPreviewsShown(show);
 
+    const int oldZoomLevel = m_view->zoomLevel();
     m_view->setPreviewsShown(show);
     emit previewsShownChanged(show);
+
+    const int newZoomLevel = m_view->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }
 }
 
 bool DolphinView::previewsShown() const
@@ -277,7 +288,7 @@ void DolphinView::setHiddenFilesShown(bool show)
     m_selectedUrls.clear();
     m_selectedUrls = itemList.urlList();
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setHiddenFilesShown(show);
 
     m_model->setShowHiddenFiles(show);
@@ -295,7 +306,7 @@ void DolphinView::setGroupedSorting(bool grouped)
         return;
     }
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setGroupedSorting(grouped);
     props.save();
 
@@ -355,6 +366,7 @@ void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
 void DolphinView::markUrlAsCurrent(const KUrl& url)
 {
     m_currentItemUrl = url;
+    m_scrollToCurrentItem = true;
 }
 
 void DolphinView::selectItems(const QRegExp& pattern, bool enabled)
@@ -381,6 +393,7 @@ void DolphinView::setZoomLevel(int level)
     const int oldZoomLevel = zoomLevel();
     m_view->setZoomLevel(level);
     if (zoomLevel() != oldZoomLevel) {
+        hideToolTip();
         emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
     }
 }
@@ -431,7 +444,7 @@ void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)
 {
     const QList<QByteArray> previousRoles = roles;
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setVisibleRoles(roles);
 
     m_visibleRoles = roles;
@@ -500,6 +513,16 @@ QString DolphinView::nameFilter() const
     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;
@@ -559,7 +582,9 @@ QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) c
 
     if (items.isEmpty()) {
         const KFileItem item = m_model->rootItem();
-        actions = m_versionControlObserver->actions(KFileItemList() << item);
+        if (!item.isNull()) {
+            actions = m_versionControlObserver->actions(KFileItemList() << item);
+        }
     } else {
         actions = m_versionControlObserver->actions(items);
     }
@@ -613,9 +638,9 @@ void DolphinView::renameSelectedItems()
          return;
      }
 
-     if (items.count() == 1) {
+     if (items.count() == 1 && GeneralSettings::renameInline()) {
          const int index = m_model->index(items.first());
-         m_container->controller()->view()->editRole(index, "text");
+         m_view->editRole(index, "text");
      } else {
          RenameDialog* dialog = new RenameDialog(this, items);
          dialog->setAttribute(Qt::WA_DeleteOnClose);
@@ -731,6 +756,20 @@ void DolphinView::hideEvent(QHideEvent* 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);
@@ -786,7 +825,7 @@ void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
 
     QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
 
@@ -796,7 +835,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     bool nepomukRunning = false;
     bool indexingEnabled = false;
 #ifdef HAVE_NEPOMUK
-    nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
+    nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
     if (nepomukRunning) {
         KConfig config("nepomukserverrc");
         indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
@@ -903,7 +942,7 @@ void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal cur
 
     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();
@@ -1029,7 +1068,7 @@ void DolphinView::emitSelectionChangedSignal()
 
 void DolphinView::updateSortRole(const QByteArray& role)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortRole(role);
 
     KItemModelBase* model = m_container->controller()->model();
@@ -1040,7 +1079,7 @@ void DolphinView::updateSortRole(const QByteArray& role)
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortOrder(order);
 
     m_model->setSortOrder(order);
@@ -1050,7 +1089,7 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::updateSortFoldersFirst(bool foldersFirst)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortFoldersFirst(foldersFirst);
 
     m_model->setSortDirectoriesFirst(foldersFirst);
@@ -1119,27 +1158,20 @@ KFileItem DolphinView::rootItem() const
     return m_model->rootItem();
 }
 
-void DolphinView::observeCreatedItem(const KUrl& url)
+void DolphinView::setViewPropertiesContext(const QString& context)
 {
-    m_createdItemUrl = url;
-    //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
-    //        this, SLOT(selectAndScrollToCreatedItem()));
+    m_viewPropertiesContext = context;
 }
 
-void DolphinView::selectAndScrollToCreatedItem()
+QString DolphinView::viewPropertiesContext() const
 {
-    /*const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
-    if (dirIndex.isValid()) {
-        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
-        QAbstractItemView* view = m_viewAccessor.itemView();
-        if (view) {
-            view->setCurrentIndex(proxyIndex);
-        }
-    }
+    return m_viewPropertiesContext;
+}
 
-    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
-               this, SLOT(selectAndScrollToCreatedItem()));*/
-    m_createdItemUrl = KUrl();
+void DolphinView::observeCreatedItem(const KUrl& url)
+{
+    markUrlAsCurrent(url);
+    markUrlsAsSelected(QList<KUrl>() << url);
 }
 
 void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)
@@ -1157,6 +1189,12 @@ void DolphinView::updateViewState()
         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);
         }
@@ -1265,7 +1303,7 @@ void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOr
     Q_UNUSED(previous);
     Q_ASSERT(m_model->sortOrder() == current);
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortOrder(current);
 
     emit sortOrderChanged(current);
@@ -1276,7 +1314,7 @@ void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const Q
     Q_UNUSED(previous);
     Q_ASSERT(m_model->sortRole() == current);
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortRole(current);
 
     emit sortRoleChanged(current);
@@ -1292,7 +1330,7 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& curre
 
     m_visibleRoles = current;
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setVisibleRoles(m_visibleRoles);
 
     emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
@@ -1300,11 +1338,30 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& curre
 
 void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
 {
+    if (index < 0 || index >= m_model->count()) {
+        return;
+    }
+
     if (role == "text") {
-        const KFileItem item = m_model->fileItem(index);
+        const KFileItem oldItem = m_model->fileItem(index);
         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);
         }
     }
 }
@@ -1332,7 +1389,7 @@ void DolphinView::applyViewProperties()
 {
     m_view->beginTransaction();
 
-    const ViewProperties props(url());
+    const ViewProperties props(viewPropertiesUrl());
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
@@ -1445,7 +1502,7 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
     KUrl::List urls;
 
     const KFileItemList items = selectedItems();
-    foreach (const KFileItem &item, items) {
+    foreach (const KFileItem& item, items) {
         urls.append(item.url());
     }
 
@@ -1470,7 +1527,7 @@ void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
     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);
@@ -1491,4 +1548,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"