X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/055ad286aac372d1542f6c64f32ae4f85d307eed..refs/heads/master:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index bf3d2a54f..a7f0d85cd 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -1,252 +1,241 @@ /* This file is part of the KDE project - Copyright (c) 2007 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-FileCopyrightText: 2007 David Faure + + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "dolphinpart.h" -#include -#include +#include "dolphindebug.h" +#include "dolphinnewfilemenu.h" +#include "dolphinpart_ext.h" +#include "dolphinremoveaction.h" +#include "kitemviews/kfileitemmodel.h" +#include "views/dolphinnewfilemenuobserver.h" +#include "views/dolphinremoteencoding.h" +#include "views/dolphinview.h" +#include "views/dolphinviewactionhandler.h" -#include #include +#include #include -#include -#include +#include +#include +#include +#include #include -#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "views/dolphinview.h" -#include "views/dolphinviewactionhandler.h" -#include "views/dolphinnewfilemenuobserver.h" -#include "views/dolphinremoteencoding.h" +#include +#include +#include #include #include #include #include +#include +#include +#include +#include +#include +#include -K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) -K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin")) +#include +#include + +K_PLUGIN_CLASS_WITH_JSON(DolphinPart, "dolphinpart.json") -DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) - : KParts::ReadOnlyPart(parent) - ,m_openTerminalAction(0) +DolphinPart::DolphinPart(QWidget *parentWidget, QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) + : KParts::ReadOnlyPart(parent, metaData) + , m_openTerminalAction(nullptr) + , m_removeAction(nullptr) { Q_UNUSED(args) - setComponentData(DolphinPartFactory::componentData(), false); + m_extension = new DolphinPartBrowserExtension(this); // make sure that other apps using this part find Dolphin's view-file-columns icons - KIconLoader::global()->addAppDir("dolphin"); + KIconLoader::global()->addAppDir(QStringLiteral("dolphin")); - m_view = new DolphinView(KUrl(), parentWidget); + m_view = new DolphinView(QUrl(), parentWidget); m_view->setTabsForFilesEnabled(true); setWidget(m_view); - connect(m_view, SIGNAL(directoryLoadingCompleted()), this, SIGNAL(completed())); - connect(m_view, SIGNAL(directoryLoadingProgress(int)), this, SLOT(updateProgress(int))); - connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); - - setXMLFile("dolphinpart.rc"); - - connect(m_view, SIGNAL(infoMessage(QString)), - this, SLOT(slotMessage(QString))); - connect(m_view, SIGNAL(operationCompletedMessage(QString)), - this, SLOT(slotMessage(QString))); - connect(m_view, SIGNAL(errorMessage(QString)), - this, SLOT(slotErrorMessage(QString))); - connect(m_view, SIGNAL(itemActivated(KFileItem)), - this, SLOT(slotItemActivated(KFileItem))); - connect(m_view, SIGNAL(tabRequested(KUrl)), - this, SLOT(createNewWindow(KUrl))); - connect(m_view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList)), - this, SLOT(slotOpenContextMenu(QPoint,KFileItem,KUrl,QList))); - connect(m_view, SIGNAL(selectionChanged(KFileItemList)), - m_extension, SIGNAL(selectionInfo(KFileItemList))); - connect(m_view, SIGNAL(selectionChanged(KFileItemList)), - this, SLOT(slotSelectionChanged(KFileItemList))); - connect(m_view, SIGNAL(requestItemInfo(KFileItem)), - this, SLOT(slotRequestItemInfo(KFileItem))); - connect(m_view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)), - this, SIGNAL(viewModeChanged())); // relay signal - connect(m_view, SIGNAL(redirection(KUrl,KUrl)), - this, SLOT(slotDirectoryRedirection(KUrl,KUrl))); + connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage, this, &DolphinPart::slotErrorMessage); + + connect(m_view, &DolphinView::directoryLoadingCompleted, this, &KParts::ReadOnlyPart::completed); + connect(m_view, &DolphinView::directoryLoadingCompleted, this, &DolphinPart::updatePasteAction); + connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinPart::updateProgress); + connect(m_view, &DolphinView::errorMessage, this, &DolphinPart::slotErrorMessage); + + setXMLFile(QStringLiteral("dolphinpart.rc")); + + connect(m_view, &DolphinView::infoMessage, this, &DolphinPart::slotMessage); + connect(m_view, &DolphinView::operationCompletedMessage, this, &DolphinPart::slotMessage); + connect(m_view, &DolphinView::errorMessage, this, &DolphinPart::slotErrorMessage); + connect(m_view, &DolphinView::itemActivated, this, &DolphinPart::slotItemActivated); + connect(m_view, &DolphinView::itemsActivated, this, &DolphinPart::slotItemsActivated); + connect(m_view, &DolphinView::statusBarTextChanged, this, [this](const QString &text) { + const QString escapedText = Qt::convertFromPlainText(text); + Q_EMIT ReadOnlyPart::setStatusBarText(QStringLiteral("%1").arg(escapedText)); + }); + connect(m_view, &DolphinView::tabRequested, this, &DolphinPart::createNewWindow); + connect(m_view, &DolphinView::requestContextMenu, this, &DolphinPart::slotOpenContextMenu); + connect(m_view, &DolphinView::selectionChanged, m_extension, &KParts::NavigationExtension::selectionInfo); + connect(m_view, &DolphinView::selectionChanged, this, &DolphinPart::slotSelectionChanged); + connect(m_view, &DolphinView::requestItemInfo, this, &DolphinPart::slotRequestItemInfo); + connect(m_view, &DolphinView::modeChanged, this, &DolphinPart::viewModeChanged); // relay signal + connect(m_view, &DolphinView::redirection, this, &DolphinPart::slotDirectoryRedirection); // Watch for changes that should result in updates to the // status bar text. - connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(updateStatusBar())); - connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(updateStatusBar())); + connect(m_view, &DolphinView::itemCountChanged, this, &DolphinPart::updateStatusBar); + connect(m_view, &DolphinView::selectionChanged, this, &DolphinPart::updateStatusBar); - m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); + m_actionHandler = new DolphinViewActionHandler(actionCollection(), nullptr, this); m_actionHandler->setCurrentView(m_view); - connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); + connect(m_actionHandler, &DolphinViewActionHandler::createDirectoryTriggered, this, &DolphinPart::createDirectory); m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); - connect(this, SIGNAL(aboutToOpenURL()), - m_remoteEncoding, SLOT(slotAboutToOpenUrl())); + connect(this, &DolphinPart::aboutToOpenURL, m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl); - QClipboard* clipboard = QApplication::clipboard(); - connect(clipboard, SIGNAL(dataChanged()), - this, SLOT(updatePasteAction())); + QClipboard *clipboard = QApplication::clipboard(); + connect(clipboard, &QClipboard::dataChanged, this, &DolphinPart::updatePasteAction); // Create file info and listing filter extensions. // NOTE: Listing filter needs to be instantiated after the creation of the view. new DolphinPartFileInfoExtension(this); + new DolphinPartListingFilterExtension(this); + KDirLister *lister = m_view->m_model->m_dirLister; + if (lister) { + DolphinPartListingNotificationExtension *notifyExt = new DolphinPartListingNotificationExtension(this); + connect(lister, &KDirLister::newItems, notifyExt, &DolphinPartListingNotificationExtension::slotNewItems); + connect(lister, &KDirLister::itemsDeleted, notifyExt, &DolphinPartListingNotificationExtension::slotItemsDeleted); + } else { + qCWarning(DolphinDebug) << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported"; + } + createActions(); m_actionHandler->updateViewActions(); slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions + // Listen to events from the app so we can update the remove key by + // checking for a Shift key press. + qApp->installEventFilter(this); + // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror // (sort of spacial navigation) - - loadPlugins(this, this, componentData()); - } DolphinPart::~DolphinPart() { - DolphinNewFileMenuObserver::instance().detach(m_newFileMenu); } void DolphinPart::createActions() { // Edit menu - - m_newFileMenu = new KNewFileMenu(actionCollection(), "new_menu", this); + QAction *newDirAction = actionCollection()->action(QStringLiteral("create_dir")); + QAction *newFileAction = actionCollection()->action(QStringLiteral("create_file")); + m_newFileMenu = new DolphinNewFileMenu(newDirAction, newFileAction, this); m_newFileMenu->setParentWidget(widget()); - DolphinNewFileMenuObserver::instance().attach(m_newFileMenu); - connect(m_newFileMenu->menu(), SIGNAL(aboutToShow()), - this, SLOT(updateNewMenu())); + connect(m_newFileMenu->menu(), &QMenu::aboutToShow, this, &DolphinPart::updateNewMenu); - KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" ); - editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) ); - connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType())); + QAction *editMimeTypeAction = actionCollection()->addAction(QStringLiteral("editMimeType")); + editMimeTypeAction->setText(i18nc("@action:inmenu Edit", "&Edit File Type…")); + connect(editMimeTypeAction, &QAction::triggered, this, &DolphinPart::slotEditMimeType); - KAction* selectItemsMatching = actionCollection()->addAction("select_items_matching"); - selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching...")); - selectItemsMatching->setShortcut(Qt::CTRL | Qt::Key_S); - connect(selectItemsMatching, SIGNAL(triggered()), this, SLOT(slotSelectItemsMatchingPattern())); + QAction *selectItemsMatching = actionCollection()->addAction(QStringLiteral("select_items_matching")); + selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching…")); + actionCollection()->setDefaultShortcut(selectItemsMatching, Qt::CTRL | Qt::Key_S); + connect(selectItemsMatching, &QAction::triggered, this, &DolphinPart::slotSelectItemsMatchingPattern); - KAction* unselectItemsMatching = actionCollection()->addAction("unselect_items_matching"); - unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching...")); - connect(unselectItemsMatching, SIGNAL(triggered()), this, SLOT(slotUnselectItemsMatchingPattern())); + QAction *unselectItemsMatching = actionCollection()->addAction(QStringLiteral("unselect_items_matching")); + unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching…")); + connect(unselectItemsMatching, &QAction::triggered, this, &DolphinPart::slotUnselectItemsMatchingPattern); - actionCollection()->addAction(KStandardAction::SelectAll, "select_all", m_view, SLOT(selectAll())); + KStandardAction::selectAll(m_view, &DolphinView::selectAll, actionCollection()); - KAction* unselectAll = actionCollection()->addAction("unselect_all"); + QAction *unselectAll = actionCollection()->addAction(QStringLiteral("unselect_all")); unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All")); - connect(unselectAll, SIGNAL(triggered()), m_view, SLOT(clearSelection())); + connect(unselectAll, &QAction::triggered, m_view, &DolphinView::clearSelection); - KAction* invertSelection = actionCollection()->addAction("invert_selection"); + QAction *invertSelection = actionCollection()->addAction(QStringLiteral("invert_selection")); invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); - invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A); - connect(invertSelection, SIGNAL(triggered()), m_view, SLOT(invertSelection())); + actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A); + connect(invertSelection, &QAction::triggered, m_view, &DolphinView::invertSelection); // View menu: all done by DolphinViewActionHandler // Go menu - QActionGroup* goActionGroup = new QActionGroup(this); - connect(goActionGroup, SIGNAL(triggered(QAction*)), - this, SLOT(slotGoTriggered(QAction*))); + QActionGroup *goActionGroup = new QActionGroup(this); + connect(goActionGroup, &QActionGroup::triggered, this, &DolphinPart::slotGoTriggered); - createGoAction("go_applications", "start-here-kde", - i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"), - goActionGroup); - createGoAction("go_network_folders", "folder-remote", - i18nc("@action:inmenu Go", "&Network Folders"), QString("remote:/"), - goActionGroup); - createGoAction("go_settings", "preferences-system", - i18nc("@action:inmenu Go", "Sett&ings"), QString("settings:/"), - goActionGroup); - createGoAction("go_trash", "user-trash", - i18nc("@action:inmenu Go", "Trash"), QString("trash:/"), - goActionGroup); - createGoAction("go_autostart", "", - i18nc("@action:inmenu Go", "Autostart"), KGlobalSettings::autostartPath(), + createGoAction("go_applications", "start-here-kde", i18nc("@action:inmenu Go", "App&lications"), QStringLiteral("programs:/"), goActionGroup); + createGoAction("go_network_folders", "folder-remote", i18nc("@action:inmenu Go", "&Network Folders"), QStringLiteral("remote:/"), goActionGroup); + createGoAction("go_trash", "user-trash", i18nc("@action:inmenu Go", "Trash"), QStringLiteral("trash:/"), goActionGroup); + createGoAction("go_autostart", + "", + i18nc("@action:inmenu Go", "Autostart"), + QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/autostart", goActionGroup); // Tools menu - m_findFileAction = actionCollection()->addAction("find_file"); - m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File...")); - m_findFileAction->setShortcut(Qt::CTRL | Qt::Key_F); - m_findFileAction->setIcon(KIcon("edit-find")); - connect(m_findFileAction, SIGNAL(triggered()), this, SLOT(slotFindFile())); - - if (KAuthorized::authorizeKAction("shell_access")) { - m_openTerminalAction = actionCollection()->addAction("open_terminal"); - m_openTerminalAction->setIcon(KIcon("utilities-terminal")); + m_findFileAction = KStandardAction::find(this, &DolphinPart::slotFindFile, actionCollection()); + m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File…")); + +#ifndef Q_OS_WIN + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { + m_openTerminalAction = actionCollection()->addAction(QStringLiteral("open_terminal")); + m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts"))); m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal")); - connect(m_openTerminalAction, SIGNAL(triggered()), SLOT(slotOpenTerminal())); - m_openTerminalAction->setShortcut(Qt::Key_F4); + connect(m_openTerminalAction, &QAction::triggered, this, &DolphinPart::slotOpenTerminal); + actionCollection()->setDefaultShortcut(m_openTerminalAction, Qt::Key_F4); } +#endif } -void DolphinPart::createGoAction(const char* name, const char* iconName, - const QString& text, const QString& url, - QActionGroup* actionGroup) +void DolphinPart::createGoAction(const char *name, const char *iconName, const QString &text, const QString &url, QActionGroup *actionGroup) { - KAction* action = actionCollection()->addAction(name); - action->setIcon(KIcon(iconName)); + QAction *action = actionCollection()->addAction(name); + action->setIcon(QIcon::fromTheme(iconName)); action->setText(text); action->setData(url); action->setActionGroup(actionGroup); } -void DolphinPart::slotGoTriggered(QAction* action) +void DolphinPart::slotGoTriggered(QAction *action) { const QString url = action->data().toString(); - emit m_extension->openUrlRequest(KUrl(url)); + Q_EMIT m_extension->openUrlRequest(QUrl(url)); } -void DolphinPart::slotSelectionChanged(const KFileItemList& selection) +void DolphinPart::slotSelectionChanged(const KFileItemList &selection) { const bool hasSelection = !selection.isEmpty(); - QAction* renameAction = actionCollection()->action("rename"); - QAction* moveToTrashAction = actionCollection()->action("move_to_trash"); - QAction* deleteAction = actionCollection()->action("delete"); - QAction* editMimeTypeAction = actionCollection()->action("editMimeType"); - QAction* propertiesAction = actionCollection()->action("properties"); - QAction* deleteWithTrashShortcut = actionCollection()->action("delete_shortcut"); // see DolphinViewActionHandler + QAction *renameAction = actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile)); + QAction *moveToTrashAction = actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash)); + QAction *deleteAction = actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)); + QAction *editMimeTypeAction = actionCollection()->action(QStringLiteral("editMimeType")); + QAction *propertiesAction = actionCollection()->action(QStringLiteral("properties")); + QAction *deleteWithTrashShortcut = actionCollection()->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler if (!hasSelection) { - stateChanged("has_no_selection"); + stateChanged(QStringLiteral("has_no_selection")); - emit m_extension->enableAction("cut", false); - emit m_extension->enableAction("copy", false); + Q_EMIT m_extension->enableAction("cut", false); + Q_EMIT m_extension->enableAction("copy", false); deleteWithTrashShortcut->setEnabled(false); editMimeTypeAction->setEnabled(false); } else { - stateChanged("has_selection"); + stateChanged(QStringLiteral("has_selection")); // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code) // in libkonq @@ -259,24 +248,31 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash); editMimeTypeAction->setEnabled(true); propertiesAction->setEnabled(true); - emit m_extension->enableAction("cut", capabilities.supportsMoving()); - emit m_extension->enableAction("copy", true); + Q_EMIT m_extension->enableAction("cut", capabilities.supportsMoving()); + Q_EMIT m_extension->enableAction("copy", true); } } void DolphinPart::updatePasteAction() { QPair pasteInfo = m_view->pasteInfo(); - emit m_extension->enableAction( "paste", pasteInfo.first ); - emit m_extension->setActionText( "paste", pasteInfo.second ); + Q_EMIT m_extension->enableAction("paste", pasteInfo.first); + Q_EMIT m_extension->setActionText("paste", pasteInfo.second); } -KAboutData* DolphinPart::createAboutData() +QString DolphinPart::urlToLocalFilePath(const QUrl &url) { - return new KAboutData("dolphinpart", "dolphin", ki18nc("@title", "Dolphin Part"), "0.1"); + KIO::StatJob *statJob = KIO::mostLocalUrl(url); + KJobWidgets::setWindow(statJob, widget()); + statJob->exec(); + QUrl localUrl = statJob->mostLocalUrl(); + if (localUrl.isLocalFile()) { + return localUrl.toLocalFile(); + } + return QString(); } -bool DolphinPart::openUrl(const KUrl& url) +bool DolphinPart::openUrl(const QUrl &url) { bool reload = arguments().reload(); // A bit of a workaround so that changing the namefilter works: force reload. @@ -286,24 +282,25 @@ bool DolphinPart::openUrl(const KUrl& url) if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started return true; } - setUrl(url); // remember it at the KParts level - KUrl visibleUrl(url); + setUrl(url); // remember url at the KParts level + setLocalFilePath(urlToLocalFilePath(url)); // remember local path at the KParts level + QUrl visibleUrl(url); if (!m_nameFilter.isEmpty()) { - visibleUrl.addPath(m_nameFilter); + visibleUrl.setPath(visibleUrl.path() + '/' + m_nameFilter); } - QString prettyUrl = visibleUrl.pathOrUrl(); - emit setWindowCaption(prettyUrl); - emit m_extension->setLocationBarUrl(prettyUrl); - emit started(0); // get the wheel to spin + QString prettyUrl = visibleUrl.toDisplayString(QUrl::PreferLocalFile); + Q_EMIT setWindowCaption(prettyUrl); + Q_EMIT m_extension->setLocationBarUrl(prettyUrl); + Q_EMIT started(nullptr); // get the wheel to spin m_view->setNameFilter(m_nameFilter); m_view->setUrl(url); updatePasteAction(); - emit aboutToOpenURL(); + Q_EMIT aboutToOpenURL(); if (reload) m_view->reload(); // Disable "Find File" and "Open Terminal" actions for non-file URLs, // e.g. ftp, smb, etc. #279283 - const bool isLocalUrl = url.isLocalFile(); + const bool isLocalUrl = !(localFilePath().isEmpty()); m_findFileAction->setEnabled(isLocalUrl); if (m_openTerminalAction) { m_openTerminalAction->setEnabled(isLocalUrl); @@ -311,29 +308,30 @@ bool DolphinPart::openUrl(const KUrl& url) return true; } -void DolphinPart::slotMessage(const QString& msg) +void DolphinPart::slotMessage(const QString &msg) { - emit setStatusBarText(msg); + Q_EMIT setStatusBarText(msg); } -void DolphinPart::slotErrorMessage(const QString& msg) +void DolphinPart::slotErrorMessage(const QString &msg) { - kDebug() << msg; - emit canceled(msg); + qCDebug(DolphinDebug) << msg; + Q_EMIT canceled(msg); //KMessageBox::error(m_view, msg); } -void DolphinPart::slotRequestItemInfo(const KFileItem& item) +void DolphinPart::slotRequestItemInfo(const KFileItem &item) { - emit m_extension->mouseOverInfo(item); + Q_EMIT m_extension->mouseOverInfo(item); if (item.isNull()) { updateStatusBar(); } else { - ReadOnlyPart::setStatusBarText(item.getStatusBarInfo()); + const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo()); + Q_EMIT ReadOnlyPart::setStatusBarText(QStringLiteral("%1").arg(escapedText)); } } -void DolphinPart::slotItemActivated(const KFileItem& item) +void DolphinPart::slotItemActivated(const KFileItem &item) { KParts::OpenUrlArguments args; // Forget about the known mimetype if a target URL is used. @@ -342,154 +340,159 @@ void DolphinPart::slotItemActivated(const KFileItem& item) args.setMimeType(item.mimetype()); } - // Ideally, konqueror should be changed to not require trustedSource for directory views, - // since the idea was not to need BrowserArguments for non-browser stuff... - KParts::BrowserArguments browserArgs; - browserArgs.trustedSource = true; - emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs); + Q_EMIT m_extension->openUrlRequest(item.targetUrl(), args); } -void DolphinPart::createNewWindow(const KUrl& url) +void DolphinPart::slotItemsActivated(const KFileItemList &items) +{ + for (const KFileItem &item : items) { + slotItemActivated(item); + } +} + +void DolphinPart::createNewWindow(const QUrl &url) { // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code // should be moved into DolphinPart::slotItemActivated() - emit m_extension->createNewWindow(url); + Q_EMIT m_extension->createNewWindow(url); } -void DolphinPart::slotOpenContextMenu(const QPoint& pos, - const KFileItem& _item, - const KUrl&, - const QList& customActions) +void DolphinPart::slotOpenContextMenu(const QPoint &pos, const KFileItem &_item, const KFileItemList &selectedItems, const QUrl &) { - KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems - | KParts::BrowserExtension::ShowProperties - | KParts::BrowserExtension::ShowUrlOperations; + KParts::NavigationExtension::PopupFlags popupFlags = + KParts::NavigationExtension::DefaultPopupItems | KParts::NavigationExtension::ShowProperties | KParts::NavigationExtension::ShowUrlOperations; KFileItem item(_item); if (item.isNull()) { // viewport context menu - popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp; item = m_view->rootItem(); if (item.isNull()) - item = KFileItem( S_IFDIR, (mode_t)-1, url() ); + item = KFileItem(url()); else item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799) } - // TODO: We should change the signature of the slots (and signals) for being able - // to tell for which items we want a popup. KFileItemList items; - if (m_view->selectedItems().isEmpty()) { + if (selectedItems.isEmpty()) { items.append(item); } else { - items = m_view->selectedItems(); + items = selectedItems; } KFileItemListProperties capabilities(items); - KParts::BrowserExtension::ActionGroupMap actionGroups; + KParts::NavigationExtension::ActionGroupMap actionGroups; QList editActions; editActions += m_view->versionControlActions(m_view->selectedItems()); - editActions += customActions; if (!_item.isNull()) { // only for context menu on one or more items - bool supportsDeleting = capabilities.supportsDeleting(); - bool supportsMoving = capabilities.supportsMoving(); - - if (!supportsDeleting) { - popupFlags |= KParts::BrowserExtension::NoDeletion; + const bool supportsMoving = capabilities.supportsMoving(); + + if (capabilities.supportsDeleting()) { + const bool showDeleteAction = + (KSharedConfig::openConfig()->group(QStringLiteral("KDE")).readEntry("ShowDeleteCommand", false) || !item.isLocalFile()); + const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving; + + if (showDeleteAction && showMoveToTrashAction) { + delete m_removeAction; + m_removeAction = nullptr; + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash))); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); + } else if (showDeleteAction && !showMoveToTrashAction) { + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); + } else { + if (!m_removeAction) + m_removeAction = new DolphinRemoveAction(this, actionCollection()); + editActions.append(m_removeAction); + m_removeAction->update(); + } + } else { + popupFlags |= KParts::NavigationExtension::NoDeletion; } if (supportsMoving) { - editActions.append(actionCollection()->action("rename")); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile))); } - bool addTrash = capabilities.isLocal() && supportsMoving; - bool addDel = false; - if (supportsDeleting) { - if ( !item.isLocalFile() ) - addDel = true; - else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { - addTrash = false; - addDel = true; - } - else { - KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); - KConfigGroup configGroup(globalConfig, "KDE"); - addDel = configGroup.readEntry("ShowDeleteCommand", false); - } - } - - if (addTrash) - editActions.append(actionCollection()->action("move_to_trash")); - if (addDel) - editActions.append(actionCollection()->action("delete")); - // Normally KonqPopupMenu only shows the "Create new" submenu in the current view // since otherwise the created file would not be visible. // But in treeview mode we should allow it. if (m_view->itemsExpandable()) - popupFlags |= KParts::BrowserExtension::ShowCreateDirectory; - + popupFlags |= KParts::NavigationExtension::ShowCreateDirectory; } - actionGroups.insert("editactions", editActions); + actionGroups.insert(QStringLiteral("editactions"), editActions); - emit m_extension->popupMenu(pos, - items, - KParts::OpenUrlArguments(), - KParts::BrowserArguments(), - popupFlags, - actionGroups); + Q_EMIT m_extension->popupMenu(pos, items, KParts::OpenUrlArguments(), popupFlags, actionGroups); } -void DolphinPart::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl) +void DolphinPart::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl) { - //kDebug() << oldUrl << newUrl << "currentUrl=" << url(); - if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) { + qCDebug(DolphinDebug) << oldUrl << newUrl << "currentUrl=" << url(); + if (oldUrl.matches(url(), QUrl::StripTrailingSlash /* #207572 */)) { KParts::ReadOnlyPart::setUrl(newUrl); - const QString prettyUrl = newUrl.pathOrUrl(); - emit m_extension->setLocationBarUrl(prettyUrl); + const QString prettyUrl = newUrl.toDisplayString(QUrl::PreferLocalFile); + Q_EMIT m_extension->setLocationBarUrl(prettyUrl); } } - void DolphinPart::slotEditMimeType() { const KFileItemList items = m_view->selectedItems(); if (!items.isEmpty()) { - KonqOperations::editMimeType(items.first().mimetype(), m_view); + KMimeTypeEditor::editMimeType(items.first().mimetype(), m_view); } } void DolphinPart::slotSelectItemsMatchingPattern() { - openSelectionDialog(i18nc("@title:window", "Select"), - i18n("Select all items matching this pattern:"), - true); + openSelectionDialog(i18nc("@title:window", "Select"), i18n("Select all items matching this pattern:"), true); } void DolphinPart::slotUnselectItemsMatchingPattern() { - openSelectionDialog(i18nc("@title:window", "Unselect"), - i18n("Unselect all items matching this pattern:"), - false); + openSelectionDialog(i18nc("@title:window", "Unselect"), i18n("Unselect all items matching this pattern:"), false); } -void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems) +void DolphinPart::openSelectionDialog(const QString &title, const QString &text, bool selectItems) { - bool okClicked; - QString pattern = KInputDialog::getText(title, text, "*", &okClicked, m_view); + auto *dialog = new QInputDialog(m_view); + dialog->setAttribute(Qt::WA_DeleteOnClose, true); + dialog->setInputMode(QInputDialog::TextInput); + dialog->setWindowTitle(title); + dialog->setLabelText(text); - if (okClicked && !pattern.isEmpty()) { - QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard); - m_view->selectItems(patternRegExp, selectItems); - } + const KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group(QStringLiteral("Select Dialog")); + dialog->setComboBoxEditable(true); + dialog->setComboBoxItems(group.readEntry("History", QStringList())); + + dialog->setTextValue(QStringLiteral("*")); + + connect(dialog, &QDialog::accepted, this, [=, this]() { + const QString pattern = dialog->textValue(); + if (!pattern.isEmpty()) { + QStringList items = dialog->comboBoxItems(); + items.removeAll(pattern); + items.prepend(pattern); + + // Need to evaluate this again here, because the captured value is const + // (even if the const were removed from 'const KConfigGroup group =' above). + KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group(QStringLiteral("Select Dialog")); + // Limit the size of the saved history. + group.writeEntry("History", items.mid(0, 10)); + group.sync(); + + const QRegularExpression patternRegExp(QRegularExpression::wildcardToRegularExpression(pattern)); + m_view->selectItems(patternRegExp, selectItems); + } + }); + + dialog->open(); } -void DolphinPart::setCurrentViewMode(const QString& viewModeName) +void DolphinPart::setCurrentViewMode(const QString &viewModeName) { - QAction* action = actionCollection()->action(viewModeName); + QAction *action = actionCollection()->action(viewModeName); Q_ASSERT(action); action->trigger(); } @@ -499,7 +502,7 @@ QString DolphinPart::currentViewMode() const return m_actionHandler->currentViewModeActionName(); } -void DolphinPart::setNameFilter(const QString& nameFilter) +void DolphinPart::setNameFilter(const QString &nameFilter) { // This is the "/home/dfaure/*.diff" kind of name filter (KDirLister::setNameFilter) // which is unrelated to DolphinView::setNameFilter which is substring filtering in a proxy. @@ -507,56 +510,55 @@ void DolphinPart::setNameFilter(const QString& nameFilter) // TODO save/restore name filter in saveState/restoreState like KonqDirPart did in kde3? } -void DolphinPart::slotOpenTerminal() +QString DolphinPart::localFilePathOrHome() const { - QString dir(QDir::homePath()); - - KUrl u(url()); - - // If the given directory is not local, it can still be the URL of an - // ioslave using UDS_LOCAL_PATH which to be converted first. - u = KIO::NetAccess::mostLocalUrl(u, widget()); - - //If the URL is local after the above conversion, set the directory. - if (u.isLocalFile()) { - dir = u.toLocalFile(); + const QString localPath = localFilePath(); + if (!localPath.isEmpty()) { + return localPath; } + return QDir::homePath(); +} - KToolInvocation::invokeTerminal(QString(), dir); +void DolphinPart::slotOpenTerminal() +{ + auto job = new KTerminalLauncherJob(QString()); + job->setWorkingDirectory(localFilePathOrHome()); + job->start(); } void DolphinPart::slotFindFile() { - KRun::run("kfind", url(), widget()); + KIO::CommandLauncherJob *job = new KIO::CommandLauncherJob(QStringLiteral("kfind"), {url().toString()}, this); + job->setDesktopName(QStringLiteral("org.kde.kfind")); + job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, widget())); + job->start(); } void DolphinPart::updateNewMenu() { // As requested by KNewFileMenu : m_newFileMenu->checkUpToDate(); - m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown()); // And set the files that the menu apply on : - m_newFileMenu->setPopupFiles(url()); + m_newFileMenu->setWorkingDirectory(url()); } void DolphinPart::updateStatusBar() { - emit ReadOnlyPart::setStatusBarText(m_view->statusBarText()); + m_view->requestStatusBarText(); } void DolphinPart::updateProgress(int percent) { - m_extension->loadingProgress(percent); + Q_EMIT m_extension->loadingProgress(percent); } void DolphinPart::createDirectory() { - m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown()); - m_newFileMenu->setPopupFiles(url()); + m_newFileMenu->setWorkingDirectory(url()); m_newFileMenu->createDirectory(); } -void DolphinPart::setFilesToSelect(const KUrl::List& files) +void DolphinPart::setFilesToSelect(const QList &files) { if (files.isEmpty()) { return; @@ -566,144 +568,23 @@ void DolphinPart::setFilesToSelect(const KUrl::List& files) m_view->markUrlAsCurrent(files.at(0)); } -//// - -void DolphinPartBrowserExtension::restoreState(QDataStream &stream) -{ - KParts::BrowserExtension::restoreState(stream); - m_part->view()->restoreState(stream); -} - -void DolphinPartBrowserExtension::saveState(QDataStream &stream) -{ - KParts::BrowserExtension::saveState(stream); - m_part->view()->saveState(stream); -} - -void DolphinPartBrowserExtension::cut() -{ - m_part->view()->cutSelectedItems(); -} - -void DolphinPartBrowserExtension::copy() -{ - m_part->view()->copySelectedItems(); -} - -void DolphinPartBrowserExtension::paste() -{ - m_part->view()->paste(); -} - -void DolphinPartBrowserExtension::pasteTo(const KUrl&) -{ - m_part->view()->pasteIntoFolder(); -} - -void DolphinPartBrowserExtension::reparseConfiguration() -{ - m_part->view()->readSettings(); -} - -//// - -DolphinPartFileInfoExtension::DolphinPartFileInfoExtension(DolphinPart* part) - : KParts::FileInfoExtension(part) -{ -} - -DolphinPart* DolphinPartFileInfoExtension::part() const -{ - return static_cast(parent()); -} - -bool DolphinPartFileInfoExtension::hasSelection() const -{ - return part()->view()->selectedItemsCount() > 0; -} - -KParts::FileInfoExtension::QueryModes DolphinPartFileInfoExtension::supportedQueryModes() const -{ - return (KParts::FileInfoExtension::AllItems | KParts::FileInfoExtension::SelectedItems); -} - -KFileItemList DolphinPartFileInfoExtension::queryFor(KParts::FileInfoExtension::QueryMode mode) const +bool DolphinPart::eventFilter(QObject *obj, QEvent *event) { - KFileItemList list; - - if (mode == KParts::FileInfoExtension::None) - return list; - - if (!(supportedQueryModes() & mode)) - return list; - - switch (mode) { - case KParts::FileInfoExtension::SelectedItems: - if (hasSelection()) - return part()->view()->selectedItems(); - break; - case KParts::FileInfoExtension::AllItems: - return part()->view()->items(); - default: - break; - } + using ShiftState = DolphinRemoveAction::ShiftState; + const int type = event->type(); - return list; -} - -DolphinPartListingFilterExtension::DolphinPartListingFilterExtension (DolphinPart* part) - : KParts::ListingFilterExtension(part) - , m_part(part) -{ -} - -KParts::ListingFilterExtension::FilterModes DolphinPartListingFilterExtension::supportedFilterModes() const -{ - return (KParts::ListingFilterExtension::MimeType | - KParts::ListingFilterExtension::SubString | - KParts::ListingFilterExtension::WildCard); -} - -bool DolphinPartListingFilterExtension::supportsMultipleFilters (KParts::ListingFilterExtension::FilterMode mode) const -{ - if (mode == KParts::ListingFilterExtension::MimeType) - return true; - - return false; -} - -QVariant DolphinPartListingFilterExtension::filter (KParts::ListingFilterExtension::FilterMode mode) const -{ - QVariant result; - - switch (mode) { - case KParts::ListingFilterExtension::MimeType: - result = m_part->view()->mimeTypeFilters(); - break; - case KParts::ListingFilterExtension::SubString: - case KParts::ListingFilterExtension::WildCard: - result = m_part->view()->nameFilter(); - break; - default: - break; + if ((type == QEvent::KeyPress || type == QEvent::KeyRelease) && m_removeAction) { + QMenu *menu = qobject_cast(obj); + if (menu && menu->parent() == m_view) { + QKeyEvent *ev = static_cast(event); + if (ev->key() == Qt::Key_Shift) { + m_removeAction->update(type == QEvent::KeyPress ? ShiftState::Pressed : ShiftState::Released); + } + } } - return result; -} - -void DolphinPartListingFilterExtension::setFilter (KParts::ListingFilterExtension::FilterMode mode, const QVariant& filter) -{ - switch (mode) { - case KParts::ListingFilterExtension::MimeType: - m_part->view()->setMimeTypeFilters(filter.toStringList()); - break; - case KParts::ListingFilterExtension::SubString: - case KParts::ListingFilterExtension::WildCard: - m_part->view()->setNameFilter(filter.toString()); - break; - default: - break; - } + return KParts::ReadOnlyPart::eventFilter(obj, event); } #include "dolphinpart.moc" +#include "moc_dolphinpart.cpp"