]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinmainwindow.cpp
projects / dolphin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use a smaller step size when using the scroll wheel
[dolphin.git] / src / dolphinmainwindow.cpp
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f64f847feb97d69705e6c581ff90e64aad6d4d68..ebb11ba5b5a06e6e0eb9864a8c6d01076553b81b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,6 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinviewactionhandler.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphinviewactionhandler.h"
-#include "dolphindropcontroller.h"
 
 #include <config-nepomuk.h>
 
 
 #include <config-nepomuk.h>
 
@@ -36,7 +35,6 @@
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
 #include "treeviewsidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
 #include "treeviewsidebarpage.h"
-#include "viewpropertiesdialog.h"
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
@@ -45,6 +43,7 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "draganddrophelper.h"
 
 #include <kaction.h>
 #include <kactioncollection.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>
@@ -59,23 +58,25 @@
 #include <kio/netaccess.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kio/netaccess.h>
 #include <kinputdialog.h>
 #include <klocale.h>
+#include <kprotocolmanager.h>
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kurlnavigator.h>
+#include <konq_fileitemcapabilities.h>
 #include <konqmimedata.h>
 #include <konqmimedata.h>
-#include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
 #include <kprotocolinfo.h>
-#include <ktoggleaction.h>
 #include <krun.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstandardaction.h>
 #include <ktabbar.h>
 #include <krun.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstandardaction.h>
 #include <ktabbar.h>
+#include <ktoggleaction.h>
+#include <kurlnavigator.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 
 #include <kurl.h>
 #include <kurlcombobox.h>
 
+#include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>
 #include <QLineEdit>
 #include <QKeyEvent>
 #include <QClipboard>
 #include <QLineEdit>
@@ -101,22 +102,25 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     new MainWindowAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
 
     new MainWindowAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
 
-    KonqFileUndoManager::incRef();
-
-    KonqFileUndoManager* undoManager = KonqFileUndoManager::self();
-    undoManager->setUiInterface(new UndoUiInterface(this));
+    KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
+    undoManager->setUiInterface(new UndoUiInterface());
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));
     connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
             this, SLOT(slotUndoTextChanged(const QString&)));
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));
     connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
             this, SLOT(slotUndoTextChanged(const QString&)));
+    connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)),
+            this, SLOT(clearStatusBar()));
+    connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
+            this, SLOT(showCommand(CommandType)));
     connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
     connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
-            this, SLOT(slotHandlePlacesError(const QString&)));
+            this, SLOT(showErrorMessage(const QString&)));
+    connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)),
+            this, SLOT(showErrorMessage(const QString&)));
 }
 
 DolphinMainWindow::~DolphinMainWindow()
 {
 }
 
 DolphinMainWindow::~DolphinMainWindow()
 {
-    KonqFileUndoManager::decRef();
     DolphinApplication::app()->removeMainWindow(this);
 }
 
     DolphinApplication::app()->removeMainWindow(this);
 }
 
@@ -135,10 +139,39 @@ void DolphinMainWindow::toggleViews()
     m_viewTab[m_tabIndex].secondaryView = container;
 }
 
     m_viewTab[m_tabIndex].secondaryView = container;
 }
 
-void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType)
+void DolphinMainWindow::showCommand(CommandType command)
 {
 {
-    clearStatusBar();
-    m_undoCommandTypes.append(commandType);
+    DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
+    switch (command) {
+    case KIO::FileUndoManager::Copy:
+        statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Move:
+        statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Link:
+        statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Trash:
+        statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Rename:
+        statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+
+    case KIO::FileUndoManager::Mkdir:
+        statusBar->setMessage(i18nc("@info:status", "Created folder."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+
+    default:
+        break;
+    }
 }
 
 void DolphinMainWindow::refreshViews()
 }
 
 void DolphinMainWindow::refreshViews()
@@ -150,23 +183,17 @@ void DolphinMainWindow::refreshViews()
     // the secondary view
     DolphinViewContainer* activeViewContainer = m_activeViewContainer;
 
     // the secondary view
     DolphinViewContainer* activeViewContainer = m_activeViewContainer;
 
-    m_viewTab[m_tabIndex].primaryView->view()->refresh();
-    if (m_viewTab[m_tabIndex].secondaryView != 0) {
-        m_viewTab[m_tabIndex].secondaryView->view()->refresh();
+    const int tabCount = m_viewTab.count();
+    for (int i = 0; i < tabCount; ++i) {
+        m_viewTab[i].primaryView->refresh();
+        if (m_viewTab[i].secondaryView != 0) {
+            m_viewTab[i].secondaryView->refresh();
+        }
     }
 
     setActiveViewContainer(activeViewContainer);
 }
 
     }
 
     setActiveViewContainer(activeViewContainer);
 }
 
