* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e7f6260623e8130108387fc3ea0bc3424eb87ac3..697fba85fcb8a2ac823a74ee506e7935dfce8c6a 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -20,268 +20,286 @@
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"

+#include "dolphinviewactionhandler.h"

 
 

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

 
 

+#include "dolphinapplication.h"
+#include "dolphinnewmenu.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
+#include "dolphinsearchbox.h"
+#include "dolphinstatusbar.h"
+#include "dolphinviewcontainer.h"
+#include "panels/folders/folderspanel.h"
+#include "panels/places/placespanel.h"
+#include "panels/information/informationpanel.h"
+#include "panels/information/metadatawidget.h"
+#include "mainwindowadaptor.h"
+#include "viewproperties.h"
+
+#ifndef Q_OS_WIN
+#include "panels/terminal/terminalpanel.h"
+#endif
+
+#include "dolphin_generalsettings.h"
+#include "dolphin_iconsmodesettings.h"
+#include "draganddrophelper.h"
+
+#include <kaction.h>

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

-#include <ktoggleaction.h>
-#include <kbookmarkmanager.h>
+#include <kconfig.h>
+#include <kdesktopfile.h>
+#include <kdeversion.h>
+#include <kfiledialog.h>
+#include <kfileplacesmodel.h>

 #include <kglobal.h>
 #include <kglobal.h>

-#include <kpropertiesdialog.h>
+#include <klineedit.h>
+#include <ktoolbar.h>

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

-#include <kdeversion.h>
-#include <kstatusbar.h>

 #include <kio/netaccess.h>
 #include <kio/netaccess.h>

-#include <kfiledialog.h>
-#include <kconfig.h>
-#include <kurl.h>
-#include <kaction.h>
-#include <kstandardaction.h>
-#include <kmenu.h>
-#include <kio/renamedialog.h>

 #include <kinputdialog.h>
 #include <kinputdialog.h>

-#include <kshell.h>
-#include <kdesktopfile.h>
-#include <kstandarddirs.h>
-#include <kprotocolinfo.h>
-#include <kmessagebox.h>
-#include <kservice.h>
-#include <kstandarddirs.h>
-#include <krun.h>

 #include <klocale.h>
 #include <klocale.h>

+#include <kprotocolmanager.h>
+#include <kmenu.h>
+#include <kmenubar.h>
+#include <kmessagebox.h>
+#include <konq_fileitemcapabilities.h>

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

+#include <kprotocolinfo.h>
+#include <krun.h>
+#include <kshell.h>
+#include <kstandarddirs.h>
+#include <kstatusbar.h>
+#include <kstandardaction.h>
+#include <ktabbar.h>
+#include <ktoggleaction.h>
+#include <kurlnavigator.h>
+#include <kurl.h>
+#include <kurlcombobox.h>

 
 

-#include <qclipboard.h>
-#include <q3dragobject.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-#include <QCloseEvent>
+#include <QDBusMessage>
+#include <QKeyEvent>
+#include <QClipboard>
+#include <QLineEdit>

 #include <QSplitter>
 #include <QDockWidget>
 
 #include <QSplitter>
 #include <QDockWidget>
 

-#include "urlnavigator.h"
-#include "viewpropertiesdialog.h"
-#include "viewproperties.h"
-#include "dolphinsettings.h"
-#include "dolphinsettingsdialog.h"
-#include "dolphinstatusbar.h"
-#include "dolphinapplication.h"
-#include "undomanager.h"
-#include "progressindicator.h"
-#include "dolphinsettings.h"
-#include "bookmarkssidebarpage.h"
-#include "infosidebarpage.h"
-#include "generalsettings.h"
-#include "dolphinapplication.h"
+DolphinMainWindow::DolphinMainWindow(int id) :
+    KXmlGuiWindow(0),
+    m_newMenu(0),
+    m_showMenuBar(0),
+    m_tabBar(0),
+    m_activeViewContainer(0),
+    m_centralWidgetLayout(0),
+    m_searchBox(0),
+    m_id(id),
+    m_tabIndex(0),
+    m_viewTab(),
+    m_actionHandler(0),
+    m_settingsDialog(0)
+{
+    setObjectName("Dolphin#");

 
 

+    m_viewTab.append(ViewTab());

 
 

-DolphinMainWindow::DolphinMainWindow() :
-    KMainWindow(0),
-    m_splitter(0),
-    m_activeView(0)
-{
-    setObjectName("Dolphin");
-    m_view[PrimaryIdx] = 0;
-    m_view[SecondaryIdx] = 0;
+    new MainWindowAdaptor(this);
+    QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
+
+    KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
+    undoManager->setUiInterface(new UndoUiInterface());
+
+    connect(undoManager, SIGNAL(undoAvailable(bool)),
+            this, SLOT(slotUndoAvailable(bool)));
+    connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
+            this, SLOT(slotUndoTextChanged(const QString&)));
+    connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)),
+            this, SLOT(clearStatusBar()));
+    connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
+            this, SLOT(showCommand(CommandType)));
+    connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
+            this, SLOT(showErrorMessage(const QString&)));
+    connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)),
+            this, SLOT(showErrorMessage(const QString&)));

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

-    qDeleteAll(m_fileGroupActions);
-    m_fileGroupActions.clear();
-

     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_viewTab[m_tabIndex].primaryView == 0) {

         return;
     }
 
         return;
     }
 

-    m_activeView = view;
-
-    updateHistory();
-    updateEditActions();
-    updateViewActions();
-    updateGoActions();
+    // move secondary view from the last position of the splitter
+    // to the first position
+    m_viewTab[m_tabIndex].splitter->insertWidget(0, m_viewTab[m_tabIndex].secondaryView);

 
 

-    setCaption(m_activeView->url().fileName());
-
-    emit activeViewChanged();
+    DolphinViewContainer* container = m_viewTab[m_tabIndex].primaryView;
+    m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView;
+    m_viewTab[m_tabIndex].secondaryView = container;

 }
 
 }
 

-void DolphinMainWindow::dropUrls(const KUrl::List& urls,
-                                 const KUrl& destination)
+void DolphinMainWindow::showCommand(CommandType command)

 {
 {

-    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;
-
-
-
-    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 'Move Here' is used
-        selectedIndex = 0;
-    }
-    else*/ {
-        // no shortcut is used, hence open a popup menu
-        KMenu popup(this);
-
-        QAction* moveAction = popup.addAction(SmallIcon("goto"), i18n("&Move Here"));
-        connect(moveAction, SIGNAL(triggered()), this, SLOT(moveDroppedItems()));
-
-        QAction* copyAction = popup.addAction(SmallIcon("editcopy"), i18n( "&Copy Here" ));
-        connect(copyAction, SIGNAL(triggered()), this, SLOT(copyDroppedItems()));
-
-        QAction* linkAction = popup.addAction(i18n("&Link Here"));
-        connect(linkAction, SIGNAL(triggered()), this, SLOT(linkDroppedItems()));
+    DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
+    switch (command) {
+    case KIO::FileUndoManager::Copy:
+        statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Move:
+        statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Link:
+        statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Trash:
+        statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;
+    case KIO::FileUndoManager::Rename:
+        statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
+                              DolphinStatusBar::OperationCompleted);
+        break;

 
 

-        QAction* cancelAction = popup.addAction(SmallIcon("stop"), i18n("Cancel"));
-        popup.insertSeparator(cancelAction);
+    case KIO::FileUndoManager::Mkdir:
+        statusBar->setMessage(i18nc("@info:status", "Created folder."),
+                              DolphinStatusBar::OperationCompleted);
+        break;

 
 

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

     }
     }

-
-    m_droppedUrls.clear();

 }
 
 void DolphinMainWindow::refreshViews()
 {
 }
 
 void DolphinMainWindow::refreshViews()
 {

-    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;
-        }
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+
+    // remember the current active view, as because of
+    // the refreshing the active view might change to
+    // the secondary view
+    DolphinViewContainer* activeViewContainer = m_activeViewContainer;

 
 

-        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();
+    const int tabCount = m_viewTab.count();
+    for (int i = 0; i < tabCount; ++i) {
+        m_viewTab[i].primaryView->refresh();
+        if (m_viewTab[i].secondaryView != 0) {
+            m_viewTab[i].secondaryView->refresh();

         }
     }
 
         }
     }
 

-    m_activeView = isPrimaryViewActive ? m_view[PrimaryIdx] : m_view[SecondaryIdx];
-    assert(m_activeView != 0);
-
-    updateViewActions();
-    emit activeViewChanged();
-}
-
-void DolphinMainWindow::slotViewModeChanged()
-{
-    updateViewActions();
+    setActiveViewContainer(activeViewContainer);

 }
 
 }
 

-void DolphinMainWindow::slotShowHiddenFilesChanged()
+void DolphinMainWindow::pasteIntoFolder()

 {
 {

-    KToggleAction* showHiddenFilesAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+    m_activeViewContainer->view()->pasteIntoFolder();

 }
 
 }
 

-void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
+void DolphinMainWindow::changeUrl(const KUrl& url)

 {
 {

-    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;
+    if (!KProtocolManager::supportsListing(url)) {
+        // The URL navigator only checks for validity, not
+        // if the URL can be listed. An error message is
+        // shown due to DolphinViewContainer::restoreView().
+        return;

     }
 
     }
 

-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);
+        updateEditActions();
+        updateViewActions();
+        updateGoActions();
+        setCaption(url.fileName());
+        if (m_viewTab.count() > 1) {
+            m_tabBar->setTabText(m_tabIndex, tabName(url));
+        }
+        emit urlChanged(url);

     }
 }
 
     }
 }
 

-void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
+void DolphinMainWindow::changeSelection(const KFileItemList& selection)

 {
 {

-    KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending"));
-    const bool sortDescending = (order == Qt::Descending);
-    descending->setChecked(sortDescending);
+    activeViewContainer()->view()->changeSelection(selection);

 }
 
 }
 

-void DolphinMainWindow::slotSelectionChanged()
+void DolphinMainWindow::slotEditableStateChanged(bool editable)
+{
+    KToggleAction* editableLocationAction =
+        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+    editableLocationAction->setChecked(editable);
+}
+
+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_viewTab[m_tabIndex].primaryView != 0);
+    int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
+    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+        selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();

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

-    compareFilesAction->setEnabled(selectedUrlsCount == 2);
+    if (selectedUrlsCount == 2) {
+        compareFilesAction->setEnabled(isKompareInstalled());
+    } else {
+        compareFilesAction->setEnabled(false);
+    }

 
 

-    m_activeView->updateStatusBar();
+#if defined(QUICK_VIEW)
+    const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
+    actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);
+#endif

 
 

-    emit selectionChanged();
-}
+    m_activeViewContainer->updateStatusBar();

 
 

-void DolphinMainWindow::slotHistoryChanged()
-{
-    updateHistory();
+    emit selectionChanged(selection);

 }
 
 }
 

-void DolphinMainWindow::slotUrlChanged(const KUrl& url)
+void DolphinMainWindow::slotWheelMoved(int wheelDelta)

 {
 {

-    updateEditActions();
-    updateGoActions();
-    setCaption(url.fileName());
+    if (wheelDelta > 0) {
+        activatePrevTab();
+    } else {
+        activateNextTab();
+    }

 }
 
 }
 

-void DolphinMainWindow::updateFilterBarAction(bool show)
+void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)

 {
 {

-    KToggleAction* showFilterBarAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
-    showFilterBarAction->setChecked(show);
+    emit requestItemInfo(item);

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-void DolphinMainWindow::undo()
+void DolphinMainWindow::updateFilterBarAction(bool show)

 {
 {

-    UndoManager::instance().undo(this);
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    showFilterBarAction->setChecked(show);

 }
 
 void DolphinMainWindow::openNewMainWindow()
 }
 
 void DolphinMainWindow::openNewMainWindow()


@@ -289,291 +307,166 @@ void DolphinMainWindow::openNewMainWindow()
     DolphinApplication::app()->createMainWindow()->show();
 }
 
     DolphinApplication::app()->createMainWindow()->show();
 }
 

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

 {
 {

-    moveUrls(m_droppedUrls, m_dropDestination);
-}
+    openNewTab(m_activeViewContainer->url());
+    m_tabBar->setCurrentIndex(m_viewTab.count() - 1);

 
 

-void DolphinMainWindow::copyDroppedItems()
-{
-    copyUrls(m_droppedUrls, m_dropDestination);
+    KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
+    if (navigator->isUrlEditable()) {
+        // if a new tab is opened and the URL is editable, assure that
+        // the user can edit the URL without manually setting the focus
+        navigator->setFocus();
+    }

 }
 
 }
 

-void DolphinMainWindow::linkDroppedItems()
+void DolphinMainWindow::openNewTab(const KUrl& url)

 {
 {

-    KIO::Job* job = KIO::link(m_droppedUrls, m_dropDestination);
-    addPendingUndoJob(job, DolphinCommand::Link, m_droppedUrls, m_dropDestination);
-}
+    if (m_viewTab.count() == 1) {
+        // Only one view is open currently and hence no tab is shown at
+        // all. Before creating a tab for 'url', provide a tab for the current URL.
+        m_tabBar->addTab(KIcon("folder"), tabName(m_activeViewContainer->url()));
+        m_tabBar->blockSignals(false);
+    }

 
 

-void DolphinMainWindow::closeEvent(QCloseEvent* event)
-{
-    DolphinSettings& settings = DolphinSettings::instance();
-    GeneralSettings* generalSettings = settings.generalSettings();
-    generalSettings->setFirstRun(false);
+    m_tabBar->addTab(KIcon("folder"), tabName(url));

 
 

-    settings.save();
+    ViewTab viewTab;
+    viewTab.splitter = new QSplitter(this);
+    viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
+    viewTab.primaryView->setActive(false);
+    connectViewSignals(viewTab.primaryView);
+    viewTab.primaryView->view()->reload();

 
 

-    // 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();
-    }
+    m_viewTab.append(viewTab);

 
 

-    KMainWindow::closeEvent(event);
-}
+    actionCollection()->action("close_tab")->setEnabled(true);

 
 

-void DolphinMainWindow::saveProperties(KConfig* config)
-{
-    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());
+    // provide a split view, if the startup settings are set this way
+    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+    if (generalSettings->splitView()) {
+        const int tabIndex = m_viewTab.count() - 1;
+        createSecondaryView(tabIndex);
+        m_viewTab[tabIndex].secondaryView->setActive(true);
+        m_viewTab[tabIndex].isPrimaryViewActive = false;

     }
 }
 
     }
 }
 

-void DolphinMainWindow::readProperties(KConfig* config)
+void DolphinMainWindow::activateNextTab()

 {
 {

-    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();
+    if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+        return;

     }
     }

+
+    const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count();
+    m_tabBar->setCurrentIndex(tabIndex);

 }
 
 }
 

-void DolphinMainWindow::createFolder()
+void DolphinMainWindow::activatePrevTab()

 {
 {

-    // 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"));
-    }
-
-    bool ok = false;
-    name = KInputDialog::getText(i18n("New Folder"),
-                                 i18n("Enter folder name:" ),
-                                 name,
-                                 &ok,
-                                 this);
-
-    if (!ok) {
-        // the user has pressed 'Cancel'
+    if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {

         return;
     }
 
         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);
-    }
-    ok = KIO::NetAccess::mkdir(url, this);
-
-    // TODO: provide message type hint
-    if (ok) {
-        statusBar->setMessage(i18n("Created folder %1.",url.path()),
-                              DolphinStatusBar::OperationCompleted);
-
-        DolphinCommand command(DolphinCommand::CreateFolder, KUrl::List(), url);
-        UndoManager::instance().addCommand(command);
-    }
-    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);
-        }
-
+    int tabIndex = m_tabBar->currentIndex() - 1;
+    if (tabIndex == -1) {
+        tabIndex = m_tabBar->count() - 1;

     }
     }

+    m_tabBar->setCurrentIndex(tabIndex);

 }
 
 }
 

-void DolphinMainWindow::createFile()
+void DolphinMainWindow::openInNewTab()

 {
 {

-    // 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();
-
-    // TODO: const Entry& entry = m_createFileTemplates[QString(sender->name())];
-    // should be enough. Anyway: the implemantation 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;
-        }
-    }
-
-    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);
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if ((list.count() == 1) && list[0].isDir()) {
+        openNewTab(m_activeViewContainer->view()->selectedUrls()[0]);

     }
     }

+}

 
 

-    // 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;
+void DolphinMainWindow::openInNewWindow()
+{
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if ((list.count() == 1) && list[0].isDir()) {
+        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
+        window->changeUrl(m_activeViewContainer->view()->selectedUrls()[0]);
+        window->show();

     }
     }

+}

 
 

-    // 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);
+void DolphinMainWindow::toggleActiveView()
+{
+    if (m_viewTab[m_tabIndex].secondaryView == 0) {
+        // only one view is available

         return;
     }
 
         return;
     }
 

-    // 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);
+    Q_ASSERT(m_activeViewContainer != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);

 
 

-        KUrl::List list;
-        list.append(sourceUrl);
-        DolphinCommand command(DolphinCommand::CreateFile, list, destUrl);
-        UndoManager::instance().addCommand(command);
-
-    }
-    else {
-        statusBar->setMessage(i18n("Creating of file %1 failed.",name),
-                              DolphinStatusBar::Error);
-    }
+    DolphinViewContainer* left  = m_viewTab[m_tabIndex].primaryView;
+    DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView;
+    setActiveViewContainer(m_activeViewContainer == right ? left : right);

 }
 
 }
 

-void DolphinMainWindow::rename()
+void DolphinMainWindow::closeEvent(QCloseEvent* event)

 {
 {

-    clearStatusBar();
-    m_activeView->renameSelectedItems();
+    DolphinSettings& settings = DolphinSettings::instance();
+    GeneralSettings* generalSettings = settings.generalSettings();
+    generalSettings->setFirstRun(false);
+
+    settings.save();
+
+    KXmlGuiWindow::closeEvent(event);

 }
 
 }
 

-void DolphinMainWindow::moveToTrash()
+void DolphinMainWindow::saveProperties(KConfigGroup& group)

 {
 {

-    clearStatusBar();
-    KUrl::List selectedUrls = m_activeView->selectedUrls();
-    KIO::Job* job = KIO::trash(selectedUrls);
-    addPendingUndoJob(job, DolphinCommand::Trash, selectedUrls, m_activeView->url());
+    // TODO: remember tabs
+    DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;
+    group.writeEntry("Primary Url", cont->url().url());
+    group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+
+    cont = m_viewTab[m_tabIndex].secondaryView;
+    if (cont != 0) {
+        group.writeEntry("Secondary Url", cont->url().url());
+        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());
+    }

 }
 
 }
 

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

 {
 {

-    clearStatusBar();
+    // TODO: read tabs
+    DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;

 
 

-    KUrl::List list = m_activeView->selectedUrls();
-    const uint itemCount = list.count();
-    assert(itemCount >= 1);
+    cont->setUrl(group.readEntry("Primary Url"));
+    bool editable = group.readEntry("Primary Editable Url", false);
+    cont->urlNavigator()->setUrlEditable(editable);

 
 

-    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());
-    }
+    cont = m_viewTab[m_tabIndex].secondaryView;
+    const QString secondaryUrl = group.readEntry("Secondary Url");
+    if (!secondaryUrl.isEmpty()) {
+        if (cont == 0) {
+            // a secondary view should be shown, but no one is available
+            // currently -> create a new view
+            toggleSplitView();
+            cont = m_viewTab[m_tabIndex].secondaryView;
+            Q_ASSERT(cont != 0);
+        }

 
 

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

     }
 }
 
     }
 }
 

-void DolphinMainWindow::properties()
+void DolphinMainWindow::updateNewMenu()

 {
 {

-    const KFileItemList list = m_activeView->selectedItems();
-    new KPropertiesDialog(list, this);
+    m_newMenu->slotCheckUpToDate();
+    m_newMenu->setPopupFiles(activeViewContainer()->url());

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


@@ -581,31 +474,17 @@ void DolphinMainWindow::quit()
     close();
 }
 
     close();
 }
 

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

 {
 {

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

     }
 }
 
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     }
 }
 
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {

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

     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }
     if (undoAction != 0) {
         undoAction->setEnabled(available);
     }


