]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinmainwindow.cpp
projects / dolphin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed some activation issues in combination with split views
[dolphin.git] / src / dolphinmainwindow.cpp
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 59fc84af33dc4e3043a1a84906538037187ef82d..35c50e88d783c4e776d8ee6af89a363716c3c84b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,13 +21,14 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 
-#include <config-kmetadata.h>
+#include "config-nepomuk.h"
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
+#include "dolphinviewcontainer.h"
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
@@ -78,12 +79,12 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
     m_splitter(0),
     KXmlGuiWindow(0),
     m_newMenu(0),
     m_splitter(0),
-    m_activeView(0),
+    m_activeViewContainer(0),
     m_id(id)
 {
     setObjectName("Dolphin");
     m_id(id)
 {
     setObjectName("Dolphin");
-    m_view[PrimaryIdx] = 0;
-    m_view[SecondaryIdx] = 0;
+    m_viewContainer[PrimaryView] = 0;
+    m_viewContainer[SecondaryView] = 0;
 
     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);
@@ -105,23 +106,43 @@ DolphinMainWindow::~DolphinMainWindow()
     DolphinApplication::app()->removeMainWindow(this);
 }
 
     DolphinApplication::app()->removeMainWindow(this);
 }
 
-void DolphinMainWindow::setActiveView(DolphinView* view)
+void DolphinMainWindow::toggleViews()
 {
 {
-    Q_ASSERT((view == m_view[PrimaryIdx]) || (view == m_view[SecondaryIdx]));
-    if (m_activeView == view) {
+    if (m_viewContainer[SecondaryView] == 0) {
         return;
     }
 
         return;
     }
 
-    m_activeView = view;
+    // move secondary view from the last position of the splitter
+    // to the first position
+    m_splitter->insertWidget(0, m_viewContainer[SecondaryView]);
 
 
-    updateHistory();
-    updateEditActions();
-    updateViewActions();
-    updateGoActions();
+    DolphinViewContainer* container = m_viewContainer[PrimaryView];
+    m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
+    m_viewContainer[SecondaryView] = container;
+}
+
+void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    clearStatusBar();
+    KonqOperations::rename(this, oldUrl, newUrl);
+    m_undoCommandTypes.append(KonqUndoManager::RENAME);
+}
 
 
-    setCaption(m_activeView->url().fileName());
+void DolphinMainWindow::refreshViews()
+{
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
 
 
-    emit activeViewChanged();
+    // 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();
+    }
+
+    setActiveViewContainer(activeViewContainer);
 }
 
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 }
 
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
@@ -198,34 +219,11 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
     }
 }
 
     }
 }
 
-void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
-{
-    clearStatusBar();
-    KonqOperations::rename(this, oldUrl, newUrl);
-    m_undoCommandTypes.append(KonqUndoManager::RENAME);
-}
-
-void DolphinMainWindow::refreshViews()
-{
-    Q_ASSERT(m_view[PrimaryIdx] != 0);
-
-    // remember the current active view, as because of
-    // the refreshing the active view might change to
-    // the secondary view
-    DolphinView* activeView = m_activeView;
-
-    m_view[PrimaryIdx]->refresh();
-    if (m_view[SecondaryIdx] != 0) {
-        m_view[SecondaryIdx]->refresh();
-    }
-
-    setActiveView(activeView);
-}
-
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
-    if (activeView() != 0) {
-        activeView()->setUrl(url);
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);
         updateEditActions();
         updateViewActions();
         updateGoActions();
         updateEditActions();
         updateViewActions();
         updateGoActions();
@@ -236,7 +234,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
 
 void DolphinMainWindow::changeSelection(const KFileItemList& selection)
 {
 
 void DolphinMainWindow::changeSelection(const KFileItemList& selection)
 {
-    activeView()->changeSelection(selection);
+    activeViewContainer()->view()->changeSelection(selection);
 }
 
 void DolphinMainWindow::slotViewModeChanged()
 }
 
 void DolphinMainWindow::slotViewModeChanged()
