Port from KNewFileMenu::setPopupFiles to KNewFileMenu::setWorkingDirectory

The former is deprecated

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 2568f503f13b5246e0ed1d7f08a2d1e5b87b346b..6c1fa4ad34d3a72b02feb34e1be9593040fcf37e 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -31,6 +31,7 @@
 #include <KPluginMetaData>
 #include <KStandardAction>
 #include <KToolBar>
 #include <KPluginMetaData>
 #include <KStandardAction>
 #include <KToolBar>

+#include <kio_version.h>

 
 #include <QApplication>
 #include <QClipboard>
 
 #include <QApplication>
 #include <QClipboard>


@@ -175,7 +176,11 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
     // set up 'Create New' menu
     DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
     newFileMenu->checkUpToDate();
     // set up 'Create New' menu
     DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
     newFileMenu->checkUpToDate();

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    newFileMenu->setWorkingDirectory(m_fileInfo.url());
+#else

     newFileMenu->setPopupFiles(QList<QUrl>() << m_fileInfo.url());
     newFileMenu->setPopupFiles(QList<QUrl>() << m_fileInfo.url());

+#endif

     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
     connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
     connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);


@@ -280,7 +285,11 @@ void DolphinContextMenu::addViewportContextMenu()
     // Set up and insert 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     newFileMenu->checkUpToDate();
     // Set up and insert 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     newFileMenu->checkUpToDate();

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    newFileMenu->setWorkingDirectory(m_baseUrl);
+#else

     newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);
     newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);

+#endif

     addMenu(newFileMenu->menu());
 
     // Show "open with" menu items even if the dir is empty, because there are legitimate
     addMenu(newFileMenu->menu());
 
     // Show "open with" menu items even if the dir is empty, because there are legitimate

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 2a2ac36375b83e61e43fb7d377d3ff1ef9979fc8..39b8203877b011a5c6a5b76cf7232170814a37dc 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -661,12 +661,20 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
 void DolphinMainWindow::updateNewMenu()
 {
     m_newFileMenu->checkUpToDate();
 void DolphinMainWindow::updateNewMenu()
 {
     m_newFileMenu->checkUpToDate();

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    m_newFileMenu->setWorkingDirectory(activeViewContainer()->url());
+#else

     m_newFileMenu->setPopupFiles(QList<QUrl>() << activeViewContainer()->url());
     m_newFileMenu->setPopupFiles(QList<QUrl>() << activeViewContainer()->url());

+#endif

 }
 
 void DolphinMainWindow::createDirectory()
 {
 }
 
 void DolphinMainWindow::createDirectory()
 {

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    m_newFileMenu->setWorkingDirectory(activeViewContainer()->url());
+#else

     m_newFileMenu->setPopupFiles(QList<QUrl>() << activeViewContainer()->url());
     m_newFileMenu->setPopupFiles(QList<QUrl>() << activeViewContainer()->url());

+#endif

     m_newFileMenu->createDirectory();
 }
 
     m_newFileMenu->createDirectory();
 }
 

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index fdc55043123dd6e484e6fcb02b13f72439bb560d..8f2279d45f8abd92d05c12eb2f7b3adae34dce18 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -33,6 +33,7 @@
 #include <KPluginMetaData>
 #include <KSharedConfig>
 #include <KTerminalLauncherJob>
 #include <KPluginMetaData>
 #include <KSharedConfig>
 #include <KTerminalLauncherJob>

+#include <kio_version.h>

 
 #include <QActionGroup>
 #include <QApplication>
 
 #include <QActionGroup>
 #include <QApplication>


@@ -589,7 +590,11 @@ void DolphinPart::updateNewMenu()
     // As requested by KNewFileMenu :
     m_newFileMenu->checkUpToDate();
     // And set the files that the menu apply on :
     // As requested by KNewFileMenu :
     m_newFileMenu->checkUpToDate();
     // And set the files that the menu apply on :

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    m_newFileMenu->setWorkingDirectory(url());
+#else

     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());

+#endif

 }
 
 void DolphinPart::updateStatusBar()
 }
 
 void DolphinPart::updateStatusBar()


@@ -604,7 +609,11 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
 
 void DolphinPart::createDirectory()
 {

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    m_newFileMenu->setWorkingDirectory(url());
+#else

     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());

+#endif

     m_newFileMenu->createDirectory();
 }
 
     m_newFileMenu->createDirectory();
 }