Fix regression that creating a sub-folder is not possible

CCBUG: 265714

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9b6512aa26231a01256f9dd509d1f8a375cec859..bb24ffa310d82e91b2d5b62ef539564fed224b2e 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -240,12 +240,14 @@ void DolphinContextMenu::openItemContextMenu()
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu

-            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup, m_mainWindow);
+            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);

             const DolphinView* view = m_mainWindow->activeViewContainer()->view();
             newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
             const DolphinView* view = m_mainWindow->activeViewContainer()->view();
             newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());

+            connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
+            connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));

 
             KMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
 
             KMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 11597fe1eb3bac599519cf7b84d0ba8c58bb61b3..3e63dc6c95422ae03e0dbc35e17d595a6b0c96ba 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1412,7 +1412,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu

-    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    m_newFileMenu = new DolphinNewFileMenu(this);

     KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index 7dfd368893875cc359bba0db3b2a54ba1e00174f..dcbc57b408a5e945163fb01053a12efb990a8d3c 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -29,9 +29,9 @@
 #include <KActionCollection>
 #include <KIO/Job>
 
 #include <KActionCollection>
 #include <KIO/Job>
 

-DolphinNewFileMenu::DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin) :
-    KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
-    m_mainWin(mainWin)
+DolphinNewFileMenu::DolphinNewFileMenu(DolphinMainWindow* parent) :
+    KNewFileMenu(parent->actionCollection(), "create_new", parent),
+    m_mainWin(parent)

 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }
 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }

diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index 186c95c5a50aca6b29de2ec8e831e3673e2dfd1f..0d336080baac061724739a625fd346d45b6fd228 100644 (file)
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -39,7 +39,7 @@ class DolphinNewFileMenu : public KNewFileMenu
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin);
+    DolphinNewFileMenu(DolphinMainWindow* parent);

     virtual ~DolphinNewFileMenu();
 
 protected slots:
     virtual ~DolphinNewFileMenu();
 
 protected slots: