don't use SPACE as shortcut for Quick View, as this conflicts with the Terminal Panel

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 872042eb2646784ebd51d6b6f1c3e0c921efde2c..78e5ab31c3759acb717378689002515dcfd8c7f0 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -20,10 +20,13 @@
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"

+#include "dolphinviewactionhandler.h"
+#include "dolphindropcontroller.h"

 
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
 
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"

+#include "dolphinfileplacesview.h"

 #include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"


@@ -32,15 +35,15 @@
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"

-#include "terminalsidebarpage.h"

 #include "treeviewsidebarpage.h"
 #include "treeviewsidebarpage.h"

-#include "kurlnavigator.h"
-#include "viewpropertiesdialog.h"

 #include "viewproperties.h"
 #include "viewproperties.h"

-#include "kfileplacesmodel.h"
-#include "kfileplacesview.h"
+
+#ifndef Q_OS_WIN
+#include "terminalsidebarpage.h"
+#endif

 
 #include "dolphin_generalsettings.h"
 
 #include "dolphin_generalsettings.h"

+#include "dolphin_iconsmodesettings.h"

 
 #include <kaction.h>
 #include <kactioncollection.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>


@@ -48,6 +51,7 @@
 #include <kdesktopfile.h>
 #include <kdeversion.h>
 #include <kfiledialog.h>
 #include <kdesktopfile.h>
 #include <kdeversion.h>
 #include <kfiledialog.h>

+#include <kfileplacesmodel.h>

 #include <kglobal.h>
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kicon.h>
 #include <kiconloader.h>


@@ -57,42 +61,48 @@
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>

+#include <konq_fileitemcapabilities.h>

 #include <konqmimedata.h>
 #include <konqmimedata.h>

-#include <konq_operations.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 <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 <kurl.h>

+#include <kurlcombobox.h>

 
 

-#include <QtGui/QKeyEvent>
-#include <QtGui/QClipboard>
-#include <QtGui/QSplitter>
-#include <QtGui/QDockWidget>
+#include <QDBusMessage>
+#include <QKeyEvent>
+#include <QClipboard>
+#include <QLineEdit>
+#include <QSplitter>
+#include <QDockWidget>

 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
     m_showMenuBar(0),
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
     m_showMenuBar(0),

-    m_splitter(0),
+    m_tabBar(0),

     m_activeViewContainer(0),
     m_activeViewContainer(0),

-    m_id(id)
+    m_centralWidgetLayout(0),
+    m_id(id),
+    m_tabIndex(0),
+    m_viewTab(),
+    m_actionHandler(0)

 {
 {

-    setObjectName("Dolphin");
-    m_viewContainer[PrimaryView] = 0;
-    m_viewContainer[SecondaryView] = 0;
+    setObjectName("Dolphin#");
+
+    m_viewTab.append(ViewTab());

 
     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(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));


@@ -104,26 +114,25 @@ DolphinMainWindow::DolphinMainWindow(int id) :
 
 DolphinMainWindow::~DolphinMainWindow()
 {
 
 DolphinMainWindow::~DolphinMainWindow()
 {

-    KonqFileUndoManager::decRef();

     DolphinApplication::app()->removeMainWindow(this);
 }
 
 void DolphinMainWindow::toggleViews()
 {
     DolphinApplication::app()->removeMainWindow(this);
 }
 
 void DolphinMainWindow::toggleViews()
 {

-    if (m_viewContainer[SecondaryView] == 0) {
+    if (m_viewTab[m_tabIndex].primaryView == 0) {

         return;
     }
 
     // move secondary view from the last position of the splitter
     // to the first position
         return;
     }
 
     // move secondary view from the last position of the splitter
     // to the first position

-    m_splitter->insertWidget(0, m_viewContainer[SecondaryView]);
+    m_viewTab[m_tabIndex].splitter->insertWidget(0, m_viewTab[m_tabIndex].secondaryView);

 
 

-    DolphinViewContainer* container = m_viewContainer[PrimaryView];
-    m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
-    m_viewContainer[SecondaryView] = container;
+    DolphinViewContainer* container = m_viewTab[m_tabIndex].primaryView;
+    m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView;
+    m_viewTab[m_tabIndex].secondaryView = container;

 }
 
 }
 

-void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType)
+void DolphinMainWindow::slotDoingOperation(KIO::FileUndoManager::CommandType commandType)

 {
     clearStatusBar();
     m_undoCommandTypes.append(commandType);
 {
     clearStatusBar();
     m_undoCommandTypes.append(commandType);


@@ -131,16 +140,16 @@ void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType comm
 
 void DolphinMainWindow::refreshViews()
 {
 
 void DolphinMainWindow::refreshViews()
 {

-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);

 
     // remember the current active view, as because of
     // the refreshing the active view might change to
     // the secondary view
     DolphinViewContainer* activeViewContainer = m_activeViewContainer;
 
 
     // remember the current active view, as because of
     // the refreshing the active view might change to
     // the secondary view
     DolphinViewContainer* activeViewContainer = m_activeViewContainer;
 

-    m_viewContainer[PrimaryView]->view()->refresh();
-    if (m_viewContainer[SecondaryView] != 0) {
-        m_viewContainer[SecondaryView]->view()->refresh();
+    m_viewTab[m_tabIndex].primaryView->view()->refresh();
+    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+        m_viewTab[m_tabIndex].secondaryView->view()->refresh();

     }
 
     setActiveViewContainer(activeViewContainer);
     }
 
     setActiveViewContainer(activeViewContainer);


@@ -149,84 +158,15 @@ void DolphinMainWindow::refreshViews()
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                  const KUrl& destination)
 {
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                  const KUrl& destination)
 {

-    kDebug() << "Source" << urls;
-    kDebug() << "Destination:" << destination;
-
-    Qt::DropAction action = Qt::CopyAction;
-
-    Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
-    const bool shiftPressed   = modifier & Qt::ShiftModifier;
-    const bool controlPressed = modifier & Qt::ControlModifier;
-    if (shiftPressed && controlPressed) {
-        // shortcut for 'Link Here' is used
-        action = Qt::LinkAction;
-    } else if (shiftPressed) {
-        // shortcut for 'Move Here' is used
-        action = Qt::MoveAction;
-    } else if (controlPressed) {
-        // shortcut for 'Copy Here' is used
-        action = Qt::CopyAction;
-    } else {
-        // open a context menu which offers the following actions:
-        // - Move Here
-        // - Copy Here
-        // - Link Here
-        // - Cancel
-
-        KMenu popup(this);
-
-        QString seq = QKeySequence(Qt::ShiftModifier).toString();
-        seq.chop(1); // chop superfluous '+'
-        QAction* moveAction = popup.addAction(KIcon("go-jump"),
-                                              i18nc("@action:inmenu",
-                                                    "&Move Here\t<shortcut>%1</shortcut>", seq));
-
-        seq = QKeySequence(Qt::ControlModifier).toString();
-        seq.chop(1);
-        QAction* copyAction = popup.addAction(KIcon("edit-copy"),
-                                              i18nc("@action:inmenu",
-                                                    "&Copy Here\t<shortcut>%1</shortcut>", seq));
-
-        seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
-        seq.chop(1);
-        QAction* linkAction = popup.addAction(KIcon("insert-link"),
-                                              i18nc("@action:inmenu",
-                                                    "&Link Here\t<shortcut>%1</shortcut>", seq));
-
-        popup.addSeparator();
-        popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel"));
-
-        QAction* activatedAction = popup.exec(QCursor::pos());
-        if (activatedAction == moveAction) {
-            action = Qt::MoveAction;
-        } else if (activatedAction == copyAction) {
-            action = Qt::CopyAction;
-        } else if (activatedAction == linkAction) {
-            action = Qt::LinkAction;
-        } else {
-            return;
-        }
-    }
-
-    switch (action) {
-    case Qt::MoveAction:
-        KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
-        m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
-        break;
-
-    case Qt::CopyAction:
-        KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
-        m_undoCommandTypes.append(KonqFileUndoManager::COPY);
-        break;
-
-    case Qt::LinkAction:
-        KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
-        m_undoCommandTypes.append(KonqFileUndoManager::LINK);
-        break;
+    DolphinDropController dropController(this);
+    connect(&dropController, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)),
+            this, SLOT(slotDoingOperation(KIO::FileUndoManager::CommandType)));
+    dropController.dropUrls(urls, destination);
+}

 
 

-    default:
-        break;
-    }
+void DolphinMainWindow::pasteIntoFolder()
+{
+    m_activeViewContainer->view()->pasteIntoFolder();

 }
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 }
 
 void DolphinMainWindow::changeUrl(const KUrl& url)


@@ -238,6 +178,9 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
         updateViewActions();
         updateGoActions();
         setCaption(url.fileName());
         updateViewActions();
         updateGoActions();
         setCaption(url.fileName());

+        if (m_viewTab.count() > 1) {
+            m_tabBar->setTabText(m_tabIndex, tabName(url));
+        }

         emit urlChanged(url);
     }
 }
         emit urlChanged(url);
     }
 }


@@ -247,150 +190,32 @@ void DolphinMainWindow::changeSelection(const KFileItemList& selection)
     activeViewContainer()->view()->changeSelection(selection);
 }
 
     activeViewContainer()->view()->changeSelection(selection);
 }
 

-void DolphinMainWindow::slotViewModeChanged()
-{
-    updateViewActions();
-}
-
-void DolphinMainWindow::slotShowPreviewChanged()
-{
-    // It is not enough to update the 'Show Preview' action, also
-    // the 'Zoom In' and 'Zoom Out' actions must be adapted.
-    updateViewActions();
-}
-
-void DolphinMainWindow::slotShowHiddenFilesChanged()
+void DolphinMainWindow::slotEditableStateChanged(bool editable)

 {
 {

-    KToggleAction* showHiddenFilesAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    const DolphinView* view = m_activeViewContainer->view();
-    showHiddenFilesAction->setChecked(view->showHiddenFiles());
-}
-
-void DolphinMainWindow::slotCategorizedSortingChanged()
-{
-    KToggleAction* showInGroupsAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_in_groups"));
-    const DolphinView* view = m_activeViewContainer->view();
-    showInGroupsAction->setChecked(view->categorizedSorting());
-    showInGroupsAction->setEnabled(view->supportsCategorizedSorting());
-}
-
-void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
-{
-    QAction* action = 0;
-    switch (sorting) {
-    case DolphinView::SortByName:
-        action = actionCollection()->action("sort_by_name");
-        break;
-    case DolphinView::SortBySize:
-        action = actionCollection()->action("sort_by_size");
-        break;
-    case DolphinView::SortByDate:
-        action = actionCollection()->action("sort_by_date");
-        break;
-    case DolphinView::SortByPermissions:
-        action = actionCollection()->action("sort_by_permissions");
-        break;
-    case DolphinView::SortByOwner:
-        action = actionCollection()->action("sort_by_owner");
-        break;
-    case DolphinView::SortByGroup:
-        action = actionCollection()->action("sort_by_group");
-        break;
-    case DolphinView::SortByType:
-        action = actionCollection()->action("sort_by_type");
-        break;
-#ifdef HAVE_NEPOMUK
-    case DolphinView::SortByRating:
-        action = actionCollection()->action("sort_by_rating");
-        break;
-    case DolphinView::SortByTags:
-        action = actionCollection()->action("sort_by_tags");
-        break;
-#endif
-    default:
-        break;
-    }
-
-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
-    }
-}
-
-void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
-{
-    KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending"));
-    const bool sortDescending = (order == Qt::DescendingOrder);
-    descending->setChecked(sortDescending);
-}
-
-void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list)
-{
-    QAction* showSizeInfo = actionCollection()->action("show_size_info");
-    QAction* showDateInfo = actionCollection()->action("show_date_info");
-    QAction* showPermissionsInfo = actionCollection()->action("show_permissions_info");
-    QAction* showOwnerInfo = actionCollection()->action("show_owner_info");
-    QAction* showGroupInfo = actionCollection()->action("show_group_info");
-    QAction* showMimeInfo = actionCollection()->action("show_mime_info");
-
-    showSizeInfo->setChecked(false);
-    showDateInfo->setChecked(false);
-    showPermissionsInfo->setChecked(false);
-    showOwnerInfo->setChecked(false);
-    showGroupInfo->setChecked(false);
-    showMimeInfo->setChecked(false);
-
-    const DolphinView* view = m_activeViewContainer->view();
-
-    // currently the column view does not support additional information
-    const bool enable = (view->mode() != DolphinView::ColumnView);
-    showSizeInfo->setEnabled(enable);
-    showDateInfo->setEnabled(enable);
-    showPermissionsInfo->setEnabled(enable);
-    showOwnerInfo->setEnabled(enable);
-    showGroupInfo->setEnabled(enable);
-    showMimeInfo->setEnabled(enable);
-
-    foreach (KFileItemDelegate::Information info, list) {
-        switch (info) {
-        case KFileItemDelegate::Size:
-            showSizeInfo->setChecked(true);
-            break;
-        case KFileItemDelegate::ModificationTime:
-            showDateInfo->setChecked(true);
-            break;
-        case KFileItemDelegate::Permissions:
-            showPermissionsInfo->setChecked(true);
-            break;
-        case KFileItemDelegate::Owner:
-            showOwnerInfo->setChecked(true);
-            break;
-        case KFileItemDelegate::OwnerAndGroup:
-            showGroupInfo->setChecked(true);
-            break;
-        case KFileItemDelegate::FriendlyMimeType:
-            showMimeInfo->setChecked(true);
-            break;
-        default:
-            break;
-        }
-    }
+    KToggleAction* editableLocationAction =
+        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+    editableLocationAction->setChecked(editable);

 }
 
 void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 
 }
 
 void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 

-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
-    int selectedUrlsCount = m_viewContainer[PrimaryView]->view()->selectedUrls().count();
-    if (m_viewContainer[SecondaryView] != 0) {
-        selectedUrlsCount += m_viewContainer[SecondaryView]->view()->selectedUrls().count();
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
+    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+        selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();

     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");

-    compareFilesAction->setEnabled(selectedUrlsCount == 2);
+    if (selectedUrlsCount == 2) {
+        compareFilesAction->setEnabled(isKompareInstalled());
+    } else {
+        compareFilesAction->setEnabled(false);
+    }
+
+    const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
+    actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);

 
     m_activeViewContainer->updateStatusBar();
 
 
     m_activeViewContainer->updateStatusBar();
 


@@ -402,15 +227,25 @@ void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
     emit requestItemInfo(item);
 }
 
     emit requestItemInfo(item);
 }
 

-void DolphinMainWindow::slotHistoryChanged()
+void DolphinMainWindow::updateHistory()

 {
 {

-    updateHistory();
+    const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    const int index = urlNavigator->historyIndex();
+
+    QAction* backAction = actionCollection()->action("go_back");
+    if (backAction != 0) {
+        backAction->setEnabled(index < urlNavigator->historySize() - 1);
+    }
+
+    QAction* forwardAction = actionCollection()->action("go_forward");
+    if (forwardAction != 0) {
+        forwardAction->setEnabled(index > 0);
+    }

 }
 
 void DolphinMainWindow::updateFilterBarAction(bool show)
 {
 }
 
 void DolphinMainWindow::updateFilterBarAction(bool show)
 {

-    KToggleAction* showFilterBarAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");

     showFilterBarAction->setChecked(show);
 }
 
     showFilterBarAction->setChecked(show);
 }
 


@@ -419,18 +254,46 @@ void DolphinMainWindow::openNewMainWindow()
     DolphinApplication::app()->createMainWindow()->show();
 }
 
     DolphinApplication::app()->createMainWindow()->show();
 }
 

+void DolphinMainWindow::openNewTab()
+{
+    openNewTab(m_activeViewContainer->url());
+    m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+}
+
+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.
+        m_tabBar->addTab(KIcon("folder"), tabName(m_activeViewContainer->url()));
+        m_tabBar->blockSignals(false);
+    }
+
+    m_tabBar->addTab(KIcon("folder"), tabName(url));
+
+    ViewTab viewTab;
+    viewTab.splitter = new QSplitter(this);
+    viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
+    connectViewSignals(viewTab.primaryView);
+    viewTab.primaryView->view()->reload();
+
+    m_viewTab.append(viewTab);
+    
+    actionCollection()->action("close_tab")->setEnabled(true);
+}
+

 void DolphinMainWindow::toggleActiveView()
 {
 void DolphinMainWindow::toggleActiveView()
 {

-    if (m_viewContainer[SecondaryView] == 0) {
+    if (m_viewTab[m_tabIndex].secondaryView == 0) {

         // only one view is available
         return;
     }
 
     Q_ASSERT(m_activeViewContainer != 0);
         // only one view is available
         return;
     }
 
     Q_ASSERT(m_activeViewContainer != 0);

-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);

 
 

-    DolphinViewContainer* left  = m_viewContainer[PrimaryView];
-    DolphinViewContainer* right = m_viewContainer[SecondaryView];
+    DolphinViewContainer* left  = m_viewTab[m_tabIndex].primaryView;
+    DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView;

     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 
     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 


@@ -447,11 +310,12 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
 void DolphinMainWindow::saveProperties(KConfigGroup& group)
 {
 
 void DolphinMainWindow::saveProperties(KConfigGroup& group)
 {

-    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
+    // TODO: remember tabs
+    DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;

     group.writeEntry("Primary Url", cont->url().url());
     group.writeEntry("Primary Editable Url", cont->isUrlEditable());
 
     group.writeEntry("Primary Url", cont->url().url());
     group.writeEntry("Primary Editable Url", cont->isUrlEditable());
 

-    cont = m_viewContainer[SecondaryView];
+    cont = m_viewTab[m_tabIndex].secondaryView;

     if (cont != 0) {
         group.writeEntry("Secondary Url", cont->url().url());
         group.writeEntry("Secondary Editable Url", cont->isUrlEditable());
     if (cont != 0) {
         group.writeEntry("Secondary Url", cont->url().url());
         group.writeEntry("Secondary Editable Url", cont->isUrlEditable());


@@ -460,20 +324,21 @@ void DolphinMainWindow::saveProperties(KConfigGroup& group)
 
 void DolphinMainWindow::readProperties(const KConfigGroup& group)
 {
 
 void DolphinMainWindow::readProperties(const KConfigGroup& group)
 {

-    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
+    // TODO: read tabs
+    DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;

 
     cont->setUrl(group.readEntry("Primary Url"));
     bool editable = group.readEntry("Primary Editable Url", false);
     cont->urlNavigator()->setUrlEditable(editable);
 
 
     cont->setUrl(group.readEntry("Primary Url"));
     bool editable = group.readEntry("Primary Editable Url", false);
     cont->urlNavigator()->setUrlEditable(editable);
 

-    cont = m_viewContainer[SecondaryView];
+    cont = m_viewTab[m_tabIndex].secondaryView;

     const QString secondaryUrl = group.readEntry("Secondary Url");
     if (!secondaryUrl.isEmpty()) {
         if (cont == 0) {
             // a secondary view should be shown, but no one is available
             // currently -> create a new view
             toggleSplitView();
     const QString secondaryUrl = group.readEntry("Secondary Url");
     if (!secondaryUrl.isEmpty()) {
         if (cont == 0) {
             // a secondary view should be shown, but no one is available
             // currently -> create a new view
             toggleSplitView();

-            cont = m_viewContainer[SecondaryView];
+            cont = m_viewTab[m_tabIndex].secondaryView;

             Q_ASSERT(cont != 0);
         }
 
             Q_ASSERT(cont != 0);
         }
 


@@ -493,39 +358,6 @@ void DolphinMainWindow::updateNewMenu()
     m_newMenu->setPopupFiles(activeViewContainer()->url());
 }
 
     m_newMenu->setPopupFiles(activeViewContainer()->url());
 }
 

-void DolphinMainWindow::rename()
-{
-    clearStatusBar();
-    m_activeViewContainer->view()->renameSelectedItems();
-}
-
-void DolphinMainWindow::moveToTrash()
-{
-    clearStatusBar();
-
-    DolphinView* view = m_activeViewContainer->view();
-
-    if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
-        view->deleteSelectedItems();
-    } else {
-        view->trashSelectedItems();
-    }
-}
-
-void DolphinMainWindow::deleteItems()
-{
-    clearStatusBar();
-    m_activeViewContainer->view()->deleteSelectedItems();
-}
-
-void DolphinMainWindow::properties()
-{
-    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
-
-    KPropertiesDialog dialog(list, this);
-    dialog.exec();
-}
-

 void DolphinMainWindow::quit()
 {
     close();
 void DolphinMainWindow::quit()
 {
     close();


@@ -541,37 +373,37 @@ void DolphinMainWindow::slotHandlePlacesError(const QString &message)
 
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
 
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {

-    QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));
+    QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));

     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }
 
     if (available && (m_undoCommandTypes.count() > 0)) {
     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }
 
     if (available && (m_undoCommandTypes.count() > 0)) {

-        const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
+        const KIO::FileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();

         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {

-        case KonqFileUndoManager::COPY:
+        case KIO::FileUndoManager::Copy:

             statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqFileUndoManager::MOVE:
+        case KIO::FileUndoManager::Move:

             statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqFileUndoManager::LINK:
+        case KIO::FileUndoManager::Link:

             statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqFileUndoManager::TRASH:
+        case KIO::FileUndoManager::Trash:

             statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqFileUndoManager::RENAME:
+        case KIO::FileUndoManager::Rename:

             statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
 
             statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
 

-        case KonqFileUndoManager::MKDIR:
+        case KIO::FileUndoManager::Mkdir:

             statusBar->setMessage(i18nc("@info:status", "Created folder."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Created folder."),
                                   DolphinStatusBar::OperationCompleted);
             break;


@@ -585,7 +417,7 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {

-    QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));
+    QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));

     if (undoAction != 0) {
         undoAction->setText(text);
     }
     if (undoAction != 0) {
         undoAction->setText(text);
     }


@@ -594,7 +426,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()


@@ -614,11 +447,7 @@ void DolphinMainWindow::paste()
 
 void DolphinMainWindow::updatePasteAction()
 {
 
 void DolphinMainWindow::updatePasteAction()
 {

-    QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
-    if (pasteAction == 0) {
-        return;
-    }
-
+    QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));

     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);


@@ -627,7 +456,19 @@ void DolphinMainWindow::updatePasteAction()
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();

-    m_activeViewContainer->view()->selectAll();
+
+    // if the URL navigator is editable and focused, select the whole
+    // URL instead of all items of the view
+
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    QLineEdit* lineEdit = urlNavigator->editor()->lineEdit();
+    const bool selectUrl = urlNavigator->isUrlEditable() &&
+                           lineEdit->hasFocus();
+    if (selectUrl) {
+        lineEdit->selectAll();
+    } else {
+        m_activeViewContainer->view()->selectAll();
+    }

 }
 
 void DolphinMainWindow::invertSelection()
 }
 
 void DolphinMainWindow::invertSelection()


@@ -636,140 +477,45 @@ void DolphinMainWindow::invertSelection()
     m_activeViewContainer->view()->invertSelection();
 }
 
     m_activeViewContainer->view()->invertSelection();
 }
 