-void DolphinMainWindow::dropUrls(const KUrl::List& urls,
-                                 const KUrl& destination)
-{
-    DolphinDropController dropController(this);
-    connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
-            this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));
-    dropController.dropUrls(urls, destination);
-}
-
 void DolphinMainWindow::pasteIntoFolder()
 {
     m_activeViewContainer->view()->pasteIntoFolder();
 void DolphinMainWindow::pasteIntoFolder()
 {
     m_activeViewContainer->view()->pasteIntoFolder();
@@ -174,16 +201,22 @@ void DolphinMainWindow::pasteIntoFolder()
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
+    if (!KProtocolManager::supportsListing(url)) {
+        // The URL navigator only checks for validity, not
+        // if the URL can be listed. An error message is
+        // shown due to DolphinViewContainer::restoreView().
+        return;
+    }
+    
     DolphinViewContainer* view = activeViewContainer();
     if (view != 0) {
         view->setUrl(url);
         updateEditActions();
         updateViewActions();
         updateGoActions();
     DolphinViewContainer* view = activeViewContainer();
     if (view != 0) {
         view->setUrl(url);
         updateEditActions();
         updateViewActions();
         updateGoActions();
-        const QString caption = url.fileName();
-        setCaption(caption);
+        setCaption(url.fileName());
         if (m_viewTab.count() > 1) {
         if (m_viewTab.count() > 1) {
-            m_tabBar->setTabText(m_tabIndex, caption);
+            m_tabBar->setTabText(m_tabIndex, tabName(url));
         }
         emit urlChanged(url);
     }
         }
         emit urlChanged(url);
     }
@@ -206,19 +239,23 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     updateEditActions();
 
     Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
     updateEditActions();
 
     Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
-    int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls().count();
+    int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
     if (m_viewTab[m_tabIndex].secondaryView != 0) {
     if (m_viewTab[m_tabIndex].secondaryView != 0) {
-        selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls().count();
+        selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     if (selectedUrlsCount == 2) {
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     if (selectedUrlsCount == 2) {
-        const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty();
-        compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled);
+        compareFilesAction->setEnabled(isKompareInstalled());
     } else {
         compareFilesAction->setEnabled(false);
     }
 
     } else {
         compareFilesAction->setEnabled(false);
     }
 
+#if defined(QUICK_VIEW)
+    const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
+    actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);
+#endif
+
     m_activeViewContainer->updateStatusBar();
 
     emit selectionChanged(selection);
     m_activeViewContainer->updateStatusBar();
 
     emit selectionChanged(selection);
@@ -260,6 +297,13 @@ void DolphinMainWindow::openNewTab()
 {
     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
 {
     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+    
+    KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
+    if (navigator->isUrlEditable()) {
+        // if a new tab is opened and the URL is editable, assure that
+        // the user can edit the URL without manually setting the focus
+        navigator->setFocus();
+    }
 }
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
 }
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
@@ -267,19 +311,63 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
     if (m_viewTab.count() == 1) {
         // Only one view is open currently and hence no tab is shown at
         // all. Before creating a tab for 'url', provide a tab for the current URL.
     if (m_viewTab.count() == 1) {
         // Only one view is open currently and hence no tab is shown at
         // all. Before creating a tab for 'url', provide a tab for the current URL.
-        m_tabBar->addTab(KIcon("folder"), m_activeViewContainer->url().fileName());
+        m_tabBar->addTab(KIcon("folder"), tabName(m_activeViewContainer->url()));
         m_tabBar->blockSignals(false);
     }
 
         m_tabBar->blockSignals(false);
     }
 
-    m_tabBar->addTab(KIcon("folder"), url.fileName());
+    m_tabBar->addTab(KIcon("folder"), tabName(url));
 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
     viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
     viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
+    viewTab.primaryView->setActive(false);
     connectViewSignals(viewTab.primaryView);
     viewTab.primaryView->view()->reload();
 
     m_viewTab.append(viewTab);
     connectViewSignals(viewTab.primaryView);
     viewTab.primaryView->view()->reload();
 
     m_viewTab.append(viewTab);
+
+    actionCollection()->action("close_tab")->setEnabled(true);
+}
+
+void DolphinMainWindow::activateNextTab()
+{
+    if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+        return;
+    }
+
+    const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count();
+    m_tabBar->setCurrentIndex(tabIndex);
+}
+
+void DolphinMainWindow::activatePrevTab()
+{
+    if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+        return;
+    }
+
+    int tabIndex = m_tabBar->currentIndex() - 1;
+    if (tabIndex == -1) {
+        tabIndex = m_tabBar->count() - 1;
+    }
+    m_tabBar->setCurrentIndex(tabIndex);
+}
+
+void DolphinMainWindow::openInNewTab()
+{
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if ((list.count() == 1) && list[0].isDir()) {
+        openNewTab(m_activeViewContainer->view()->selectedUrls()[0]);
+    }
+}
+
+void DolphinMainWindow::openInNewWindow()
+{
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if ((list.count() == 1) && list[0].isDir()) {
+        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
+        window->changeUrl(m_activeViewContainer->view()->selectedUrls()[0]);
+        window->show();
+    }
 }
 
 void DolphinMainWindow::toggleActiveView()
 }
 
 void DolphinMainWindow::toggleActiveView()
