Allow to copy or move selection to the other split view

Summary:
FEATURE: 276167

Default keyboard shortcuts set to `SHIFT+F5` for `copy`, `SHIFT+F6` for `move`

Reviewers: #dolphin, elvisangelaccio, ngraham, meven, dfaure

Reviewed By: #dolphin, elvisangelaccio, ngraham, meven, dfaure

Subscribers: yurchor, kde-doc-english, dfaure, meven, kfm-devel

Tags: #dolphin, #documentation

Differential Revision: https://phabricator.kde.org/D29006

diff --git a/doc/index.docbook b/doc/index.docbook
index 965303477f4743269d16e81affe5852577943ed7..344ab8ac01ee8221730149471f63d6bd63d074b6 100644 (file)
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1729,6 +1729,29 @@ The name of this file has to be entered in a dialog.
 </action></para></listitem>
 </varlistentry>
 
 </action></para></listitem>
 </varlistentry>
 

+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Copy to inactive split view</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Copies the currently selected item(s) from the active split view to the inactive split view.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>F6</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Move to inactive split view</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Moves the currently selected item(s) from the active split view to the inactive split view.
+Is disabled if the current user does not have write permission on the selected item(s).</action></para></listitem>
+</varlistentry>
+

 <varlistentry>
 <term><menuchoice>
 <shortcut>
 <varlistentry>
 <term><menuchoice>
 <shortcut>

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 501949a64ca6cac4e78035de3f09f388f64b2d4a..668f511ee0eedca94e4648b7a883ed3057f191fb 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1149,6 +1149,8 @@ void DolphinMainWindow::updateControlMenu()
 
     // Add "Edit" actions
     bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
 
     // Add "Edit" actions
     bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |

+                 addActionToMenu(ac->action(QStringLiteral("copy_to_inactive_split_view")), menu) |
+                 addActionToMenu(ac->action(QStringLiteral("move_to_inactive_split_view")), menu) |

                  addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
                  addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
 
                  addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
                  addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
 


@@ -1382,6 +1384,24 @@ void DolphinMainWindow::setupActions()
         "If the items were added to the clipboard by the <emphasis>Cut</emphasis> "
         "action they are removed from their old location.") +  cutCopyPastePara);
 
         "If the items were added to the clipboard by the <emphasis>Cut</emphasis> "
         "action they are removed from their old location.") +  cutCopyPastePara);
 

+    QAction* copyToOtherViewAction = actionCollection()->addAction(QStringLiteral("copy_to_inactive_split_view"));
+    copyToOtherViewAction->setText(i18nc("@action:inmenu", "Copy to inactive split view"));
+    copyToOtherViewAction->setWhatsThis(xi18nc("@info:whatsthis Copy", "This copies the selected items from "
+        "the <emphasis>active</emphasis> view to the inactive split view."));
+    copyToOtherViewAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
+    copyToOtherViewAction->setIconText(i18nc("@action:inmenu Edit", "Copy to inactive split view"));
+    actionCollection()->setDefaultShortcut(copyToOtherViewAction, Qt::SHIFT + Qt::Key_F5 );
+    connect(copyToOtherViewAction, &QAction::triggered, m_tabWidget, &DolphinTabWidget::copyToInactiveSplitView);
+
+    QAction* moveToOtherViewAction = actionCollection()->addAction(QStringLiteral("move_to_inactive_split_view"));
+    moveToOtherViewAction->setText(i18nc("@action:inmenu", "Move to inactive split view"));
+    moveToOtherViewAction->setWhatsThis(xi18nc("@info:whatsthis Move", "This moves the selected items from "
+        "the <emphasis>active</emphasis> view to the inactive split view."));
+    moveToOtherViewAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-cut")));
+    moveToOtherViewAction->setIconText(i18nc("@action:inmenu Edit", "Move to inactive split view"));
+    actionCollection()->setDefaultShortcut(moveToOtherViewAction, Qt::SHIFT + Qt::Key_F6 );
+    connect(moveToOtherViewAction, &QAction::triggered, m_tabWidget, &DolphinTabWidget::moveToInactiveSplitView);
+

     QAction *searchAction = KStandardAction::find(this, &DolphinMainWindow::find, actionCollection());
     searchAction->setText(i18n("Search..."));
     searchAction->setToolTip(i18nc("@info:tooltip", "Search for files and folders"));
     QAction *searchAction = KStandardAction::find(this, &DolphinMainWindow::find, actionCollection());
     searchAction->setText(i18n("Search..."));
     searchAction->setToolTip(i18nc("@info:tooltip", "Search for files and folders"));