@@ -613,324 +492,153 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {
 
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {

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

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

-void DolphinMainWindow::slotRedoAvailable(bool available)
-{
-    QAction* redoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Redo));
-    if (redoAction != 0) {
-        redoAction->setEnabled(available);
-    }
-}
-
-void DolphinMainWindow::slotRedoTextChanged(const QString& text)
+void DolphinMainWindow::undo()

 {
 {

-    QAction* redoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Redo));
-    if (redoAction != 0) {
-        redoAction->setText(text);
-    }
+    clearStatusBar();
+    KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this);
+    KIO::FileUndoManager::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()
 {

-    QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
-    if (pasteAction == 0) {
-        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());
-        }
-    }
+    QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
+    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();
+
+    // if the URL navigator is editable and focused, select the whole
+    // URL instead of all items of the view
+
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    QLineEdit* lineEdit = urlNavigator->editor()->lineEdit();
+    const bool selectUrl = urlNavigator->isUrlEditable() &&
+                           lineEdit->hasFocus();
+    if (selectUrl) {
+        lineEdit->selectAll();
+    } else {
+        m_activeViewContainer->view()->selectAll();
+    }

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

-    m_activeView->invertSelection();
-}
-void DolphinMainWindow::setIconsView()
-{
-    m_activeView->setMode(DolphinView::IconsView);
-}
-
-void DolphinMainWindow::setDetailsView()
-{
-    m_activeView->setMode(DolphinView::DetailsView);
-}
-
-void DolphinMainWindow::sortByName()
-{
-    m_activeView->setSorting(DolphinView::SortByName);
-}
-
-void DolphinMainWindow::sortBySize()
-{
-    m_activeView->setSorting(DolphinView::SortBySize);
-}
-
-void DolphinMainWindow::sortByDate()
-{
-    m_activeView->setSorting(DolphinView::SortByDate);
-}
-
-void DolphinMainWindow::toggleSortOrder()
-{
-    const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::Ascending) ?
-                                Qt::Descending :
-                                Qt::Ascending;
-    m_activeView->setSortOrder(order);
+    m_activeViewContainer->view()->invertSelection();

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

-    if (m_view[SecondaryIdx] == 0) {
-        const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
-        // 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]);
-        m_splitter->setSizes(QList<int>() << newWidth << newWidth);
-        m_view[SecondaryIdx]->show();
-    }
-    else {
+    if (m_viewTab[m_tabIndex].secondaryView == 0) {
+        createSecondaryView(m_tabIndex);
+        setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
+    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {

         // 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_viewTab[m_tabIndex].secondaryView->close();
+        m_viewTab[m_tabIndex].secondaryView->deleteLater();
+        m_viewTab[m_tabIndex].secondaryView = 0;
+
+        setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
+    } else {
+        // The primary view is active and should be closed. Hence from a users point of view
+        // the content of the secondary view should be moved to the primary view.
+        // From an implementation point of view it is more efficient to close
+        // the primary view and exchange the internal pointers afterwards.
+
+        m_viewTab[m_tabIndex].primaryView->close();
+        m_viewTab[m_tabIndex].primaryView->deleteLater();
+        m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView;
+        m_viewTab[m_tabIndex].secondaryView = 0;
+
+        setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);

     }
     }

+
+    updateViewActions();

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

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

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

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

 {
 {

-    const KToggleAction* showFilterBarAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
-    const bool show = showFilterBarAction->isChecked();
-    m_activeView->slotShowFilterBar(show);
-}
-
-void DolphinMainWindow::zoomIn()
-{
-    m_activeView->zoomIn();
-    updateViewActions();
-}
-
-void DolphinMainWindow::zoomOut()
-{
-    m_activeView->zoomOut();
-    updateViewActions();
+    m_activeViewContainer->showFilterBar(show);

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

-    KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
-
-    bool editOrBrowse = action->isChecked();
-//    action->setChecked(action->setChecked);
-    m_activeView->setUrlEditable(editOrBrowse);
+    QAction* action = actionCollection()->action("editable_location");
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    urlNavigator->setUrlEditable(action->isChecked());

 }
 
 }
 

-void DolphinMainWindow::editLocation()
+void DolphinMainWindow::replaceLocation()

 {
 {

-    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();
-    ViewPropertiesDialog dlg(m_activeView);
-    dlg.exec();
+    // select the whole text of the combo box editor
+    QLineEdit* lineEdit = navigator->editor()->lineEdit();
+    const QString text = lineEdit->text();
+    lineEdit->setSelection(0, text.length());

 }
 
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
 }
 
 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");
-}
-
-void DolphinMainWindow::findFile()
-{
-    KRun::run("kfind", m_activeView->url());
+    m_activeViewContainer->urlNavigator()->goHome();

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


@@ -941,42 +649,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_viewTab[m_tabIndex].primaryView != 0);

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

-    KUrl::List urls = m_view[PrimaryIdx]->selectedUrls();
+    KUrl::List urls = m_viewTab[m_tabIndex].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_viewTab[m_tabIndex].secondaryView != 0);
+        urls = m_viewTab[m_tabIndex].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_viewTab[m_tabIndex].secondaryView != 0);
+        urls = m_viewTab[m_tabIndex].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 \"");


@@ -984,138 +692,243 @@ 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::quickView()
+{
+    const KUrl::List urls = activeViewContainer()->view()->selectedUrls();
+    Q_ASSERT(urls.count() > 0);
+
+    QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.plasma", "/Previewer", "", "openFile");
+    foreach (const KUrl& url, urls) {
+        msg.setArguments(QList<QVariant>() << url.prettyUrl());
+        QDBusConnection::sessionBus().send(msg);
+    }
+}
+
+void DolphinMainWindow::toggleShowMenuBar()
+{
+    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();
+    if (m_settingsDialog == 0) {
+        const KUrl& url = activeViewContainer()->url();
+        m_settingsDialog = new DolphinSettingsDialog(url, this);
+        m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
+        m_settingsDialog->show();
+    } else {
+        m_settingsDialog->raise();
+    }
+}
+
+void DolphinMainWindow::setActiveTab(int index)
+{
+    Q_ASSERT(index >= 0);
+    Q_ASSERT(index < m_viewTab.count());
+    if (index == m_tabIndex) {
+        return;
+    }
+
+    // hide current tab content
+    ViewTab& hiddenTab = m_viewTab[m_tabIndex];
+    hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive();
+    hiddenTab.primaryView->setActive(false);
+    if (hiddenTab.secondaryView != 0) {
+        hiddenTab.secondaryView->setActive(false);
+    }
+    QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
+    splitter->hide();
+    m_centralWidgetLayout->removeWidget(splitter);
+
+    // show active tab content
+    m_tabIndex = index;
+
+    ViewTab& viewTab = m_viewTab[index];
+    m_centralWidgetLayout->addWidget(viewTab.splitter);
+    viewTab.primaryView->show();
+    if (viewTab.secondaryView != 0) {
+        viewTab.secondaryView->show();
+    }
+    viewTab.splitter->show();
+
+    setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView :
+                                                         viewTab.secondaryView);
+}
+
+void DolphinMainWindow::closeTab()
+{
+    closeTab(m_tabBar->currentIndex());

 }
 
 }
 