@@ -358,23 +446,12 @@ void DolphinMainWindow::updateNewMenu()
     m_newMenu->setPopupFiles(activeViewContainer()->url());
 }
 
     m_newMenu->setPopupFiles(activeViewContainer()->url());
 }
 
-void DolphinMainWindow::properties()
-{
-    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
-
-    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-    dialog->raise();
-    dialog->activateWindow();
-}
-
 void DolphinMainWindow::quit()
 {
     close();
 }
 
 void DolphinMainWindow::quit()
 {
     close();
 }
 
-void DolphinMainWindow::slotHandlePlacesError(const QString &message)
+void DolphinMainWindow::showErrorMessage(const QString& message)
 {
     if (!message.isEmpty()) {
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
 {
     if (!message.isEmpty()) {
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
@@ -388,42 +465,6 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }
     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }
-
-    if (available && (m_undoCommandTypes.count() > 0)) {
-        const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        switch (command) {
-        case KonqFileUndoManager::COPY:
-            statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::MOVE:
-            statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::LINK:
-            statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::TRASH:
-            statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::RENAME:
-            statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-
-        case KonqFileUndoManager::MKDIR:
-            statusBar->setMessage(i18nc("@info:status", "Created folder."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-
-        default:
-            break;
-        }
-
-    }
 }
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 }
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
@@ -437,7 +478,8 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 void DolphinMainWindow::undo()
 {
     clearStatusBar();
 void DolphinMainWindow::undo()
 {
     clearStatusBar();
-    KonqFileUndoManager::self()->undo();
+    KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this);
+    KIO::FileUndoManager::self()->undo();
 }
 
 void DolphinMainWindow::cut()
 }
 
 void DolphinMainWindow::cut()
@@ -458,10 +500,6 @@ void DolphinMainWindow::paste()
 void DolphinMainWindow::updatePasteAction()
 {
     QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
 void DolphinMainWindow::updatePasteAction()
 {
     QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
-    if (pasteAction == 0) {
-        return;
-    }
-
     QPair<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
     pasteAction->setEnabled(pasteInfo.first);
     pasteAction->setText(pasteInfo.second);
     QPair<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
     pasteAction->setEnabled(pasteInfo.first);
     pasteAction->setText(pasteInfo.second);
@@ -506,13 +544,17 @@ void DolphinMainWindow::toggleSplitView()
         m_viewTab[m_tabIndex].secondaryView->view()->reload();
         m_viewTab[m_tabIndex].secondaryView->setActive(false);
         m_viewTab[m_tabIndex].secondaryView->show();
         m_viewTab[m_tabIndex].secondaryView->view()->reload();
         m_viewTab[m_tabIndex].secondaryView->setActive(false);
         m_viewTab[m_tabIndex].secondaryView->show();
-    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
+
+        setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
+    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
         // remove secondary view
         m_viewTab[m_tabIndex].secondaryView->close();
         m_viewTab[m_tabIndex].secondaryView->deleteLater();
         m_viewTab[m_tabIndex].secondaryView = 0;
         // remove secondary view
         m_viewTab[m_tabIndex].secondaryView->close();
         m_viewTab[m_tabIndex].secondaryView->deleteLater();
         m_viewTab[m_tabIndex].secondaryView = 0;
+
+        setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
     } else {
     } else {
-        // The secondary view is active, hence from a users point of view
+        // The primary view is active and should be closed. Hence from a users point of view
         // the content of the secondary view should be moved to the primary view.
         // From an implementation point of view it is more efficient to close
         // the primary view and exchange the internal pointers afterwards.
         // the content of the secondary view should be moved to the primary view.
         // From an implementation point of view it is more efficient to close
         // the primary view and exchange the internal pointers afterwards.
@@ -521,9 +563,10 @@ void DolphinMainWindow::toggleSplitView()
         m_viewTab[m_tabIndex].primaryView->deleteLater();
         m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView;
         m_viewTab[m_tabIndex].secondaryView = 0;
         m_viewTab[m_tabIndex].primaryView->deleteLater();
         m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView;
         m_viewTab[m_tabIndex].secondaryView = 0;
+
+        setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
     }
 
     }
 
-    setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
     updateViewActions();
 }
 
     updateViewActions();
 }
 