@@ -255,15 +253,17 @@ void DolphinMainWindow::slotShowHiddenFilesChanged()
 {
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
 {
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+    const DolphinView* view = m_activeViewContainer->view();
+    showHiddenFilesAction->setChecked(view->showHiddenFiles());
 }
 
 void DolphinMainWindow::slotCategorizedSortingChanged()
 {
     KToggleAction* categorizedSortingAction =
         static_cast<KToggleAction*>(actionCollection()->action("categorized"));
 }
 
 void DolphinMainWindow::slotCategorizedSortingChanged()
 {
     KToggleAction* categorizedSortingAction =
         static_cast<KToggleAction*>(actionCollection()->action("categorized"));
-    categorizedSortingAction->setChecked(m_activeView->categorizedSorting());
-    categorizedSortingAction->setEnabled(m_activeView->supportsCategorizedSorting());
+    const DolphinView* view = m_activeViewContainer->view();
+    categorizedSortingAction->setChecked(view->categorizedSorting());
+    categorizedSortingAction->setEnabled(view->supportsCategorizedSorting());
 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
@@ -332,7 +332,8 @@ void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::AdditionalI
 
         QActionGroup* group = toggleAction->actionGroup();
         Q_ASSERT(group != 0);
 
         QActionGroup* group = toggleAction->actionGroup();
         Q_ASSERT(group != 0);
-        group->setEnabled(m_activeView->mode() == DolphinView::IconsView);
+        const DolphinView* view = m_activeViewContainer->view();
+        group->setEnabled(view->mode() == DolphinView::IconsView);
     }
 }
 
     }
 }
 
@@ -340,16 +341,16 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 
 {
     updateEditActions();
 
-    Q_ASSERT(m_view[PrimaryIdx] != 0);
-    int selectedUrlsCount = m_view[PrimaryIdx]->selectedUrls().count();
-    if (m_view[SecondaryIdx] != 0) {
-        selectedUrlsCount += m_view[SecondaryIdx]->selectedUrls().count();
+    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();
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     compareFilesAction->setEnabled(selectedUrlsCount == 2);
 
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     compareFilesAction->setEnabled(selectedUrlsCount == 2);
 
-    m_activeView->updateStatusBar();
+    m_activeViewContainer->updateStatusBar();
 
     emit selectionChanged(selection);
 }
 
     emit selectionChanged(selection);
 }
@@ -376,6 +377,15 @@ void DolphinMainWindow::openNewMainWindow()
     DolphinApplication::app()->createMainWindow()->show();
 }
 
     DolphinApplication::app()->createMainWindow()->show();
 }
 
+void DolphinMainWindow::toggleActiveView()
+{
+    if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+        setActiveViewContainer(m_viewContainer[SecondaryView]);
+    } else {
+        setActiveViewContainer(m_viewContainer[PrimaryView]);
+    }
+}
+
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();
@@ -390,28 +400,31 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 void DolphinMainWindow::saveProperties(KConfig* config)
 {
     KConfigGroup primaryView = config->group("Primary view");
 void DolphinMainWindow::saveProperties(KConfig* config)
 {
     KConfigGroup primaryView = config->group("Primary view");
-    primaryView.writeEntry("Url", m_view[PrimaryIdx]->url().url());
-    primaryView.writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());
-    if (m_view[SecondaryIdx] != 0) {
+    primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url());
+    primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable());
+    if (m_viewContainer[SecondaryView] != 0) {
         KConfigGroup secondaryView = config->group("Secondary view");
         KConfigGroup secondaryView = config->group("Secondary view");
-        secondaryView.writeEntry("Url", m_view[SecondaryIdx]->url().url());
-        secondaryView.writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());
+        secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url());
+        secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable());
     }
 }
 
 void DolphinMainWindow::readProperties(KConfig* config)
 {
     }
 }
 
 void DolphinMainWindow::readProperties(KConfig* config)
 {
-    const KConfigGroup primaryView = config->group("Primary view");
-    m_view[PrimaryIdx]->setUrl(primaryView.readEntry("Url"));
-    m_view[PrimaryIdx]->setUrlEditable(primaryView.readEntry("Editable Url", false));
+    const KConfigGroup primaryViewGroup = config->group("Primary view");
+    m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url"));
+    bool editable = primaryViewGroup.readEntry("Editable Url", false);
+    m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+
     if (config->hasGroup("Secondary view")) {
     if (config->hasGroup("Secondary view")) {
-        const KConfigGroup secondaryView = config->group("Secondary view");
-        if (m_view[SecondaryIdx] == 0) {
+        const KConfigGroup secondaryViewGroup = config->group("Secondary view");
+        if (m_viewContainer[PrimaryView] == 0) {
             toggleSplitView();
         }
             toggleSplitView();
         }
-        m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url"));
-        m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false));
-    } else if (m_view[SecondaryIdx] != 0) {
+        m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url"));
+        editable = secondaryViewGroup.readEntry("Editable Url", false);
+        m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+    } else if (m_viewContainer[SecondaryView] != 0) {
         toggleSplitView();
     }
 }
         toggleSplitView();
     }
 }
