X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/42cd439af882c78e6e3c1f6a58dd8d47ce47ff57..c4ffe88c9fafaed4b66a010a25b117427ba709f6:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 00c99efd0..a7f0d85cd 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -11,28 +11,27 @@ #include "dolphinpart_ext.h" #include "dolphinremoveaction.h" #include "kitemviews/kfileitemmodel.h" -#include "kitemviews/private/kfileitemmodeldirlister.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 @@ -45,16 +44,17 @@ #include #include +#include +#include + K_PLUGIN_CLASS_WITH_JSON(DolphinPart, "dolphinpart.json") -DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, - const KPluginMetaData& metaData, const QVariantList& args) - : KParts::ReadOnlyPart(parent) - ,m_openTerminalAction(nullptr) - ,m_removeAction(nullptr) +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) - setMetaData(metaData); m_extension = new DolphinPartBrowserExtension(this); @@ -65,57 +65,46 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, m_view->setTabsForFilesEnabled(true); setWidget(m_view); - connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage, - this, &DolphinPart::slotErrorMessage); + connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage, this, &DolphinPart::slotErrorMessage); - connect(m_view, &DolphinView::directoryLoadingCompleted, this, QOverload<>::of(&KParts::ReadOnlyPart::completed)); + 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::tabRequested, - this, &DolphinPart::createNewWindow); - connect(m_view, &DolphinView::requestContextMenu, - this, &DolphinPart::slotOpenContextMenu); - connect(m_view, &DolphinView::selectionChanged, - m_extension, QOverload::of(&KParts::BrowserExtension::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); + 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, &DolphinView::itemCountChanged, this, &DolphinPart::updateStatusBar); - connect(m_view, &DolphinView::selectionChanged, 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, &DolphinViewActionHandler::createDirectoryTriggered, this, &DolphinPart::createDirectory); m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); - connect(this, &DolphinPart::aboutToOpenURL, - m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl); + connect(this, &DolphinPart::aboutToOpenURL, m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl); - QClipboard* clipboard = QApplication::clipboard(); - connect(clipboard, &QClipboard::dataChanged, - this, &DolphinPart::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. @@ -123,9 +112,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, new DolphinPartListingFilterExtension(this); - KDirLister* lister = m_view->m_model->m_dirLister; + KDirLister *lister = m_view->m_model->m_dirLister; if (lister) { - DolphinPartListingNotificationExtension* notifyExt = new DolphinPartListingNotificationExtension(this); + DolphinPartListingNotificationExtension *notifyExt = new DolphinPartListingNotificationExtension(this); connect(lister, &KDirLister::newItems, notifyExt, &DolphinPartListingNotificationExtension::slotNewItems); connect(lister, &KDirLister::itemsDeleted, notifyExt, &DolphinPartListingNotificationExtension::slotItemsDeleted); } else { @@ -142,8 +131,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror // (sort of spacial navigation) - - loadPlugins(this, this, componentName()); } DolphinPart::~DolphinPart() @@ -153,32 +140,32 @@ DolphinPart::~DolphinPart() void DolphinPart::createActions() { // Edit menu - - m_newFileMenu = new DolphinNewFileMenu(actionCollection(), 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()); - connect(m_newFileMenu->menu(), &QMenu::aboutToShow, - this, &DolphinPart::updateNewMenu); + connect(m_newFileMenu->menu(), &QMenu::aboutToShow, this, &DolphinPart::updateNewMenu); - QAction *editMimeTypeAction = actionCollection()->addAction( QStringLiteral("editMimeType") ); - editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) ); + 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(QStringLiteral("select_items_matching")); - selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching...")); + 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); - QAction* unselectItemsMatching = actionCollection()->addAction(QStringLiteral("unselect_items_matching")); - unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "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); KStandardAction::selectAll(m_view, &DolphinView::selectAll, actionCollection()); - QAction* unselectAll = actionCollection()->addAction(QStringLiteral("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(QStringLiteral("invert_selection")); + QAction *invertSelection = actionCollection()->addAction(QStringLiteral("invert_selection")); invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A); connect(invertSelection, &QAction::triggered, m_view, &DolphinView::invertSelection); @@ -187,29 +174,21 @@ void DolphinPart::createActions() // Go menu - QActionGroup* goActionGroup = new QActionGroup(this); - connect(goActionGroup, &QActionGroup::triggered, - this, &DolphinPart::slotGoTriggered); + QActionGroup *goActionGroup = new QActionGroup(this); + connect(goActionGroup, &QActionGroup::triggered, this, &DolphinPart::slotGoTriggered); - 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_settings", "preferences-system", - i18nc("@action:inmenu Go", "Sett&ings"), QStringLiteral("settings:/"), - 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", + 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 = KStandardAction::find(this, &DolphinPart::slotFindFile, actionCollection()); - m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File...")); + m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File…")); #ifndef Q_OS_WIN if (KAuthorized::authorize(QStringLiteral("shell_access"))) { @@ -222,33 +201,31 @@ void DolphinPart::createActions() #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) { - QAction* action = actionCollection()->addAction(name); + 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(); 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(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 + 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(QStringLiteral("has_no_selection")); @@ -279,8 +256,20 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) void DolphinPart::updatePasteAction() { QPair pasteInfo = m_view->pasteInfo(); - Q_EMIT m_extension->enableAction( "paste", pasteInfo.first ); - Q_EMIT m_extension->setActionText( "paste", pasteInfo.second ); + Q_EMIT m_extension->enableAction("paste", pasteInfo.first); + Q_EMIT m_extension->setActionText("paste", pasteInfo.second); +} + +QString DolphinPart::urlToLocalFilePath(const QUrl &url) +{ + 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) @@ -293,7 +282,8 @@ 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 + 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.setPath(visibleUrl.path() + '/' + m_nameFilter); @@ -310,7 +300,7 @@ bool DolphinPart::openUrl(const QUrl &url) 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); @@ -318,19 +308,19 @@ bool DolphinPart::openUrl(const QUrl &url) return true; } -void DolphinPart::slotMessage(const QString& msg) +void DolphinPart::slotMessage(const QString &msg) { Q_EMIT setStatusBarText(msg); } -void DolphinPart::slotErrorMessage(const QString& msg) +void DolphinPart::slotErrorMessage(const QString &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) { Q_EMIT m_extension->mouseOverInfo(item); if (item.isNull()) { @@ -341,7 +331,7 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item) } } -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. @@ -350,35 +340,27 @@ 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; - Q_EMIT m_extension->openUrlRequest(item.targetUrl(), args, browserArgs); + Q_EMIT m_extension->openUrlRequest(item.targetUrl(), args); } -void DolphinPart::slotItemsActivated(const KFileItemList& items) +void DolphinPart::slotItemsActivated(const KFileItemList &items) { - for (const KFileItem& item : items) { + for (const KFileItem &item : items) { slotItemActivated(item); } } -void DolphinPart::createNewWindow(const QUrl& 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() Q_EMIT m_extension->createNewWindow(url); } -void DolphinPart::slotOpenContextMenu(const QPoint& pos, - const KFileItem& _item, - const QUrl &, - 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); @@ -390,28 +372,25 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, 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 const bool supportsMoving = capabilities.supportsMoving(); if (capabilities.supportsDeleting()) { - const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) || - !item.isLocalFile()); + const bool showDeleteAction = + (KSharedConfig::openConfig()->group(QStringLiteral("KDE")).readEntry("ShowDeleteCommand", false) || !item.isLocalFile()); const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving; if (showDeleteAction && showMoveToTrashAction) { @@ -428,7 +407,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, m_removeAction->update(); } } else { - popupFlags |= KParts::BrowserExtension::NoDeletion; + popupFlags |= KParts::NavigationExtension::NoDeletion; } if (supportsMoving) { @@ -439,18 +418,12 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, // 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(QStringLiteral("editactions"), editActions); - Q_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 QUrl &oldUrl, const QUrl &newUrl) @@ -463,7 +436,6 @@ void DolphinPart::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUr } } - void DolphinPart::slotEditMimeType() { const KFileItemList items = m_view->selectedItems(); @@ -474,19 +446,15 @@ void DolphinPart::slotEditMimeType() 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) { auto *dialog = new QInputDialog(m_view); dialog->setAttribute(Qt::WA_DeleteOnClose, true); @@ -494,13 +462,13 @@ void DolphinPart::openSelectionDialog(const QString& title, const QString& text, dialog->setWindowTitle(title); dialog->setLabelText(text); - const KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group("Select Dialog"); + 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, [=]() { + connect(dialog, &QDialog::accepted, this, [=, this]() { const QString pattern = dialog->textValue(); if (!pattern.isEmpty()) { QStringList items = dialog->comboBoxItems(); @@ -509,7 +477,7 @@ void DolphinPart::openSelectionDialog(const QString& title, const QString& text, // 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"); + 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(); @@ -522,9 +490,9 @@ void DolphinPart::openSelectionDialog(const QString& title, const QString& text, 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(); } @@ -534,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. @@ -542,41 +510,41 @@ void DolphinPart::setNameFilter(const QString& nameFilter) // TODO save/restore name filter in saveState/restoreState like KonqDirPart did in kde3? } +QString DolphinPart::localFilePathOrHome() const +{ + const QString localPath = localFilePath(); + if (!localPath.isEmpty()) { + return localPath; + } + return QDir::homePath(); +} + void DolphinPart::slotOpenTerminal() { - KToolInvocation::invokeTerminal(QString(), KParts::ReadOnlyPart::localFilePath()); + auto job = new KTerminalLauncherJob(QString()); + job->setWorkingDirectory(localFilePathOrHome()); + job->start(); } void DolphinPart::slotFindFile() { - QMenu searchTools; - KMoreToolsMenuFactory("dolphin/search-tools").fillMenuFromGroupingNames( - &searchTools, { "files-find" }, QUrl::fromLocalFile(KParts::ReadOnlyPart::localFilePath()) - ); - 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(); - } + 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(QList() << url()); + m_newFileMenu->setWorkingDirectory(url()); } void DolphinPart::updateStatusBar() { - const QString escapedText = Qt::convertFromPlainText(m_view->statusBarText()); - Q_EMIT ReadOnlyPart::setStatusBarText(QStringLiteral("%1").arg(escapedText)); + m_view->requestStatusBarText(); } void DolphinPart::updateProgress(int percent) @@ -586,12 +554,11 @@ void DolphinPart::updateProgress(int percent) void DolphinPart::createDirectory() { - m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown()); - m_newFileMenu->setPopupFiles(QList() << url()); + m_newFileMenu->setWorkingDirectory(url()); m_newFileMenu->createDirectory(); } -void DolphinPart::setFilesToSelect(const QList& files) +void DolphinPart::setFilesToSelect(const QList &files) { if (files.isEmpty()) { return; @@ -601,15 +568,15 @@ void DolphinPart::setFilesToSelect(const QList& files) m_view->markUrlAsCurrent(files.at(0)); } -bool DolphinPart::eventFilter(QObject* obj, QEvent* event) +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) { - QMenu* menu = qobject_cast(obj); + QMenu *menu = qobject_cast(obj); if (menu && menu->parent() == m_view) { - QKeyEvent* ev = static_cast(event); + QKeyEvent *ev = static_cast(event); if (ev->key() == Qt::Key_Shift) { m_removeAction->update(type == QEvent::KeyPress ? ShiftState::Pressed : ShiftState::Released); } @@ -620,3 +587,4 @@ bool DolphinPart::eventFilter(QObject* obj, QEvent* event) } #include "dolphinpart.moc" +#include "moc_dolphinpart.cpp"