X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a..994e0570eec41e639044b74c97898ee4aadffe32:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index f5a972d37..3f8933bd3 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -866,18 +866,12 @@ void DolphinView::emitContentsMoved()
 
 void DolphinView::showHoverInformation(const KFileItem& item)
 {
-    if (hasSelection() || !m_active) {
-        return;
-    }
-
     emit requestItemInfo(item);
 }
 
 void DolphinView::clearHoverInformation()
 {
-    if (m_active) {
-        emit requestItemInfo(KFileItem());
-    }
+    emit requestItemInfo(KFileItem());
 }
 
 void DolphinView::createView()
@@ -1023,14 +1017,19 @@ void DolphinView::renameSelectedItems()
                 }
             }
         }
+    } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        Q_ASSERT(items.count() == 1);
+
+        if (isColumnViewActive()) {
+            m_columnView->editItem(items.first());
+        } else {
+            const QModelIndex dirIndex = m_dolphinModel->indexForItem(items.first());
+            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+            itemView()->edit(proxyIndex);
+        }
     } else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
         Q_ASSERT(items.count() == 1);
 
-        // TODO: Think about using KFileItemDelegate as soon as it supports editing.
-        // Currently the RenameDialog is used, but I'm not sure whether inline renaming
-        // is a benefit for the user at all -> let's wait for some input first...
         RenameDialog dialog(this, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
@@ -1123,8 +1122,8 @@ void DolphinView::paste()
                 int result = KMessageBox::questionYesNo(window(),
                                                         text,
                                                         i18nc("@title:window", "Paste into Folder"),
-                                                        KGuiItem(i18nc("@label", "Paste"), "dialog-ok"),
-                                                        KGuiItem(i18nc("@label", "Cancel"), "dialog-cancel"));
+                                                        KGuiItem(i18nc("@action:button", "Paste"), "dialog-ok"),
+                                                        KGuiItem(i18nc("@action:button", "Cancel"), "dialog-cancel"));
                 if (result == KMessageBox::No) {
                     return;
                 }