fixed issue that turning off the preview during the preview job still was active...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 66794e3a4ab87aa95b9a5002a1a926284008964a..13406a6b5224d5b7f08d9a4eb2eca3a82882ff59 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"


@@ -40,6 +41,7 @@
 #include "kfileplacesview.h"
 
 #include "dolphin_generalsettings.h"
 #include "kfileplacesview.h"
 
 #include "dolphin_generalsettings.h"

+#include "dolphin_iconsmodesettings.h"

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


@@ -51,11 +53,10 @@
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>

-#include <kio/deletejob.h>
-#include <kio/renamedialog.h>

 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>

+#include <kmenubar.h>

 #include <kmessagebox.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kmessagebox.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>


@@ -77,56 +78,81 @@
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),

+    m_showMenuBar(0),

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

-    KonqUndoManager::incRef();
+    KonqFileUndoManager::incRef();

 
 

-    KonqUndoManager* undoManager = KonqUndoManager::self();
+    KonqFileUndoManager* undoManager = KonqFileUndoManager::self();

     undoManager->setUiInterface(new UndoUiInterface(this));
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));
     connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
             this, SLOT(slotUndoTextChanged(const QString&)));
     undoManager->setUiInterface(new UndoUiInterface(this));
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));
     connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
             this, SLOT(slotUndoTextChanged(const QString&)));

+    connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
+            this, SLOT(slotHandlePlacesError(const QString&)));

 }
 
 DolphinMainWindow::~DolphinMainWindow()
 {
 }
 
 DolphinMainWindow::~DolphinMainWindow()
 {

-    KonqUndoManager::decRef();
+    KonqFileUndoManager::decRef();

     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;
+}

 
 

-    setCaption(m_activeView->url().fileName());
+void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType)
+{
+    clearStatusBar();
+    m_undoCommandTypes.append(commandType);
+}

 
 

-    emit activeViewChanged();
+void DolphinMainWindow::refreshViews()
+{
+    Q_ASSERT(m_viewContainer[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();
+    }
+
+    setActiveViewContainer(activeViewContainer);

 }
 
 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();
     Qt::DropAction action = Qt::CopyAction;
 
     Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();


@@ -152,21 +178,24 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'
 
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'

-        QAction* moveAction = popup.addAction(KIcon("goto-page"),
-                                              i18n("&Move Here") + '\t' + seq);
+        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"),
 
         seq = QKeySequence(Qt::ControlModifier).toString();
         seq.chop(1);
         QAction* copyAction = popup.addAction(KIcon("edit-copy"),

-                                              i18n("&Copy Here") + '\t' + seq);
+                                              i18nc("@action:inmenu",
+                                                    "&Copy Here\t<shortcut>%1</shortcut>", seq));

 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);
 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);

-        QAction* linkAction = popup.addAction(KIcon("www"),
-                                              i18n("&Link Here") + '\t' + seq);
+        QAction* linkAction = popup.addAction(KIcon("insert-link"),
+                                              i18nc("@action:inmenu",
+                                                    "&Link Here\t<shortcut>%1</shortcut>", seq));

 
         popup.addSeparator();
 
         popup.addSeparator();

-        popup.addAction(KIcon("process-stop"), i18n("Cancel"));
+        popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel"));

 
         QAction* activatedAction = popup.exec(QCursor::pos());
         if (activatedAction == moveAction) {
 
         QAction* activatedAction = popup.exec(QCursor::pos());
         if (activatedAction == moveAction) {


@@ -182,15 +211,18 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
     switch (action) {
     case Qt::MoveAction:
 
     switch (action) {
     case Qt::MoveAction:

-        moveUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::MOVE);

         break;
 
     case Qt::CopyAction:
         break;
 
     case Qt::CopyAction:

-        copyUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::COPY);

         break;
 
     case Qt::LinkAction:
         break;
 
     case Qt::LinkAction:

-        linkUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::LINK);

         break;
 
     default:
         break;
 
     default:


@@ -198,34 +230,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 +245,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 +264,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()
 {
 }
 
 void DolphinMainWindow::slotCategorizedSortingChanged()
 {

-    KToggleAction* categorizedSortingAction =
-        static_cast<KToggleAction*>(actionCollection()->action("categorized"));
-    categorizedSortingAction->setChecked(m_activeView->categorizedSorting());
-    categorizedSortingAction->setEnabled(m_activeView->supportsCategorizedSorting());
+    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)
 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)