-void DolphinMainWindow::setViewMode(QAction* action)
-{
-    const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
-    m_activeViewContainer->view()->setMode(mode);
-}
-
-void DolphinMainWindow::sortByName()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByName);
-}
-
-void DolphinMainWindow::sortBySize()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortBySize);
-}
-
-void DolphinMainWindow::sortByDate()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByDate);
-}
-
-void DolphinMainWindow::sortByPermissions()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByPermissions);
-}
-
-void DolphinMainWindow::sortByOwner()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByOwner);
-}
-
-void DolphinMainWindow::sortByGroup()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByGroup);
-}
-
-void DolphinMainWindow::sortByType()
-{
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByType);
-}
-
-void DolphinMainWindow::sortByRating()
-{
-#ifdef HAVE_NEPOMUK
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByRating);
-#endif
-}
-
-void DolphinMainWindow::sortByTags()
-{
-#ifdef HAVE_NEPOMUK
-    m_activeViewContainer->view()->setSorting(DolphinView::SortByTags);
-#endif
-}
-
-void DolphinMainWindow::toggleSortOrder()
-{
-    DolphinView* view = m_activeViewContainer->view();
-    const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
-                                Qt::DescendingOrder :
-                                Qt::AscendingOrder;
-    view->setSortOrder(order);
-}
-
-void DolphinMainWindow::toggleSortCategorization()
-{
-    DolphinView* view = m_activeViewContainer->view();
-    const bool categorizedSorting = view->categorizedSorting();
-    view->setCategorizedSorting(!categorizedSorting);
-}
-
-void DolphinMainWindow::toggleSizeInfo()
-{
-    toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size);
-}
-
-void DolphinMainWindow::toggleDateInfo()
-{
-    toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime);
-}
-
-void DolphinMainWindow::togglePermissionsInfo()
-{
-    toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions);
-}
-
-void DolphinMainWindow::toggleOwnerInfo()
-{
-    toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner);
-}
-
-void DolphinMainWindow::toggleGroupInfo()
-{
-    toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup);
-}
-
-void DolphinMainWindow::toggleMimeInfo()
-{
-    toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType);
-}
-

 void DolphinMainWindow::toggleSplitView()
 {
 void DolphinMainWindow::toggleSplitView()
 {

-    if (m_viewContainer[SecondaryView] == 0) {
+    if (m_viewTab[m_tabIndex].secondaryView == 0) {

         // create a secondary view
         // create a secondary view

-        const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;
-
-        const DolphinView* view = m_viewContainer[PrimaryView]->view();
-        m_viewContainer[SecondaryView] = new DolphinViewContainer(this, 0, view->rootUrl());
-        connectViewSignals(SecondaryView);
-        m_splitter->addWidget(m_viewContainer[SecondaryView]);
-        m_splitter->setSizes(QList<int>() << newWidth << newWidth);
-        m_viewContainer[SecondaryView]->view()->reload();
-        m_viewContainer[SecondaryView]->setActive(false);
-        m_viewContainer[SecondaryView]->show();
-    } else if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+        QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
+        const int newWidth = (m_viewTab[m_tabIndex].primaryView->width() - splitter->handleWidth()) / 2;
+
+        const DolphinView* view = m_viewTab[m_tabIndex].primaryView->view();
+        m_viewTab[m_tabIndex].secondaryView = new DolphinViewContainer(this, 0, view->rootUrl());
+        connectViewSignals(m_viewTab[m_tabIndex].secondaryView);
+        splitter->addWidget(m_viewTab[m_tabIndex].secondaryView);
+        splitter->setSizes(QList<int>() << newWidth << newWidth);
+        m_viewTab[m_tabIndex].secondaryView->view()->reload();
+        m_viewTab[m_tabIndex].secondaryView->setActive(false);
+        m_viewTab[m_tabIndex].secondaryView->show();
+
+        setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
+    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {

         // remove secondary view
         // remove secondary view

-        m_viewContainer[SecondaryView]->close();
-        m_viewContainer[SecondaryView]->deleteLater();
-        m_viewContainer[SecondaryView] = 0;
+        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.

-        m_viewContainer[PrimaryView]->close();
-        m_viewContainer[PrimaryView]->deleteLater();
-        m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
-        m_viewContainer[SecondaryView] = 0;
+
+        m_viewTab[m_tabIndex].primaryView->close();
+        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_viewContainer[PrimaryView]);

     updateViewActions();
     updateViewActions();

-    emit activeViewChanged();

 }
 
 void DolphinMainWindow::reloadView()
 }
 
 void DolphinMainWindow::reloadView()


@@ -782,55 +528,18 @@ void DolphinMainWindow::stopLoading()
 {
 }
 
 {
 }
 

-void DolphinMainWindow::togglePreview()
-{
-    clearStatusBar();
-
-    const KToggleAction* showPreviewAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
-    const bool show = showPreviewAction->isChecked();
-    m_activeViewContainer->view()->setShowPreview(show);
-}
-
-void DolphinMainWindow::toggleShowHiddenFiles()
-{
-    clearStatusBar();
-
-    const KToggleAction* showHiddenFilesAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    const bool show = showHiddenFilesAction->isChecked();
-    m_activeViewContainer->view()->setShowHiddenFiles(show);
-}
-
-void DolphinMainWindow::toggleFilterBarVisibility()
+void DolphinMainWindow::toggleFilterBarVisibility(bool show)

 {
 {

-    const KToggleAction* showFilterBarAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
-    const bool show = showFilterBarAction->isChecked();

     m_activeViewContainer->showFilterBar(show);
 }
 
     m_activeViewContainer->showFilterBar(show);
 }
 

-void DolphinMainWindow::zoomIn()
-{
-    m_activeViewContainer->view()->zoomIn();
-    updateViewActions();
-}
-
-void DolphinMainWindow::zoomOut()
-{
-    m_activeViewContainer->view()->zoomOut();
-    updateViewActions();
-}
-

 void DolphinMainWindow::toggleEditLocation()
 {
     clearStatusBar();
 
 void DolphinMainWindow::toggleEditLocation()
 {
     clearStatusBar();
 

-    KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
-
-    bool editOrBrowse = action->isChecked();
+    QAction* action = actionCollection()->action("editable_location");

     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();

-    urlNavigator->setUrlEditable(editOrBrowse);
+    urlNavigator->setUrlEditable(action->isChecked());

 }
 
 void DolphinMainWindow::editLocation()
 }
 
 void DolphinMainWindow::editLocation()


@@ -838,13 +547,11 @@ void DolphinMainWindow::editLocation()
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
     navigator->setFocus();
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
     navigator->setFocus();

-}

 
 

