Fixed issue that the 'Create New' menu might be disabled although creating of files...

BUG: 183812

svn path=/trunk/KDE/kdebase/apps/; revision=924120

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f09d3d1c926895573bf4fc55602c31ebe250f7f7..e22342ed8b5e055b2270f1c557b47c91716bd952 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -66,6 +66,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                                            const KUrl& url) :
     QWidget(parent),
     m_showProgress(false),
+    m_isFolderWritable(false),
     m_mainWindow(mainWindow),
     m_topLayout(0),
     m_urlNavigator(0),
@@ -182,7 +183,10 @@ void DolphinViewContainer::setUrl(const KUrl& newUrl)
         // Temporary disable the 'File'->'Create New...' menu until
         // the write permissions can be checked in a fast way at
         // DolphinViewContainer::slotDirListerCompleted().
-        m_mainWindow->newMenu()->menu()->setEnabled(false);
+        m_isFolderWritable = false;
+        if (isActive()) {
+            m_mainWindow->newMenu()->menu()->setEnabled(false);
+        }
     }
 }
 
@@ -195,6 +199,9 @@ void DolphinViewContainer::setActive(bool active)
 {
     m_urlNavigator->setActive(active);
     m_view->setActive(active);
+    if (active) {
+        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+    }
 }
 
 bool DolphinViewContainer::isActive() const
@@ -262,14 +269,17 @@ void DolphinViewContainer::slotDirListerCompleted()
 
     // Enable the 'File'->'Create New...' menu only if the directory
     // supports writing.
-    KMenu* createNew = m_mainWindow->newMenu()->menu();
     KFileItem item = m_dirLister->rootItem();
     if (item.isNull()) {
         // it is unclear whether writing is supported
-        createNew->setEnabled(true);
+        m_isFolderWritable = true;
     } else {
         KonqFileItemCapabilities capabilities(KFileItemList() << item);
-        createNew->setEnabled(capabilities.supportsWriting());
+        m_isFolderWritable = capabilities.supportsWriting();
+    }
+
+    if (isActive()) {
+        m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
     }
 }
 

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index eb70c37e1aca5da2f010d50fd0841b7f44a89350..3c5270a6e5fe4efef3e98e1a9bb8ecdc8c360f14 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -234,6 +234,7 @@ private slots:
 
 private:
     bool m_showProgress;
+    bool m_isFolderWritable;
 
     DolphinMainWindow* m_mainWindow;
     QVBoxLayout* m_topLayout;