@@ -551,7 +594,7 @@ void DolphinMainWindow::toggleEditLocation()
     urlNavigator->setUrlEditable(action->isChecked());
 }
 
     urlNavigator->setUrlEditable(action->isChecked());
 }
 
-void DolphinMainWindow::editLocation()
+void DolphinMainWindow::replaceLocation()
 {
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
 {
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
@@ -563,13 +606,6 @@ void DolphinMainWindow::editLocation()
     lineEdit->setSelection(0, text.length());
 }
 
     lineEdit->setSelection(0, text.length());
 }
 
-void DolphinMainWindow::adjustViewProperties()
-{
-    clearStatusBar();
-    ViewPropertiesDialog dlg(m_activeViewContainer->view());
-    dlg.exec();
-}
-
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
@@ -594,11 +630,6 @@ void DolphinMainWindow::goHome()
     m_activeViewContainer->urlNavigator()->goHome();
 }
 
     m_activeViewContainer->urlNavigator()->goHome();
 }
 
-void DolphinMainWindow::findFile()
-{
-    KRun::run("kfind", m_activeViewContainer->url(), this);
-}
-
 void DolphinMainWindow::compareFiles()
 {
     // The method is only invoked if exactly 2 files have
 void DolphinMainWindow::compareFiles()
 {
     // The method is only invoked if exactly 2 files have
@@ -653,6 +684,18 @@ void DolphinMainWindow::compareFiles()
     KRun::runCommand(command, "Kompare", "kompare", this);
 }
 
     KRun::runCommand(command, "Kompare", "kompare", this);
 }
 