-void DolphinMainWindow::adjustViewProperties()
-{
-    clearStatusBar();
-    ViewPropertiesDialog dlg(m_activeViewContainer->view());
-    dlg.exec();
+    // select the whole text of the combo box editor
+    QLineEdit* lineEdit = navigator->editor()->lineEdit();
+    const QString text = lineEdit->text();
+    lineEdit->setSelection(0, text.length());

 }
 
 void DolphinMainWindow::goBack()
 }
 
 void DolphinMainWindow::goBack()


@@ -871,11 +578,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


@@ -884,16 +586,16 @@ void DolphinMainWindow::compareFiles()
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view

-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);

 
     KUrl urlA;
     KUrl urlB;
 
     KUrl urlA;
     KUrl urlB;

-    KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls();
+    KUrl::List urls = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls();

 
     switch (urls.count()) {
     case 0: {
 
     switch (urls.count()) {
     case 0: {

-        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
-        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
+        Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
+        urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();

         Q_ASSERT(urls.count() == 2);
         urlA = urls[0];
         urlB = urls[1];
         Q_ASSERT(urls.count() == 2);
         urlA = urls[0];
         urlB = urls[1];


@@ -902,8 +604,8 @@ void DolphinMainWindow::compareFiles()
 
     case 1: {
         urlA = urls[0];
 
     case 1: {
         urlA = urls[0];

-        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
-        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
+        Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
+        urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();

         Q_ASSERT(urls.count() == 1);
         urlB = urls[0];
         break;
         Q_ASSERT(urls.count() == 1);
         urlB = urls[0];
         break;


@@ -928,7 +630,18 @@ void DolphinMainWindow::compareFiles()
     command.append(urlB.pathOrUrl());
     command.append('\"');
     KRun::runCommand(command, "Kompare", "kompare", this);
     command.append(urlB.pathOrUrl());
     command.append('\"');
     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()
 }
 
 void DolphinMainWindow::toggleShowMenuBar()


@@ -943,11 +656,136 @@ void DolphinMainWindow::editSettings()
     dialog.exec();
 }
 
     dialog.exec();
 }
 

+void DolphinMainWindow::setActiveTab(int index)
+{
+    Q_ASSERT(index >= 0);
+    Q_ASSERT(index < m_viewTab.count());
+    if (index == m_tabIndex) {
+        return;
+    }
+
+    // hide current tab content
+    m_viewTab[m_tabIndex].isPrimaryViewActive = m_viewTab[m_tabIndex].primaryView->isActive();
+    QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
+    splitter->hide();
+    m_centralWidgetLayout->removeWidget(splitter);
+
+    // show active tab content
+    m_tabIndex = index;
+
+    ViewTab& viewTab = m_viewTab[index];
+    m_centralWidgetLayout->addWidget(viewTab.splitter);
+    viewTab.primaryView->show();
+    if (viewTab.secondaryView != 0) {
+        viewTab.secondaryView->show();
+    }
+    viewTab.splitter->show();
+
+    setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView :
+                                                         viewTab.secondaryView);
+}
+
+void DolphinMainWindow::closeTab()
+{
+    closeTab(m_tabBar->currentIndex());
+}
+
+void DolphinMainWindow::closeTab(int index)
+{
+    Q_ASSERT(index >= 0);
+    Q_ASSERT(index < m_viewTab.count());
+    if (m_viewTab.count() == 1) {
+          // the last tab may never get closed
+        return;
+    }
+
+    if (index == m_tabIndex) {
+        // The tab that should be closed is the active tab. Activate the
+        // previous tab before closing the tab.
+        m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
+    }
+
+    // delete tab
+    m_viewTab[index].primaryView->deleteLater();
+    if (m_viewTab[index].secondaryView != 0) {
+        m_viewTab[index].secondaryView->deleteLater();
+    }
+    m_viewTab[index].splitter->deleteLater();
+    m_viewTab.erase(m_viewTab.begin() + index);
+
+    m_tabBar->blockSignals(true);
+    m_tabBar->removeTab(index);
+
+    if (m_tabIndex > index) {
+        m_tabIndex--;
+        Q_ASSERT(m_tabIndex >= 0);
+    }
+
+    // if only one tab is left, also remove the tab entry so that
+    // 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);
+    }
+}
+
+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()
 {
 void DolphinMainWindow::init()
 {

+    DolphinSettings& settings = DolphinSettings::instance();
+

     // Check whether Dolphin runs the first time. If yes then
     // a proper default window size is given at the end of DolphinMainWindow::init().
     // Check whether Dolphin runs the first time. If yes then
     // a proper default window size is given at the end of DolphinMainWindow::init().

-    GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* generalSettings = settings.generalSettings();

     const bool firstRun = generalSettings->firstRun();
     if (firstRun) {
         generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
     const bool firstRun = generalSettings->firstRun();
     if (firstRun) {
         generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());


@@ -955,32 +793,54 @@ void DolphinMainWindow::init()
 
     setAcceptDrops(true);
 
 
     setAcceptDrops(true);
 

-    m_splitter = new QSplitter(this);
-
-    DolphinSettings& settings = DolphinSettings::instance();
+    m_viewTab[m_tabIndex].splitter = new QSplitter(this);

 
     setupActions();
 
 
     setupActions();
 

-    const KUrl& homeUrl = settings.generalSettings()->homeUrl();
+    const KUrl& homeUrl = generalSettings->homeUrl();

     setCaption(homeUrl.fileName());
     setCaption(homeUrl.fileName());

+    m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
+    connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));

     ViewProperties props(homeUrl);
     ViewProperties props(homeUrl);

-    m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
-                                                            m_splitter,
-                                                            homeUrl);
-
-    m_activeViewContainer = m_viewContainer[PrimaryView];
-    connectViewSignals(PrimaryView);
-    m_viewContainer[PrimaryView]->view()->reload();
-    m_viewContainer[PrimaryView]->show();
+    m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(this,
+                                                                 m_viewTab[m_tabIndex].splitter,
+                                                                 homeUrl);

 
 

-    setCentralWidget(m_splitter);
+    m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
+    connectViewSignals(m_activeViewContainer);
+    DolphinView* view = m_activeViewContainer->view();
+    view->reload();
+    m_activeViewContainer->show();
+    m_actionHandler->setCurrentView(view);
+
+    m_tabBar = new KTabBar(this);
+    m_tabBar->setCloseButtonEnabled(true);
+    connect(m_tabBar, SIGNAL(currentChanged(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_centralWidgetLayout = new QVBoxLayout(centralWidget);
+    m_centralWidgetLayout->setSpacing(0);
+    m_centralWidgetLayout->setMargin(0);
+    m_centralWidgetLayout->addWidget(m_tabBar);
+    m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter);
+
+
+    setCentralWidget(centralWidget);

     setupDockWidgets();
 
     setupGUI(Keys | Save | Create | ToolBar);
     setupDockWidgets();
 
     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()),


@@ -993,25 +853,37 @@ 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
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time

-        resize(700, 500);
+        resize(750, 500);

     }
 
     emit urlChanged(homeUrl);
 }
 
     }
 
     emit urlChanged(homeUrl);
 }
 

