Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index de81af06d121cbf834c31de38870cd5ff2a8202b..872042eb2646784ebd51d6b6f1c3e0c921efde2c 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,24 +21,29 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include <assert.h>
+#include <config-nepomuk.h>

 
 #include "dolphinapplication.h"
 
 #include "dolphinapplication.h"

+#include "dolphinnewmenu.h"

 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
 #include "dolphinsettings.h"
 #include "dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"

-#include "dolphinapplication.h"
-#include "urlnavigator.h"
-#include "dolphinsettings.h"
-#include "bookmarkssidebarpage.h"
+#include "dolphinviewcontainer.h"

 #include "infosidebarpage.h"
 #include "infosidebarpage.h"

-#include "generalsettings.h"
+#include "metadatawidget.h"
+#include "mainwindowadaptor.h"
+#include "terminalsidebarpage.h"
+#include "treeviewsidebarpage.h"
+#include "kurlnavigator.h"

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

+#include "kfileplacesmodel.h"
+#include "kfileplacesview.h"
+
+#include "dolphin_generalsettings.h"

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

-#include <kbookmarkmanager.h>

 #include <kconfig.h>
 #include <kdesktopfile.h>
 #include <kdeversion.h>
 #include <kconfig.h>
 #include <kdesktopfile.h>
 #include <kdeversion.h>


@@ -47,13 +52,13 @@
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.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 <kmessagebox.h>
 #include <konqmimedata.h>

-#include <konq_undo.h>
+#include <konq_operations.h>

 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
 #include <ktoggleaction.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
 #include <ktoggleaction.h>


@@ -64,142 +69,193 @@
 #include <kstandardaction.h>
 #include <kurl.h>
 
 #include <kstandardaction.h>
 #include <kurl.h>
 

-#include <Q3ValueList>  // TODO
-#include <QCloseEvent>
-#include <QClipboard>
-#include <QSplitter>
-#include <QDockWidget>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QSplitter>
+#include <QtGui/QDockWidget>

 
 

-DolphinMainWindow::DolphinMainWindow() :
-    KMainWindow(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");
 {
     setObjectName("Dolphin");

-    m_view[PrimaryIdx] = 0;
-    m_view[SecondaryIdx] = 0;
+    m_viewContainer[PrimaryView] = 0;
+    m_viewContainer[SecondaryView] = 0;

 
 

-    KonqUndoManager::incRef();
+    new MainWindowAdaptor(this);
+    QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);

 
 

-    connect(KonqUndoManager::self(), SIGNAL(undoAvailable(bool)),
+    KonqFileUndoManager::incRef();
+
+    KonqFileUndoManager* undoManager = KonqFileUndoManager::self();
+    undoManager->setUiInterface(new UndoUiInterface(this));
+
+    connect(undoManager, SIGNAL(undoAvailable(bool)),

             this, SLOT(slotUndoAvailable(bool)));
             this, SLOT(slotUndoAvailable(bool)));

-    connect(KonqUndoManager::self(), SIGNAL(undoTextChanged(const QString&)),
+    connect(undoManager, SIGNAL(undoTextChanged(const QString&)),

             this, SLOT(slotUndoTextChanged(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();
-
-    qDeleteAll(m_fileGroupActions);
-    m_fileGroupActions.clear();
-
+    KonqFileUndoManager::decRef();

     DolphinApplication::app()->removeMainWindow(this);
 }
 
     DolphinApplication::app()->removeMainWindow(this);
 }
 

-void DolphinMainWindow::setActiveView(DolphinView* view)
+void DolphinMainWindow::toggleViews()

 {
 {

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

-    m_dropDestination = destination;
-    m_droppedUrls = urls;
-
-    /* KDE4-TODO
-    const ButtonState keyboardState = KApplication::keyboardMouseState();
-    const bool shiftPressed = (keyboardState & ShiftButton) > 0;
-    const bool controlPressed = (keyboardState & ControlButton) > 0;
-
+    kDebug() << "Source" << urls;
+    kDebug() << "Destination:" << destination;

 
 

+    Qt::DropAction action = Qt::CopyAction;

 
 

+    Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
+    const bool shiftPressed   = modifier & Qt::ShiftModifier;
+    const bool controlPressed = modifier & Qt::ControlModifier;

     if (shiftPressed && controlPressed) {
     if (shiftPressed && controlPressed) {

-        // shortcut for 'Linke Here' is used
-        selectedIndex = 2;
-    }
-    else if (controlPressed) {
-        // shortcut for 'Copy Here' is used
-        selectedIndex = 1;
-    }
-    else if (shiftPressed) {
+        // shortcut for 'Link Here' is used
+        action = Qt::LinkAction;
+    } else if (shiftPressed) {

         // shortcut for 'Move Here' is used
         // shortcut for 'Move Here' is used

-        selectedIndex = 0;
-    }
-    else*/ {
-        // no shortcut is used, hence open a popup menu
+        action = Qt::MoveAction;
+    } else if (controlPressed) {
+        // shortcut for 'Copy Here' is used
+        action = Qt::CopyAction;
+    } else {
+        // open a context menu which offers the following actions:
+        // - Move Here
+        // - Copy Here
+        // - Link Here
+        // - Cancel
+

         KMenu popup(this);
 
         KMenu popup(this);
 

-        QAction* moveAction = popup.addAction(SmallIcon("goto"), i18n("&Move Here"));
-        connect(moveAction, SIGNAL(triggered()), this, SLOT(moveDroppedItems()));
+        QString seq = QKeySequence(Qt::ShiftModifier).toString();
+        seq.chop(1); // chop superfluous '+'
+        QAction* moveAction = popup.addAction(KIcon("go-jump"),
+                                              i18nc("@action:inmenu",
+                                                    "&Move Here\t<shortcut>%1</shortcut>", seq));
+
+        seq = QKeySequence(Qt::ControlModifier).toString();
+        seq.chop(1);
+        QAction* copyAction = popup.addAction(KIcon("edit-copy"),
+                                              i18nc("@action:inmenu",
+                                                    "&Copy Here\t<shortcut>%1</shortcut>", seq));
+
+        seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
+        seq.chop(1);
+        QAction* linkAction = popup.addAction(KIcon("insert-link"),
+                                              i18nc("@action:inmenu",
+                                                    "&Link Here\t<shortcut>%1</shortcut>", seq));
+
+        popup.addSeparator();
+        popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel"));
+
+        QAction* activatedAction = popup.exec(QCursor::pos());
+        if (activatedAction == moveAction) {
+            action = Qt::MoveAction;
+        } else if (activatedAction == copyAction) {
+            action = Qt::CopyAction;
+        } else if (activatedAction == linkAction) {
+            action = Qt::LinkAction;
+        } else {
+            return;
+        }
+    }

 
 

-        QAction* copyAction = popup.addAction(SmallIcon("editcopy"), i18n( "&Copy Here" ));
-        connect(copyAction, SIGNAL(triggered()), this, SLOT(copyDroppedItems()));
+    switch (action) {
+    case Qt::MoveAction:
+        KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
+        break;

 
 

-        QAction* linkAction = popup.addAction(i18n("&Link Here"));
-        connect(linkAction, SIGNAL(triggered()), this, SLOT(linkDroppedItems()));
+    case Qt::CopyAction:
+        KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::COPY);
+        break;

 
 

-        QAction* cancelAction = popup.addAction(SmallIcon("stop"), i18n("Cancel"));
-        popup.insertSeparator(cancelAction);
+    case Qt::LinkAction:
+        KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::LINK);
+        break;

 
 

-        popup.exec(QCursor::pos());
+    default:
+        break;

     }
     }

-
-    m_droppedUrls.clear();

 }
 
 }
 

-void DolphinMainWindow::refreshViews()
+void DolphinMainWindow::changeUrl(const KUrl& url)

 {
 {

-    const bool split = DolphinSettings::instance().generalSettings()->splitView();
-    const bool isPrimaryViewActive = (m_activeView == m_view[PrimaryIdx]);
-    KUrl url;
-    for (int i = PrimaryIdx; i <= SecondaryIdx; ++i) {
-       if (m_view[i] != 0) {
-            url = m_view[i]->url();
-
-            // delete view instance...
-            m_view[i]->close();
-            m_view[i]->deleteLater();
-            m_view[i] = 0;
-        }
-
-        if (split || (i == PrimaryIdx)) {
-            // ... and recreate it
-            ViewProperties props(url);
-            m_view[i] = new DolphinView(this,
-                                        m_splitter,
-                                        url,
-                                        props.viewMode(),
-                                        props.showHiddenFiles());
-            connectViewSignals(i);
-            m_view[i]->show();
-        }
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);
+        updateEditActions();
+        updateViewActions();
+        updateGoActions();
+        setCaption(url.fileName());
+        emit urlChanged(url);

     }
     }

+}

 
 

-    m_activeView = isPrimaryViewActive ? m_view[PrimaryIdx] : m_view[SecondaryIdx];
-    assert(m_activeView != 0);
+void DolphinMainWindow::changeSelection(const KFileItemList& selection)
+{
+    activeViewContainer()->view()->changeSelection(selection);
+}

 
 

+void DolphinMainWindow::slotViewModeChanged()
+{

     updateViewActions();
     updateViewActions();

-    emit activeViewChanged();

 }
 
 }
 

-void DolphinMainWindow::slotViewModeChanged()
+void DolphinMainWindow::slotShowPreviewChanged()

 {
 {

+    // It is not enough to update the 'Show Preview' action, also
+    // the 'Zoom In' and 'Zoom Out' actions must be adapted.

     updateViewActions();
 }
 
     updateViewActions();
 }
 


@@ -207,24 +263,54 @@ void DolphinMainWindow::slotShowHiddenFilesChanged()
 {
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
 {
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));

