X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/45a1074b0a38f38cfebde8bb65d5a6520b2db3e8..8cb8b519099e2d8bc86a574e014fc3cd780acfa8:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index c1d6cef39..f64f847fe 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -26,6 +26,7 @@
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
+#include "dolphinfileplacesview.h"
 #include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
@@ -34,13 +35,13 @@
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
-#include "terminalsidebarpage.h"
 #include "treeviewsidebarpage.h"
-#include "kurlnavigator.h"
 #include "viewpropertiesdialog.h"
 #include "viewproperties.h"
-#include "kfileplacesmodel.h"
-#include "kfileplacesview.h"
+
+#ifndef Q_OS_WIN
+#include "terminalsidebarpage.h"
+#endif
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
@@ -51,6 +52,7 @@
 #include <kdesktopfile.h>
 #include <kdeversion.h>
 #include <kfiledialog.h>
+#include <kfileplacesmodel.h>
 #include <kglobal.h>
 #include <kicon.h>
 #include <kiconloader.h>
@@ -60,6 +62,7 @@
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
+#include <kurlnavigator.h>
 #include <konqmimedata.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
@@ -69,6 +72,7 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstandardaction.h>
+#include <ktabbar.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 
@@ -82,13 +86,17 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
     m_showMenuBar(0),
-    m_splitter(0),
+    m_tabBar(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);
@@ -114,17 +122,17 @@ DolphinMainWindow::~DolphinMainWindow()
 
 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
-    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)
@@ -135,16 +143,16 @@ void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType comm
 
 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;
 
-    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);
@@ -159,6 +167,11 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
     dropController.dropUrls(urls, destination);
 }
 
+void DolphinMainWindow::pasteIntoFolder()
+{
+    m_activeViewContainer->view()->pasteIntoFolder();
+}
+
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
     DolphinViewContainer* view = activeViewContainer();
@@ -167,7 +180,11 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
         updateEditActions();
         updateViewActions();
         updateGoActions();
-        setCaption(url.fileName());
+        const QString caption = url.fileName();
+        setCaption(caption);
+        if (m_viewTab.count() > 1) {
+            m_tabBar->setTabText(m_tabIndex, caption);
+        }
         emit urlChanged(url);
     }
 }
@@ -177,61 +194,21 @@ void DolphinMainWindow::changeSelection(const KFileItemList& selection)
     activeViewContainer()->view()->changeSelection(selection);
 }
 
-void DolphinMainWindow::slotViewModeChanged()
+void DolphinMainWindow::slotEditableStateChanged(bool editable)
 {
-    updateViewActions();
-}
-
-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) {
-        action->setChecked(true);
-    }
+    KToggleAction* editableLocationAction =
+        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+    editableLocationAction->setChecked(editable);
 }
 
 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()->selectedUrls().count();
+    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+        selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls().count();
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
@@ -252,9 +229,20 @@ void DolphinMainWindow::slotRequestItemInfo(const KFileItem& 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)
@@ -268,18 +256,44 @@ void DolphinMainWindow::openNewMainWindow()
     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"), m_activeViewContainer->url().fileName());
+        m_tabBar->blockSignals(false);
+    }
+
+    m_tabBar->addTab(KIcon("folder"), url.fileName());
+
+    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);
+}
+
 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);
-    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);
 }
 
@@ -296,11 +310,12 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
 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());
 
-    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());
@@ -309,20 +324,21 @@ void DolphinMainWindow::saveProperties(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 = 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();
-            cont = m_viewContainer[SecondaryView];
+            cont = m_viewTab[m_tabIndex].secondaryView;
             Q_ASSERT(cont != 0);
         }
 
@@ -368,7 +384,7 @@ void DolphinMainWindow::slotHandlePlacesError(const QString &message)
 
 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);
     }
@@ -412,7 +428,7 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
 
 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);
     }
@@ -441,7 +457,7 @@ void DolphinMainWindow::paste()
 
 void DolphinMainWindow::updatePasteAction()
 {
-    QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
+    QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
     if (pasteAction == 0) {
         return;
     }
@@ -475,94 +491,40 @@ void DolphinMainWindow::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::toggleSplitView()
 {
-    if (m_viewContainer[SecondaryView] == 0) {
+    if (m_viewTab[m_tabIndex].secondaryView == 0) {
         // 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();
+    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
         // 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;
     } else {
         // The secondary view is active, 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.
-        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_viewContainer[PrimaryView]);
+    setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
     updateViewActions();
-    emit activeViewChanged(); // TODO unused; remove?
 }
 
 void DolphinMainWindow::reloadView()
@@ -594,6 +556,11 @@ void DolphinMainWindow::editLocation()
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
     navigator->setFocus();
+
+    // 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::adjustViewProperties()
@@ -640,16 +607,16 @@ void DolphinMainWindow::compareFiles()
     // - 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::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls();
+    KUrl::List urls = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls();
 
     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];
@@ -658,8 +625,8 @@ void DolphinMainWindow::compareFiles()
 
     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;
@@ -684,7 +651,6 @@ void DolphinMainWindow::compareFiles()
     command.append(urlB.pathOrUrl());
     command.append('\"');
     KRun::runCommand(command, "Kompare", "kompare", this);
-
 }
 
 void DolphinMainWindow::toggleShowMenuBar()