-void DolphinMainWindow::addUndoOperation(KJob* job)
+void DolphinMainWindow::closeTab(int index)

 {
 {

-    if (job->error() != 0) {
-        slotHandleJobError(job);
+    Q_ASSERT(index >= 0);
+    Q_ASSERT(index < m_viewTab.count());
+    if (m_viewTab.count() == 1) {
+          // the last tab may never get closed
+        return;

     }
     }

-    else {
-        const int id = job->progressId();
-
-        // set iterator to the executed command with the current id...
-        Q3ValueList<UndoInfo>::Iterator it = m_pendingUndoJobs.begin();
-        const Q3ValueList<UndoInfo>::Iterator end = m_pendingUndoJobs.end();
-        bool found = false;
-        while (!found && (it != end)) {
-            if ((*it).id == id) {
-                found = true;
-            }
-            else {
-                ++it;
-            }
-        }

 
 

-        if (found) {
-            DolphinCommand command = (*it).command;
-            if (command.type() == DolphinCommand::Trash) {
-                // To be able to perform an undo for the 'Move to Trash' operation
-                // all source Urls must be updated with the trash Url. E. g. when moving
-                // a file "test.txt" and a second file "test.txt" to the trash,
-                // then the filenames in the trash are "0-test.txt" and "1-test.txt".
-                QMap<QString, QString> metaData;
-                KIO::Job *kiojob = qobject_cast<KIO::Job*>( job );
-                if ( kiojob )
-                {
-                    metaData = kiojob->metaData();
-                }
-                KUrl::List newSourceUrls;
-
-                KUrl::List sourceUrls = command.source();
-                KUrl::List::Iterator sourceIt = sourceUrls.begin();
-                const KUrl::List::Iterator sourceEnd = sourceUrls.end();
-
-                while (sourceIt != sourceEnd) {
-                    QMap<QString, QString>::ConstIterator metaIt = metaData.find("trashUrl-" + (*sourceIt).path());
-                    if (metaIt != metaData.end()) {
-                        newSourceUrls.append(KUrl(metaIt.value()));
-                    }
-                    ++sourceIt;
-                }
-                command.setSource(newSourceUrls);
-            }
-
-            UndoManager::instance().addCommand(command);
-            m_pendingUndoJobs.erase(it);
-
-            DolphinStatusBar* statusBar = m_activeView->statusBar();
-            switch (command.type()) {
-                case DolphinCommand::Copy:
-                    statusBar->setMessage(i18n("Copy operation completed."),
-                                          DolphinStatusBar::OperationCompleted);
-                    break;
-                case DolphinCommand::Move:
-                    statusBar->setMessage(i18n("Move operation completed."),
-                                          DolphinStatusBar::OperationCompleted);
-                    break;
-                case DolphinCommand::Trash:
-                    statusBar->setMessage(i18n("Move to trash operation completed."),
-                                          DolphinStatusBar::OperationCompleted);
-                    break;
-                default:
-                    break;
-            }
+    if (index == m_tabIndex) {
+        // The tab that should be closed is the active tab. Activate the
+        // previous tab before closing the tab.
+        m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
+    }
+
+    // delete tab
+    m_viewTab[index].primaryView->deleteLater();
+    if (m_viewTab[index].secondaryView != 0) {
+        m_viewTab[index].secondaryView->deleteLater();
+    }
+    m_viewTab[index].splitter->deleteLater();
+    m_viewTab.erase(m_viewTab.begin() + index);
+
+    m_tabBar->blockSignals(true);
+    m_tabBar->removeTab(index);
+
+    if (m_tabIndex > index) {
+        m_tabIndex--;
+        Q_ASSERT(m_tabIndex >= 0);
+    }
+
+    // if only one tab is left, also remove the tab entry so that
+    // closing the last tab is not possible
+    if (m_viewTab.count() == 1) {
+        m_tabBar->removeTab(0);
+        actionCollection()->action("close_tab")->setEnabled(false);
+    } else {
+        m_tabBar->blockSignals(false);
+    }
+}
+
+void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
+{
+    KMenu menu(this);
+
+    QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab"));
+    newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut());
+
+    QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs"));
+
+    QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab"));
+    closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut());
+
+    QAction* selectedAction = menu.exec(pos);
+    if (selectedAction == newTabAction) {
+        const ViewTab& tab = m_viewTab[index];
+        Q_ASSERT(tab.primaryView != 0);
+        const KUrl url = (tab.secondaryView != 0) && tab.secondaryView->isActive() ?
+                         tab.secondaryView->url() : tab.primaryView->url();
+        openNewTab(url);
+        m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+    } else if (selectedAction == closeOtherTabsAction) {
+        const int count = m_tabBar->count();
+        for (int i = 0; i < index; ++i) {
+            closeTab(0);
+        }
+        for (int i = index + 1; i < count; ++i) {
+            closeTab(1);

         }
         }

+    } else if (selectedAction == closeTabAction) {
+        closeTab(index);

     }
 }
 
     }
 }
 

+void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons)
+{
+    if (buttons & Qt::MidButton) {
+        openNewTab(url);
+        m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+    } else {
+        changeUrl(url);
+    }
+}
+
+void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode)
+{
+    canDecode = KUrl::List::canDecode(event->mimeData());
+}
+
+void DolphinMainWindow::searchItems(const KUrl& url)
+{
+    m_activeViewContainer->setUrl(url);
+}
+
+

 void DolphinMainWindow::init()
 {
 void DolphinMainWindow::init()
 {

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

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

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

     const bool firstRun = generalSettings->firstRun();
     const bool firstRun = generalSettings->firstRun();

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

 
     setAcceptDrops(true);
 
 
     setAcceptDrops(true);
 

-    m_splitter = new QSplitter(this);
-
-    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");
-    }
+    m_viewTab[m_tabIndex].splitter = new QSplitter(this);

 
     setupActions();
 
 
     setupActions();
 

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

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

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

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

-    m_view[PrimaryIdx] = new DolphinView(this,
-                                         m_splitter,
-                                         homeUrl,
-                                         props.viewMode(),
-                                         props.showHiddenFiles());
-    connectViewSignals(PrimaryIdx);
-    m_view[PrimaryIdx]->show();
-
-    m_activeView = m_view[PrimaryIdx];
-
-    setCentralWidget(m_splitter);
+    m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(this,
+                                                                 m_viewTab[m_tabIndex].splitter,
+                                                                 homeUrl);
+
+    m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
+    connectViewSignals(m_activeViewContainer);
+    DolphinView* view = m_activeViewContainer->view();
+    view->reload();
+    m_activeViewContainer->show();
+    m_actionHandler->setCurrentView(view);
+
+    m_tabBar = new KTabBar(this);
+    m_tabBar->setCloseButtonEnabled(true);
+    connect(m_tabBar, SIGNAL(currentChanged(int)),
+            this, SLOT(setActiveTab(int)));
+    connect(m_tabBar, SIGNAL(closeRequest(int)),
+            this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)),
+            this, SLOT(openTabContextMenu(int, const QPoint&)));
+    connect(m_tabBar, SIGNAL(newTabRequest()),
+            this, SLOT(openNewTab()));
+    connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
+            this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
+    connect(m_tabBar, SIGNAL(wheelDelta(int)),
+           this, SLOT(slotWheelMoved(int)));
+    connect(m_tabBar, SIGNAL(mouseMiddleClick(int)),
+            this, SLOT(closeTab(int)));
+
+    m_tabBar->blockSignals(true);  // signals get unblocked after at least 2 tabs are open
+
+    QWidget* centralWidget = new QWidget(this);
+    m_centralWidgetLayout = new QVBoxLayout(centralWidget);
+    m_centralWidgetLayout->setSpacing(0);
+    m_centralWidgetLayout->setMargin(0);
+    m_centralWidgetLayout->addWidget(m_tabBar);
+    m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter);
+
+    setCentralWidget(centralWidget);

     setupDockWidgets();
     setupDockWidgets();