-    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+    const DolphinView* view = m_activeViewContainer->view();
+    showHiddenFilesAction->setChecked(view->showHiddenFiles());
+}
+
+void DolphinMainWindow::slotCategorizedSortingChanged()
+{
+    KToggleAction* showInGroupsAction =
+        static_cast<KToggleAction*>(actionCollection()->action("show_in_groups"));
+    const DolphinView* view = m_activeViewContainer->view();
+    showInGroupsAction->setChecked(view->categorizedSorting());
+    showInGroupsAction->setEnabled(view->supportsCategorizedSorting());

 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 {
     QAction* action = 0;
     switch (sorting) {
 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 {
     QAction* action = 0;
     switch (sorting) {

-        case DolphinView::SortByName:
-            action = actionCollection()->action("by_name");
-            break;
-        case DolphinView::SortBySize:
-            action = actionCollection()->action("by_size");
-            break;
-        case DolphinView::SortByDate:
-            action = actionCollection()->action("by_date");
-            break;
-        default:
-            break;
+    case DolphinView::SortByName:
+        action = actionCollection()->action("sort_by_name");
+        break;
+    case DolphinView::SortBySize:
+        action = actionCollection()->action("sort_by_size");
+        break;
+    case DolphinView::SortByDate:
+        action = actionCollection()->action("sort_by_date");
+        break;
+    case DolphinView::SortByPermissions:
+        action = actionCollection()->action("sort_by_permissions");
+        break;
+    case DolphinView::SortByOwner:
+        action = actionCollection()->action("sort_by_owner");
+        break;
+    case DolphinView::SortByGroup:
+        action = actionCollection()->action("sort_by_group");
+        break;
+    case DolphinView::SortByType:
+        action = actionCollection()->action("sort_by_type");
+        break;
+#ifdef HAVE_NEPOMUK
+    case DolphinView::SortByRating:
+        action = actionCollection()->action("sort_by_rating");
+        break;
+    case DolphinView::SortByTags:
+        action = actionCollection()->action("sort_by_tags");
+        break;
+#endif
+    default:
+        break;

     }
 
     if (action != 0) {
     }
 
     if (action != 0) {


@@ -236,38 +322,89 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
 {
     KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending"));
 void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
 {
     KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending"));

-    const bool sortDescending = (order == Qt::Descending);
+    const bool sortDescending = (order == Qt::DescendingOrder);

     descending->setChecked(sortDescending);
 }
 
     descending->setChecked(sortDescending);
 }
 

-void DolphinMainWindow::slotSelectionChanged()
+void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list)
+{
+    QAction* showSizeInfo = actionCollection()->action("show_size_info");
+    QAction* showDateInfo = actionCollection()->action("show_date_info");
+    QAction* showPermissionsInfo = actionCollection()->action("show_permissions_info");
+    QAction* showOwnerInfo = actionCollection()->action("show_owner_info");
+    QAction* showGroupInfo = actionCollection()->action("show_group_info");
+    QAction* showMimeInfo = actionCollection()->action("show_mime_info");
+
+    showSizeInfo->setChecked(false);
+    showDateInfo->setChecked(false);
+    showPermissionsInfo->setChecked(false);
+    showOwnerInfo->setChecked(false);
+    showGroupInfo->setChecked(false);
+    showMimeInfo->setChecked(false);
+
+    const DolphinView* view = m_activeViewContainer->view();
+
+    // currently the column view does not support additional information
+    const bool enable = (view->mode() != DolphinView::ColumnView);
+    showSizeInfo->setEnabled(enable);
+    showDateInfo->setEnabled(enable);
+    showPermissionsInfo->setEnabled(enable);
+    showOwnerInfo->setEnabled(enable);
+    showGroupInfo->setEnabled(enable);
+    showMimeInfo->setEnabled(enable);
+
+    foreach (KFileItemDelegate::Information info, list) {
+        switch (info) {
+        case KFileItemDelegate::Size:
+            showSizeInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::ModificationTime:
+            showDateInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Permissions:
+            showPermissionsInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Owner:
+            showOwnerInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::OwnerAndGroup:
+            showGroupInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::FriendlyMimeType:
+            showMimeInfo->setChecked(true);
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)

 {
     updateEditActions();
 
 {
     updateEditActions();
 

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-void DolphinMainWindow::slotUrlChanged(const KUrl& url)
+void DolphinMainWindow::slotHistoryChanged()

 {
 {

-    updateEditActions();
-    updateGoActions();
-    setCaption(url.fileName());
+    updateHistory();

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


@@ -282,20 +419,19 @@ void DolphinMainWindow::openNewMainWindow()
     DolphinApplication::app()->createMainWindow()->show();
 }
 
     DolphinApplication::app()->createMainWindow()->show();
 }
 

-void DolphinMainWindow::moveDroppedItems()
+void DolphinMainWindow::toggleActiveView()

 {
 {

-    moveUrls(m_droppedUrls, m_dropDestination);
-}
+    if (m_viewContainer[SecondaryView] == 0) {
+        // only one view is available
+        return;
+    }

 
 

-void DolphinMainWindow::copyDroppedItems()
-{
-    copyUrls(m_droppedUrls, m_dropDestination);
-}
+    Q_ASSERT(m_activeViewContainer != 0);
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);

 
 

-void DolphinMainWindow::linkDroppedItems()
-{
-    KonqOperations::copy(this, KonqOperations::LINK, m_droppedUrls, m_dropDestination);
-    m_undoOperations.append(KonqOperations::LINK);
+    DolphinViewContainer* left  = m_viewContainer[PrimaryView];
+    DolphinViewContainer* right = m_viewContainer[SecondaryView];
+    setActiveViewContainer(m_activeViewContainer == right ? left : right);

 }
 
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 }
 
 void DolphinMainWindow::closeEvent(QCloseEvent* event)


@@ -306,269 +442,88 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     settings.save();
 
 
     settings.save();
 

-    // TODO: I assume there will be a generic way in KDE 4 to store the docks
-    // of the main window. In the meantime they are stored manually:
-    QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName());
-    filename.append("/panels_layout");
-    QFile file(filename);
-    if (file.open(QIODevice::WriteOnly)) {
-        QByteArray data = saveState();
-        file.write(data);
-        file.close();
-    }
-
-    KMainWindow::closeEvent(event);
+    KXmlGuiWindow::closeEvent(event);

 }
 
 }
 

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

 {
 {

-    config->setGroup("Primary view");
-    config->writeEntry("Url", m_view[PrimaryIdx]->url().url());
-    config->writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());
-    if (m_view[SecondaryIdx] != 0) {
-        config->setGroup("Secondary view");
-        config->writeEntry("Url", m_view[SecondaryIdx]->url().url());
-        config->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());

 
 

-void DolphinMainWindow::readProperties(KConfig* config)
-{
-    config->setGroup("Primary view");
-    m_view[PrimaryIdx]->setUrl(config->readEntry("Url"));
-    m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
-    if (config->hasGroup("Secondary view")) {
-        config->setGroup("Secondary view");
-        if (m_view[SecondaryIdx] == 0) {
-            toggleSplitView();
-        }
-        m_view[SecondaryIdx]->setUrl(config->readEntry("Url"));
-        m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
-    }
-    else if (m_view[SecondaryIdx] != 0) {
-        toggleSplitView();
+    cont = m_viewContainer[SecondaryView];
+    if (cont != 0) {
+        group.writeEntry("Secondary Url", cont->url().url());
+        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());

     }
 }
 
     }
 }
 

-void DolphinMainWindow::createFolder()
+void DolphinMainWindow::readProperties(const KConfigGroup& group)

 {
 {

-    // Parts of the following code have been taken
-    // from the class KonqPopupMenu located in
-    // libqonq/konq_popupmenu.h of Konqueror.
-    // (Copyright (C) 2000  David Faure <faure@kde.org>,
-    // Copyright (C) 2001 Holger Freyther <freyther@yahoo.com>)
-
-    clearStatusBar();
-
-    DolphinStatusBar* statusBar = m_activeView->statusBar();
-    const KUrl baseUrl(m_activeView->url());
-
-    QString name(i18n("New Folder"));
-    baseUrl.path(KUrl::AddTrailingSlash);
-
-
-    if (baseUrl.isLocalFile() && QFileInfo(baseUrl.path(KUrl::AddTrailingSlash) + name).exists()) {
-        name = KIO::RenameDialog::suggestName(baseUrl, i18n("New Folder"));
-    }
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];

 
 

-    bool ok = false;
-    name = KInputDialog::getText(i18n("New Folder"),
-                                 i18n("Enter folder name:" ),
-                                 name,
-                                 &ok,
-                                 this);
-
-    if (!ok) {
-        // the user has pressed 'Cancel'
-        return;
-    }
-
-    assert(!name.isEmpty());
-
-    KUrl url;
-    if ((name[0] == '/') || (name[0] == '~')) {
-        url.setPath(KShell::tildeExpand(name));
-    }
-    else {
-        name = KIO::encodeFileName(name);
-        url = baseUrl;
-        url.addPath(name);
-    }
-
-    KonqOperations::mkdir(this, url);
-
-    // TODO: is there a possability to check whether the mkdir operation
-    // has been successful?
-    //if (ok) {
-        statusBar->setMessage(i18n("Created folder %1.",url.path()),
-                              DolphinStatusBar::OperationCompleted);
-    //}
-    //else {
-    //    // Creating of the folder has been failed. Check whether the creating
-    //    // has been failed because a folder with the same name exists...
-    //    if (KIO::NetAccess::exists(url, true, this)) {
-    //        statusBar->setMessage(i18n("A folder named %1 already exists.",url.path()),
-    //                              DolphinStatusBar::Error);
-    //    }
-    //    else {
-    //        statusBar->setMessage(i18n("Creating of folder %1 failed.",url.path()),
-    //                              DolphinStatusBar::Error);
-    //    }
-}
-
-void DolphinMainWindow::createFile()
-{
-    // Parts of the following code have been taken
-    // from the class KonqPopupMenu located in
-    // libqonq/konq_popupmenu.h of Konqueror.
-    // (Copyright (C) 2000  David Faure <faure@kde.org>,
-    // Copyright (C) 2001 Holger Freyther <freyther@yahoo.com>)
-
-    clearStatusBar();
+    cont->setUrl(group.readEntry("Primary Url"));
+    bool editable = group.readEntry("Primary Editable Url", false);
+    cont->urlNavigator()->setUrlEditable(editable);

 
 

-    // TODO: const Entry& entry = m_createFileTemplates[QString(sender->name())];
-    // should be enough. Anyway: the implementation of [] does a linear search internally too.
-    KSortableList<CreateFileEntry, QString>::ConstIterator it = m_createFileTemplates.begin();
-    KSortableList<CreateFileEntry, QString>::ConstIterator end = m_createFileTemplates.end();
-
-    const QString senderName(sender()->objectName());
-    bool found = false;
-    CreateFileEntry entry;
-    while (!found && (it != end)) {
-        if ((*it).key() == senderName) {
-            entry = (*it).value();
-            found = true;
-        }
-        else {
-            ++it;
+    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();
+            cont = m_viewContainer[SecondaryView];
+            Q_ASSERT(cont != 0);

         }
         }

-    }
-
-    DolphinStatusBar* statusBar = m_activeView->statusBar();
-    if (!found || !QFile::exists(entry.templatePath)) {
-        statusBar->setMessage(i18n("Could not create file."), DolphinStatusBar::Error);
-       return;
-    }
-
-    // Get the source path of the template which should be copied.
-    // The source path is part of the Url entry of the desktop file.
-    const int pos = entry.templatePath.lastIndexOf('/');
-    QString sourcePath(entry.templatePath.left(pos + 1));
-    sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url");
-
-    QString name(i18n(entry.name.toAscii()));
-    // Most entry names end with "..." (e. g. "HTML File..."), which is ok for
-    // menus but no good choice for a new file name -> remove the dots...
-    name.replace("...", QString::null);
-
-    // add the file extension to the name
-    name.append(sourcePath.right(sourcePath.length() - sourcePath.lastIndexOf('.')));
-
-    // Check whether a file with the current name already exists. If yes suggest automatically
-    // a unique file name (e. g. "HTML File" will be replaced by "HTML File_1").
-    const KUrl viewUrl(m_activeView->url());
-    const bool fileExists = viewUrl.isLocalFile() &&
-                            QFileInfo(viewUrl.path(KUrl::AddTrailingSlash) + KIO::encodeFileName(name)).exists();
-    if (fileExists) {
-        name = KIO::RenameDialog::suggestName(viewUrl, name);
-    }
-
-    // let the user change the suggested file name
-    bool ok = false;
-    name = KInputDialog::getText(entry.name,
-                                 entry.comment,
-                                 name,
-                                 &ok,
-                                 this);
-    if (!ok) {
-        // the user has pressed 'Cancel'
-        return;
-    }

 
 

-    // before copying the template to the destination path check whether a file
-    // with the given name already exists
-    const QString destPath(viewUrl.pathOrUrl() + "/" + KIO::encodeFileName(name));
-    const KUrl destUrl(destPath);
-    if (KIO::NetAccess::exists(destUrl, false, this)) {
-        statusBar->setMessage(i18n("A file named %1 already exists.",name),
-                              DolphinStatusBar::Error);
-        return;
+        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();

     }
     }

+}

 
 

-    // copy the template to the destination path
-    const KUrl sourceUrl(sourcePath);
-    KIO::CopyJob* job = KIO::copyAs(sourceUrl, destUrl);
-    job->setDefaultPermissions(true);
-    if (KIO::NetAccess::synchronousRun(job, this)) {
-        statusBar->setMessage(i18n("Created file %1.",name),
-                              DolphinStatusBar::OperationCompleted);
-
-        KUrl::List list;
-        list.append(sourceUrl);
-
-        // TODO: use the KonqUndoManager/KonqOperations instead.
-        //DolphinCommand command(DolphinCommand::CreateFile, list, destUrl);
-        //UndoManager::instance().addCommand(command);
-
-    }
-    else {
-        statusBar->setMessage(i18n("Creating of file %1 failed.",name),
-                              DolphinStatusBar::Error);
-    }
+void DolphinMainWindow::updateNewMenu()
+{
+    m_newMenu->slotCheckUpToDate();
+    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();
-    // TODO: per default a message box is opened which asks whether the item
-    // should really be moved to the trash. This does not make sense, as the
-    // action can be undone anyway by the user.
-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
-    m_undoOperations.append(KonqOperations::TRASH);
+
+    DolphinView* view = m_activeViewContainer->view();
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+        view->deleteSelectedItems();
+    } else {
+        view->trashSelectedItems();
+    }

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

-
-    KUrl::List list = m_activeView->selectedUrls();
-    const uint itemCount = list.count();
-    assert(itemCount >= 1);
-
-    QString text;
-    if (itemCount > 1) {
-        text = i18n("Do you really want to delete the %1 selected items?",itemCount);
-    }
-    else {
-        const KUrl& url = list.first();
-        text = i18n("Do you really want to delete '%1'?",url.fileName());
-    }
-
-    const bool del = KMessageBox::warningContinueCancel(this,
-                                                        text,
-                                                        QString::null,
-                                                        KGuiItem(i18n("Delete"), KIcon("editdelete"))
-                                                       ) == KMessageBox::Continue;
-    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();
-    new KPropertiesDialog(list, this);
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+
+    KPropertiesDialog dialog(list, this);
+    dialog.exec();

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


@@ -576,25 +531,11 @@ void DolphinMainWindow::quit()
     close();
 }
 
     close();
 }
 