@@ -699,11 +665,82 @@ void DolphinMainWindow::editSettings()
     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(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.
+        setActiveTab((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);
+    } else {
+        m_tabBar->blockSignals(false);
+    }
+}
+
 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().
-    GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* generalSettings = settings.generalSettings();
     const bool firstRun = generalSettings->firstRun();
     if (firstRun) {
         generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
@@ -711,29 +748,43 @@ void DolphinMainWindow::init()
 
     setAcceptDrops(true);
 
-    m_splitter = new QSplitter(this);
-
-    DolphinSettings& settings = DolphinSettings::instance();
+    m_viewTab[m_tabIndex].splitter = new QSplitter(this);
 
     setupActions();
 
-    const KUrl& homeUrl = settings.generalSettings()->homeUrl();
+    const KUrl& homeUrl = generalSettings->homeUrl();
     setCaption(homeUrl.fileName());
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
     ViewProperties props(homeUrl);
-    m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
-                                                            m_splitter,
-                                                            homeUrl);
+    m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(this,
+                                                                 m_viewTab[m_tabIndex].splitter,
+                                                                 homeUrl);
 
-    m_activeViewContainer = m_viewContainer[PrimaryView];
-    connectViewSignals(PrimaryView);
-    DolphinView* view = m_viewContainer[PrimaryView]->view();
+    m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
+    connectViewSignals(m_activeViewContainer);
+    DolphinView* view = m_activeViewContainer->view();
     view->reload();
-    m_viewContainer[PrimaryView]->show();
+    m_activeViewContainer->show();
     m_actionHandler->setCurrentView(view);
 
-    setCentralWidget(m_splitter);
+    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)));
+    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);
@@ -755,7 +806,7 @@ void DolphinMainWindow::init()
 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
-        resize(700, 500);
+        resize(750, 500);
     }
 
     emit urlChanged(homeUrl);
@@ -764,14 +815,23 @@ void DolphinMainWindow::init()
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
 {
     Q_ASSERT(viewContainer != 0);
-    Q_ASSERT((viewContainer == m_viewContainer[PrimaryView]) || (viewContainer == m_viewContainer[SecondaryView]));
+    Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
+             (viewContainer == m_viewTab[m_tabIndex].secondaryView));
     if (m_activeViewContainer == viewContainer) {
         return;
     }
 
     m_activeViewContainer->setActive(false);
     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);
+    connect(m_activeViewContainer->view(), SIGNAL(activated()), this, SLOT(toggleActiveView()));
+
+    m_actionHandler->setCurrentView(viewContainer->view());
 
     updateHistory();
     updateEditActions();
@@ -779,11 +839,12 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     updateGoActions();
 
     const KUrl& url = m_activeViewContainer->url();
-    setCaption(url.fileName());
-
-    m_actionHandler->setCurrentView(viewContainer->view());
+    const QString caption = url.fileName();
+    setCaption(caption);
+    if (m_viewTab.count() > 1) {
+        m_tabBar->setTabText(m_tabIndex, caption);
+    }
 
-    emit activeViewChanged(); // TODO unused; remove?
     emit urlChanged(url);
 }
 
@@ -792,7 +853,7 @@ void DolphinMainWindow::setupActions()
     // 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()));
@@ -803,6 +864,12 @@ void DolphinMainWindow::setupActions()
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
+    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);
+    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);
@@ -815,8 +882,8 @@ void DolphinMainWindow::setupActions()
                           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);
@@ -835,86 +902,7 @@ void DolphinMainWindow::setupActions()
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 
     // setup 'View' menu
-
-    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*)));
-
-    //QActionGroup* sortActionGroup = DolphinView::createSortActionGroup(actionCollection());
-    //connect(sortActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(sortActionGroupTriggered(QAction*)));
-
-    // TODO use a QActionGroup
-
-    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);
+    // (note that most of it is set up in DolphinViewActionHandler)
 
     KAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F3);
@@ -932,9 +920,7 @@ void DolphinMainWindow::setupActions()
     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);
@@ -1025,7 +1011,8 @@ void DolphinMainWindow::setupDockWidgets()
             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);
@@ -1033,25 +1020,28 @@ void DolphinMainWindow::setupDockWidgets()
 
     connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
 
-    terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
+    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)));
+#endif
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
-        infoDock->hide();
         treeViewDock->hide();
+#ifndef Q_OS_WIN
         terminalDock->hide();
+#endif
     }
 
     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);
@@ -1067,22 +1057,6 @@ void DolphinMainWindow::setupDockWidgets()
             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();
@@ -1119,14 +1093,6 @@ void DolphinMainWindow::updateViewActions()
 {
     m_actionHandler->updateViewActions();
 
-    const DolphinView* view = m_activeViewContainer->view();
-    QAction* action = actionCollection()->action(view->currentViewModeActionName());
-    if (action != 0) {
-        action->setChecked(true);
-    }
-
-    slotSortingChanged(view->sorting());
-
     QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
     showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
 
@@ -1139,7 +1105,7 @@ void DolphinMainWindow::updateViewActions()
 
 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);
 }
@@ -1149,17 +1115,12 @@ void DolphinMainWindow::clearStatusBar()
     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(view, SIGNAL(modeChanged()),
-            this, SLOT(slotViewModeChanged()));
-    connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
-            this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KFileItem)),
@@ -1168,19 +1129,23 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             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&)));
 
     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");
-    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].primaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setIcon(KIcon("view-right-close"));
         } else {