kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port from KNewFileMenu::setPopupFiles to KNewFileMenu::setWorkingDirectory

Browse source 
The former is deprecated
This commit is contained in:
Nicolas Fella 2021-12-14 21:47:20 +01:00
parent 05941a522b
commit 513fe3bb42
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dolphincontextmenu.cpp
View file

@ -31,6 +31,7 @@
#include <KPluginMetaData> #include <KPluginMetaData>
#include <KStandardAction> #include <KStandardAction>
#include <KToolBar> #include <KToolBar>
#include <kio_version.h>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
@ -175,7 +176,11 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
// set up 'Create New' menu // set up 'Create New' menu
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow); DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
newFileMenu->checkUpToDate(); 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()); newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
@ -280,7 +285,11 @@ void DolphinContextMenu::addViewportContextMenu()
// Set up and insert 'Create New' menu // Set up and insert 'Create New' menu
KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
newFileMenu->checkUpToDate(); 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()); addMenu(newFileMenu->menu());
// Show "open with" menu items even if the dir is empty, because there are legitimate // Show "open with" menu items even if the dir is empty, because there are legitimate

8
src/dolphinmainwindow.cpp
View file

@ -661,12 +661,20 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
void DolphinMainWindow::updateNewMenu() void DolphinMainWindow::updateNewMenu()
{ {
m_newFileMenu->checkUpToDate(); 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();
} }

9
src/dolphinpart.cpp
View file

@ -33,6 +33,7 @@
#include <KPluginMetaData> #include <KPluginMetaData>
#include <KSharedConfig> #include <KSharedConfig>
#include <KTerminalLauncherJob> #include <KTerminalLauncherJob>
#include <kio_version.h>
#include <QActionGroup> #include <QActionGroup>
#include <QApplication> #include <QApplication>
@ -589,7 +590,11 @@ void DolphinPart::updateNewMenu()
// As requested by KNewFileMenu : // As requested by KNewFileMenu :
m_newFileMenu->checkUpToDate(); m_newFileMenu->checkUpToDate();
// And set the files that the menu apply on : // 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();
} }