-void DolphinMainWindow::slotHandleJobError(KJob* job)
+void DolphinMainWindow::slotHandlePlacesError(const QString &message)

 {
 {

-    if (job->error() != 0) {
-        m_activeView->statusBar()->setMessage(job->errorString(),
-                                              DolphinStatusBar::Error);
-    }
-}
-
-void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
-{
-    if (job->error() == 0) {
-        m_activeView->statusBar()->setMessage(i18n("Delete operation completed."),
-                                               DolphinStatusBar::OperationCompleted);
-
-        // TODO: In opposite to the 'Move to Trash' operation in the class KFileIconView
-        // no rearranging of the item position is done when a file has been deleted.
-        // This is bypassed by reloading the view, but it might be worth to investigate
-        // deeper for the root of this issue.
-        m_activeView->reload();
+    if (!message.isEmpty()) {
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
+        statusBar->setMessage(message, DolphinStatusBar::Error);

     }
 }
 
     }
 }
 


@@ -605,28 +546,38 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
         undoAction->setEnabled(available);
     }
 
         undoAction->setEnabled(available);
     }
 

-    if (available && (m_undoOperations.count() > 0)) {
-        const KonqOperations::Operation op = m_undoOperations.takeFirst();
-        DolphinStatusBar* statusBar = m_activeView->statusBar();
-        switch (op) {
-            case KonqOperations::COPY:
-                statusBar->setMessage(i18n("Copy operation completed."),
-                                      DolphinStatusBar::OperationCompleted);
-                break;
-            case KonqOperations::MOVE:
-                statusBar->setMessage(i18n("Move operation completed."),
-                                      DolphinStatusBar::OperationCompleted);
-                break;
-            case KonqOperations::LINK:
-                statusBar->setMessage(i18n("Link operation completed."),
-                                      DolphinStatusBar::OperationCompleted);
-                break;
-            case KonqOperations::TRASH:
-                statusBar->setMessage(i18n("Move to trash operation completed."),
-                                      DolphinStatusBar::OperationCompleted);
-                break;
-            default:
-                break;
+    if (available && (m_undoCommandTypes.count() > 0)) {
+        const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
+        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
+        switch (command) {
+        case KonqFileUndoManager::COPY:
+            statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
+                                  DolphinStatusBar::OperationCompleted);
+            break;
+        case KonqFileUndoManager::MOVE:
+            statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
+                                  DolphinStatusBar::OperationCompleted);
+            break;
+        case KonqFileUndoManager::LINK:
+            statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
+                                  DolphinStatusBar::OperationCompleted);
+            break;
+        case KonqFileUndoManager::TRASH:
+            statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
+                                  DolphinStatusBar::OperationCompleted);
+            break;
+        case KonqFileUndoManager::RENAME:
+            statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
+                                  DolphinStatusBar::OperationCompleted);
+            break;
+
+        case KonqFileUndoManager::MKDIR:
+            statusBar->setMessage(i18nc("@info:status", "Created folder."),
+                                  DolphinStatusBar::OperationCompleted);
+            break;
+
+        default:
+            break;

         }
 
     }
         }
 
     }