@@ -419,19 +432,19 @@ void DolphinMainWindow::readProperties(KConfig* config)
 void DolphinMainWindow::updateNewMenu()
 {
     m_newMenu->slotCheckUpToDate();
 void DolphinMainWindow::updateNewMenu()
 {
     m_newMenu->slotCheckUpToDate();
-    m_newMenu->setPopupFiles(activeView()->url());
+    m_newMenu->setPopupFiles(activeViewContainer()->url());
 }
 
 void DolphinMainWindow::rename()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::rename()
 {
     clearStatusBar();
-    m_activeView->renameSelectedItems();
+    m_activeViewContainer->renameSelectedItems();
 }
 
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
-    const KUrl::List selectedUrls = m_activeView->selectedUrls();
+    const KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
     KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
     m_undoCommandTypes.append(KonqUndoManager::TRASH);
 }
     KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
     m_undoCommandTypes.append(KonqUndoManager::TRASH);
 }
@@ -440,7 +453,7 @@ void DolphinMainWindow::deleteItems()
 {
     clearStatusBar();
 
 {
     clearStatusBar();
 
-    const KUrl::List list = m_activeView->selectedUrls();
+    const KUrl::List list = m_activeViewContainer->view()->selectedUrls();
     const bool del = KonqOperations::askDeleteConfirmation(list,
                      KonqOperations::DEL,
                      KonqOperations::DEFAULT_CONFIRMATION,
     const bool del = KonqOperations::askDeleteConfirmation(list,
                      KonqOperations::DEL,
                      KonqOperations::DEFAULT_CONFIRMATION,
@@ -457,7 +470,7 @@ void DolphinMainWindow::deleteItems()
 
 void DolphinMainWindow::properties()
 {
 
 void DolphinMainWindow::properties()
 {
-    const KFileItemList list = m_activeView->selectedItems();
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     KPropertiesDialog dialog(list, this);
     dialog.exec();
 }
     KPropertiesDialog dialog(list, this);
     dialog.exec();
 }
@@ -470,7 +483,7 @@ void DolphinMainWindow::quit()
 void DolphinMainWindow::slotHandleJobError(KJob* job)
 {
     if (job->error() != 0) {
 void DolphinMainWindow::slotHandleJobError(KJob* job)
 {
     if (job->error() != 0) {
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         statusBar->setMessage(job->errorString(),
                               DolphinStatusBar::Error);
     }
         statusBar->setMessage(job->errorString(),
                               DolphinStatusBar::Error);
     }
@@ -479,7 +492,7 @@ void DolphinMainWindow::slotHandleJobError(KJob* job)
 void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
 {
     if (job->error() == 0) {
 void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
 {
     if (job->error() == 0) {
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         statusBar->setMessage(i18n("Delete operation completed."),
                               DolphinStatusBar::OperationCompleted);
     }
         statusBar->setMessage(i18n("Delete operation completed."),
                               DolphinStatusBar::OperationCompleted);
     }
@@ -494,7 +507,7 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
 
     if (available && (m_undoCommandTypes.count() > 0)) {
         const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
 
     if (available && (m_undoCommandTypes.count() > 0)) {
         const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {
         case KonqUndoManager::COPY:
             statusBar->setMessage(i18n("Copy operation completed."),
         switch (command) {
         case KonqUndoManager::COPY:
             statusBar->setMessage(i18n("Copy operation completed."),
@@ -546,7 +559,7 @@ void DolphinMainWindow::undo()
 void DolphinMainWindow::cut()
 {
     QMimeData* mimeData = new QMimeData();
 void DolphinMainWindow::cut()
 {
     QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = m_activeView->selectedUrls();
+    const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls();
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
     QApplication::clipboard()->setMimeData(mimeData);
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
     QApplication::clipboard()->setMimeData(mimeData);
@@ -555,7 +568,7 @@ void DolphinMainWindow::cut()
 void DolphinMainWindow::copy()
 {
     QMimeData* mimeData = new QMimeData();
 void DolphinMainWindow::copy()
 {
     QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = m_activeView->selectedUrls();
+    const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls();
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
 
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
 
@@ -572,10 +585,10 @@ void DolphinMainWindow::paste()
     const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
 
     // per default the pasting is done into the current Url of the view
     const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
 
     // per default the pasting is done into the current Url of the view
-    KUrl destUrl(m_activeView->url());
+    KUrl destUrl(m_activeViewContainer->url());
 
     // check whether the pasting should be done into a selected directory
 
     // check whether the pasting should be done into a selected directory
-    KUrl::List selectedUrls = m_activeView->selectedUrls();
+    KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
     if (selectedUrls.count() == 1) {
         const KFileItem fileItem(S_IFDIR,
                                  KFileItem::Unknown,
     if (selectedUrls.count() == 1) {
         const KFileItem fileItem(S_IFDIR,
                                  KFileItem::Unknown,
@@ -618,7 +631,7 @@ void DolphinMainWindow::updatePasteAction()
     }
 
     if (pasteAction->isEnabled()) {
     }
 
     if (pasteAction->isEnabled()) {
-        KUrl::List urls = m_activeView->selectedUrls();
+        KUrl::List urls = m_activeViewContainer->view()->selectedUrls();
         const uint count = urls.count();
         if (count > 1) {
             // pasting should not be allowed when more than one file
         const uint count = urls.count();
         if (count > 1) {
             // pasting should not be allowed when more than one file
@@ -628,7 +641,7 @@ void DolphinMainWindow::updatePasteAction()
             // Only one file is selected. Pasting is only allowed if this
             // file is a directory.
             // TODO: this doesn't work with remote protocols; instead we need a
             // Only one file is selected. Pasting is only allowed if this
             // file is a directory.
             // TODO: this doesn't work with remote protocols; instead we need a
-            // m_activeView->selectedFileItems() to get the real KFileItems
+            // m_activeViewContainer->selectedFileItems() to get the real KFileItems
             const KFileItem fileItem(S_IFDIR,
                                      KFileItem::Unknown,
                                      urls.first(),
             const KFileItem fileItem(S_IFDIR,
                                      KFileItem::Unknown,
                                      urls.first(),
@@ -641,145 +654,141 @@ void DolphinMainWindow::updatePasteAction()
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();
-    m_activeView->selectAll();
+    m_activeViewContainer->view()->selectAll();
 }
 
 void DolphinMainWindow::invertSelection()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::invertSelection()
 {
     clearStatusBar();
-    m_activeView->invertSelection();
+    m_activeViewContainer->view()->invertSelection();
 }
 void DolphinMainWindow::setIconsView()
 {
 }
 void DolphinMainWindow::setIconsView()
 {
-    m_activeView->setMode(DolphinView::IconsView);
+    m_activeViewContainer->view()->setMode(DolphinView::IconsView);
 }
 
 void DolphinMainWindow::setDetailsView()
 {
 }
 
 void DolphinMainWindow::setDetailsView()
 {
-    m_activeView->setMode(DolphinView::DetailsView);
+    m_activeViewContainer->view()->setMode(DolphinView::DetailsView);
 }
 
 void DolphinMainWindow::setColumnView()
 {
 }
 
 void DolphinMainWindow::setColumnView()
 {
-    m_activeView->setMode(DolphinView::ColumnView);
+    m_activeViewContainer->view()->setMode(DolphinView::ColumnView);
 }
 
 void DolphinMainWindow::sortByName()
 {
 }
 
 void DolphinMainWindow::sortByName()
 {
-    m_activeView->setSorting(DolphinView::SortByName);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByName);
 }
 
 void DolphinMainWindow::sortBySize()
 {
 }
 
 void DolphinMainWindow::sortBySize()
 {
-    m_activeView->setSorting(DolphinView::SortBySize);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortBySize);
 }
 
 void DolphinMainWindow::sortByDate()
 {
 }
 
 void DolphinMainWindow::sortByDate()
 {
-    m_activeView->setSorting(DolphinView::SortByDate);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByDate);
 }
 
 void DolphinMainWindow::sortByPermissions()
 {
 }
 
 void DolphinMainWindow::sortByPermissions()
 {
-    m_activeView->setSorting(DolphinView::SortByPermissions);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByPermissions);
 }
 
 void DolphinMainWindow::sortByOwner()
 {
 }
 
 void DolphinMainWindow::sortByOwner()
 {
-    m_activeView->setSorting(DolphinView::SortByOwner);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByOwner);
 }
 
 void DolphinMainWindow::sortByGroup()
 {
 }
 
 void DolphinMainWindow::sortByGroup()
 {
-    m_activeView->setSorting(DolphinView::SortByGroup);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByGroup);
 }
 
 void DolphinMainWindow::sortByType()
 {
 }
 
 void DolphinMainWindow::sortByType()
 {
-    m_activeView->setSorting(DolphinView::SortByType);
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByType);
 }
 
 void DolphinMainWindow::toggleSortOrder()
 {
 }
 
 void DolphinMainWindow::toggleSortOrder()
 {
-    const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::AscendingOrder) ?
+    DolphinView* view = m_activeViewContainer->view();
+    const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
                                 Qt::DescendingOrder :
                                 Qt::AscendingOrder;
                                 Qt::DescendingOrder :
                                 Qt::AscendingOrder;
-    m_activeView->setSortOrder(order);
+    view->setSortOrder(order);
 }
 
 void DolphinMainWindow::toggleSortCategorization()
 {
 }
 
 void DolphinMainWindow::toggleSortCategorization()
 {
-    const bool categorizedSorting = m_activeView->categorizedSorting();
-    m_activeView->setCategorizedSorting(!categorizedSorting);
+    DolphinView* view = m_activeViewContainer->view();
+    const bool categorizedSorting = view->categorizedSorting();
+    view->setCategorizedSorting(!categorizedSorting);
 }
 
 void DolphinMainWindow::clearInfo()
 {
 }
 
 void DolphinMainWindow::clearInfo()
 {
-    m_activeView->setAdditionalInfo(KFileItemDelegate::NoInformation);
+    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::NoInformation);
 }
 
 void DolphinMainWindow::showMimeInfo()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::showMimeInfo()
 {
     clearStatusBar();
-    m_activeView->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);
+    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);
 }
 
 void DolphinMainWindow::showSizeInfo()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::showSizeInfo()
 {
     clearStatusBar();
-    m_activeView->setAdditionalInfo(KFileItemDelegate::Size);
+    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::Size);
 }
 
 void DolphinMainWindow::showDateInfo()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::showDateInfo()
 {
     clearStatusBar();
-    m_activeView->setAdditionalInfo(KFileItemDelegate::ModificationTime);
+    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::ModificationTime);
 }
 
 void DolphinMainWindow::toggleSplitView()
 {
 }
 
 void DolphinMainWindow::toggleSplitView()
 {
-    if (m_view[SecondaryIdx] == 0) {
-        const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
+    if (m_viewContainer[SecondaryView] == 0) {
+        const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;
         // create a secondary view
         // create a secondary view
-        m_view[SecondaryIdx] = new DolphinView(this,
-                                               0,
-                                               m_view[PrimaryIdx]->rootUrl(),
-                                               m_view[PrimaryIdx]->mode(),
-                                               m_view[PrimaryIdx]->showHiddenFiles());
-        connectViewSignals(SecondaryIdx);
-        m_splitter->addWidget(m_view[SecondaryIdx]);
+        const DolphinView* view = m_viewContainer[PrimaryView]->view();
+        m_viewContainer[SecondaryView] = new DolphinViewContainer(this,
+                                                                 0,
+                                                                 view->rootUrl(),
+                                                                 view->mode(),
+                                                                 view->showHiddenFiles());
+        connectViewSignals(SecondaryView);
+        m_splitter->addWidget(m_viewContainer[SecondaryView]);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
-        m_view[SecondaryIdx]->reload();
-        m_view[SecondaryIdx]->show();
+        m_viewContainer[SecondaryView]->view()->reload();
+        m_viewContainer[SecondaryView]->setActive(false);
+        m_viewContainer[SecondaryView]->show();
     } else {
         // remove secondary view
     } else {
         // remove secondary view
-        if (m_activeView == m_view[PrimaryIdx]) {
-            m_view[SecondaryIdx]->close();
-            m_view[SecondaryIdx]->deleteLater();
-            m_view[SecondaryIdx] = 0;
-        } else {
-            // The secondary view is active, hence from the 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_view[PrimaryIdx]->close();
-            delete m_view[PrimaryIdx];
-            m_view[PrimaryIdx] = m_view[SecondaryIdx];
-            m_view[SecondaryIdx] = 0;
-        }
+        m_viewContainer[SecondaryView]->close();
+        m_viewContainer[SecondaryView]->deleteLater();
+        m_viewContainer[SecondaryView] = 0;
     }
     }
-    setActiveView(m_view[PrimaryIdx]);
+
+    setActiveViewContainer(m_viewContainer[PrimaryView]);
+    updateViewActions();
     emit activeViewChanged();
 }
 
 void DolphinMainWindow::reloadView()
 {
     clearStatusBar();
     emit activeViewChanged();
 }
 
 void DolphinMainWindow::reloadView()
 {
     clearStatusBar();
-    m_activeView->reload();
+    m_activeViewContainer->view()->reload();
 }
 
 void DolphinMainWindow::stopLoading()
 }
 
 void DolphinMainWindow::stopLoading()
-{}
+{
+}
 
 void DolphinMainWindow::togglePreview()
 {
 
 void DolphinMainWindow::togglePreview()
 {
@@ -788,7 +797,7 @@ void DolphinMainWindow::togglePreview()
     const KToggleAction* showPreviewAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
     const bool show = showPreviewAction->isChecked();
     const KToggleAction* showPreviewAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
     const bool show = showPreviewAction->isChecked();
-    m_activeView->setShowPreview(show);
+    m_activeViewContainer->view()->setShowPreview(show);
 }
 
 void DolphinMainWindow::toggleShowHiddenFiles()
 }
 
 void DolphinMainWindow::toggleShowHiddenFiles()
@@ -798,7 +807,7 @@ void DolphinMainWindow::toggleShowHiddenFiles()
     const KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     const bool show = showHiddenFilesAction->isChecked();
     const KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     const bool show = showHiddenFilesAction->isChecked();
-    m_activeView->setShowHiddenFiles(show);
+    m_activeViewContainer->view()->setShowHiddenFiles(show);
 }
 
 void DolphinMainWindow::toggleFilterBarVisibility()
 }
 
 void DolphinMainWindow::toggleFilterBarVisibility()
@@ -806,18 +815,18 @@ void DolphinMainWindow::toggleFilterBarVisibility()
     const KToggleAction* showFilterBarAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
     const bool show = showFilterBarAction->isChecked();
     const KToggleAction* showFilterBarAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
     const bool show = showFilterBarAction->isChecked();
-    m_activeView->showFilterBar(show);
+    m_activeViewContainer->showFilterBar(show);
 }
 
 void DolphinMainWindow::zoomIn()
 {
 }
 
 void DolphinMainWindow::zoomIn()
 {
-    m_activeView->zoomIn();
+    m_activeViewContainer->view()->zoomIn();
     updateViewActions();
 }
 
 void DolphinMainWindow::zoomOut()
 {
     updateViewActions();
 }
 
 void DolphinMainWindow::zoomOut()
 {
-    m_activeView->zoomOut();
+    m_activeViewContainer->view()->zoomOut();
     updateViewActions();
 }
 
     updateViewActions();
 }
 
@@ -828,48 +837,49 @@ void DolphinMainWindow::toggleEditLocation()
     KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
 
     bool editOrBrowse = action->isChecked();
     KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
 
     bool editOrBrowse = action->isChecked();
-    m_activeView->setUrlEditable(editOrBrowse);
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    urlNavigator->setUrlEditable(editOrBrowse);
 }
 
 void DolphinMainWindow::editLocation()
 {
 }
 
 void DolphinMainWindow::editLocation()
 {
-    m_activeView->setUrlEditable(true);
+    m_activeViewContainer->urlNavigator()->setUrlEditable(true);
 }
 
 void DolphinMainWindow::adjustViewProperties()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::adjustViewProperties()
 {
     clearStatusBar();
-    ViewPropertiesDialog dlg(m_activeView);
+    ViewPropertiesDialog dlg(m_activeViewContainer->view());
     dlg.exec();
 }
 
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
     dlg.exec();
 }
 
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
-    m_activeView->goBack();
+    m_activeViewContainer->urlNavigator()->goBack();
 }
 
 void DolphinMainWindow::goForward()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::goForward()
 {
     clearStatusBar();
-    m_activeView->goForward();
+    m_activeViewContainer->urlNavigator()->goForward();
 }
 
 void DolphinMainWindow::goUp()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::goUp()
 {
     clearStatusBar();
-    m_activeView->goUp();
+    m_activeViewContainer->urlNavigator()->goUp();
 }
 
 void DolphinMainWindow::goHome()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::goHome()
 {
     clearStatusBar();
-    m_activeView->goHome();
+    m_activeViewContainer->urlNavigator()->goHome();
 }
 
 void DolphinMainWindow::findFile()
 {
 }
 
 void DolphinMainWindow::findFile()
 {
-    KRun::run("kfind", m_activeView->url(), this);
+    KRun::run("kfind", m_activeViewContainer->url(), this);
 }
 
 void DolphinMainWindow::compareFiles()
 }
 
 void DolphinMainWindow::compareFiles()
@@ -880,16 +890,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_view[PrimaryIdx] != 0);
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
 
     KUrl urlA;
     KUrl urlB;
 
     KUrl urlA;
     KUrl urlB;
-    KUrl::List urls = m_view[PrimaryIdx]->selectedUrls();
+    KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls();
 
     switch (urls.count()) {
     case 0: {
 
     switch (urls.count()) {
     case 0: {
-        Q_ASSERT(m_view[SecondaryIdx] != 0);
-        urls = m_view[SecondaryIdx]->selectedUrls();
+        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+        urls = m_viewContainer[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];
@@ -898,8 +908,8 @@ void DolphinMainWindow::compareFiles()
 
     case 1: {
         urlA = urls[0];
 
     case 1: {
         urlA = urls[0];
-        Q_ASSERT(m_view[SecondaryIdx] != 0);
-        urls = m_view[SecondaryIdx]->selectedUrls();
+        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
         Q_ASSERT(urls.count() == 1);
         urlB = urls[0];
         break;
         Q_ASSERT(urls.count() == 1);
         urlB = urls[0];
         break;
@@ -954,16 +964,16 @@ void DolphinMainWindow::init()
     const KUrl& homeUrl = settings.generalSettings()->homeUrl();
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
     const KUrl& homeUrl = settings.generalSettings()->homeUrl();
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
-    m_view[PrimaryIdx] = new DolphinView(this,
-                                         m_splitter,
-                                         homeUrl,
-                                         props.viewMode(),
-                                         props.showHiddenFiles());
+    m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
+                                                           m_splitter,
+                                                           homeUrl,
+                                                           props.viewMode(),
+                                                           props.showHiddenFiles());
 
 
-    m_activeView = m_view[PrimaryIdx];
-    connectViewSignals(PrimaryIdx);
-    m_view[PrimaryIdx]->reload();
-    m_view[PrimaryIdx]->show();
+    m_activeViewContainer = m_viewContainer[PrimaryView];
+    connectViewSignals(PrimaryView);
+    m_viewContainer[PrimaryView]->view()->reload();
+    m_viewContainer[PrimaryView]->show();
 
     setCentralWidget(m_splitter);
     setupDockWidgets();
 
     setCentralWidget(m_splitter);
     setupDockWidgets();
@@ -984,11 +994,11 @@ void DolphinMainWindow::init()
 
     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(640, 480);
+        resize(700, 500);
     }
     }
-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK
     if (!MetaDataWidget::metaDataAvailable())
     if (!MetaDataWidget::metaDataAvailable())
-        activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
+        activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
 #endif
 
     emit urlChanged(homeUrl);
 #endif
 
     emit urlChanged(homeUrl);
@@ -997,14 +1007,31 @@ void DolphinMainWindow::init()
 void DolphinMainWindow::loadSettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 void DolphinMainWindow::loadSettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    updateSplitAction(settings->splitView());
+    updateViewActions();
+}
 
 
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    if (settings->splitView()) {
-        splitAction->setChecked(true);
-        toggleSplitView();
+void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
+{
+    Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
+    if (m_activeViewContainer == view) {
+        return;
     }
 
     }
 
+    m_activeViewContainer->setActive(false);
+    m_activeViewContainer = view;
+    m_activeViewContainer->setActive(true);
+
+    updateHistory();
+    updateEditActions();
     updateViewActions();
     updateViewActions();
+    updateGoActions();
+
+    const KUrl& url = m_activeViewContainer->url();
+    setCaption(url.fileName());
+
+    emit activeViewChanged();
+    emit urlChanged(url);
 }
 
 void DolphinMainWindow::setupActions()
 }
 
 void DolphinMainWindow::setupActions()
@@ -1078,13 +1105,13 @@ void DolphinMainWindow::setupActions()
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
     iconsView->setText(i18n("Icons"));
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
     iconsView->setText(i18n("Icons"));
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
-    iconsView->setIcon(KIcon("view-icon"));
+    iconsView->setIcon(KIcon("fileview-icon"));
     connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));
 
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
     detailsView->setText(i18n("Details"));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
     connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));
 
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
     detailsView->setText(i18n("Details"));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