+    emit urlChanged(homeUrl);

 
 

-    setupGUI(Keys|Save|Create|ToolBar);
-    createGUI();
+    setupGUI(Keys | Save | Create | ToolBar);
+
+    m_searchBox->setParent(toolBar("searchToolBar"));
+    m_searchBox->show();

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

-    setAutoSaveSettings();

 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),


@@ -1123,513 +936,470 @@ void DolphinMainWindow::init()
     updatePasteAction();
     updateGoActions();
 
     updatePasteAction();
     updateGoActions();
 

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

 
 

-    loadSettings();
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    showFilterBarAction->setChecked(generalSettings->filterBar());

 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time

-        resize(640, 480);
+        resize(750, 500);

     }
     }

+
+    m_showMenuBar->setChecked(!menuBar()->isHidden());  // workaround for bug #171080

 }
 
 }
 

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

 {
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    if (settings->splitView()) {
-        splitAction->setChecked(true);
-        toggleSplitView();
+    Q_ASSERT(viewContainer != 0);
+    Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
+             (viewContainer == m_viewTab[m_tabIndex].secondaryView));
+    if (m_activeViewContainer == viewContainer) {
+        return;

     }
 
     }
 

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

     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());
+    if (m_viewTab.count() > 1) {
+        m_tabBar->setTabText(m_tabIndex, tabName(url));

     }
     }

+
+    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);
-    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);
-    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"));
-    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);
-    connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
+    m_newMenu = new DolphinNewMenu(this, this);
+    KMenu* menu = m_newMenu->menu();
+    menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
+    menu->setIcon(KIcon("document-new"));
+    connect(menu, SIGNAL(aboutToShow()),
+            this, SLOT(updateNewMenu()));
+
+    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* newTab = actionCollection()->addAction("new_tab");
+    newTab->setIcon(KIcon("tab-new"));
+    newTab->setText(i18nc("@action:inmenu File", "New Tab"));
+    newTab->setShortcut(KShortcut(Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N));
+    connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
+
+    QAction* closeTab = actionCollection()->addAction("close_tab");
+    closeTab->setIcon(KIcon("tab-close"));
+    closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
+    closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
+    closeTab->setEnabled(false);
+    connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab()));

 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu

-    UndoManager& undoManager = UndoManager::instance();

     KStandardAction::undo(this,
     KStandardAction::undo(this,

-                     SLOT(undo()),
-                     actionCollection());
-    connect(&undoManager, SIGNAL(undoAvailable(bool)),
-            this, SLOT(slotUndoAvailable(bool)));
-    connect(&undoManager, SIGNAL(undoTextChanged(const QString&)),
-            this, SLOT(slotUndoTextChanged(const QString&)));
-
-    KStandardAction::redo(this,
-                     SLOT(redo()),
-                     actionCollection());
-    connect(&undoManager, SIGNAL(redoAvailable(bool)),
-            this, SLOT(slotRedoAvailable(bool)));
-    connect(&undoManager, SIGNAL(redoTextChanged(const QString&)),
-            this, SLOT(slotRedoTextChanged(const QString&)));
-
-    KStandardAction::cut(this, SLOT(cut()), actionCollection());
+                          SLOT(undo()),
+                          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
     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());
-
-    KStandardAction::zoomOut(this,
-                        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()));
-
-    QActionGroup* viewModeGroup = new QActionGroup(this);
-    viewModeGroup->addAction(iconsView);
-    viewModeGroup->addAction(detailsView);
-
-    KToggleAction* sortByName = actionCollection()->add<KToggleAction>("by_name");
-    sortByName->setText(i18n("By Name"));
-    connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
-
-    KToggleAction* sortBySize = actionCollection()->add<KToggleAction>("by_size");
-    sortBySize->setText(i18n("By Size"));
-    connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize()));
-
-    KToggleAction* sortByDate = actionCollection()->add<KToggleAction>("by_date");
-    sortByDate->setText(i18n("By Date"));
-    connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate()));
-
-    QActionGroup* sortGroup = new QActionGroup(this);
-    sortGroup->addAction(sortByName);
-    sortGroup->addAction(sortBySize);
-    sortGroup->addAction(sortByDate);
-
-    KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
-    sortDescending->setText(i18n("Descending"));
-    connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
-
-    KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
-    showPreview->setText(i18n("Show Preview"));
-    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 '.'?
-    connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
-
-    KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
-    split->setText(i18n("Split View"));
-    split->setShortcut(Qt::Key_F10);
-    split->setIcon(KIcon("view_left_right"));
+    // (note that most of it is set up in DolphinViewActionHandler)
+
+    KAction* split = actionCollection()->addAction("split_view");
+    split->setShortcut(Qt::Key_F3);
+    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()));
 
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");

-    showFullLocation->setText(i18n("Show Full Location"));
+    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable 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"));
-    editLocation->setShortcut(Qt::Key_F6);
-    connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
-
-    QAction* adjustViewProps = actionCollection()->addAction("view_properties");
-    adjustViewProps->setText(i18n("Adjust View Properties..."));
-    connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
+    KAction* replaceLocation = actionCollection()->addAction("replace_location");
+    replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
+    replaceLocation->setShortcut(Qt::Key_F6);
+    connect(replaceLocation, SIGNAL(triggered()), this, SLOT(replaceLocation()));

 
     // setup 'Go' menu
 
     // 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");
-    findFile->setText(i18n("Find File..."));
-    findFile->setShortcut(Qt::Key_F);
-    findFile->setIcon(KIcon("filefind"));
-    connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
+    KToggleAction* showSearchBar = actionCollection()->add<KToggleAction>("show_search_bar");
+    showSearchBar->setText(i18nc("@action:inmenu Tools", "Show Search Bar"));
+    showSearchBar->setShortcut(Qt::CTRL | Qt::Key_S);
+    connect(showSearchBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));

 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
 
     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(bool)), this, SLOT(toggleFilterBarVisibility(bool)));

 
 