@@ -640,58 +591,25 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
     }
 }
 
     }
 }
 

+void DolphinMainWindow::undo()
+{
+    clearStatusBar();
+    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()


@@ -701,134 +619,163 @@ 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);
-
-        const int count = urls.count();
-        if (count == 1) {
-            pasteAction->setText(i18n("Paste 1 File"));
-        }
-        else {
-            pasteAction->setText(i18n("Paste %1 Files").arg(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);
+    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()
+{
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByPermissions);
+}
+
+void DolphinMainWindow::sortByOwner()
+{
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByOwner);
+}
+
+void DolphinMainWindow::sortByGroup()
+{
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByGroup);
+}
+
+void DolphinMainWindow::sortByType()
+{
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByType);
+}
+
+void DolphinMainWindow::sortByRating()
+{
+#ifdef HAVE_NEPOMUK
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByRating);
+#endif
+}
+
+void DolphinMainWindow::sortByTags()
+{
+#ifdef HAVE_NEPOMUK
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByTags);
+#endif

 }
 
 void DolphinMainWindow::toggleSortOrder()
 {
 }
 
 void DolphinMainWindow::toggleSortOrder()
 {

-    const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::Ascending) ?
-                                Qt::Descending :
-                                Qt::Ascending;
-    m_activeView->setSortOrder(order);
+    DolphinView* view = m_activeViewContainer->view();
+    const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    view->setSortOrder(order);
+}
+
+void DolphinMainWindow::toggleSortCategorization()
+{
+    DolphinView* view = m_activeViewContainer->view();
+    const bool categorizedSorting = view->categorizedSorting();
+    view->setCategorizedSorting(!categorizedSorting);
+}
+
+void DolphinMainWindow::toggleSizeInfo()
+{
+    toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size);
+}
+
+void DolphinMainWindow::toggleDateInfo()
+{
+    toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime);
+}
+
+void DolphinMainWindow::togglePermissionsInfo()
+{
+    toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions);
+}
+
+void DolphinMainWindow::toggleOwnerInfo()
+{
+    toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner);
+}
+
+void DolphinMainWindow::toggleGroupInfo()
+{
+    toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup);
+}
+
+void DolphinMainWindow::toggleMimeInfo()
+{
+    toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType);

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

-    if (m_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]->url(),
-                                               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]->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

-        if (m_activeView == m_view[PrimaryIdx]) {
-            m_view[SecondaryIdx]->close();
-            m_view[SecondaryIdx]->deleteLater();
-            m_view[SecondaryIdx] = 0;
-            setActiveView(m_view[PrimaryIdx]);
-        }
-        else {
-            // The secondary view is active, hence from the users point of view
-            // the content of the secondary view should be moved to the primary view.
-            // From an implementation point of view it is more efficient to close
-            // the primary view and exchange the internal pointers afterwards.
-            m_view[PrimaryIdx]->close();
-            delete m_view[PrimaryIdx];
-            m_view[PrimaryIdx] = m_view[SecondaryIdx];
-            m_view[SecondaryIdx] = 0;
-            setActiveView(m_view[PrimaryIdx]);
-        }
+        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;

     }
     }

+
+    setActiveViewContainer(m_viewContainer[PrimaryView]);
+    updateViewActions();
+    emit activeViewChanged();

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

-    m_activeView->reload();
+    m_activeViewContainer->view()->reload();

 }
 
 void DolphinMainWindow::stopLoading()
 }
 
 void DolphinMainWindow::stopLoading()


@@ -842,7 +789,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()


@@ -852,26 +799,26 @@ 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::showFilterBar()
+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->slotShowFilterBar(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();
 }
 


@@ -882,60 +829,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();

-//    action->setChecked(action->setChecked);
-    m_activeView->setUrlEditable(editOrBrowse);
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    urlNavigator->setUrlEditable(editOrBrowse);

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

-    KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
-    action->setChecked(true);
-    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();
-}
-
-void DolphinMainWindow::openTerminal()
-{
-    QString command("konsole --workdir \"");
-    command.append(m_activeView->url().path());
-    command.append('\"');
-
-    KRun::runCommand(command, "Konsole", "konsole");
+    m_activeViewContainer->urlNavigator()->goHome();

 }
 
 void DolphinMainWindow::findFile()
 {
 }
 
 void DolphinMainWindow::findFile()
 {

-    KRun::run("kfind", m_activeView->url());
+    KRun::run("kfind", m_activeViewContainer->url(), this);

 }
 
 void DolphinMainWindow::compareFiles()
 }
 
 void DolphinMainWindow::compareFiles()


@@ -946,42 +884,42 @@ 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

-    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()) {
 
     switch (urls.count()) {

-        case 0: {
-            assert(m_view[SecondaryIdx] != 0);
-            urls = m_view[SecondaryIdx]->selectedUrls();
-            assert(urls.count() == 2);
-            urlA = urls[0];
-            urlB = urls[1];
-            break;
-        }
+    case 0: {
+        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
+        Q_ASSERT(urls.count() == 2);
+        urlA = urls[0];
+        urlB = urls[1];
+        break;
+    }

 
 

-        case 1: {
-            urlA = urls[0];
-            assert(m_view[SecondaryIdx] != 0);
-            urls = m_view[SecondaryIdx]->selectedUrls();
-            assert(urls.count() == 1);
-            urlB = urls[0];
-            break;
-        }
+    case 1: {
+        urlA = urls[0];
+        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
+        Q_ASSERT(urls.count() == 1);
+        urlB = urls[0];
+        break;
+    }

 
 

-        case 2: {
-            urlA = urls[0];
-            urlB = urls[1];
-            break;
-        }
+    case 2: {
+        urlA = urls[0];
+        urlB = urls[1];
+        break;
+    }

 
 

-        default: {
-            // may not happen: compareFiles may only get invoked if 2
-            // files are selected
-            assert(false);
-        }
+    default: {
+        // may not happen: compareFiles may only get invoked if 2
+        // files are selected
+        Q_ASSERT(false);
+    }

     }
 
     QString command("kompare -c \"");
     }
 
     QString command("kompare -c \"");


