kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update KParts' ReadOnlyPart::localFilePath in DolphinPart::openUrl()

Browse source
This commit is contained in:
Piotr Henryk Dabrowski 2020-03-10 17:11:49 +01:00
parent b5885871d8
commit 741072272f
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/dolphinpart.cpp
View file

@ -283,6 +283,18 @@ void DolphinPart::updatePasteAction()
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)
{
bool reload = arguments().reload();
@ -293,7 +305,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 +323,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);
@ -542,16 +555,25 @@ 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());
KToolInvocation::invokeTerminal(QString(), localFilePathOrHome());
}
void DolphinPart::slotFindFile()
{
QMenu searchTools;
KMoreToolsMenuFactory("dolphin/search-tools").fillMenuFromGroupingNames(
&searchTools, { "files-find" }, QUrl::fromLocalFile(KParts::ReadOnlyPart::localFilePath())
&searchTools, { "files-find" }, QUrl::fromLocalFile(localFilePathOrHome())
);
QList<QAction*> actions = searchTools.actions();
if (!(actions.isEmpty())) {

2
src/dolphinpart.h
View file

@ -218,6 +218,8 @@ private:
void openSelectionDialog(const QString& title, const QString& text,
bool selectItems);
QString urlToLocalFilePath(const QUrl &url);
QString localFilePathOrHome() const;
private:
DolphinView* m_view;