-    detailsView->setIcon(KIcon("fileview-text"));
+    detailsView->setIcon(KIcon("fileview-detailed"));
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 
     KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 
     KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
@@ -1167,7 +1194,7 @@ void DolphinMainWindow::setupActions()
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18n("Preview"));
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18n("Preview"));
-    showPreview->setIcon(KIcon("thumbnail-show"));
+    showPreview->setIcon(KIcon("fileview-preview"));
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
@@ -1175,10 +1202,9 @@ void DolphinMainWindow::setupActions()
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
-    KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
-    split->setText(i18n("Split"));
+    QAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F10);
     split->setShortcut(Qt::Key_F10);
-    split->setIcon(KIcon("view-left-right"));
+    updateSplitAction(false);
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");
@@ -1317,7 +1343,7 @@ void DolphinMainWindow::setupDockWidgets()
 
 void DolphinMainWindow::updateHistory()
 {
 
 void DolphinMainWindow::updateHistory()
 {
-    const KUrlNavigator* urlNavigator = m_activeView->urlNavigator();
+    const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     const int index = urlNavigator->historyIndex();
 
     QAction* backAction = actionCollection()->action("go_back");
     const int index = urlNavigator->historyIndex();
 
     QAction* backAction = actionCollection()->action("go_back");
@@ -1333,7 +1359,7 @@ void DolphinMainWindow::updateHistory()
 
 void DolphinMainWindow::updateEditActions()
 {
 
 void DolphinMainWindow::updateEditActions()
 {
-    const KFileItemList list = m_activeView->selectedItems();
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     if (list.isEmpty()) {
         stateChanged("has_no_selection");
     } else {
     if (list.isEmpty()) {
         stateChanged("has_no_selection");
     } else {
@@ -1366,18 +1392,19 @@ void DolphinMainWindow::updateEditActions()
 
 void DolphinMainWindow::updateViewActions()
 {
 
 void DolphinMainWindow::updateViewActions()
 {
+    const DolphinView* view = m_activeViewContainer->view();
     QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn));
     if (zoomInAction != 0) {
     QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn));
     if (zoomInAction != 0) {
-        zoomInAction->setEnabled(m_activeView->isZoomInPossible());
+        zoomInAction->setEnabled(view->isZoomInPossible());
     }
 
     QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut));
     if (zoomOutAction != 0) {
     }
 
     QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut));
     if (zoomOutAction != 0) {
-        zoomOutAction->setEnabled(m_activeView->isZoomOutPossible());
+        zoomOutAction->setEnabled(view->isZoomOutPossible());
     }
 
     QAction* action = 0;
     }
 
     QAction* action = 0;