@@ -1907,12 +1927,18 @@ void DolphinMainWindow::updateFileAndEditActions()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     const KActionCollection* col = actionCollection();
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     const KActionCollection* col = actionCollection();

+    KFileItemListProperties capabilitiesSource(list);
+

     QAction* addToPlacesAction = col->action(QStringLiteral("add_to_places"));
     QAction* addToPlacesAction = col->action(QStringLiteral("add_to_places"));

+    QAction* copyToOtherViewAction   = col->action(QStringLiteral("copy_to_inactive_split_view"));
+    QAction* moveToOtherViewAction   = col->action(QStringLiteral("move_to_inactive_split_view"));

 
     if (list.isEmpty()) {
         stateChanged(QStringLiteral("has_no_selection"));
 
         addToPlacesAction->setEnabled(true);
 
     if (list.isEmpty()) {
         stateChanged(QStringLiteral("has_no_selection"));
 
         addToPlacesAction->setEnabled(true);

+        copyToOtherViewAction->setEnabled(false);
+        moveToOtherViewAction->setEnabled(false);

     } else {
         stateChanged(QStringLiteral("has_selection"));
 
     } else {
         stateChanged(QStringLiteral("has_selection"));
 


@@ -1930,16 +1956,32 @@ void DolphinMainWindow::updateFileAndEditActions()
             addToPlacesAction->setEnabled(false);
         }
 
             addToPlacesAction->setEnabled(false);
         }
 

-        KFileItemListProperties capabilities(list);
-        const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
+        if (m_tabWidget->currentTabPage()->splitViewEnabled()) {
+            DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
+            KFileItem capabilitiesDestination;
+
+            if (tabPage->primaryViewActive()) {
+                capabilitiesDestination = tabPage->secondaryViewContainer()->url();
+            } else {
+                capabilitiesDestination = tabPage->primaryViewContainer()->url();
+            }
+
+            copyToOtherViewAction->setEnabled(capabilitiesDestination.isWritable());
+            moveToOtherViewAction->setEnabled(capabilitiesSource.supportsMoving() && capabilitiesDestination.isWritable());
+        } else {
+            copyToOtherViewAction->setEnabled(false);
+            moveToOtherViewAction->setEnabled(false);
+        }
+
+        const bool enableMoveToTrash = capabilitiesSource.isLocal() && capabilitiesSource.supportsMoving();

 
 

-        renameAction->setEnabled(capabilities.supportsMoving());
+        renameAction->setEnabled(capabilitiesSource.supportsMoving());

         moveToTrashAction->setEnabled(enableMoveToTrash);
         moveToTrashAction->setEnabled(enableMoveToTrash);

-        deleteAction->setEnabled(capabilities.supportsDeleting());
-        deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
-        cutAction->setEnabled(capabilities.supportsMoving());
+        deleteAction->setEnabled(capabilitiesSource.supportsDeleting());
+        deleteWithTrashShortcut->setEnabled(capabilitiesSource.supportsDeleting() && !enableMoveToTrash);
+        cutAction->setEnabled(capabilitiesSource.supportsMoving());

         showTarget->setEnabled(list.length() == 1 && list.at(0).isLink());
         showTarget->setEnabled(list.length() == 1 && list.at(0).isLink());

-        duplicateAction->setEnabled(capabilities.supportsWriting());
+        duplicateAction->setEnabled(capabilitiesSource.supportsWriting());

     }
 }
 
     }
 }
 

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index fba6fe084992dc50a7b20f8ce21d984b2afc4bc3..9fd6005673f405d3f743004f711543c61df2c83b 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -320,6 +320,40 @@ void DolphinTabWidget::restoreClosedTab(const QByteArray& state)
     currentTabPage()->restoreState(state);
 }
 
     currentTabPage()->restoreState(state);
 }
 