@@ -989,15 +927,20 @@ void DolphinMainWindow::compareFiles()
     command.append("\" \"");
     command.append(urlB.pathOrUrl());
     command.append('\"');
     command.append("\" \"");
     command.append(urlB.pathOrUrl());
     command.append('\"');

-    KRun::runCommand(command, "Kompare", "kompare");
+    KRun::runCommand(command, "Kompare", "kompare", this);

 
 }
 
 
 }
 

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

 void DolphinMainWindow::editSettings()
 {
 void DolphinMainWindow::editSettings()
 {

-    // TODO: make a static method for opening the settings dialog
-    DolphinSettingsDialog dlg(this);
-    dlg.exec();
+    DolphinSettingsDialog dialog(this);
+    dialog.exec();

 }
 
 void DolphinMainWindow::init()
 }
 
 void DolphinMainWindow::init()


@@ -1006,6 +949,9 @@ void DolphinMainWindow::init()
     // a proper default window size is given at the end of DolphinMainWindow::init().
     GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
     const bool firstRun = generalSettings->firstRun();
     // a proper default window size is given at the end of DolphinMainWindow::init().
     GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
     const bool firstRun = generalSettings->firstRun();

+    if (firstRun) {
+        generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
+    }

 
     setAcceptDrops(true);
 
 
     setAcceptDrops(true);
 


@@ -1013,36 +959,24 @@ void DolphinMainWindow::init()
 
     DolphinSettings& settings = DolphinSettings::instance();
 
 
     DolphinSettings& settings = DolphinSettings::instance();
 

-    KBookmarkManager* manager = settings.bookmarkManager();
-    assert(manager != 0);
-    KBookmarkGroup root = manager->root();
-    if (root.first().isNull()) {
-        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder_home");
-        root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "blockdevice");
-        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network_local");
-        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red");
-        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "trashcan_full");
-    }
-

     setupActions();
 
     setupActions();
 

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

     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);

-    m_view[PrimaryIdx] = new DolphinView(this,
-                                         m_splitter,
-                                         homeUrl,
-                                         props.viewMode(),
-                                         props.showHiddenFiles());
-    connectViewSignals(PrimaryIdx);
-    m_view[PrimaryIdx]->show();
+    m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
+                                                            m_splitter,
+                                                            homeUrl);

 
 

-    m_activeView = m_view[PrimaryIdx];
+    m_activeViewContainer = m_viewContainer[PrimaryView];
+    connectViewSignals(PrimaryView);
+    m_viewContainer[PrimaryView]->view()->reload();
+    m_viewContainer[PrimaryView]->show();

 
     setCentralWidget(m_splitter);
     setupDockWidgets();
 
 
     setCentralWidget(m_splitter);
     setupDockWidgets();
 

-    setupGUI(Keys|Save|Create|ToolBar);
+    setupGUI(Keys | Save | Create | ToolBar);

     createGUI();
 
     stateChanged("new_file");
     createGUI();
 
     stateChanged("new_file");


@@ -1054,351 +988,383 @@ void DolphinMainWindow::init()
     updatePasteAction();
     updateGoActions();
 
     updatePasteAction();
     updateGoActions();
 

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

     }
     }

+
+    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"));
-    if (settings->splitView()) {
-        splitAction->setChecked(true);
-        toggleSplitView();
+    Q_ASSERT(view != 0);
+    Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
+    if (m_activeViewContainer == view) {
+        return;

     }
 
     }
 

+    m_activeViewContainer->setActive(false);
+    m_activeViewContainer = view;
+    m_activeViewContainer->setActive(true);
+
+    updateHistory();
+    updateEditActions();

     updateViewActions();
     updateViewActions();

+    updateGoActions();

 
 

-    // TODO: I assume there will be a generic way in KDE 4 to restore the docks
-    // of the main window. In the meantime they are restored manually (see also
-    // DolphinMainWindow::closeEvent() for more details):
-    QString filename = KStandardDirs::locateLocal("data", KGlobal::instance()->instanceName());
-    filename.append("/panels_layout");
-    QFile file(filename);
-    if (file.open(QIODevice::ReadOnly)) {
-        QByteArray data = file.readAll();
-        restoreState(data);
-        file.close();
-    }
+    const KUrl& url = m_activeViewContainer->url();
+    setCaption(url.fileName());
+
+    emit activeViewChanged();
+    emit urlChanged(url);

 }
 
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 }
 
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu

-    QAction *action = actionCollection()->addAction("new_window");
-    action->setIcon(KIcon("window_new"));
-    action->setText(i18n("New &Window"));
-    connect(action, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
-
-    QAction* createFolder = actionCollection()->addAction("create_folder");
-    createFolder->setText(i18n("Folder..."));
-    createFolder->setIcon(KIcon("folder"));
-    createFolder->setShortcut(Qt::Key_N);
-    connect(createFolder, SIGNAL(triggered()), this, SLOT(createFolder()));
-
-    QAction* rename = actionCollection()->addAction("rename");
-    rename->setText(i18n("Rename"));
-    rename->setShortcut(Qt::Key_F2);
+    m_newMenu = new DolphinNewMenu(this);
+    KMenu* menu = m_newMenu->menu();
+    menu->setTitle(i18nc("@title:menu", "Create New"));
+    menu->setIcon(KIcon("document-new"));
+    connect(menu, SIGNAL(aboutToShow()),
+            this, SLOT(updateNewMenu()));
+
+    KAction* newWindow = actionCollection()->addAction("new_window");
+    newWindow->setIcon(KIcon("window-new"));
+    newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
+    newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
+    connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
+
+    KAction* rename = DolphinView::createRenameAction(actionCollection());

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

-    QAction* moveToTrash = actionCollection()->addAction("move_to_trash");
-    moveToTrash->setText(i18n("Move to Trash"));
-    moveToTrash->setIcon(KIcon("edittrash"));
-    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::ALT | Qt::Key_Delete);
-    deleteAction->setIcon(KIcon("editdelete"));
+    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("Propert&ies"));
-    properties->setShortcut(Qt::Key_Alt | Qt::Key_Return);
+    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()));
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu

-    KStandardAction::undo(KonqUndoManager::self(),
+    KStandardAction::undo(this,

                           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()));
 
     // setup 'View' menu
     KStandardAction::zoomIn(this,
     invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 
     // setup 'View' menu
     KStandardAction::zoomIn(this,

-                       SLOT(zoomIn()),
-                       actionCollection());
+                            SLOT(zoomIn()),
+                            actionCollection());

 
     KStandardAction::zoomOut(this,
 
     KStandardAction::zoomOut(this,

-                        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("view_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("view_text"));
-    connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
+    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);
 
     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>("sort_by_permissions");
+    sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions"));
+    connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions()));
+
+    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("sort_by_owner");
+    sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner"));
+    connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner()));
+
+    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("sort_by_group");
+    sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group"));
+    connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup()));
+
+    KToggleAction* sortByType = actionCollection()->add<KToggleAction>("sort_by_type");
+    sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
+    connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
+
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //
+    // KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
+    // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
+    //
+    // KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
+    // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
+    //
+#ifdef HAVE_NEPOMUK
+    // if (MetaDataWidget::metaDataAvailable()) {
+    //     connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
+    //     connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
+    // }
+    // else {
+    //     sortByRating->setEnabled(false);
+    //     sortByTags->setEnabled(false);
+    // }
+#else
+    // sortByRating->setEnabled(false);
+    // sortByTags->setEnabled(false);
+#endif
+

     QActionGroup* sortGroup = new QActionGroup(this);
     sortGroup->addAction(sortByName);
     sortGroup->addAction(sortBySize);
     sortGroup->addAction(sortByDate);
     QActionGroup* sortGroup = new QActionGroup(this);
     sortGroup->addAction(sortByName);
     sortGroup->addAction(sortBySize);
     sortGroup->addAction(sortByDate);