+void DolphinMainWindow::quickView()
+{
+    const KUrl::List urls = activeViewContainer()->view()->selectedUrls();
+    Q_ASSERT(urls.count() > 0);
+
+    QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.plasma", "/Previewer", "", "openFile");
+    foreach (const KUrl& url, urls) {
+        msg.setArguments(QList<QVariant>() << url.prettyUrl());
+        QDBusConnection::sessionBus().send(msg);
+    }
+}
+
 void DolphinMainWindow::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
 void DolphinMainWindow::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
@@ -674,7 +717,12 @@ void DolphinMainWindow::setActiveTab(int index)
     }
 
     // hide current tab content
     }
 
     // hide current tab content
-    m_viewTab[m_tabIndex].isPrimaryViewActive = m_viewTab[m_tabIndex].primaryView->isActive();
+    ViewTab& hiddenTab = m_viewTab[m_tabIndex];
+    hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive();
+    hiddenTab.primaryView->setActive(false);
+    if (hiddenTab.secondaryView != 0) {
+        hiddenTab.secondaryView->setActive(false);
+    }
     QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
     splitter->hide();
     m_centralWidgetLayout->removeWidget(splitter);
     QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
     splitter->hide();
     m_centralWidgetLayout->removeWidget(splitter);
@@ -694,6 +742,11 @@ void DolphinMainWindow::setActiveTab(int index)
                                                          viewTab.secondaryView);
 }
 
                                                          viewTab.secondaryView);
 }
 
+void DolphinMainWindow::closeTab()
+{
+    closeTab(m_tabBar->currentIndex());
+}
+
 void DolphinMainWindow::closeTab(int index)
 {
     Q_ASSERT(index >= 0);
 void DolphinMainWindow::closeTab(int index)
 {
     Q_ASSERT(index >= 0);
@@ -706,7 +759,7 @@ void DolphinMainWindow::closeTab(int index)
     if (index == m_tabIndex) {
         // The tab that should be closed is the active tab. Activate the
         // previous tab before closing the tab.
     if (index == m_tabIndex) {
         // The tab that should be closed is the active tab. Activate the
         // previous tab before closing the tab.
-        setActiveTab((index > 0) ? index - 1 : 1);
+        m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
     }
 
     // delete tab
     }
 
     // delete tab
@@ -729,11 +782,60 @@ void DolphinMainWindow::closeTab(int index)
     // closing the last tab is not possible
     if (m_viewTab.count() == 1) {
         m_tabBar->removeTab(0);
     // closing the last tab is not possible
     if (m_viewTab.count() == 1) {
         m_tabBar->removeTab(0);
+        actionCollection()->action("close_tab")->setEnabled(false);
     } else {
         m_tabBar->blockSignals(false);
     }
 }
 
     } else {
         m_tabBar->blockSignals(false);
     }
 }
 
+void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
+{
+    KMenu menu(this);
+
+    QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab"));
+    newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut());
+
+    QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs"));
+
+    QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab"));
+    closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut());
+
+    QAction* selectedAction = menu.exec(pos);
+    if (selectedAction == newTabAction) {
+        const ViewTab& tab = m_viewTab[index];
+        Q_ASSERT(tab.primaryView != 0);
+        const KUrl url = (tab.secondaryView != 0) && tab.secondaryView->isActive() ?
+                         tab.secondaryView->url() : tab.primaryView->url();
+        openNewTab(url);
+        m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+    } else if (selectedAction == closeOtherTabsAction) {
+        const int count = m_tabBar->count();
+        for (int i = 0; i < index; ++i) {
+            closeTab(0);
+        }
+        for (int i = index + 1; i < count; ++i) {
+            closeTab(1);
+        }
+    } else if (selectedAction == closeTabAction) {
+        closeTab(index);
+    }
+}
+
+void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons)
+{
+    if (buttons & Qt::MidButton) {
+        openNewTab(url);
+        m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+    } else {
+        changeUrl(url);
+    }
+}
+
+void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode)
+{
+    canDecode = KUrl::List::canDecode(event->mimeData());
+}
+
 void DolphinMainWindow::init()
 {
     DolphinSettings& settings = DolphinSettings::instance();
 void DolphinMainWindow::init()
 {
     DolphinSettings& settings = DolphinSettings::instance();
@@ -774,6 +876,12 @@ void DolphinMainWindow::init()
             this, SLOT(setActiveTab(int)));
     connect(m_tabBar, SIGNAL(closeRequest(int)),
             this, SLOT(closeTab(int)));
             this, SLOT(setActiveTab(int)));
     connect(m_tabBar, SIGNAL(closeRequest(int)),
             this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)),
