Fix dolphin to only enable the Cut context menu option if the file capabilites suppor...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 21ef3a984a386fc67266e7f024e6da0beb6a7158..41e7cd309aa77bcb71c12b27d47c6bff7eb2da3f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1113,6 +1113,7 @@ void DolphinMainWindow::updateEditActions()
         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
         actionCollection()->action("move_to_trash")->setEnabled(enableMoveToTrash);
         actionCollection()->action("delete")->setEnabled(capabilities.supportsDeleting());
+        actionCollection()->action(KStandardAction::name(KStandardAction::Cut))->setEnabled(capabilities.supportsMoving());
     }
     updatePasteAction();
 }
@@ -1188,7 +1189,16 @@ void DolphinMainWindow::updateSplitAction()
 
 QString DolphinMainWindow::tabName(const KUrl& url) const
 {
-    return url.equals(KUrl("file:///")) ? "/" : url.fileName();
+    QString name;
+    if (url.equals(KUrl("file:///"))) {
+        name = "/";
+    } else {
+        name = url.fileName();
+        if (name.isEmpty()) {
+            name = url.protocol();
+        }
+    }
+    return name;
 }
 
 DolphinMainWindow::UndoUiInterface::UndoUiInterface() :