+    sortGroup->addAction(sortByPermissions);
+    sortGroup->addAction(sortByOwner);
+    sortGroup->addAction(sortByGroup);
+    sortGroup->addAction(sortByType);
+
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //sortGroup->addAction(sortByRating);
+    //sortGroup->addAction(sortByTags);

 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
 
     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* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");
+    showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
+    connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
+
+    KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
+    showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
+    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo()));
+
+    KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
+    showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
+    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo()));
+
+    KToggleAction* showPermissionsInfo = actionCollection()->add<KToggleAction>("show_permissions_info");
+    showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
+    connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo()));
+
+    KToggleAction* showOwnerInfo = actionCollection()->add<KToggleAction>("show_owner_info");
+    showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
+    connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo()));
+
+    KToggleAction* showGroupInfo = actionCollection()->add<KToggleAction>("show_group_info");
+    showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
+    connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo()));
+
+    KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
+    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
+    connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo()));
+

     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");

-    showPreview->setText(i18n("Show Preview"));
+    showPreview->setText(i18nc("@action:intoolbar", "Preview"));
+    showPreview->setIcon(KIcon("fileview-preview"));

     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");

-    showHiddenFiles->setText(i18n("Show Hidden Files"));
-    //showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_      KDE4-TODO: what Qt-Key represents '.'?
+    showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
+    showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);

     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 

-    KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
-    split->setText(i18n("Split View"));
+    KAction* split = actionCollection()->addAction("split_view");

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

-    split->setIcon(KIcon("view_left_right"));
+    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->setShortcut(Qt::Key_F5);

-    reload->setIcon(KIcon("reload"));
+    reload->setIcon(KIcon("view-refresh"));

     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 

-    QAction* stop = actionCollection()->addAction("stop");
-    stop->setText(i18n("Stop"));
-    stop->setIcon(KIcon("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()));
 
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 

+    // TODO: the URL navigator must emit a signal if the editable state has been
+    // changed, so that the corresponding showFullLocation action is updated. Also
+    // the naming "Show full Location" is currently confusing...

     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     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()));
 

-    KToggleAction* editLocation = actionCollection()->add<KToggleAction>("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
     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu

-    QAction* openTerminal = actionCollection()->addAction("open_terminal");
-    openTerminal->setText(i18n("Open Terminal"));
-    openTerminal->setShortcut(Qt::Key_F4);
-    openTerminal->setIcon(KIcon("konsole"));
-    connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
-

     QAction* findFile = actionCollection()->addAction("find_file");
     QAction* findFile = actionCollection()->addAction("find_file");

-    findFile->setText(i18n("Find File..."));
-    findFile->setShortcut(Qt::Key_F);
-    findFile->setIcon(KIcon("filefind"));
+    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
+    findFile->setShortcut(Qt::CTRL | Qt::Key_F);
+    findFile->setIcon(KIcon("edit-find"));

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

-    showFilterBar->setText(i18n("Show Filter Bar"));
-    showFilterBar->setShortcut(Qt::Key_Slash);
-    connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar()));
+    showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
+    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()
 {
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 }
 
 void DolphinMainWindow::setupDockWidgets()
 {

-    QDockWidget* shortcutsDock = new QDockWidget(i18n("Bookmarks"));
-    shortcutsDock->setObjectName("bookmarksDock");
-    shortcutsDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-    shortcutsDock->setWidget(new BookmarksSidebarPage(this));
-
-    shortcutsDock->toggleViewAction()->setText(i18n("Show Bookmarks Panel"));
-    actionCollection()->addAction("show_bookmarks_panel", shortcutsDock->toggleViewAction());
-
-    addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock);
-
-    QDockWidget* infoDock = new QDockWidget(i18n("Information"));
+    // setup "Information"
+    QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information"));

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

-    infoDock->setWidget(new InfoSidebarPage(this));
+    SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
+    infoDock->setWidget(infoWidget);

 
 

-    infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+    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);

-}
-
-void DolphinMainWindow::setupCreateNewMenuActions()
-{
-    // Parts of the following code have been taken
-    // from the class KNewMenu located in
-    // libqonq/knewmenu.h of Konqueror.
-    //  Copyright (C) 1998, 1999 David Faure <faure@kde.org>
-    //                2003       Sven Leiber <s.leiber@web.de>
-
-    QStringList files = actionCollection()->instance()->dirs()->findAllResources("templates");
-    for (QStringList::Iterator it = files.begin() ; it != files.end(); ++it) {
-        if ((*it)[0] != '.' ) {
-            KSimpleConfig config(*it, true);
-            config.setDesktopGroup();
-
-            // tricky solution to ensure that TextFile is at the beginning
-            // because this filetype is the most used (according kde-core discussion)
-            const QString name(config.readEntry("Name"));
-            QString key(name);
-
-            const QString path(config.readPathEntry("Url"));
-            if (!path.endsWith("emptydir")) {
-                if (path.endsWith("TextFile.txt")) {
-                    key = "1" + key;
-                }
-                else if (!KDesktopFile::isDesktopFile(path)) {
-                    key = "2" + key;
-                }
-                else if (path.endsWith("Url.desktop")){
-                    key = "3" + key;
-                }
-                else if (path.endsWith("Program.desktop")){
-                    key = "4" + key;
-                }
-                else {
-                    key = "5";
-                }
-
-                const QString icon(config.readEntry("Icon"));
-                const QString comment(config.readEntry("Comment"));
-                const QString type(config.readEntry("Type"));
-
-                const QString filePath(*it);
-
-
-                if (type == "Link") {
-                    CreateFileEntry entry;
-                    entry.name = name;
-                    entry.icon = icon;
-                    entry.comment = comment;
-                    entry.templatePath = filePath;
-                    m_createFileTemplates.insert(key, entry);
-                }
-            }
-        }
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            infoWidget, SLOT(setUrl(KUrl)));
+    connect(this, SIGNAL(selectionChanged(KFileItemList)),
+            infoWidget, SLOT(setSelection(KFileItemList)));
+    connect(this, SIGNAL(requestItemInfo(KFileItem)),
+            infoWidget, SLOT(requestDelayedItemInfo(KFileItem)));
+
+    // setup "Tree View"
+    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->toggleViewAction()->setText(i18nc("@title:window", "Folders"));
+    treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7);
+    actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
+
+    addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            treeWidget, SLOT(setUrl(KUrl)));
+    connect(treeWidget, SIGNAL(changeUrl(KUrl)),
+            this, SLOT(changeUrl(KUrl)));
+    connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
+            this, SLOT(changeSelection(KFileItemList)));
+    connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
+            this, SLOT(dropUrls(KUrl::List, KUrl)));
+
+    // setup "Terminal"
+    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal"));
+    terminalDock->setObjectName("terminalDock");
+    terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+    SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
+    terminalDock->setWidget(terminalWidget);
+
+    terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
+    terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
+    actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
+
+    addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            terminalWidget, SLOT(setUrl(KUrl)));
+
+    const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
+    if (firstRun) {
+        infoDock->hide();
+        treeViewDock->hide();
+        terminalDock->hide();

     }
     }