-void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
+void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)

 {
 {

-    Q_ASSERT(view != 0);
-    Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
-    if (m_activeViewContainer == view) {
+    Q_ASSERT(viewContainer != 0);
+    Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
+             (viewContainer == m_viewTab[m_tabIndex].secondaryView));
+    if (m_activeViewContainer == viewContainer) {

         return;
     }
 
     m_activeViewContainer->setActive(false);
         return;
     }
 
     m_activeViewContainer->setActive(false);

-    m_activeViewContainer = view;
+    m_activeViewContainer = viewContainer;
+
+    // Activating the view container might trigger a recursive setActiveViewContainer() call
+    // inside DolphinMainWindow::toggleActiveView() when having a split view. Temporary
+    // disconnect the activated() signal in this case:
+    disconnect(m_activeViewContainer->view(), SIGNAL(activated()), this, SLOT(toggleActiveView()));

     m_activeViewContainer->setActive(true);
     m_activeViewContainer->setActive(true);

+    connect(m_activeViewContainer->view(), SIGNAL(activated()), this, SLOT(toggleActiveView()));
+
+    m_actionHandler->setCurrentView(viewContainer->view());

 
     updateHistory();
     updateEditActions();
 
     updateHistory();
     updateEditActions();


@@ -1020,8 +892,10 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
 
     const KUrl& url = m_activeViewContainer->url();
     setCaption(url.fileName());
 
     const KUrl& url = m_activeViewContainer->url();
     setCaption(url.fileName());

+    if (m_viewTab.count() > 1) {
+        m_tabBar->setTabText(m_tabIndex, tabName(url));
+    }

 
 

-    emit activeViewChanged();

     emit urlChanged(url);
 }
 
     emit urlChanged(url);
 }
 


@@ -1030,7 +904,7 @@ void DolphinMainWindow::setupActions()
     // setup 'File' menu
     m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();
     // setup 'File' menu
     m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();

-    menu->setTitle(i18nc("@title:menu", "Create New"));
+    menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));


@@ -1041,19 +915,17 @@ void DolphinMainWindow::setupActions()
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 

-    KAction* rename = DolphinView::createRenameAction(actionCollection());
-    connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
-
-    KAction* moveToTrash = DolphinView::createMoveToTrashAction(actionCollection());
-    connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
-
-    KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());
-    connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
+    KAction* newTab = actionCollection()->addAction("new_tab");
+    newTab->setIcon(KIcon("tab-new"));
+    newTab->setText(i18nc("@action:inmenu File", "New Tab"));
+    newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T));
+    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());
 


