kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Port away from deprecated KNewFileMenu ctor

Browse Source
This commit is contained in:
Nicolas Fella 2022-10-18 22:38:45 +02:00 committed by Dāvis Mosāns
parent c2ef0392e9
commit c64059bd02
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dolphincontextmenu.cpp
View File

@ -170,6 +170,9 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
// set up 'Create New' menu
DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
newFileMenu->setNewFolderShortcutAction(m_mainWindow->actionCollection()->action("create_dir"));
#endif
newFileMenu->checkUpToDate();
#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
newFileMenu->setWorkingDirectory(m_fileInfo.url());

4
src/dolphinmainwindow.cpp
View File

@ -163,6 +163,10 @@ DolphinMainWindow::DolphinMainWindow()
connect(m_actionHandler, &DolphinViewActionHandler::createDirectoryTriggered, this, &DolphinMainWindow::createDirectory);
connect(m_actionHandler, &DolphinViewActionHandler::selectionModeChangeTriggered, this, &DolphinMainWindow::slotSetSelectionMode);
#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
m_newFileMenu->setNewFolderShortcutAction(actionCollection()->action("create_dir"));
#endif
m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
connect(this, &DolphinMainWindow::urlChanged, m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl);

7
src/dolphinnewfilemenu.cpp
View File

@ -10,10 +10,17 @@
#include <KActionCollection>
#include <KIO/Job>
#include <kio_version.h>
DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection *collection, QObject *parent)
#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
: KNewFileMenu(parent)
{
Q_UNUSED(collection)
#else
: KNewFileMenu(collection, QStringLiteral("new_menu"), parent)
{
#endif
DolphinNewFileMenuObserver::instance().attach(this);
}

3
src/dolphinpart.cpp
View File

@ -143,6 +143,9 @@ void DolphinPart::createActions()
m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
m_newFileMenu->setParentWidget(widget());
#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
m_newFileMenu->setNewFolderShortcutAction(actionCollection()->action("create_dir"));
#endif
connect(m_newFileMenu->menu(), &QMenu::aboutToShow, this, &DolphinPart::updateNewMenu);
QAction *editMimeTypeAction = actionCollection()->addAction(QStringLiteral("editMimeType"));