@@ -271,25 +282,34 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
     QAction* action = 0;
     switch (sorting) {
     case DolphinView::SortByName:
     QAction* action = 0;
     switch (sorting) {
     case DolphinView::SortByName:

-        action = actionCollection()->action("by_name");
+        action = actionCollection()->action("sort_by_name");

         break;
     case DolphinView::SortBySize:
         break;
     case DolphinView::SortBySize:

-        action = actionCollection()->action("by_size");
+        action = actionCollection()->action("sort_by_size");

         break;
     case DolphinView::SortByDate:
         break;
     case DolphinView::SortByDate:

-        action = actionCollection()->action("by_date");
+        action = actionCollection()->action("sort_by_date");

         break;
     case DolphinView::SortByPermissions:
         break;
     case DolphinView::SortByPermissions:

-        action = actionCollection()->action("by_permissions");
+        action = actionCollection()->action("sort_by_permissions");

         break;
     case DolphinView::SortByOwner:
         break;
     case DolphinView::SortByOwner:

-        action = actionCollection()->action("by_owner");
+        action = actionCollection()->action("sort_by_owner");

         break;
     case DolphinView::SortByGroup:
         break;
     case DolphinView::SortByGroup:

-        action = actionCollection()->action("by_group");
+        action = actionCollection()->action("sort_by_group");

         break;
     case DolphinView::SortByType:
         break;
     case DolphinView::SortByType:

-        action = actionCollection()->action("by_type");
+        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;
     }
     default:
         break;
     }


@@ -307,32 +327,58 @@ void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
     descending->setChecked(sortDescending);
 }
 
     descending->setChecked(sortDescending);
 }
 

-void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info)
+void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list)

 {
 {

-    QAction* action = 0;
-    switch (info) {
-    case KFileItemDelegate::FriendlyMimeType:
-        action = actionCollection()->action("show_mime_info");
-        break;
-    case KFileItemDelegate::Size:
-        action = actionCollection()->action("show_size_info");
-        break;
-    case KFileItemDelegate::ModificationTime:
-        action = actionCollection()->action("show_date_info");
-        break;
-    case KFileItemDelegate::NoInformation:
-    default:
-        action = actionCollection()->action("clear_info");
-        break;
-    }
+    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");

 
 

-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
+    showSizeInfo->setChecked(false);
+    showDateInfo->setChecked(false);
+    showPermissionsInfo->setChecked(false);
+    showOwnerInfo->setChecked(false);
+    showGroupInfo->setChecked(false);
+    showMimeInfo->setChecked(false);
+
+    const DolphinView* view = m_activeViewContainer->view();

 
 

-        QActionGroup* group = toggleAction->actionGroup();
-        Q_ASSERT(group != 0);
-        group->setEnabled(m_activeView->mode() == DolphinView::IconsView);
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const bool enable = (view->mode() == DolphinView::DetailsView) ||
+                         ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
+
+    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;
+        }

     }
 }
 
     }
 }
 


@@ -340,23 +386,23 @@ 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);
 }
 

-void DolphinMainWindow::slotRequestItemInfo(const KUrl& url)
+void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)

 {
 {

-    emit requestItemInfo(url);
+    emit requestItemInfo(item);

 }
 
 void DolphinMainWindow::slotHistoryChanged()
 }
 
 void DolphinMainWindow::slotHistoryChanged()


@@ -376,6 +422,21 @@ void DolphinMainWindow::openNewMainWindow()
     DolphinApplication::app()->createMainWindow()->show();
 }
 
     DolphinApplication::app()->createMainWindow()->show();
 }
 

+void DolphinMainWindow::toggleActiveView()
+{
+    if (m_viewContainer[SecondaryView] == 0) {
+        // only one view is available
+        return;
+    }
+
+    Q_ASSERT(m_activeViewContainer != 0);
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+
+    DolphinViewContainer* left  = m_viewContainer[PrimaryView];
+    DolphinViewContainer* right = m_viewContainer[SecondaryView];
+    setActiveViewContainer(m_activeViewContainer == right ? left : right);
+}
+

 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();


@@ -387,31 +448,44 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
     KXmlGuiWindow::closeEvent(event);
 }
 
     KXmlGuiWindow::closeEvent(event);
 }
 

-void DolphinMainWindow::saveProperties(KConfig* config)
+void DolphinMainWindow::saveProperties(KConfigGroup& group)

 {
 {

-    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) {
-        KConfigGroup secondaryView = config->group("Secondary view");
-        secondaryView.writeEntry("Url", m_view[SecondaryIdx]->url().url());
-        secondaryView.writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
+    group.writeEntry("Primary Url", cont->url().url());
+    group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+
+    cont = m_viewContainer[SecondaryView];
+    if (cont != 0) {
+        group.writeEntry("Secondary Url", cont->url().url());
+        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());

     }
 }
 
     }
 }
 

