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

DolphinView: rename new methods to copy/move urls

Browse source 
DolphinView doesn't know anything about split views and it shouldn't.
Rename these new methods to what they actually do (just copy or move to a
given QUrl).
This commit is contained in:
Elvis Angelaccio 2020-05-19 00:22:26 +02:00
parent 1ee665bac8
commit a3052c3942
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dolphintabwidget.cpp
View file

@ -330,10 +330,10 @@ void DolphinTabWidget::copyToInactiveSplitView()
if (tabPage->primaryViewActive()) {
// copy from left panel to right
activeViewContainer->view()->copySelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
} else {
// copy from right panel to left
activeViewContainer->view()->copySelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
}
}
@ -347,10 +347,10 @@ void DolphinTabWidget::moveToInactiveSplitView()
if (tabPage->primaryViewActive()) {
// move from left panel to right
activeViewContainer->view()->moveSelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
} else {
// move from right panel to left
activeViewContainer->view()->moveSelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
}
}

4
src/views/dolphinview.cpp
View file

@ -692,7 +692,7 @@ void DolphinView::copySelectedItemsToClipboard()
QApplication::clipboard()->setMimeData(mimeData);
}
void DolphinView::copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl)
void DolphinView::copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
{
KIO::CopyJob* job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags);
KJobWidgets::setWindow(job, this);
@ -702,7 +702,7 @@ void DolphinView::copySelectedItemsToInactiveSplitView(const KFileItemList &sele
KIO::FileUndoManager::self()->recordCopyJob(job);
}
void DolphinView::moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl)
void DolphinView::moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
{
KIO::CopyJob* job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags);
KJobWidgets::setWindow(job, this);

10
src/views/dolphinview.h
View file

@ -371,16 +371,14 @@ public slots:
void copySelectedItemsToClipboard();
/**
* Copies all selected items to the inactive split view.
* Only used in Split View.
* Copies all selected items to @p destinationUrl.
*/
void copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl);
void copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl);
/**
* Moves all selected items to the inactive split view.
* Only used in Split View.
* Moves all selected items to @p destinationUrl.
*/
void moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl);
void moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl);
/** Pastes the clipboard data to this view. */
void paste();