+            this, SLOT(openTabContextMenu(int, const QPoint&)));
+    connect(m_tabBar, SIGNAL(newTabRequest()),
+            this, SLOT(openNewTab()));
+    connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
+            this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
     m_tabBar->blockSignals(true);  // signals get unblocked after at least 2 tabs are open
 
     QWidget* centralWidget = new QWidget(this);
     m_tabBar->blockSignals(true);  // signals get unblocked after at least 2 tabs are open
 
     QWidget* centralWidget = new QWidget(this);
@@ -783,15 +891,13 @@ void DolphinMainWindow::init()
     m_centralWidgetLayout->addWidget(m_tabBar);
     m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter);
 
     m_centralWidgetLayout->addWidget(m_tabBar);
     m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter);
 
-
     setCentralWidget(centralWidget);
     setupDockWidgets();
     setCentralWidget(centralWidget);
     setupDockWidgets();
+    emit urlChanged(homeUrl);
 
     setupGUI(Keys | Save | Create | ToolBar);
 
     setupGUI(Keys | Save | Create | ToolBar);
-    createGUI();
 
     stateChanged("new_file");
 
     stateChanged("new_file");
-    setAutoSaveSettings();
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
@@ -804,12 +910,15 @@ void DolphinMainWindow::init()
     }
     updateViewActions();
 
     }
     updateViewActions();
 
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    showFilterBarAction->setChecked(generalSettings->filterBar());
+
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
         resize(750, 500);
     }
 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
         resize(750, 500);
     }
 
-    emit urlChanged(homeUrl);
+    m_showMenuBar->setChecked(!menuBar()->isHidden());  // workaround for bug #171080
 }
 
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
 }
 
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
@@ -839,10 +948,9 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     updateGoActions();
 
     const KUrl& url = m_activeViewContainer->url();
     updateGoActions();
 
     const KUrl& url = m_activeViewContainer->url();
-    const QString caption = url.fileName();
-    setCaption(caption);
+    setCaption(url.fileName());
     if (m_viewTab.count() > 1) {
     if (m_viewTab.count() > 1) {
-        m_tabBar->setTabText(m_tabIndex, caption);
+        m_tabBar->setTabText(m_tabIndex, tabName(url));
     }
 
     emit urlChanged(url);
     }
 
     emit urlChanged(url);
@@ -851,7 +959,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
-    m_newMenu = new DolphinNewMenu(this);
+    m_newMenu = new DolphinNewMenu(this, this);
     KMenu* menu = m_newMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     KMenu* menu = m_newMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
@@ -867,13 +975,14 @@ void DolphinMainWindow::setupActions()
     KAction* newTab = actionCollection()->addAction("new_tab");
     newTab->setIcon(KIcon("tab-new"));
     newTab->setText(i18nc("@action:inmenu File", "New Tab"));
     KAction* newTab = actionCollection()->addAction("new_tab");
     newTab->setIcon(KIcon("tab-new"));
     newTab->setText(i18nc("@action:inmenu File", "New Tab"));
-    newTab->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N);
+    newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T));
     connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
 
     connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
 