-void DolphinMainWindow::readProperties(KConfig* config)
+void DolphinMainWindow::readProperties(const KConfigGroup& group)

 {
 {

-    const KConfigGroup primaryView = config->group("Primary view");
-    m_view[PrimaryIdx]->setUrl(primaryView.readEntry("Url"));
-    m_view[PrimaryIdx]->setUrlEditable(primaryView.readEntry("Editable Url", false));
-    if (config->hasGroup("Secondary view")) {
-        const KConfigGroup secondaryView = config->group("Secondary view");
-        if (m_view[SecondaryIdx] == 0) {
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
+
+    cont->setUrl(group.readEntry("Primary Url"));
+    bool editable = group.readEntry("Primary Editable Url", false);
+    cont->urlNavigator()->setUrlEditable(editable);
+
+    cont = m_viewContainer[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();
             toggleSplitView();

+            cont = m_viewContainer[SecondaryView];
+            Q_ASSERT(cont != 0);

         }
         }

-        m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url"));
-        m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false));
-    } else if (m_view[SecondaryIdx] != 0) {
+
+        cont->setUrl(secondaryUrl);
+        bool editable = group.readEntry("Secondary Editable Url", false);
+        cont->urlNavigator()->setUrlEditable(editable);
+    } else if (cont != 0) {
+        // no secondary view should be shown, but the default setting shows
+        // one already -> close the view

         toggleSplitView();
     }
 }
         toggleSplitView();
     }
 }


@@ -419,47 +493,43 @@ 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->view()->renameSelectedItems();

 }
 
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();

-    const KUrl::List selectedUrls = m_activeView->selectedUrls();
-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
-    m_undoCommandTypes.append(KonqUndoManager::TRASH);
+
+    DolphinView* view = m_activeViewContainer->view();
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+        view->deleteSelectedItems();
+    } else {
+        view->trashSelectedItems();
+    }

 }
 
 void DolphinMainWindow::deleteItems()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::deleteItems()
 {
     clearStatusBar();

-
-    const KUrl::List list = m_activeView->selectedUrls();
-    const bool del = KonqOperations::askDeleteConfirmation(list,
-                     KonqOperations::DEL,
-                     KonqOperations::DEFAULT_CONFIRMATION,
-                     this);
-
-    if (del) {
-        KIO::Job* job = KIO::del(list);
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotHandleJobError(KJob*)));
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotDeleteFileFinished(KJob*)));
-    }
+    m_activeViewContainer->view()->deleteSelectedItems();

 }
 
 void DolphinMainWindow::properties()
 {
 }
 
 void DolphinMainWindow::properties()
 {

-    const KFileItemList list = m_activeView->selectedItems();
-    KPropertiesDialog dialog(list, this);
-    dialog.exec();
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+
+    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+    dialog->raise();
+    dialog->activateWindow();

 }
 
 void DolphinMainWindow::quit()
 }
 
 void DolphinMainWindow::quit()


@@ -467,21 +537,11 @@ void DolphinMainWindow::quit()
     close();
 }
 
     close();
 }
 

-void DolphinMainWindow::slotHandleJobError(KJob* job)
-{
-    if (job->error() != 0) {
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
-        statusBar->setMessage(job->errorString(),
-                              DolphinStatusBar::Error);
-    }
-}
-
-void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
+void DolphinMainWindow::slotHandlePlacesError(const QString &message)

 {
 {

-    if (job->error() == 0) {
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
-        statusBar->setMessage(i18n("Delete operation completed."),
-                              DolphinStatusBar::OperationCompleted);
+    if (!message.isEmpty()) {
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
+        statusBar->setMessage(message, DolphinStatusBar::Error);

     }
 }
 
     }
 }
 