-    switch (m_activeView->mode()) {
+    switch (view->mode()) {
     case DolphinView::IconsView:
         action = actionCollection()->action("icons");
         break;
     case DolphinView::IconsView:
         action = actionCollection()->action("icons");
         break;
@@ -1396,35 +1423,35 @@ void DolphinMainWindow::updateViewActions()
         toggleAction->setChecked(true);
     }
 
         toggleAction->setChecked(true);
     }
 
-    slotSortingChanged(m_activeView->sorting());
-    slotSortOrderChanged(m_activeView->sortOrder());
+    slotSortingChanged(view->sorting());
+    slotSortOrderChanged(view->sortOrder());
     slotCategorizedSortingChanged();
     slotCategorizedSortingChanged();
-    slotAdditionalInfoChanged(m_activeView->additionalInfo());
+    slotAdditionalInfoChanged(view->additionalInfo());
 
     KToggleAction* showFilterBarAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
 
     KToggleAction* showFilterBarAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
-    showFilterBarAction->setChecked(m_activeView->isFilterBarVisible());
+    showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
 
     KToggleAction* showPreviewAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
 
     KToggleAction* showPreviewAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
-    showPreviewAction->setChecked(m_activeView->showPreview());
+    showPreviewAction->setChecked(view->showPreview());
 
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
 
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+    showHiddenFilesAction->setChecked(view->showHiddenFiles());
 
 
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    splitAction->setChecked(m_view[SecondaryIdx] != 0);
+    updateSplitAction(m_viewContainer[SecondaryView] != 0);
 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