@@ -1062,8 +934,8 @@ void DolphinMainWindow::setupActions()
                           SLOT(undo()),
                           actionCollection());
 
                           SLOT(undo()),
                           actionCollection());
 

-    //Need to remove shift+del from cut action, else the shortcut for deletejob
-    //doesn't work
+    // need to remove shift+del from cut action, else the shortcut for deletejob
+    // doesn't work

     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);


@@ -1082,134 +954,10 @@ void DolphinMainWindow::setupActions()
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 
     // setup 'View' menu
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 
     // setup 'View' menu

-    KStandardAction::zoomIn(this,
-                            SLOT(zoomIn()),
-                            actionCollection());
-
-    KStandardAction::zoomOut(this,
-                             SLOT(zoomOut()),
-                             actionCollection());
-
-
-    KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
-    KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
-    KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());
-
-    QActionGroup* viewModeGroup = new QActionGroup(this);
-    viewModeGroup->addAction(iconsView);
-    viewModeGroup->addAction(detailsView);
-    viewModeGroup->addAction(columnView);
-    connect(viewModeGroup, SIGNAL(triggered(QAction*)), this, SLOT(setViewMode(QAction*)));
-
-    KToggleAction* sortByName = actionCollection()->add<KToggleAction>("sort_by_name");
-    sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));
-    connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
-
-    KToggleAction* sortBySize = actionCollection()->add<KToggleAction>("sort_by_size");
-    sortBySize->setText(i18nc("@action:inmenu Sort By", "Size"));
-    connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize()));
-
-    KToggleAction* sortByDate = actionCollection()->add<KToggleAction>("sort_by_date");
-    sortByDate->setText(i18nc("@action:inmenu Sort By", "Date"));
-    connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate()));
-
-    KToggleAction* sortByPermissions = actionCollection()->add<KToggleAction>("sort_by_permissions");
-    sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions"));
-    connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions()));
-
-    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("sort_by_owner");
-    sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner"));
-    connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner()));
-
-    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("sort_by_group");
-    sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group"));
-    connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup()));
-
-    KToggleAction* sortByType = actionCollection()->add<KToggleAction>("sort_by_type");
-    sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
-    connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
-
-    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
-    // is too slow currently (Nepomuk will support caching in future releases).
-    //
-    // KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
-    // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
-    //
-    // KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
-    // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
-    //
-#ifdef HAVE_NEPOMUK
-    // if (MetaDataWidget::metaDataAvailable()) {
-    //     connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
-    //     connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
-    // }
-    // else {
-    //     sortByRating->setEnabled(false);
-    //     sortByTags->setEnabled(false);
-    // }
-#else
-    // sortByRating->setEnabled(false);
-    // sortByTags->setEnabled(false);
-#endif
-
-    QActionGroup* sortGroup = new QActionGroup(this);
-    sortGroup->addAction(sortByName);
-    sortGroup->addAction(sortBySize);
-    sortGroup->addAction(sortByDate);
-    sortGroup->addAction(sortByPermissions);
-    sortGroup->addAction(sortByOwner);
-    sortGroup->addAction(sortByGroup);
-    sortGroup->addAction(sortByType);
-
-    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
-    // is too slow currently (Nepomuk will support caching in future releases).
-    //sortGroup->addAction(sortByRating);
-    //sortGroup->addAction(sortByTags);
-
-    KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
-    sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
-    connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
-
-    KToggleAction* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");
-    showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
-    connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
-
-    KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
-    showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
-    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo()));
-
-    KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
-    showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
-    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo()));
-
-    KToggleAction* showPermissionsInfo = actionCollection()->add<KToggleAction>("show_permissions_info");
-    showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
-    connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo()));
-
-    KToggleAction* showOwnerInfo = actionCollection()->add<KToggleAction>("show_owner_info");
-    showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
-    connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo()));
-
-    KToggleAction* showGroupInfo = actionCollection()->add<KToggleAction>("show_group_info");
-    showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
-    connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo()));
-
-    KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
-    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
-    connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo()));
-
-    KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
-    showPreview->setText(i18nc("@action:intoolbar", "Preview"));
-    showPreview->setIcon(KIcon("fileview-preview"));
-    connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
-
-    KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
-    showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
-    showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
-    connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
+    // (note that most of it is set up in DolphinViewActionHandler)

 
     KAction* split = actionCollection()->addAction("split_view");
 
     KAction* split = actionCollection()->addAction("split_view");

-    split->setShortcut(Qt::Key_F10);
+    split->setShortcut(Qt::Key_F3);

     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 


@@ -1224,9 +972,7 @@ 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 URL navigator must emit a signal if the editable state has been
-    // changed, so that the corresponding showFullLocation action is updated. Also
-    // the naming "Show full Location" is currently confusing...
+    // TODO: the naming "Show full Location" is currently confusing...

     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);


@@ -1237,10 +983,6 @@ void DolphinMainWindow::setupActions()
     editLocation->setShortcut(Qt::Key_F6);
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
 
     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()));
-

     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
     KShortcut backShortcut = backAction->shortcut();
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
     KShortcut backShortcut = backAction->shortcut();


@@ -1252,16 +994,10 @@ 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);

-    connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
+    connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));

 
     KAction* compareFiles = actionCollection()->addAction("compare_files");
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
 
     KAction* compareFiles = actionCollection()->addAction("compare_files");
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));


@@ -1269,6 +1005,13 @@ void DolphinMainWindow::setupActions()
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 

+    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()));
+

     // 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());


@@ -1309,39 +1052,45 @@ 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(urlsDropped(KUrl::List, KUrl)),
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"
     connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
             this, SLOT(changeSelection(KFileItemList)));
     connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"

-    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal"));
+#ifndef Q_OS_WIN
+    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window Shell terminal", "Terminal"));

     terminalDock->setObjectName("terminalDock");
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 
     terminalDock->setObjectName("terminalDock");
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 

-    terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
+    connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+
+    terminalDock->toggleViewAction()->setText(i18nc("@title:window Shell terminal", "Terminal"));

     terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
     terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));

+#endif

 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {

-        infoDock->hide();

         treeViewDock->hide();
         treeViewDock->hide();

+#ifndef Q_OS_WIN

         terminalDock->hide();
         terminalDock->hide();

+#endif

     }
 
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     }
 
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);

-    KFilePlacesView* placesView = new KFilePlacesView(placesDock);
+
+    DolphinFilePlacesView* placesView = new DolphinFilePlacesView(placesDock);

     placesDock->setWidget(placesView);
     placesView->setModel(DolphinSettings::instance().placesModel());
     placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     placesDock->setWidget(placesView);
     placesView->setModel(DolphinSettings::instance().placesModel());
     placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);