-    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()));
 
     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 

+    // disabled Quick View
+#if defined(QUICK_VIEW)
+    KAction* quickView = actionCollection()->addAction("quick_view");
+    quickView->setText(i18nc("@action:inmenu Tools", "Quick View"));
+    quickView->setIcon(KIcon("view-preview"));
+    quickView->setShortcut(Qt::CTRL + Qt::Key_Return);
+    quickView->setEnabled(false);
+    connect(quickView, SIGNAL(triggered()), this, SLOT(quickView()));
+#endif
+

     // setup 'Settings' menu
     // setup 'Settings' menu

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

     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());

+
+    // not in menu actions
+    KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
+    activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
+    connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
+    activateNextTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabPrev() :
+                                                                  KStandardShortcut::tabNext());
+
+    KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
+    activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
+    connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
+    activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabNext() :
+                                                                  KStandardShortcut::tabPrev());
+
+    // for context menu
+    KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
+    openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));
+    openInNewTab->setIcon(KIcon("tab-new"));
+    connect(openInNewTab, SIGNAL(triggered()), this, SLOT(openInNewTab()));
+
+    KAction* openInNewWindow = actionCollection()->addAction("open_in_new_window");
+    openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
+    openInNewWindow->setIcon(KIcon("window-new"));
+    connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow()));
+
+    // 'Search' toolbar
+    m_searchBox = new DolphinSearchBox(this);
+    connect(m_searchBox, SIGNAL(search(KUrl)), this, SLOT(searchItems(KUrl)));
+
+    KAction* search = new KAction(this);
+    actionCollection()->addAction("search_bar", search);
+    search->setText(i18nc("@action:inmenu", "Search Bar"));
+    search->setDefaultWidget(m_searchBox);
+    search->setShortcutConfigurable(false);

 }
 
 void DolphinMainWindow::setupDockWidgets()
 {
 }
 
 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));
+    Panel* infoPanel = new InformationPanel(infoDock);
+    infoDock->setWidget(infoPanel);

 
 

-    infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+    QAction* infoAction = infoDock->toggleViewAction();
+    infoAction->setText(i18nc("@title:window", "Information"));
+    infoAction->setShortcut(Qt::Key_F11);
+    infoAction->setIcon(KIcon("dialog-information"));

     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);
-                }
-            }
-        }
-    }
-    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;
-            }
-
-            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;
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            infoPanel, SLOT(setUrl(KUrl)));
+    connect(this, SIGNAL(selectionChanged(KFileItemList)),
+            infoPanel, SLOT(setSelection(KFileItemList)));
+    connect(this, SIGNAL(requestItemInfo(KFileItem)),
+            infoPanel, SLOT(requestDelayedItemInfo(KFileItem)));
+
+    // setup "Folders"
+    QDockWidget* foldersDock = new QDockWidget(i18nc("@title:window", "Folders"));
+    foldersDock->setObjectName("foldersDock");
+    foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
+    foldersDock->setWidget(foldersPanel);
+
+    QAction* foldersAction = foldersDock->toggleViewAction();
+    foldersAction->setText(i18nc("@title:window", "Folders"));
+    foldersAction->setShortcut(Qt::Key_F7);
+    foldersAction->setIcon(KIcon("folder"));
+    actionCollection()->addAction("show_folders_panel", foldersDock->toggleViewAction());
+
+    addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            foldersPanel, SLOT(setUrl(KUrl)));
+    connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
+            this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
+    connect(foldersPanel, SIGNAL(changeSelection(KFileItemList)),
+            this, SLOT(changeSelection(KFileItemList)));
+
+    // setup "Terminal"
+#ifndef Q_OS_WIN
+    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
+    terminalDock->setObjectName("terminalDock");
+    terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+    Panel* terminalPanel = new TerminalPanel(terminalDock);
+    terminalDock->setWidget(terminalPanel);
+
+    connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
+
+    QAction* terminalAction = terminalDock->toggleViewAction();
+    terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
+    terminalAction->setShortcut(Qt::Key_F4);
+    terminalAction->setIcon(KIcon("terminal"));
+    actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
+
+    addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            terminalPanel, SLOT(setUrl(KUrl)));
+#endif
+
+    const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
+    if (firstRun) {
+        foldersDock->hide();
+#ifndef Q_OS_WIN
+        terminalDock->hide();
+#endif

     }
 
     }
 

-    plugActionList("create_file_group", m_fileGroupActions);
-    //plugActionList("create_link_group", m_linkGroupActions);
-    //plugActionList("link_to_device", m_linkToDeviceActions);*/
-}
+    QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
+    placesDock->setObjectName("placesDock");
+    placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);

 
 

-void DolphinMainWindow::updateHistory()
-{
-    int index = 0;
-    const Q3ValueList<UrlNavigator::HistoryElem> list = m_activeView->urlHistory(index);
+    PlacesPanel* placesPanel = new PlacesPanel(placesDock);
+    placesDock->setWidget(placesPanel);
+    placesPanel->setModel(DolphinSettings::instance().placesModel());
+    placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

 
 

-    QAction* backAction = actionCollection()->action("go_back");
-    if (backAction != 0) {
-        backAction->setEnabled(index < static_cast<int>(list.count()) - 1);
-    }
+    QAction* placesAction = placesDock->toggleViewAction();
+    placesAction->setText(i18nc("@title:window", "Places"));
+    placesAction->setShortcut(Qt::Key_F9);
+    placesAction->setIcon(KIcon("bookmarks"));
+    actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());

 
 

-    QAction* forwardAction = actionCollection()->action("go_forward");
-    if (forwardAction != 0) {
-        forwardAction->setEnabled(index > 0);
-    }
+    addDockWidget(Qt::LeftDockWidgetArea, placesDock);
+    connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
+            this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            placesPanel, SLOT(setUrl(KUrl)));

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

-        QAction* renameAction = actionCollection()->action("rename");
-        if (renameAction != 0) {
-            renameAction->setEnabled(list.count() >= 1);
-        }
+        KActionCollection* col = actionCollection();
+        QAction* renameAction      = col->action("rename");
+        QAction* moveToTrashAction = col->action("move_to_trash");
+        QAction* deleteAction      = col->action("delete");
+        QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
+        QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler

 
 

-        bool enableMoveToTrash = true;
-
-        KFileItemList::const_iterator it = list.begin();
-        const KFileItemList::const_iterator end = list.end();
-        while (it != end) {
-            KFileItem* item = *it;
-            const KUrl& url = item->url();
-            // only enable the 'Move to Trash' action for local files
-            if (!url.isLocalFile()) {
-                enableMoveToTrash = false;
-            }
-            ++it;
-        }
+        KonqFileItemCapabilities capabilities(list);
+        const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();

 
 