-    editableLocactionAction->setChecked(m_activeView->isUrlEditable());
+    const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
 }
 
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up));
 }
 
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up));
-    const KUrl& currentUrl = m_activeView->url();
+    const KUrl& currentUrl = m_activeViewContainer->url();
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
@@ -1448,12 +1475,16 @@ void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest)
 
 void DolphinMainWindow::clearStatusBar()
 {
 
 void DolphinMainWindow::clearStatusBar()
 {
-    m_activeView->statusBar()->clear();
+    m_activeViewContainer->statusBar()->clear();
 }
 
 void DolphinMainWindow::connectViewSignals(int viewIndex)
 {
 }
 
 void DolphinMainWindow::connectViewSignals(int viewIndex)
 {
-    DolphinView* view = m_view[viewIndex];
+    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(showPreviewChanged()),
     connect(view, SIGNAL(modeChanged()),
             this, SLOT(slotViewModeChanged()));
     connect(view, SIGNAL(showPreviewChanged()),
@@ -1472,18 +1503,28 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KUrl)),
             this, SLOT(slotRequestItemInfo(KUrl)));
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KUrl)),
             this, SLOT(slotRequestItemInfo(KUrl)));
-    connect(view, SIGNAL(showFilterBarChanged(bool)),
-            this, SLOT(updateFilterBarAction(bool)));
-    connect(view, SIGNAL(urlChanged(KUrl)),
-            this, SLOT(changeUrl(KUrl)));
+    connect(view, SIGNAL(activated()),
+            this, SLOT(toggleActiveView()));
 
 
-    const KUrlNavigator* navigator = view->urlNavigator();
+    const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(changeUrl(const KUrl&)));
     connect(navigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
 }
 
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(changeUrl(const KUrl&)));
     connect(navigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
 }
 
+void DolphinMainWindow::updateSplitAction(bool isSplit)
+{
+    QAction* splitAction = actionCollection()->action("split_view");
+    if (isSplit) {
+        splitAction->setText(i18n("Join"));
+        splitAction->setIcon(KIcon("fileview-join"));
+    } else {
+        splitAction->setText(i18n("Split"));
+        splitAction->setIcon(KIcon("fileview-split"));
+    }
+}
+
 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
     KonqUndoManager::UiInterface(mainWin),
     m_mainWin(mainWin)
 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
     KonqUndoManager::UiInterface(mainWin),
     m_mainWin(mainWin)
@@ -1497,7 +1538,7 @@ DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
 
 void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
 {
 
 void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
 {
-    DolphinStatusBar* statusBar = m_mainWin->activeView()->statusBar();
+    DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
     statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
 }
 
     statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
 }