ability to swap source and destination when comparing files or directories

Author: jsalatas

Diff for: TODO.txt

@@ -8,7 +8,6 @@ alpha (initial prelease phase)
 
 later
 --------------
-- Swap source and destination
 - Create a plugin for KDevelop
 - intraline diffs are wrong at some cases. Need to fix libkomparediff2
 - Account for Intraline diffs when changing cursor positions

Diff for: kdiffui.rc

@@ -8,6 +8,7 @@
       <Action name="open_diff" />
       <Action name="blend_diff" />
       <Merge />
+      <Action name="swap" />
     </Menu>
     <Merge />
   <Menu name="settings"><text>&amp;Settings</text>

Diff for: mainwindow.cpp

@@ -101,6 +101,12 @@ void KDiffMainWindow::setupActions() {
     a = actionCollection()->addAction(KStandardAction::KeyBindings, m_viewPart, SLOT(editKeys()));
     a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
 
+    swapAction = new QAction(this);
+    swapAction->setEnabled(false);
+    swapAction->setText(i18n("&Swap Source and Destination"));
+    actionCollection()->addAction("swap", swapAction);
+    connect(swapAction, SIGNAL(triggered(bool)), this, SLOT(swap()));
+
 }
 
 void KDiffMainWindow::openFiles() {
@@ -115,6 +121,7 @@ void KDiffMainWindow::openFiles() {
         QUrl destination = QUrl(settings->recentDestinationUrls().at(0));
 
         viewPart()->openFiles(source, destination);
+        swapAction->setEnabled(true);
     }
 }
 
@@ -127,6 +134,7 @@ void KDiffMainWindow::openDiff() {
         QUrl diffUrl = QUrl(settings->recentPatchUrls().at(0));
 
         viewPart()->openDiff(diffUrl);
+        swapAction->setEnabled(false);
     }
 
 }
@@ -143,6 +151,7 @@ void KDiffMainWindow::openDiffAndFiles() {
         QUrl destination = QUrl(settings->recentDestinationUrls().at(0));
 
         viewPart()->openDiffAndFiles(diffUrl, destination);
+        swapAction->setEnabled(false);
     }
 
 }
@@ -198,3 +207,9 @@ KDiffInterface* KDiffMainWindow::viewPart() const
 {
     return qobject_cast<KDiffInterface *>(m_viewPart);
 }
+
+void KDiffMainWindow::swap() {
+    QUrl source = QUrl(settings->recentSourceUrls().at(0));
+    QUrl destination = QUrl(settings->recentDestinationUrls().at(0));
+    viewPart()->openFiles(destination, source);
+}

Diff for: mainwindow.h

@@ -33,6 +33,7 @@ private slots:
     void editToolbars();
     void aboutEditor();
     void toggleMenuBar();
+    void swap();
 
 protected:
     void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
@@ -43,6 +44,7 @@ private slots:
     KParts::ReadWritePart* m_viewPart;
     KDiffInterface* viewPart() const;
     void setupActions();
+    QAction* swapAction;
 };
 
 #endif //KDIFF_MAINWINDOW_H