Fix issue that the enabled state of the "Create New..." menu is not updated correctly...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 06682202d746c45c09d0ce372ee8f1c222a0f38b..8f934d163278bbf4431c7eb3384c5097f3d6ee41 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -38,7 +38,6 @@
 #include <kmenu.h>
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <kmenu.h>
 #include <knewmenu.h>
 #include <konqmimedata.h>

-#include <kfileitemlistproperties.h>

 #include <konq_operations.h>
 #include <kshell.h>
 #include <kurl.h>
 #include <konq_operations.h>
 #include <kshell.h>
 #include <kurl.h>


@@ -65,7 +64,6 @@
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),

-    m_isFolderWritable(false),

     m_topLayout(0),
     m_urlNavigator(0),
     m_searchBox(0),
     m_topLayout(0),
     m_urlNavigator(0),
     m_searchBox(0),


@@ -155,6 +153,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, SLOT(slotStartedPathLoading()));
     connect(m_view, SIGNAL(finishedPathLoading(KUrl)),
             this, SLOT(slotFinishedPathLoading()));
             this, SLOT(slotStartedPathLoading()));
     connect(m_view, SIGNAL(finishedPathLoading(KUrl)),
             this, SLOT(slotFinishedPathLoading()));

+    connect(m_view, SIGNAL(writeStateChanged(bool)),
+            this, SIGNAL(writeStateChanged(bool)));

 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));


@@ -209,9 +209,6 @@ void DolphinViewContainer::setActive(bool active)
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);

-    if (active) {
-        emit writeStateChanged(m_isFolderWritable);
-    }

 }
 
 bool DolphinViewContainer::isActive() const
 }
 
 bool DolphinViewContainer::isActive() const


@@ -291,14 +288,6 @@ void DolphinViewContainer::setUrl(const KUrl& newUrl)
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);
 {
     if (newUrl != m_urlNavigator->locationUrl()) {
         m_urlNavigator->setLocationUrl(newUrl);

-
-        // Temporary disable the 'File'->'Create New...' menu until
-        // the write permissions can be checked in a fast way at
-        // DolphinViewContainer::slotDirListerCompleted().
-        m_isFolderWritable = false;
-        if (isActive()) {
-            emit writeStateChanged(false);
-        }

     }
 }
 
     }
 }
 


@@ -389,21 +378,6 @@ void DolphinViewContainer::slotFinishedPathLoading()
     } else {
         updateStatusBar();
     }
     } else {
         updateStatusBar();
     }

-
-    // Enable the 'File'->'Create New...' menu only if the directory
-    // supports writing.
-    KFileItem item = m_dirLister->rootItem();
-    if (item.isNull()) {
-        // it is unclear whether writing is supported
-        m_isFolderWritable = true;
-    } else {
-        KFileItemListProperties capabilities(KFileItemList() << item);
-        m_isFolderWritable = capabilities.supportsWriting();
-    }
-
-    if (isActive()) {
-        emit writeStateChanged(m_isFolderWritable);
-    }

 }
 
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 }
 
 void DolphinViewContainer::showItemInfo(const KFileItem& item)