-        QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
+        renameAction->setEnabled(capabilities.supportsMoving());

         moveToTrashAction->setEnabled(enableMoveToTrash);
         moveToTrashAction->setEnabled(enableMoveToTrash);

+        deleteAction->setEnabled(capabilities.supportsDeleting());
+        deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
+        cutAction->setEnabled(capabilities.supportsMoving());

     }
     updatePasteAction();
 }
 
 void DolphinMainWindow::updateViewActions()
 {
     }
     updatePasteAction();
 }
 
 void DolphinMainWindow::updateViewActions()
 {

-    QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn));
-    if (zoomInAction != 0) {
-        zoomInAction->setEnabled(m_activeView->isZoomInPossible());
-    }
+    m_actionHandler->updateViewActions();

 
 

-    QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut));
-    if (zoomOutAction != 0) {
-        zoomOutAction->setEnabled(m_activeView->isZoomOutPossible());
-    }
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());

 
 

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

 
 

-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
-    }
+    QAction* editableLocactionAction = actionCollection()->action("editable_location");
+    const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
+}

 
 

-    slotSortingChanged(m_activeView->sorting());
-    slotSortOrderChanged(m_activeView->sortOrder());
+void DolphinMainWindow::updateGoActions()
+{
+    QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
+    const KUrl& currentUrl = m_activeViewContainer->url();
+    goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
+}

 
 

-    KToggleAction* showFilterBarAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
-    showFilterBarAction->setChecked(m_activeView->isFilterBarVisible());
+void DolphinMainWindow::clearStatusBar()
+{
+    m_activeViewContainer->statusBar()->clear();
+}

 
 

-    KToggleAction* showHiddenFilesAction =
-        static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
-    showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
+{
+    connect(container, SIGNAL(showFilterBarChanged(bool)),
+            this, SLOT(updateFilterBarAction(bool)));

 
 

-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    splitAction->setChecked(m_view[SecondaryIdx] != 0);
+    DolphinView* view = container->view();
+    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(tabRequested(const KUrl&)),
+            this, SLOT(openNewTab(const KUrl&)));
+
+    const KUrlNavigator* navigator = container->urlNavigator();
+    connect(navigator, SIGNAL(urlChanged(const KUrl&)),
+            this, SLOT(changeUrl(const KUrl&)));
+    connect(navigator, SIGNAL(historyChanged()),
+            this, SLOT(updateHistory()));
+    connect(navigator, SIGNAL(editableStateChanged(bool)),
+            this, SLOT(slotEditableStateChanged(bool)));

 }
 
 }
 

-void DolphinMainWindow::updateGoActions()
+void DolphinMainWindow::updateSplitAction()

 {
 {

-    QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up));
-    const KUrl& currentUrl = m_activeView->url();
-    goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
+    QAction* splitAction = actionCollection()->action("split_view");
+    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+        if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
+            splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
+            splitAction->setIcon(KIcon("view-right-close"));
+        } else {
+            splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
+            splitAction->setIcon(KIcon("view-left-close"));
+        }
+    } else {
+        splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
+        splitAction->setIcon(KIcon("view-right-new"));
+    }

 }
 
 }
 

-void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest)
+QString DolphinMainWindow::tabName(const KUrl& url) const

 {
 {

-    KIO::Job* job = KIO::copy(source, dest);
-    addPendingUndoJob(job, DolphinCommand::Copy, source, dest);
+    QString name;
+    if (url.equals(KUrl("file:///"))) {
+        name = "/";
+    } else {
+        name = url.fileName();
+        if (name.isEmpty()) {
+            name = url.protocol();
+        } else {
+            // Make sure that a '&' inside the directory name is displayed correctly
+            // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
+            name.replace('&', "&&");
+        }
+    }
+    return name;

 }
 
 }
 

-void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest)
+bool DolphinMainWindow::isKompareInstalled() const

 {
 {

-    KIO::Job* job = KIO::move(source, dest);
-    addPendingUndoJob(job, DolphinCommand::Move, source, dest);
+    static bool initialized = false;
+    static bool installed = false;
+    if (!initialized) {
+        // TODO: maybe replace this approach later by using a menu
+        // plugin like kdiff3plugin.cpp
+        installed = !KGlobal::dirs()->findExe("kompare").isEmpty();
+        initialized = true;
+    }
+    return installed;

 }
 
 }
 

-void DolphinMainWindow::addPendingUndoJob(KIO::Job* job,
-                                          DolphinCommand::Type commandType,
-                                          const KUrl::List& source,
-                                          const KUrl& dest)
+void DolphinMainWindow::createSecondaryView(int tabIndex)

 {
 {

-    connect(job, SIGNAL(result(KJob*)),
-            this, SLOT(addUndoOperation(KJob*)));
+    QSplitter* splitter = m_viewTab[tabIndex].splitter;
+    const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2;

 
 

-    UndoInfo undoInfo;
-    undoInfo.id = job->progressId();
-    undoInfo.command = DolphinCommand(commandType, source, dest);
-    m_pendingUndoJobs.append(undoInfo);
+    const DolphinView* view = m_viewTab[tabIndex].primaryView->view();
+    m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(this, 0, view->rootUrl());
+    splitter->addWidget(m_viewTab[tabIndex].secondaryView);
+    splitter->setSizes(QList<int>() << newWidth << newWidth);
+    connectViewSignals(m_viewTab[tabIndex].secondaryView);
+    m_viewTab[tabIndex].secondaryView->view()->reload();
+    m_viewTab[tabIndex].secondaryView->setActive(false);
+    m_viewTab[tabIndex].secondaryView->show();

 }
 
 }
 

-void DolphinMainWindow::clearStatusBar()
+DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
+    KIO::FileUndoManager::UiInterface()

 {
 {

-    m_activeView->statusBar()->clear();

 }
 
 }
 

-void DolphinMainWindow::connectViewSignals(int viewIndex)
+DolphinMainWindow::UndoUiInterface::~UndoUiInterface()

 {
 {

-    DolphinView* view = m_view[viewIndex];
-    connect(view, SIGNAL(modeChanged()),
-            this, SLOT(slotViewModeChanged()));
-    connect(view, SIGNAL(showHiddenFilesChanged()),
-            this, SLOT(slotShowHiddenFilesChanged()));
-    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(navigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(slotUrlChanged(const KUrl&)));
-    connect(navigator, SIGNAL(historyChanged()),
-            this, SLOT(slotHistoryChanged()));
+}

 
 

+void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
+{
+    DolphinMainWindow* mainWin= qobject_cast<DolphinMainWindow *>(parentWidget());
+    if (mainWin) {
+        DolphinStatusBar* statusBar = mainWin->activeViewContainer()->statusBar();
+        statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
+    } else {
+        KIO::FileUndoManager::UiInterface::jobError(job);
+    }

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