+void DolphinTabWidget::copyToInactiveSplitView()
+{
+    const DolphinTabPage* tabPage = tabPageAt(currentIndex());
+    DolphinViewContainer* activeViewContainer = currentTabPage()->activeViewContainer();
+    if (!tabPage->splitViewEnabled() || activeViewContainer->view()->selectedItems().isEmpty()) {
+        return;
+    }
+
+    if (tabPage->primaryViewActive()) {
+        // copy from left panel to right
+        activeViewContainer->view()->copySelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
+    } else {
+        // copy from right panel to left
+        activeViewContainer->view()->copySelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
+    }
+}
+
+void DolphinTabWidget::moveToInactiveSplitView()
+{
+    const DolphinTabPage* tabPage = tabPageAt(currentIndex());
+    DolphinViewContainer* activeViewContainer = currentTabPage()->activeViewContainer();
+    if (!tabPage->splitViewEnabled() || activeViewContainer->view()->selectedItems().isEmpty()) {
+        return;
+    }
+
+    if (tabPage->primaryViewActive()) {
+        // move from left panel to right
+        activeViewContainer->view()->moveSelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
+    } else {
+        // move from right panel to left
+        activeViewContainer->view()->moveSelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
+    }
+}
+

 void DolphinTabWidget::detachTab(int index)
 {
     Q_ASSERT(index >= 0);
 void DolphinTabWidget::detachTab(int index)
 {
     Q_ASSERT(index >= 0);

diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h
index 746aec6c64ec347fdb2611c22d8e01a115374958..f0ce11ce8994e4013df7bb9e3d7d0e3090de625c 100644 (file)
--- a/src/dolphintabwidget.h
+++ b/src/dolphintabwidget.h
@@ -189,6 +189,12 @@ public slots:
      */
     void restoreClosedTab(const QByteArray& state);
 
      */
     void restoreClosedTab(const QByteArray& state);
 

+    /** Copies all selected items to the inactive view. */
+    void copyToInactiveSplitView();
+
+    /** Moves all selected items to the inactive view. */
+    void moveToInactiveSplitView();
+

 private slots:
     /**
      * Opens the tab with the index \a index in a new Dolphin instance and closes
 private slots:
     /**
      * Opens the tab with the index \a index in a new Dolphin instance and closes

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index e717b67ae96d9f3cfd1ce48ef8062a544faa13d9..acb2f1dcd75fe13b3d7d004bdce3acdf54e15ab9 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">

-<kpartgui name="dolphin" version="30">
+<kpartgui name="dolphin" version="31">

     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />
     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />


@@ -20,6 +20,8 @@
             <Action name="properties" />
         </Menu>
         <Menu name="edit">
             <Action name="properties" />
         </Menu>
         <Menu name="edit">

+            <Action name="copy_to_inactive_split_view" />
+            <Action name="move_to_inactive_split_view" />

             <Action name="edit_select_all" />
             <Action name="invert_selection" />
         </Menu>
             <Action name="edit_select_all" />
             <Action name="invert_selection" />
         </Menu>

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 2500902afeea370de650c8dc568a8eacf7867f7d..aef0e85d603149198720e584543b11ec5068e671 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -692,6 +692,27 @@ void DolphinView::copySelectedItemsToClipboard()
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
     QApplication::clipboard()->setMimeData(mimeData);
 }
 

+void DolphinView::copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl)
+{
+    KIO::CopyJob* job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags);
+    KJobWidgets::setWindow(job, this);
+
+    connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);
+    connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotCopyingDone);
+    KIO::FileUndoManager::self()->recordCopyJob(job);
+}
+
+void DolphinView::moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl)
+{
+    KIO::CopyJob* job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags);
+    KJobWidgets::setWindow(job, this);
+
+    connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);
+    connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotCopyingDone);
+    KIO::FileUndoManager::self()->recordCopyJob(job);
+
+}
+

 void DolphinView::paste()
 {
     pasteToUrl(url());
 void DolphinView::paste()
 {
     pasteToUrl(url());


@@ -1132,7 +1153,7 @@ void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *
     KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
 
     if (job) {
     KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
 
     if (job) {

-        connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);
+        connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);

 
         if (destUrl == url()) {
             // Mark the dropped urls as selected.
 
         if (destUrl == url()) {
             // Mark the dropped urls as selected.


@@ -1185,6 +1206,11 @@ void DolphinView::slotSelectedItemTextPressed(int index)
     }
 }
 
     }
 }
 

+void DolphinView::slotCopyingDone(KIO::Job *, const QUrl &, const QUrl &to)
+{
+    slotItemCreated(to);
+}
+

 void DolphinView::slotItemCreated(const QUrl& url)
 {
     if (m_markFirstNewlySelectedItemAsCurrent) {
 void DolphinView::slotItemCreated(const QUrl& url)
 {
     if (m_markFirstNewlySelectedItemAsCurrent) {


@@ -1194,7 +1220,7 @@ void DolphinView::slotItemCreated(const QUrl& url)
     m_selectedUrls << url;
 }
 
     m_selectedUrls << url;
 }
 

-void DolphinView::slotPasteJobResult(KJob *job)
+void DolphinView::slotJobResult(KJob *job)

 {
     if (job->error()) {
         emit errorMessage(job->errorString());
 {
     if (job->error()) {
         emit errorMessage(job->errorString());


@@ -1845,7 +1871,7 @@ void DolphinView::pasteToUrl(const QUrl& url)
     m_clearSelectionBeforeSelectingNewItems = true;
     m_markFirstNewlySelectedItemAsCurrent = true;
     connect(job, &KIO::PasteJob::itemCreated, this, &DolphinView::slotItemCreated);
     m_clearSelectionBeforeSelectingNewItems = true;
     m_markFirstNewlySelectedItemAsCurrent = true;
     connect(job, &KIO::PasteJob::itemCreated, this, &DolphinView::slotItemCreated);

-    connect(job, &KIO::PasteJob::result, this, &DolphinView::slotPasteJobResult);
+    connect(job, &KIO::PasteJob::result, this, &DolphinView::slotJobResult);

 }
 
 QList<QUrl> DolphinView::simplifiedSelectedUrls() const
 }
 
 QList<QUrl> DolphinView::simplifiedSelectedUrls() const

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 766540d99d6d09e7867d7855ee434405e65e07c8..0b2c0bce48a6c3f688370e2004f946a93680def0 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -370,6 +370,18 @@ public slots:
     /** Copies all selected items to the clipboard. */
     void copySelectedItemsToClipboard();
 
     /** Copies all selected items to the clipboard. */
     void copySelectedItemsToClipboard();
 

+    /**
+     * Copies all selected items to the inactive split view.
+     * Only used in Split View.
+     */
+    void copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl);
+
+    /**
+     * Moves all selected items to the inactive split view.
+     * Only used in Split View.
+     */
+    void moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl);
+

     /** Pastes the clipboard data to this view. */
     void paste();
 
     /** Pastes the clipboard data to this view. */
     void paste();
 


@@ -608,6 +620,7 @@ private slots:
     void slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons);
     void slotRenameDialogRenamingFinished(const QList<QUrl>& urls);
     void slotSelectedItemTextPressed(int index);
     void slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons);
     void slotRenameDialogRenamingFinished(const QList<QUrl>& urls);
     void slotSelectedItemTextPressed(int index);

+    void slotCopyingDone(KIO::Job *, const QUrl &, const QUrl &to);

 
     /*
      * Is called when new items get pasted or dropped.
 
     /*
      * Is called when new items get pasted or dropped.


@@ -616,7 +629,7 @@ private slots:
     /*
      * Is called after all pasted or dropped items have been copied to destination.
      */
     /*
      * Is called after all pasted or dropped items have been copied to destination.
      */

-    void slotPasteJobResult(KJob *job);
+    void slotJobResult(KJob *job);

 
     /**
      * Emits the signal \a selectionChanged() with a small delay. This is
 
     /**
      * Emits the signal \a selectionChanged() with a small delay. This is