@@ -493,32 +553,32 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
     }
 
     if (available && (m_undoCommandTypes.count() > 0)) {
     }
 
     if (available && (m_undoCommandTypes.count() > 0)) {

-        const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
+        const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();

         switch (command) {
         switch (command) {

-        case KonqUndoManager::COPY:
-            statusBar->setMessage(i18n("Copy operation completed."),
+        case KonqFileUndoManager::COPY:
+            statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::MOVE:
-            statusBar->setMessage(i18n("Move operation completed."),
+        case KonqFileUndoManager::MOVE:
+            statusBar->setMessage(i18nc("@info:status", "Move operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::LINK:
-            statusBar->setMessage(i18n("Link operation completed."),
+        case KonqFileUndoManager::LINK:
+            statusBar->setMessage(i18nc("@info:status", "Link operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::TRASH:
-            statusBar->setMessage(i18n("Move to trash operation completed."),
+        case KonqFileUndoManager::TRASH:
+            statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::RENAME:
-            statusBar->setMessage(i18n("Renaming operation completed."),
+        case KonqFileUndoManager::RENAME:
+            statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
 
                                   DolphinStatusBar::OperationCompleted);
             break;
 

-        case KonqUndoManager::MKDIR:
-            statusBar->setMessage(i18n("Created folder."),
+        case KonqFileUndoManager::MKDIR:
+            statusBar->setMessage(i18nc("@info:status", "Created folder."),

                                   DolphinStatusBar::OperationCompleted);
             break;
 
                                   DolphinStatusBar::OperationCompleted);
             break;
 


@@ -540,60 +600,22 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 void DolphinMainWindow::undo()
 {
     clearStatusBar();
 void DolphinMainWindow::undo()
 {
     clearStatusBar();

-    KonqUndoManager::self()->undo();
+    KonqFileUndoManager::self()->undo();

 }
 
 void DolphinMainWindow::cut()
 {
 }
 
 void DolphinMainWindow::cut()
 {

-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = m_activeView->selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
-    QApplication::clipboard()->setMimeData(mimeData);
+    m_activeViewContainer->view()->cutSelectedItems();

 }
 
 void DolphinMainWindow::copy()
 {
 }
 
 void DolphinMainWindow::copy()
 {

-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = m_activeView->selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
-
-    QApplication::clipboard()->setMimeData(mimeData);
+    m_activeViewContainer->view()->copySelectedItems();

 }
 
 void DolphinMainWindow::paste()
 {
 }
 
 void DolphinMainWindow::paste()
 {

-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    clearStatusBar();
-
-    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());
-
-    // check whether the pasting should be done into a selected directory
-    KUrl::List selectedUrls = m_activeView->selectedUrls();
-    if (selectedUrls.count() == 1) {
-        const KFileItem fileItem(S_IFDIR,
-                                 KFileItem::Unknown,
-                                 selectedUrls.first(),
-                                 true);
-        if (fileItem.isDir()) {
-            // only one item is selected which is a directory, hence paste
-            // into this directory
-            destUrl = selectedUrls.first();
-        }
-    }
-
-    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
-        moveUrls(sourceUrls, destUrl);
-        clipboard->clear();
-    } else {
-        copyUrls(sourceUrls, destUrl);
-    }
+    m_activeViewContainer->view()->paste();

 }
 
 void DolphinMainWindow::updatePasteAction()
 }
 
 void DolphinMainWindow::updatePasteAction()


@@ -603,172 +625,168 @@ void DolphinMainWindow::updatePasteAction()
         return;
     }
 
         return;
     }
 

-    QString text(i18n("Paste"));
-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    if (!urls.isEmpty()) {
-        pasteAction->setEnabled(true);
-
-        pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count()));
-    } else {
-        pasteAction->setEnabled(false);
-        pasteAction->setText(i18n("Paste"));
-    }
-
-    if (pasteAction->isEnabled()) {
-        KUrl::List urls = m_activeView->selectedUrls();
-        const uint count = urls.count();
-        if (count > 1) {
-            // pasting should not be allowed when more than one file
-            // is selected
-            pasteAction->setEnabled(false);
-        } else if (count == 1) {
-            // 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
-            const KFileItem fileItem(S_IFDIR,
-                                     KFileItem::Unknown,
-                                     urls.first(),
-                                     true);
-            pasteAction->setEnabled(fileItem.isDir());
-        }
-    }
+    QPair<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
+    pasteAction->setEnabled(pasteInfo.first);
+    pasteAction->setText(pasteInfo.second);

 }
 
 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();
-}
-void DolphinMainWindow::setIconsView()
-{
-    m_activeView->setMode(DolphinView::IconsView);
+    m_activeViewContainer->view()->invertSelection();

 }
 
 }
 

-void DolphinMainWindow::setDetailsView()
+void DolphinMainWindow::setViewMode(QAction* action)

 {
 {

-    m_activeView->setMode(DolphinView::DetailsView);
-}
-
-void DolphinMainWindow::setColumnView()
-{
-    m_activeView->setMode(DolphinView::ColumnView);
+    const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
+    m_activeViewContainer->view()->setMode(mode);

 }
 
 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::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()
 {
 }
 
 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::toggleSizeInfo()

 {
 {

-    m_activeView->setAdditionalInfo(KFileItemDelegate::NoInformation);
+    toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size);

 }
 
 }
 

-void DolphinMainWindow::showMimeInfo()
+void DolphinMainWindow::toggleDateInfo()

 {
 {

-    clearStatusBar();
-    m_activeView->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);
+    toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime);

 }
 
 }
 

-void DolphinMainWindow::showSizeInfo()
+void DolphinMainWindow::togglePermissionsInfo()

 {
 {

-    clearStatusBar();
-    m_activeView->setAdditionalInfo(KFileItemDelegate::Size);
+    toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions);

 }
 
 }
 

