I'm very sorry for breaking the build: I forgot to add the new files :-(

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 95f8f7c49ee3674dbed4d13eb83e11c20c9803ff..a7e03deeb97166fed88fc1a5c2c9fdf1684c2b81 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -358,6 +358,8 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
         item = m_dirLister->rootItem();
         if (item.isNull())
             item = KFileItem( S_IFDIR, (mode_t)-1, url() );
+        else
+            item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }
 
     // TODO: We should change the signature of the slots (and signals) for being able
@@ -444,6 +446,18 @@ void DolphinPart::slotRequestUrlChange(const KUrl& url)
 
 ////
 
+void DolphinPartBrowserExtension::restoreState(QDataStream &stream)
+{
+    KParts::BrowserExtension::restoreState(stream);
+    m_part->view()->restoreState(stream);
+}
+
+void DolphinPartBrowserExtension::saveState(QDataStream &stream)
+{
+    KParts::BrowserExtension::saveState(stream);
+    m_part->view()->saveState(stream);
+}
+
 void DolphinPartBrowserExtension::cut()
 {
     m_part->view()->cutSelectedItems();
@@ -459,6 +473,11 @@ void DolphinPartBrowserExtension::paste()
     m_part->view()->paste();
 }
 
+void DolphinPartBrowserExtension::pasteTo(const KUrl&)
+{
+    m_part->view()->pasteIntoFolder();
+}
+
 void DolphinPartBrowserExtension::reparseConfiguration()
 {
     m_part->view()->refresh();
@@ -516,6 +535,7 @@ void DolphinPart::updateNewMenu()
 {
     // As requested by KNewMenu :
     m_newMenu->slotCheckUpToDate();
+    m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
     // And set the files that the menu apply on :
     m_newMenu->setPopupFiles(url());
 }
@@ -532,6 +552,7 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
+    m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
     m_newMenu->setPopupFiles(url());
     m_newMenu->createDirectory();
 }