-    KAction* properties = actionCollection()->addAction("properties");
-    properties->setText(i18nc("@action:inmenu File", "Properties"));
-    properties->setShortcut(Qt::ALT | Qt::Key_Return);
-    connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
+    QAction* closeTab = new QAction(KIcon("tab-close"), i18nc("@action:inmenu File", "Close Tab"), this);
+    closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
+    closeTab->setEnabled(false);
+    connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab()));
+    actionCollection()->addAction("close_tab", closeTab);
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
@@ -920,20 +1029,15 @@ void DolphinMainWindow::setupActions()
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
-    // TODO: the naming "Show full Location" is currently confusing...
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
-    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
+    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
-    KAction* editLocation = actionCollection()->addAction("edit_location");
-    editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location"));
-    editLocation->setShortcut(Qt::Key_F6);
-    connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
-
-    KAction* adjustViewProps = actionCollection()->addAction("view_properties");
-    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
-    connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
+    KAction* replaceLocation = actionCollection()->addAction("replace_location");
+    replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
+    replaceLocation->setShortcut(Qt::Key_F6);
+    connect(replaceLocation, SIGNAL(triggered()), this, SLOT(replaceLocation()));
 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
@@ -946,12 +1050,6 @@ void DolphinMainWindow::setupActions()
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
-    QAction* findFile = actionCollection()->addAction("find_file");
-    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
-    findFile->setShortcut(Qt::CTRL | Qt::Key_F);
-    findFile->setIcon(KIcon("edit-find"));
-    connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
-
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
@@ -963,9 +1061,43 @@ void DolphinMainWindow::setupActions()
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
+    // disabled Quick View
+#if defined(QUICK_VIEW)
+    KAction* quickView = actionCollection()->addAction("quick_view");
+    quickView->setText(i18nc("@action:inmenu Tools", "Quick View"));
+    quickView->setIcon(KIcon("view-preview"));
+    quickView->setShortcut(Qt::CTRL + Qt::Key_Return);
+    quickView->setEnabled(false);
+    connect(quickView, SIGNAL(triggered()), this, SLOT(quickView()));
+#endif
+
     // setup 'Settings' menu
     m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
     // setup 'Settings' menu
     m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
+
+    // not in menu actions
+    KAction* activateNextTab = actionCollection()->addAction("activatenexttab");
+    activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
+    connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
+    activateNextTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabPrev() :
+                                                                  KStandardShortcut::tabNext());
+
+    KAction* activatePrevTab = actionCollection()->addAction("activateprevtab");
+    activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
+    connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
+    activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabNext() :
+                                                                  KStandardShortcut::tabPrev());
+
+    // for context menu
+    KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
+    openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));
+    openInNewTab->setIcon(KIcon("tab-new"));
+    connect(openInNewTab, SIGNAL(triggered()), this, SLOT(openInNewTab()));
+    
+    KAction* openInNewWindow = actionCollection()->addAction("open_in_new_window");
+    openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
+    openInNewWindow->setIcon(KIcon("window-new"));
+    connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow()));
 }
 
 void DolphinMainWindow::setupDockWidgets()
 }
 
 void DolphinMainWindow::setupDockWidgets()
@@ -1003,12 +1135,10 @@ void DolphinMainWindow::setupDockWidgets()
     addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             treeWidget, SLOT(setUrl(KUrl)));
     addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             treeWidget, SLOT(setUrl(KUrl)));
-    connect(treeWidget, SIGNAL(changeUrl(KUrl)),
-            this, SLOT(changeUrl(KUrl)));
+    connect(treeWidget, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
+            this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
     connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
             this, SLOT(changeSelection(KFileItemList)));
     connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
             this, SLOT(changeSelection(KFileItemList)));
-    connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
-            this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"
 #ifndef Q_OS_WIN
 
     // setup "Terminal"
 #ifndef Q_OS_WIN
@@ -1051,8 +1181,8 @@ void DolphinMainWindow::setupDockWidgets()
     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
-    connect(placesView, SIGNAL(urlChanged(KUrl)),
-            this, SLOT(changeUrl(KUrl)));
+    connect(placesView, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
+            this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
     connect(this, SIGNAL(urlChanged(KUrl)),
             placesView, SLOT(setUrl(KUrl)));
 }
     connect(this, SIGNAL(urlChanged(KUrl)),
             placesView, SLOT(setUrl(KUrl)));
 }