-void DolphinMainWindow::showDateInfo()
+void DolphinMainWindow::toggleOwnerInfo()

 {
 {

-    clearStatusBar();
-    m_activeView->setAdditionalInfo(KFileItemDelegate::ModificationTime);
+    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_view[SecondaryIdx] == 0) {
-        const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
+    if (m_viewContainer[SecondaryView] == 0) {

         // 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 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_splitter->setSizes(QList<int>() << newWidth << newWidth);

-        m_view[SecondaryIdx]->reload();
-        m_view[SecondaryIdx]->show();
-    } else {
+        m_viewContainer[SecondaryView]->view()->reload();
+        m_viewContainer[SecondaryView]->setActive(false);
+        m_viewContainer[SecondaryView]->show();
+    } else if (m_activeViewContainer == m_viewContainer[PrimaryView]) {

         // remove secondary view
         // remove secondary view

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

     }
     }

-    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()
 {


@@ -777,7 +795,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()


@@ -787,7 +805,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()


@@ -795,18 +813,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();
 }
 


@@ -817,48 +835,51 @@ 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);
+    KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
+    navigator->setUrlEditable(true);
+    navigator->setFocus();

 }
 
 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()


@@ -869,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];


@@ -887,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;


@@ -916,6 +937,12 @@ void DolphinMainWindow::compareFiles()
 
 }
 
 
 }
 

+void DolphinMainWindow::toggleShowMenuBar()
+{
+    const bool visible = menuBar()->isVisible();
+    menuBar()->setVisible(!visible);
+}
+

 void DolphinMainWindow::editSettings()
 {
     DolphinSettingsDialog dialog(this);
 void DolphinMainWindow::editSettings()
 {
     DolphinSettingsDialog dialog(this);


@@ -943,16 +970,14 @@ 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);

 
 

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


@@ -969,34 +994,41 @@ void DolphinMainWindow::init()
     updatePasteAction();
     updateGoActions();
 
     updatePasteAction();
     updateGoActions();
 

-    loadSettings();
+    if (generalSettings->splitView()) {
+        toggleSplitView();
+    }
+    updateViewActions();

 
     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
-    if (!MetaDataWidget::metaDataAvailable())
-        activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
-#endif

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

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

 {
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    const bool isSplit = settings->splitView();
-    if (isSplit) {
-        splitAction->setChecked(true);
-        toggleSplitView();
+    Q_ASSERT(view != 0);
+    Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
+    if (m_activeViewContainer == view) {
+        return;

     }
     }

-    const KIcon splitIcon(isSplit ? "fileview-join" : "fileview-split");
-    splitAction->setIcon(splitIcon);

 
 

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


@@ -1004,36 +1036,28 @@ 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(i18n("Create New"));
+    menu->setTitle(i18nc("@title:menu", "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()));
 

-    QAction* newWindow = actionCollection()->addAction("new_window");
+    KAction* newWindow = actionCollection()->addAction("new_window");

     newWindow->setIcon(KIcon("window-new"));
     newWindow->setIcon(KIcon("window-new"));

-    newWindow->setText(i18n("New &Window"));
+    newWindow->setText(i18nc("@action:inmenu File", "New &Window"));

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

-    QAction* rename = actionCollection()->addAction("rename");
-    rename->setText(i18n("Rename..."));
-    rename->setShortcut(Qt::Key_F2);
+    KAction* rename = DolphinView::createRenameAction(actionCollection());

     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 

-    QAction* moveToTrash = actionCollection()->addAction("move_to_trash");
-    moveToTrash->setText(i18n("Move to Trash"));
-    moveToTrash->setIcon(KIcon("edit-trash"));
-    moveToTrash->setShortcut(QKeySequence::Delete);
+    KAction* moveToTrash = DolphinView::createMoveToTrashAction(actionCollection());

     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 

-    QAction* deleteAction = actionCollection()->addAction("delete");
-    deleteAction->setText(i18n("Delete"));
-    deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
-    deleteAction->setIcon(KIcon("edit-delete"));
+    KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());

     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 

-    QAction* properties = actionCollection()->addAction("properties");
-    properties->setText(i18n("Properties"));
+    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()));
 
     properties->setShortcut(Qt::ALT | Qt::Key_Return);
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
 


@@ -1044,17 +1068,22 @@ void DolphinMainWindow::setupActions()
                           SLOT(undo()),
                           actionCollection());
 
                           SLOT(undo()),
                           actionCollection());
 

-    KStandardAction::cut(this, SLOT(cut()), actionCollection());
+    //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);
+    cut->setShortcut(cutShortcut);

     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
 
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
 

-    QAction* selectAll = actionCollection()->addAction("select_all");
-    selectAll->setText(i18n("Select All"));
+    KAction* selectAll = actionCollection()->addAction("select_all");
+    selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));

     selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 
     selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 

-    QAction* invertSelection = actionCollection()->addAction("invert_selection");
-    invertSelection->setText(i18n("Invert Selection"));
+    KAction* invertSelection = actionCollection()->addAction("invert_selection");
+    invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));

     invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 
     invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 