@@ -1351,28 +1100,12 @@ 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)));
 }
 

-void DolphinMainWindow::updateHistory()
-{
-    const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
-    const int index = urlNavigator->historyIndex();
-
-    QAction* backAction = actionCollection()->action("go_back");
-    if (backAction != 0) {
-        backAction->setEnabled(index < urlNavigator->historySize() - 1);
-    }
-
-    QAction* forwardAction = actionCollection()->action("go_forward");
-    if (forwardAction != 0) {
-        forwardAction->setEnabled(index > 0);
-    }
-}
-

 void DolphinMainWindow::updateEditActions()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
 void DolphinMainWindow::updateEditActions()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();


@@ -1381,77 +1114,42 @@ 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();
 }
 
 void DolphinMainWindow::updateViewActions()
 {
     }
     updatePasteAction();
 }
 
 void DolphinMainWindow::updateViewActions()
 {

-    const DolphinView* view = m_activeViewContainer->view();
-    QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn));
-    if (zoomInAction != 0) {
-        zoomInAction->setEnabled(view->isZoomInPossible());
-    }
-
-    QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut));
-    if (zoomOutAction != 0) {
-        zoomOutAction->setEnabled(view->isZoomOutPossible());
-    }
+    m_actionHandler->updateViewActions();

 
 

-    QAction* action = actionCollection()->action(view->currentViewModeActionName());
-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
-    }
-
-    slotSortingChanged(view->sorting());
-    slotSortOrderChanged(view->sortOrder());
-    slotCategorizedSortingChanged();
-    slotAdditionalInfoChanged(view->additionalInfo());
-
-    KToggleAction* showFilterBarAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");

     showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
 
     showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
 

-    KToggleAction* showPreviewAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
-    showPreviewAction->setChecked(view->showPreview());
-
-    KToggleAction* showHiddenFilesAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    showHiddenFilesAction->setChecked(view->showHiddenFiles());
-

     updateSplitAction();
 
     updateSplitAction();
 

-    KToggleAction* editableLocactionAction =
-        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+    QAction* editableLocactionAction = actionCollection()->action("editable_location");

     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
 }
 
 void DolphinMainWindow::updateGoActions()
 {
     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
 }
 
 void DolphinMainWindow::updateGoActions()
 {

-    QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up));
+    QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));

     const KUrl& currentUrl = m_activeViewContainer->url();
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
     const KUrl& currentUrl = m_activeViewContainer->url();
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }


@@ -1461,87 +1159,79 @@ void DolphinMainWindow::clearStatusBar()
     m_activeViewContainer->statusBar()->clear();
 }
 
     m_activeViewContainer->statusBar()->clear();
 }
 

-void DolphinMainWindow::connectViewSignals(int viewIndex)
+void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)

 {
 {

-    DolphinViewContainer* container = m_viewContainer[viewIndex];

     connect(container, SIGNAL(showFilterBarChanged(bool)),
             this, SLOT(updateFilterBarAction(bool)));
 
     DolphinView* view = container->view();
     connect(container, SIGNAL(showFilterBarChanged(bool)),
             this, SLOT(updateFilterBarAction(bool)));
 
     DolphinView* view = container->view();

-    connect(view, SIGNAL(modeChanged()),
-            this, SLOT(slotViewModeChanged()));
-    connect(view, SIGNAL(showPreviewChanged()),
-            this, SLOT(slotShowPreviewChanged()));
-    connect(view, SIGNAL(showHiddenFilesChanged()),
-            this, SLOT(slotShowHiddenFilesChanged()));
-    connect(view, SIGNAL(categorizedSortingChanged()),
-            this, SLOT(slotCategorizedSortingChanged()));
-    connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
-            this, SLOT(slotSortingChanged(DolphinView::Sorting)));
-    connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
-            this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
-    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)),
-            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));

     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KFileItem)),
             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(doingOperation(KIO::FileUndoManager::CommandType)),
+            this, SLOT(slotDoingOperation(KIO::FileUndoManager::CommandType)));
+    connect(view, SIGNAL(tabRequested(const KUrl&)),
+            this, SLOT(openNewTab(const KUrl&)));

 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(changeUrl(const KUrl&)));
     connect(navigator, SIGNAL(historyChanged()),
 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(changeUrl(const KUrl&)));
     connect(navigator, SIGNAL(historyChanged()),

-            this, SLOT(slotHistoryChanged()));
+            this, SLOT(updateHistory()));
+    connect(navigator, SIGNAL(editableStateChanged(bool)),
+            this, SLOT(slotEditableStateChanged(bool)));

 }
 
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");
 }
 
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");

-    if (m_viewContainer[SecondaryView] != 0) {
-        if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+        if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {

             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));

-            splitAction->setIcon(KIcon("fileview-close-right"));
+            splitAction->setIcon(KIcon("view-right-close"));

         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));

-            splitAction->setIcon(KIcon("fileview-close-left"));
+            splitAction->setIcon(KIcon("view-left-close"));

         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));

-        splitAction->setIcon(KIcon("fileview-split"));
+        splitAction->setIcon(KIcon("view-right-new"));

     }
 }
 
     }
 }
 

-void DolphinMainWindow::toggleAdditionalInfo(const char* actionName,
-                                             KFileItemDelegate::Information info)
+QString DolphinMainWindow::tabName(const KUrl& url) const

 {
 {

-    clearStatusBar();
+    QString name;
+    if (url.equals(KUrl("file:///"))) {
+        name = "/";
+    } else {
+        name = url.fileName();
+        if (name.isEmpty()) {
+            name = url.protocol();
+        }
+    }
+    return name;
+}

 
 

-    DolphinView* view = m_activeViewContainer->view();
-    KFileItemDelegate::InformationList list = view->additionalInfo();
-
-    const bool show = actionCollection()->action(actionName)->isChecked();
-
-    const int index = list.indexOf(info);
-    const bool containsInfo = (index >= 0);
-    if (show && !containsInfo) {
-        list.append(info);
-        view->setAdditionalInfo(list);
-    } else if (!show && containsInfo) {
-        list.removeAt(index);
-        view->setAdditionalInfo(list);
-        Q_ASSERT(list.indexOf(info) < 0);
+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(DolphinMainWindow* mainWin) :
-    KonqFileUndoManager::UiInterface(mainWin),
-    m_mainWin(mainWin)
+DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
+    KIO::FileUndoManager::UiInterface()

 {
 {

-    Q_ASSERT(m_mainWin != 0);

 }
 
 DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
 }
 
 DolphinMainWindow::UndoUiInterface::~UndoUiInterface()


@@ -1550,8 +1240,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"