-    m_createFileTemplates.sort();
-
-    unplugActionList("create_actions");
-    KSortableList<CreateFileEntry, QString>::ConstIterator it = m_createFileTemplates.begin();
-    KSortableList<CreateFileEntry, QString>::ConstIterator end = m_createFileTemplates.end();
-    /* KDE4-TODO: don't port this code; use KNewMenu instead
-    while (it != end) {
-        CreateFileEntry entry = (*it).value();
-        KAction* action = new KAction(entry.name);
-        action->setIcon(entry.icon);
-        action->setName((*it).index());
-        connect(action, SIGNAL(activated()),
-                this, SLOT(createFile()));
-
-        const QChar section = ((*it).index()[0]);
-        switch (section) {
-            case '1':
-            case '2': {
-                m_fileGroupActions.append(action);
-                break;
-            }

 
 

-            case '3':
-            case '4': {
-                // TODO: not used yet. See documentation of DolphinMainWindow::linkGroupActions()
-                // and DolphinMainWindow::linkToDeviceActions() in the header file for details.
-                //m_linkGroupActions.append(action);
-                break;
-            }
+    QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
+    placesDock->setObjectName("placesDock");
+    placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    KFilePlacesView* placesView = new KFilePlacesView(placesDock);
+    placesDock->setWidget(placesView);
+    placesView->setModel(DolphinSettings::instance().placesModel());
+    placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

 
 

-            case '5': {
-                // TODO: not used yet. See documentation of DolphinMainWindow::linkGroupActions()
-                // and DolphinMainWindow::linkToDeviceActions() in the header file for details.
-                //m_linkToDeviceActions.append(action);
-                break;
-            }
-            default:
-                break;
-        }
-        ++it;
-    }
+    placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
+    placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);
+    actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());

 
 

-    plugActionList("create_file_group", m_fileGroupActions);
-    //plugActionList("create_link_group", m_linkGroupActions);
-    //plugActionList("link_to_device", m_linkToDeviceActions);*/
+    addDockWidget(Qt::LeftDockWidgetArea, placesDock);
+    connect(placesView, SIGNAL(urlChanged(KUrl)),
+            this, SLOT(changeUrl(KUrl)));
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            placesView, SLOT(setUrl(KUrl)));

 }
 
 void DolphinMainWindow::updateHistory()
 {
 }
 
 void DolphinMainWindow::updateHistory()
 {

-    int index = 0;
-    const Q3ValueList<UrlNavigator::HistoryElem> list = m_activeView->urlHistory(index);
+    const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    const int index = urlNavigator->historyIndex();

 
     QAction* backAction = actionCollection()->action("go_back");
     if (backAction != 0) {
 
     QAction* backAction = actionCollection()->action("go_back");
     if (backAction != 0) {

-        backAction->setEnabled(index < static_cast<int>(list.count()) - 1);
+        backAction->setEnabled(index < urlNavigator->historySize() - 1);

     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");
     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");


@@ -1409,16 +1375,15 @@ 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");
     if (list.isEmpty()) {
         stateChanged("has_no_selection");

-    }
-    else {
+    } else {

         stateChanged("has_selection");
 
         QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {
         stateChanged("has_selection");
 
         QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {

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

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


@@ -1426,8 +1391,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;


@@ -1443,97 +1407,151 @@ 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::PreviewsView:
-        //    action = actionCollection()->action("previews");
-        //    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();
+    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"));
+    showPreviewAction->setChecked(view->showPreview());

 
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
 
     KToggleAction* showHiddenFilesAction =
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));

-    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+    showHiddenFilesAction->setChecked(view->showHiddenFiles());

 
 

-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    splitAction->setChecked(m_view[SecondaryIdx] != 0);
+    updateSplitAction();
+
+    KToggleAction* editableLocactionAction =
+        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+    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_undoOperations.append(KonqOperations::COPY);
-}
-
-void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::MOVE, source, dest);
-    m_undoOperations.append(KonqOperations::MOVE);
-}
-

 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(modeChanged()),
             this, SLOT(slotViewModeChanged()));

+    connect(view, SIGNAL(showPreviewChanged()),
+            this, SLOT(slotShowPreviewChanged()));

     connect(view, SIGNAL(showHiddenFilesChanged()),
             this, SLOT(slotShowHiddenFilesChanged()));
     connect(view, SIGNAL(showHiddenFilesChanged()),
             this, SLOT(slotShowHiddenFilesChanged()));

+    connect(view, SIGNAL(categorizedSortingChanged()),
+            this, SLOT(slotCategorizedSortingChanged()));

     connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
     connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));

-    connect(view, SIGNAL(selectionChanged()),
-            this, SLOT(slotSelectionChanged()));
-    connect(view, SIGNAL(showFilterBarChanged(bool)),
-            this, SLOT(updateFilterBarAction(bool)));
-
-    const UrlNavigator* navigator = view->urlNavigator();
+    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)),
+            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));
+    connect(view, SIGNAL(selectionChanged(KFileItemList)),
+            this, SLOT(slotSelectionChanged(KFileItemList)));
+    connect(view, SIGNAL(requestItemInfo(KFileItem)),
+            this, SLOT(slotRequestItemInfo(KFileItem)));
+    connect(view, SIGNAL(activated()),
+            this, SLOT(toggleActiveView()));
+    connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
+            this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));
+
+    const KUrlNavigator* navigator = container->urlNavigator();

     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),

-            this, SLOT(slotUrlChanged(const KUrl&)));
+            this, SLOT(changeUrl(const KUrl&)));

     connect(navigator, SIGNAL(historyChanged()),
             this, SLOT(slotHistoryChanged()));
     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) :
+    KonqFileUndoManager::UiInterface(mainWin),
+    m_mainWin(mainWin)
+{
+    Q_ASSERT(m_mainWin != 0);
+}
+
+DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
+{
+}
+
+void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
+{
+    DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
+    statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);

 }
 
 #include "dolphinmainwindow.moc"
 }
 
 #include "dolphinmainwindow.moc"