@@ -1067,57 +1096,68 @@ void DolphinMainWindow::setupActions()
                              SLOT(zoomOut()),
                              actionCollection());
 
                              SLOT(zoomOut()),
                              actionCollection());
 

-    KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
-    iconsView->setText(i18n("Icons"));
-    iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
-    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);
-    detailsView->setIcon(KIcon("fileview-detailed"));
-    connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
-
-    KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
-    columnView->setText(i18n("Columns"));
-    columnView->setShortcut(Qt::CTRL | Qt::Key_3);
-    columnView->setIcon(KIcon("fileview-column"));
-    connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));
+    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);
 
     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>("by_name");
-    sortByName->setText(i18n("By Name"));
+    KToggleAction* sortByName = actionCollection()->add<KToggleAction>("sort_by_name");
+    sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));

     connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
 
     connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
 

-    KToggleAction* sortBySize = actionCollection()->add<KToggleAction>("by_size");
-    sortBySize->setText(i18n("By Size"));
+    KToggleAction* sortBySize = actionCollection()->add<KToggleAction>("sort_by_size");
+    sortBySize->setText(i18nc("@action:inmenu Sort By", "Size"));

     connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize()));
 
     connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize()));
 

-    KToggleAction* sortByDate = actionCollection()->add<KToggleAction>("by_date");
-    sortByDate->setText(i18n("By Date"));
+    KToggleAction* sortByDate = actionCollection()->add<KToggleAction>("sort_by_date");
+    sortByDate->setText(i18nc("@action:inmenu Sort By", "Date"));

     connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate()));
 
     connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate()));
 

-    KToggleAction* sortByPermissions = actionCollection()->add<KToggleAction>("by_permissions");
-    sortByPermissions->setText(i18n("By Permissions"));
+    KToggleAction* sortByPermissions = actionCollection()->add<KToggleAction>("sort_by_permissions");
+    sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions"));

     connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions()));
 
     connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions()));
 

-    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("by_owner");
-    sortByOwner->setText(i18n("By Owner"));
+    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("sort_by_owner");
+    sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner"));

     connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner()));
 
     connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner()));
 

-    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("by_group");
-    sortByGroup->setText(i18n("By Group"));
+    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("sort_by_group");
+    sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group"));

     connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup()));
 
     connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup()));
 

-    KToggleAction* sortByType = actionCollection()->add<KToggleAction>("by_type");
-    sortByType->setText(i18n("By Type"));
+    KToggleAction* sortByType = actionCollection()->add<KToggleAction>("sort_by_type");
+    sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));

     connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
 
     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);
     QActionGroup* sortGroup = new QActionGroup(this);
     sortGroup->addAction(sortByName);
     sortGroup->addAction(sortBySize);


@@ -1127,60 +1167,66 @@ void DolphinMainWindow::setupActions()
     sortGroup->addAction(sortByGroup);
     sortGroup->addAction(sortByType);
 
     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");
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");

-    sortDescending->setText(i18n("Descending"));
+    sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));

     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 

-    KToggleAction* sortCategorized = actionCollection()->add<KToggleAction>("categorized");
-    sortCategorized->setText(i18n("Show in Groups"));
-    connect(sortCategorized, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
-
-    KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");
-    clearInfo->setText(i18n("No Information"));
-    connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo()));
-
-    KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
-    showMimeInfo->setText(i18n("Type"));
-    connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo()));
+    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");
 
     KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");

-    showSizeInfo->setText(i18n("Size"));
-    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo()));
+    showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
+    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo()));

 
     KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
 
     KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");

-    showDateInfo->setText(i18n("Date"));
-    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo()));
+    showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
+    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo()));

 
 

-    QActionGroup* infoGroup = new QActionGroup(this);
-    infoGroup->addAction(clearInfo);
-    infoGroup->addAction(showMimeInfo);
-    infoGroup->addAction(showSizeInfo);
-    infoGroup->addAction(showDateInfo);
+    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");
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");

-    showPreview->setText(i18n("Preview"));
-    showPreview->setIcon(KIcon("thumbnail-show"));
+    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");
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");

-    showHiddenFiles->setText(i18n("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()));
 
     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"));
+    KAction* split = actionCollection()->addAction("split_view");

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

-    split->setIcon(KIcon("fileview-split"));
+    updateSplitAction();

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

-    QAction* reload = actionCollection()->addAction("reload");
-    reload->setText(i18n("Reload"));
+    KAction* reload = actionCollection()->addAction("reload");
+    reload->setText(i18nc("@action:inmenu View", "Reload"));

     reload->setShortcut(Qt::Key_F5);
     reload->setIcon(KIcon("view-refresh"));
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 
     reload->setShortcut(Qt::Key_F5);
     reload->setIcon(KIcon("view-refresh"));
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 

-    QAction* stop = actionCollection()->addAction("stop");
-    stop->setText(i18n("Stop"));
+    KAction* stop = actionCollection()->addAction("stop");
+    stop->setText(i18nc("@action:inmenu View", "Stop"));

     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 


@@ -1188,57 +1234,63 @@ void DolphinMainWindow::setupActions()
     // changed, so that the corresponding showFullLocation action is updated. Also
     // the naming "Show full Location" is currently confusing...
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     // changed, so that the corresponding showFullLocation action is updated. Also
     // the naming "Show full Location" is currently confusing...
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");

-    showFullLocation->setText(i18n("Show Full Location"));
+    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));

     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 