@@ -1065,26 +1195,21 @@ void DolphinMainWindow::updateEditActions()
     } else {
         stateChanged("has_selection");
 
     } else {
         stateChanged("has_selection");
 
-        QAction* renameAction = actionCollection()->action("rename");
-        if (renameAction != 0) {
-            renameAction->setEnabled(true);
-        }
+        KActionCollection* col = actionCollection();
+        QAction* renameAction      = col->action("rename");
+        QAction* moveToTrashAction = col->action("move_to_trash");
+        QAction* deleteAction      = col->action("delete");
+        QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
+        QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler
 
 
-        bool enableMoveToTrash = true;
-
-        KFileItemList::const_iterator it = list.begin();
-        const KFileItemList::const_iterator end = list.end();
-        while (it != end) {
-            const KUrl& url = (*it).url();
-            // only enable the 'Move to Trash' action for local files
-            if (!url.isLocalFile()) {
-                enableMoveToTrash = false;
-            }
-            ++it;
-        }
+        KonqFileItemCapabilities capabilities(list);
+        const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
 
 
-        QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
+        renameAction->setEnabled(capabilities.supportsMoving());
         moveToTrashAction->setEnabled(enableMoveToTrash);
         moveToTrashAction->setEnabled(enableMoveToTrash);
+        deleteAction->setEnabled(capabilities.supportsDeleting());
+        deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
+        cutAction->setEnabled(capabilities.supportsMoving());
     }
     updatePasteAction();
 }
     }
     updatePasteAction();
 }
@@ -1127,8 +1252,6 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
-    connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
-            this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));
     connect(view, SIGNAL(tabRequested(const KUrl&)),
             this, SLOT(openNewTab(const KUrl&)));
 
     connect(view, SIGNAL(tabRequested(const KUrl&)),
             this, SLOT(openNewTab(const KUrl&)));
 
@@ -1145,7 +1268,7 @@ void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");
     if (m_viewTab[m_tabIndex].secondaryView != 0) {
 {
     QAction* splitAction = actionCollection()->action("split_view");
     if (m_viewTab[m_tabIndex].secondaryView != 0) {
-        if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
+        if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setIcon(KIcon("view-right-close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setIcon(KIcon("view-right-close"));
         } else {
@@ -1158,11 +1281,36 @@ void DolphinMainWindow::updateSplitAction()
     }
 }
 
     }
 }
 
-DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
-    KonqFileUndoManager::UiInterface(mainWin),
-    m_mainWin(mainWin)
+QString DolphinMainWindow::tabName(const KUrl& url) const
+{
+    QString name;
+    if (url.equals(KUrl("file:///"))) {
+        name = "/";
+    } else {
+        name = url.fileName();
+        if (name.isEmpty()) {
+            name = url.protocol();
+        }
+    }
+    return name;
+}
+
+bool DolphinMainWindow::isKompareInstalled() const
+{
+    static bool initialized = false;
+    static bool installed = false;
+    if (!initialized) {
+        // TODO: maybe replace this approach later by using a menu
+        // plugin like kdiff3plugin.cpp
+        installed = !KGlobal::dirs()->findExe("kompare").isEmpty();
+        initialized = true;
+    }
+    return installed;
+}
+
+DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
+    KIO::FileUndoManager::UiInterface()
 {
 {
-    Q_ASSERT(m_mainWin != 0);
 }
 
 DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
 }
 
 DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
@@ -1171,8 +1319,13 @@ DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
 
 void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
 {
 
 void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
 {
-    DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
-    statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
+    DolphinMainWindow* mainWin= qobject_cast<DolphinMainWindow *>(parentWidget());
+    if (mainWin) {
+        DolphinStatusBar* statusBar = mainWin->activeViewContainer()->statusBar();
+        statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
+    } else {
+        KIO::FileUndoManager::UiInterface::jobError(job);
+    }
 }
 
 #include "dolphinmainwindow.moc"
 }
 
 #include "dolphinmainwindow.moc"