X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c12dc996f535f787ab828560068a2c8b7f98c5cf..27bfcde4efaf936243fc41e4a61d0cac32105ef6:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 479b80951..8d528f418 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -1,92 +1,79 @@ /* 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 "dolphinremoveaction.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 -#include - -#include "dolphinpart_ext.h" - -#include "dolphinnewfilemenu.h" -#include "views/dolphinview.h" -#include "views/dolphinviewactionhandler.h" -#include "views/dolphinnewfilemenuobserver.h" -#include "views/dolphinremoteencoding.h" -#include "kitemviews/kfileitemmodel.h" -#include "kitemviews/private/kfileitemmodeldirlister.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")) +K_PLUGIN_CLASS_WITH_JSON(DolphinPart, "dolphinpart.json") -DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) +DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, + const KPluginMetaData& metaData, const QVariantList& args) : KParts::ReadOnlyPart(parent) - ,m_openTerminalAction(0) - ,m_removeAction(0) + ,m_openTerminalAction(nullptr) + ,m_removeAction(nullptr) { Q_UNUSED(args) -#pragma message("TODO: port to KF5") - //setComponentData(DolphinPartFactory::componentData(), false); + setMetaData(metaData); + 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(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage, this, &DolphinPart::slotErrorMessage); - connect(m_view, &DolphinView::directoryLoadingCompleted, this, static_cast(&DolphinPart::completed)); + connect(m_view, &DolphinView::directoryLoadingCompleted, this, QOverload<>::of(&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("dolphinpart.rc"); + setXMLFile(QStringLiteral("dolphinpart.rc")); connect(m_view, &DolphinView::infoMessage, this, &DolphinPart::slotMessage); @@ -98,12 +85,16 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL 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, static_cast(&DolphinPartBrowserExtension::selectionInfo)); + m_extension, QOverload::of(&KParts::BrowserExtension::selectionInfo)); connect(m_view, &DolphinView::selectionChanged, this, &DolphinPart::slotSelectionChanged); connect(m_view, &DolphinView::requestItemInfo, @@ -120,7 +111,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); m_actionHandler->setCurrentView(m_view); - connect(m_actionHandler, &DolphinViewActionHandler::createDirectory, this, &DolphinPart::createDirectory); + connect(m_actionHandler, &DolphinViewActionHandler::createDirectoryTriggered, this, &DolphinPart::createDirectory); m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); connect(this, &DolphinPart::aboutToOpenURL, @@ -142,7 +133,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL connect(lister, &KDirLister::newItems, notifyExt, &DolphinPartListingNotificationExtension::slotNewItems); connect(lister, &KDirLister::itemsDeleted, notifyExt, &DolphinPartListingNotificationExtension::slotItemsDeleted); } else { - kWarning() << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported"; + qCWarning(DolphinDebug) << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported"; } createActions(); @@ -156,7 +147,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // 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()); + loadPlugins(this, this, componentName()); } DolphinPart::~DolphinPart() @@ -172,28 +163,28 @@ void DolphinPart::createActions() connect(m_newFileMenu->menu(), &QMenu::aboutToShow, this, &DolphinPart::updateNewMenu); - QAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" ); + QAction *editMimeTypeAction = actionCollection()->addAction( QStringLiteral("editMimeType") ); editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) ); connect(editMimeTypeAction, &QAction::triggered, this, &DolphinPart::slotEditMimeType); - QAction* selectItemsMatching = actionCollection()->addAction("select_items_matching"); + QAction* selectItemsMatching = actionCollection()->addAction(QStringLiteral("select_items_matching")); selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching...")); - selectItemsMatching->setShortcut(Qt::CTRL | Qt::Key_S); + actionCollection()->setDefaultShortcut(selectItemsMatching, Qt::CTRL | Qt::Key_S); connect(selectItemsMatching, &QAction::triggered, this, &DolphinPart::slotSelectItemsMatchingPattern); - QAction* unselectItemsMatching = actionCollection()->addAction("unselect_items_matching"); + 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()); - QAction* unselectAll = actionCollection()->addAction("unselect_all"); + QAction* unselectAll = actionCollection()->addAction(QStringLiteral("unselect_all")); unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All")); connect(unselectAll, &QAction::triggered, m_view, &DolphinView::clearSelection); - QAction* 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); + actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A); connect(invertSelection, &QAction::triggered, m_view, &DolphinView::invertSelection); // View menu: all done by DolphinViewActionHandler @@ -205,35 +196,31 @@ void DolphinPart::createActions() this, &DolphinPart::slotGoTriggered); createGoAction("go_applications", "start-here-kde", - i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"), + i18nc("@action:inmenu Go", "App&lications"), QStringLiteral("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:/"), + i18nc("@action:inmenu Go", "&Network Folders"), QStringLiteral("remote:/"), goActionGroup); createGoAction("go_trash", "user-trash", - i18nc("@action:inmenu Go", "Trash"), QString("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 = KStandardAction::find(this, &DolphinPart::slotFindFile, actionCollection()); m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File...")); - m_findFileAction->setShortcut(Qt::CTRL | Qt::Key_F); - m_findFileAction->setIcon(QIcon::fromTheme("edit-find")); - connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile); - if (KAuthorized::authorizeKAction("shell_access")) { - m_openTerminalAction = actionCollection()->addAction("open_terminal"); - m_openTerminalAction->setIcon(QIcon::fromTheme("utilities-terminal")); +#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, &QAction::triggered, this, &DolphinPart::slotOpenTerminal); - m_openTerminalAction->setShortcut(Qt::Key_F4); + actionCollection()->setDefaultShortcut(m_openTerminalAction, Qt::Key_F4); } +#endif } void DolphinPart::createGoAction(const char* name, const char* iconName, @@ -250,29 +237,29 @@ void DolphinPart::createGoAction(const char* name, const char* iconName, 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) { 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 @@ -285,21 +272,28 @@ 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", i18nc("@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 QUrl &url) @@ -312,24 +306,25 @@ bool DolphinPart::openUrl(const QUrl &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); @@ -339,24 +334,24 @@ bool DolphinPart::openUrl(const QUrl &url) void DolphinPart::slotMessage(const QString& msg) { - emit setStatusBarText(msg); + Q_EMIT setStatusBarText(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) { - emit m_extension->mouseOverInfo(item); + Q_EMIT m_extension->mouseOverInfo(item); if (item.isNull()) { updateStatusBar(); } else { const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo()); - ReadOnlyPart::setStatusBarText(QString("%1").arg(escapedText)); + Q_EMIT ReadOnlyPart::setStatusBarText(QStringLiteral("%1").arg(escapedText)); } } @@ -373,26 +368,26 @@ void DolphinPart::slotItemActivated(const KFileItem& item) // 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, browserArgs); } void DolphinPart::slotItemsActivated(const KFileItemList& items) { - foreach (const KFileItem& item, items) { + for (const KFileItem& item : items) { slotItemActivated(item); } } -void DolphinPart::createNewWindow(const KUrl& url) +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 QUrl &, const QList& customActions) { KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems @@ -402,10 +397,9 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, 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) } @@ -430,17 +424,17 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, const bool supportsMoving = capabilities.supportsMoving(); if (capabilities.supportsDeleting()) { - const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) || + const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) || !item.isLocalFile()); const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving; if (showDeleteAction && showMoveToTrashAction) { delete m_removeAction; - m_removeAction = 0; - editActions.append(actionCollection()->action("move_to_trash")); - editActions.append(actionCollection()->action("delete")); + 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("delete")); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); } else { if (!m_removeAction) m_removeAction = new DolphinRemoveAction(this, actionCollection()); @@ -452,7 +446,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, } if (supportsMoving) { - editActions.append(actionCollection()->action("rename")); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile))); } // Normally KonqPopupMenu only shows the "Create new" submenu in the current view @@ -463,9 +457,9 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, } - actionGroups.insert("editactions", editActions); + actionGroups.insert(QStringLiteral("editactions"), editActions); - emit m_extension->popupMenu(pos, + Q_EMIT m_extension->popupMenu(pos, items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), @@ -473,13 +467,13 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, 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); } } @@ -488,7 +482,7 @@ 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); } } @@ -508,13 +502,38 @@ void DolphinPart::slotUnselectItemsMatchingPattern() 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); + + const KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group("Select Dialog"); + dialog->setComboBoxEditable(true); + dialog->setComboBoxItems(group.readEntry("History", QStringList())); + + dialog->setTextValue(QStringLiteral("*")); + + connect(dialog, &QDialog::accepted, 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("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); + } + }); - if (okClicked && !pattern.isEmpty()) { - QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard); - m_view->selectItems(patternRegExp, selectItems); - } + dialog->open(); } void DolphinPart::setCurrentViewMode(const QString& viewModeName) @@ -537,27 +556,37 @@ 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", QList() << url(), widget()); + QMenu searchTools; + KMoreToolsMenuFactory("dolphin/search-tools").fillMenuFromGroupingNames( + &searchTools, { "files-find" }, QUrl::fromLocalFile(localFilePathOrHome()) + ); + QList actions = searchTools.actions(); + if (!(actions.isEmpty())) { + actions.first()->trigger(); + } else { + 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() @@ -566,28 +595,27 @@ void DolphinPart::updateNewMenu() m_newFileMenu->checkUpToDate(); m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown()); // And set the files that the menu apply on : - m_newFileMenu->setPopupFiles(url()); + m_newFileMenu->setPopupFiles(QList() << url()); } void DolphinPart::updateStatusBar() { - const QString escapedText = Qt::convertFromPlainText(m_view->statusBarText()); - emit ReadOnlyPart::setStatusBarText(QString("%1").arg(escapedText)); + 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->setPopupFiles(QList() << url()); m_newFileMenu->createDirectory(); } -void DolphinPart::setFilesToSelect(const KUrl::List& files) +void DolphinPart::setFilesToSelect(const QList& files) { if (files.isEmpty()) { return; @@ -599,6 +627,7 @@ void DolphinPart::setFilesToSelect(const KUrl::List& files) bool DolphinPart::eventFilter(QObject* obj, QEvent* event) { + using ShiftState = DolphinRemoveAction::ShiftState; const int type = event->type(); if ((type == QEvent::KeyPress || type == QEvent::KeyRelease) && m_removeAction) { @@ -606,7 +635,7 @@ bool DolphinPart::eventFilter(QObject* obj, QEvent* event) if (menu && menu->parent() == m_view) { QKeyEvent* ev = static_cast(event); if (ev->key() == Qt::Key_Shift) { - m_removeAction->update(); + m_removeAction->update(type == QEvent::KeyPress ? ShiftState::Pressed : ShiftState::Released); } } }