-    QAction* editLocation = actionCollection()->addAction("edit_location");
-    editLocation->setText(i18n("Edit Location"));
+    KAction* editLocation = actionCollection()->addAction("edit_location");
+    editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location"));

     editLocation->setShortcut(Qt::Key_F6);
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
 
     editLocation->setShortcut(Qt::Key_F6);
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
 

-    QAction* adjustViewProps = actionCollection()->addAction("view_properties");
-    adjustViewProps->setText(i18n("Adjust View Properties..."));
+    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
     connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
 
     // setup 'Go' menu

-    KStandardAction::back(this, SLOT(goBack()), actionCollection());
+    KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
+    KShortcut backShortcut = backAction->shortcut();
+    backShortcut.setAlternate(Qt::Key_Backspace);
+    backAction->setShortcut(backShortcut);
+

     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     QAction* findFile = actionCollection()->addAction("find_file");
     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     QAction* findFile = actionCollection()->addAction("find_file");

-    findFile->setText(i18n("Find File..."));
+    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));

     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);

-    findFile->setIcon(KIcon("file-find"));
+    findFile->setIcon(KIcon("edit-find"));

     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");

-    showFilterBar->setText(i18n("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()));
 
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
 

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

     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     // setup 'Settings' menu
     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     // setup 'Settings' menu

+    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());

     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 }
 
 void DolphinMainWindow::setupDockWidgets()
 {
     // setup "Information"
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 }
 
 void DolphinMainWindow::setupDockWidgets()
 {
     // setup "Information"

-    QDockWidget* infoDock = new QDockWidget(i18n("Information"));
+    QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information"));

     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
     infoDock->setWidget(infoWidget);
 
     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
     infoDock->setWidget(infoWidget);
 

-    infoDock->toggleViewAction()->setText(i18n("Information"));
+    infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information"));
+    infoDock->toggleViewAction()->setShortcut(Qt::Key_F11);

     actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);


@@ -1246,17 +1298,18 @@ void DolphinMainWindow::setupDockWidgets()
             infoWidget, SLOT(setUrl(KUrl)));
     connect(this, SIGNAL(selectionChanged(KFileItemList)),
             infoWidget, SLOT(setSelection(KFileItemList)));
             infoWidget, SLOT(setUrl(KUrl)));
     connect(this, SIGNAL(selectionChanged(KFileItemList)),
             infoWidget, SLOT(setSelection(KFileItemList)));

-    connect(this, SIGNAL(requestItemInfo(KUrl)),
-            infoWidget, SLOT(requestDelayedItemInfo(KUrl)));
+    connect(this, SIGNAL(requestItemInfo(KFileItem)),
+            infoWidget, SLOT(requestDelayedItemInfo(KFileItem)));

 
     // setup "Tree View"
 
     // setup "Tree View"

-    QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
+    QDockWidget* treeViewDock = new QDockWidget(i18nc("@title:window", "Folders"));

     treeViewDock->setObjectName("treeViewDock");
     treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
     treeViewDock->setWidget(treeWidget);
 
     treeViewDock->setObjectName("treeViewDock");
     treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
     treeViewDock->setWidget(treeWidget);
 

-    treeViewDock->toggleViewAction()->setText(i18n("Folders"));
+    treeViewDock->toggleViewAction()->setText(i18nc("@title:window", "Folders"));
+    treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7);

     actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
     actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);


@@ -1270,16 +1323,17 @@ void DolphinMainWindow::setupDockWidgets()
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"

-    QDockWidget* terminalDock = new QDockWidget(i18n("Terminal"));
+    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "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(i18n("Terminal"));
+    terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
+    terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);

     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
 
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
 

-    addDockWidget(Qt::RightDockWidgetArea, terminalDock);
+    addDockWidget(Qt::BottomDockWidgetArea, terminalDock);

     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
 
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
 


@@ -1290,26 +1344,28 @@ void DolphinMainWindow::setupDockWidgets()
         terminalDock->hide();
     }
 
         terminalDock->hide();
     }
 

-    QDockWidget *placesDock = new QDockWidget(i18n("Places"));
+    QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));

     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);

-    KFilePlacesView *listView = new KFilePlacesView(placesDock);
-    placesDock->setWidget(listView);
-    listView->setModel(DolphinSettings::instance().placesModel());
+    KFilePlacesView* placesView = new KFilePlacesView(placesDock);
+    placesDock->setWidget(placesView);
+    placesView->setModel(DolphinSettings::instance().placesModel());
+    placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

 
 

-    placesDock->toggleViewAction()->setText(i18n("Show Places Panel"));
+    placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
+    placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);

     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);

-    connect(listView, SIGNAL(urlChanged(KUrl)),
+    connect(placesView, SIGNAL(urlChanged(KUrl)),

             this, SLOT(changeUrl(KUrl)));
     connect(this, SIGNAL(urlChanged(KUrl)),
             this, SLOT(changeUrl(KUrl)));
     connect(this, SIGNAL(urlChanged(KUrl)),

-            listView, SLOT(setUrl(KUrl)));
+            placesView, SLOT(setUrl(KUrl)));

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


@@ -1325,7 +1381,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 {


@@ -1333,7 +1389,7 @@ void DolphinMainWindow::updateEditActions()
 
         QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {
 
         QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {

-            renameAction->setEnabled(list.count() >= 1);
+            renameAction->setEnabled(true);

         }
 
         bool enableMoveToTrash = true;
         }
 
         bool enableMoveToTrash = true;


@@ -1341,8 +1397,7 @@ void DolphinMainWindow::updateEditActions()
         KFileItemList::const_iterator it = list.begin();
         const KFileItemList::const_iterator end = list.end();
         while (it != end) {
         KFileItemList::const_iterator it = list.begin();
         const KFileItemList::const_iterator end = list.end();
         while (it != end) {

-            KFileItem* item = *it;
-            const KUrl& url = item->url();
+            const KUrl& url = (*it).url();

             // only enable the 'Move to Trash' action for local files
             if (!url.isLocalFile()) {
                 enableMoveToTrash = false;
             // only enable the 'Move to Trash' action for local files
             if (!url.isLocalFile()) {
                 enableMoveToTrash = false;


@@ -1358,97 +1413,67 @@ 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());
-    }
-
-    QAction* action = 0;
-    switch (m_activeView->mode()) {
-    case DolphinView::IconsView:
-        action = actionCollection()->action("icons");
-        break;
-    case DolphinView::DetailsView:
-        action = actionCollection()->action("details");
-        break;
-    case DolphinView::ColumnView:
-        action = actionCollection()->action("columns");
-        break;
-    default:
-        break;
+        zoomOutAction->setEnabled(view->isZoomOutPossible());

     }
 
     }
 

+    QAction* action = actionCollection()->action(view->currentViewModeActionName());

     if (action != 0) {
         KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
         toggleAction->setChecked(true);
     }
 
     if (action != 0) {
         KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
         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"));
-    const bool isSplit = (m_view[SecondaryIdx] != 0);
-    splitAction->setChecked(isSplit);
-    const KIcon splitIcon(isSplit ? "fileview-join" : "fileview-split");
-    splitAction->setIcon(splitIcon);
+    updateSplitAction();

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

-void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::COPY, source, dest);
-    m_undoCommandTypes.append(KonqUndoManager::COPY);
-}
-
-void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::MOVE, source, dest);
-    m_undoCommandTypes.append(KonqUndoManager::MOVE);
-}
-
-void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::LINK, source, dest);
-    m_undoCommandTypes.append(KonqUndoManager::LINK);
-}
-

 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()),


@@ -1461,26 +1486,65 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));

-    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::AdditionalInformation)),
-            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation)));
+    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)),
+            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));

     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             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)));
-
-    const KUrlNavigator* navigator = view->urlNavigator();
+    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)));
+
+    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()
+{
+    QAction* splitAction = actionCollection()->action("split_view");
+    if (m_viewContainer[SecondaryView] != 0) {
+        if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+            splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
+            splitAction->setIcon(KIcon("fileview-close-right"));
+        } else {
+            splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
+            splitAction->setIcon(KIcon("fileview-close-left"));
+        }
+    } else {
+        splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
+        splitAction->setIcon(KIcon("fileview-split"));
+    }
+}
+
+void DolphinMainWindow::toggleAdditionalInfo(const char* actionName,
+                                             KFileItemDelegate::Information info)
+{
+    clearStatusBar();
+
+    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);
+    }
+}
+

 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :

-    KonqUndoManager::UiInterface(mainWin),
+    KonqFileUndoManager::UiInterface(mainWin),

     m_mainWin(mainWin)
 {
     Q_ASSERT(m_mainWin != 0);
     m_mainWin(mainWin)
 {
     Q_ASSERT(m_mainWin != 0);


@@ -1492,7 +1556,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);
 }