Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 92c0cfc80a5051dd91d80f1fde7dc34c38b27a62..5f44249b7244a89093004cc020d23b504067eea3 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,21 +21,25 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinviewactionhandler.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphinviewactionhandler.h"

+#include "dolphinremoteencoding.h"

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

+#ifdef HAVE_NEPOMUK
+#include "search/dolphinsearchoptionsconfigurator.h"
+#endif

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

+#include "dolphincontextmenu.h"

 #include "dolphinnewmenu.h"
 #include "dolphinnewmenu.h"

+#include "search/dolphinsearchbox.h"

 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettingsdialog.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 "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 "mainwindowadaptor.h"

+#include "statusbar/dolphinstatusbar.h"

 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN


@@ -48,6 +52,7 @@
 
 #include <kaction.h>
 #include <kactioncollection.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>

+#include <kactionmenu.h>

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


@@ -65,7 +70,7 @@
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>

-#include <konq_fileitemcapabilities.h>
+#include <kfileitemlistproperties.h>

 #include <konqmimedata.h>
 #include <kprotocolinfo.h>
 #include <krun.h>
 #include <konqmimedata.h>
 #include <kprotocolinfo.h>
 #include <krun.h>


@@ -78,13 +83,27 @@
 #include <kurlnavigator.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 #include <kurlnavigator.h>
 #include <kurl.h>
 #include <kurlcombobox.h>

+#include <ktoolinvocation.h>

 
 #include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>
 
 #include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>

-#include <QLineEdit>

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

+#include <kacceleratormanager.h>
+
+/*
+ * Remembers the tab configuration if a tab has been closed.
+ * Each closed tab can be restored by the menu
+ * "Go -> Recently Closed Tabs".
+ */
+struct ClosedTab
+{
+    KUrl primaryUrl;
+    KUrl secondaryUrl;
+    bool isSplit;
+};
+Q_DECLARE_METATYPE(ClosedTab)

 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),


@@ -94,11 +113,17 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),
     m_searchBox(0),
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),
     m_searchBox(0),

+#ifdef HAVE_NEPOMUK
+    m_searchOptionsConfigurator(0),
+#endif

     m_id(id),
     m_tabIndex(0),
     m_viewTab(),
     m_actionHandler(0),
     m_id(id),
     m_tabIndex(0),
     m_viewTab(),
     m_actionHandler(0),

-    m_settingsDialog(0)
+    m_remoteEncoding(0),
+    m_settingsDialog(0),
+    m_captionStatJob(0),
+    m_lastHandleUrlStatJob(0)

 {
     setObjectName("Dolphin#");
 
 {
     setObjectName("Dolphin#");
 


@@ -129,6 +154,68 @@ DolphinMainWindow::~DolphinMainWindow()
     DolphinApplication::app()->removeMainWindow(this);
 }
 
     DolphinApplication::app()->removeMainWindow(this);
 }
 

+void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
+{
+    if (dirs.isEmpty()) {
+        return;
+    }
+
+    const int oldOpenTabsCount = m_viewTab.count();
+
+    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+    const bool hasSplitView = generalSettings->splitView();
+
+    // Open each directory inside a new tab. If the "split view" option has been enabled,
+    // always show two directories within one tab.
+    QList<KUrl>::const_iterator it = dirs.begin();
+    while (it != dirs.end()) {
+        openNewTab(*it);
+        ++it;
+
+        if (hasSplitView && (it != dirs.end())) {
+            const int tabIndex = m_viewTab.count() - 1;
+            m_viewTab[tabIndex].secondaryView->setUrl(*it);
+            ++it;
+        }
+    }
+
+    // remove the previously opened tabs
+    for (int i = 0; i < oldOpenTabsCount; ++i) {
+        closeTab(0);
+    }
+}
+
+void DolphinMainWindow::openFiles(const QList<KUrl>& files)
+{
+    if (files.isEmpty()) {
+        return;
+    }
+
+    // Get all distinct directories from 'files' and open a tab
+    // for each directory. If the "split view" option is enabled, two
+    // directories are shown inside one tab (see openDirectories()).
+    QList<KUrl> dirs;
+    foreach (const KUrl& url, files) {
+        const KUrl dir(url.directory());
+        if (!dirs.contains(dir)) {
+            dirs.append(dir);
+        }
+    }
+
+    openDirectories(dirs);
+
+    // Select the files. Although the files can be split between several
+    // tabs, there is no need to split 'files' accordingly, as
+    // the DolphinView will just ignore invalid selections.
+    const int tabCount = m_viewTab.count();
+    for (int i = 0; i < tabCount; ++i) {
+        m_viewTab[i].primaryView->view()->markUrlsAsSelected(files);
+        if (m_viewTab[i].secondaryView != 0) {
+            m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files);
+        }
+    }
+}
+

 void DolphinMainWindow::toggleViews()
 {
     if (m_viewTab[m_tabIndex].primaryView == 0) {
 void DolphinMainWindow::toggleViews()
 {
     if (m_viewTab[m_tabIndex].primaryView == 0) {


@@ -149,23 +236,23 @@ void DolphinMainWindow::showCommand(CommandType command)
     DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
     switch (command) {
     case KIO::FileUndoManager::Copy:
     DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
     switch (command) {
     case KIO::FileUndoManager::Copy:

-        statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
+        statusBar->setMessage(i18nc("@info:status", "Successfully copied."),

                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Move:
                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Move:

-        statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
+        statusBar->setMessage(i18nc("@info:status", "Successfully moved."),

                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Link:
                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Link:

-        statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
+        statusBar->setMessage(i18nc("@info:status", "Successfully linked."),

                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Trash:
                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Trash:

-        statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
+        statusBar->setMessage(i18nc("@info:status", "Successfully moved to trash."),

                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Rename:
                               DolphinStatusBar::OperationCompleted);
         break;
     case KIO::FileUndoManager::Rename:

-        statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
+        statusBar->setMessage(i18nc("@info:status", "Successfully renamed."),

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


@@ -219,19 +306,16 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
         updateEditActions();
         updateViewActions();
         updateGoActions();
         updateEditActions();
         updateViewActions();
         updateGoActions();

-        setCaption(url.fileName());
+        setUrlAsCaption(url);

         if (m_viewTab.count() > 1) {
         if (m_viewTab.count() > 1) {

-            m_tabBar->setTabText(m_tabIndex, tabName(url));
+            m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(m_activeViewContainer->url())));

         }
         }

+        const QString iconName = KMimeType::iconNameForUrl(url);
+        m_tabBar->setTabIcon(m_tabIndex, KIcon(iconName));

         emit urlChanged(url);
     }
 }
 
         emit urlChanged(url);
     }
 }
 

-void DolphinMainWindow::changeSelection(const KFileItemList& selection)
-{
-    activeViewContainer()->view()->changeSelection(selection);
-}
-

 void DolphinMainWindow::slotEditableStateChanged(bool editable)
 {
     KToggleAction* editableLocationAction =
 void DolphinMainWindow::slotEditableStateChanged(bool editable)
 {
     KToggleAction* editableLocationAction =


@@ -256,13 +340,6 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
         compareFilesAction->setEnabled(false);
     }
 
         compareFilesAction->setEnabled(false);
     }
 

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

     emit selectionChanged(selection);
 }
 
     emit selectionChanged(selection);
 }
 


@@ -286,11 +363,13 @@ void DolphinMainWindow::updateHistory()
     const int index = urlNavigator->historyIndex();
 
     QAction* backAction = actionCollection()->action("go_back");
     const int index = urlNavigator->historyIndex();
 
     QAction* backAction = actionCollection()->action("go_back");

+    backAction->setToolTip(i18nc("@info", "Go back"));

     if (backAction != 0) {
         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");
     if (backAction != 0) {
         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");

+    forwardAction->setToolTip(i18nc("@info", "Go forward"));

     if (forwardAction != 0) {
         forwardAction->setEnabled(index > 0);
     }
     if (forwardAction != 0) {
         forwardAction->setEnabled(index > 0);
     }


@@ -309,12 +388,18 @@ void DolphinMainWindow::openNewMainWindow()
 
 void DolphinMainWindow::openNewTab()
 {
 
 void DolphinMainWindow::openNewTab()
 {

+    const bool isUrlEditable =  m_activeViewContainer->urlNavigator()->isUrlEditable();
+

     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
 
     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
 

+    // The URL navigator of the new tab should have the same editable state
+    // as the current tab

     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();

-    if (navigator->isUrlEditable()) {
-        // if a new tab is opened and the URL is editable, assure that
+    navigator->setUrlEditable(isUrlEditable);
+
+    if (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();
     }
         // the user can edit the URL without manually setting the focus
         navigator->setFocus();
     }


@@ -322,18 +407,24 @@ void DolphinMainWindow::openNewTab()
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
 {
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
 {

+    QWidget* focusWidget = QApplication::focusWidget();
+

     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.
     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()));
+        const KUrl currentUrl = m_activeViewContainer->url();
+        m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(currentUrl)),
+                         squeezedText(tabName(currentUrl)));

         m_tabBar->blockSignals(false);
     }
 
         m_tabBar->blockSignals(false);
     }
 

-    m_tabBar->addTab(KIcon("folder"), tabName(url));
+    m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(url)),
+                     squeezedText(tabName(url)));

 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);

-    viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
+    viewTab.splitter->setChildrenCollapsible(false);
+    viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter);

     viewTab.primaryView->setActive(false);
     connectViewSignals(viewTab.primaryView);
     viewTab.primaryView->view()->reload();
     viewTab.primaryView->setActive(false);
     connectViewSignals(viewTab.primaryView);
     viewTab.primaryView->view()->reload();


@@ -350,11 +441,17 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
         m_viewTab[tabIndex].secondaryView->setActive(true);
         m_viewTab[tabIndex].isPrimaryViewActive = false;
     }
         m_viewTab[tabIndex].secondaryView->setActive(true);
         m_viewTab[tabIndex].isPrimaryViewActive = false;
     }

+
+    if (focusWidget != 0) {
+        // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened
+        // in background, assure that the previous focused widget gets the focus back.
+        focusWidget->setFocus();
+    }

 }
 
 void DolphinMainWindow::activateNextTab()
 {
 }
 
 void DolphinMainWindow::activateNextTab()
 {

-    if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+    if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) {

         return;
     }
 
         return;
     }
 


@@ -364,7 +461,7 @@ void DolphinMainWindow::activateNextTab()
 
 void DolphinMainWindow::activatePrevTab()
 {
 
 void DolphinMainWindow::activatePrevTab()
 {

-    if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+    if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) {

         return;
     }
 
         return;
     }
 


@@ -408,10 +505,70 @@ void DolphinMainWindow::toggleActiveView()
     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 
     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 

+void DolphinMainWindow::showEvent(QShowEvent* event)
+{
+    KXmlGuiWindow::showEvent(event);
+    if (!event->spontaneous()) {
+        m_activeViewContainer->view()->setFocus();
+    }
+}
+

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

+
+    // Find out if Dolphin is closed directly by the user or
+    // by the session manager because the session is closed
+    bool closedByUser = true;
+    DolphinApplication *application = qobject_cast<DolphinApplication*>(qApp);
+    if (application && application->sessionSaving()) {
+        closedByUser = false;
+    }
+
+    if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs() && closedByUser) {
+        // Ask the user if he really wants to quit and close all tabs.
+        // Open a confirmation dialog with 3 buttons:
+        // KDialog::Yes    -> Quit
+        // KDialog::No     -> Close only the current tab
+        // KDialog::Cancel -> do nothing
+        KDialog *dialog = new KDialog(this, Qt::Dialog);
+        dialog->setCaption(i18nc("@title:window", "Confirmation"));
+        dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
+        dialog->setModal(true);
+        dialog->showButtonSeparator(true);
+        dialog->setButtonGuiItem(KDialog::Yes, KStandardGuiItem::quit());
+        dialog->setButtonGuiItem(KDialog::No, KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close")));
+        dialog->setButtonGuiItem(KDialog::Cancel, KStandardGuiItem::cancel());
+        dialog->setDefaultButton(KDialog::Yes);
+
+        bool doNotAskAgainCheckboxResult = false;
+
+        const int result = KMessageBox::createKMessageBox(dialog,
+            QMessageBox::Warning,
+            i18n("You have multiple tabs open in this window, are you sure you want to quit?"),
+            QStringList(),
+            i18n("Do not ask again"),
+            &doNotAskAgainCheckboxResult,
+            KMessageBox::Notify);
+
+        if (doNotAskAgainCheckboxResult) {
+            generalSettings->setConfirmClosingMultipleTabs(false);
+        }
+
+        switch (result) {
+            case KDialog::Yes:
+                // Quit
+                break;
+            case KDialog::No:
+                // Close only the current tab
+              closeTab();
+            default:
+                event->ignore();
+                return;
+        }
+    }
+

     generalSettings->setFirstRun(false);
 
     settings.save();
     generalSettings->setFirstRun(false);
 
     settings.save();


@@ -421,52 +578,77 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
 void DolphinMainWindow::saveProperties(KConfigGroup& group)
 {
 
 void DolphinMainWindow::saveProperties(KConfigGroup& group)
 {

-    // TODO: remember tabs
-    DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;
-    group.writeEntry("Primary Url", cont->url().url());
-    group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+    const int tabCount = m_viewTab.count();
+    group.writeEntry("Tab Count", tabCount);
+    group.writeEntry("Active Tab Index", m_tabBar->currentIndex());

 
 

-    cont = m_viewTab[m_tabIndex].secondaryView;
-    if (cont != 0) {
-        group.writeEntry("Secondary Url", cont->url().url());
-        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());
+    for (int i = 0; i < tabCount; ++i) {
+        const DolphinViewContainer* cont = m_viewTab[i].primaryView;
+        group.writeEntry(tabProperty("Primary URL", i), cont->url().url());
+        group.writeEntry(tabProperty("Primary Editable", i),
+                         cont->urlNavigator()->isUrlEditable());
+
+        cont = m_viewTab[i].secondaryView;
+        if (cont != 0) {
+            group.writeEntry(tabProperty("Secondary URL", i), cont->url().url());
+            group.writeEntry(tabProperty("Secondary Editable", i),
+                             cont->urlNavigator()->isUrlEditable());
+        }

     }
 }
 
 void DolphinMainWindow::readProperties(const KConfigGroup& group)
 {
     }
 }
 
 void DolphinMainWindow::readProperties(const KConfigGroup& group)
 {

-    // TODO: read tabs
-    DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;
+    const int tabCount = group.readEntry("Tab Count", 1);
+    for (int i = 0; i < tabCount; ++i) {
+        DolphinViewContainer* cont = m_viewTab[i].primaryView;

 
 

-    cont->setUrl(group.readEntry("Primary Url"));
-    bool editable = group.readEntry("Primary Editable Url", false);
-    cont->urlNavigator()->setUrlEditable(editable);
+        cont->setUrl(group.readEntry(tabProperty("Primary URL", i)));
+        const bool editable = group.readEntry(tabProperty("Primary Editable", i), false);
+        cont->urlNavigator()->setUrlEditable(editable);

 
 

-    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
+        cont = m_viewTab[i].secondaryView;
+        const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i));
+        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[i].secondaryView;
+                Q_ASSERT(cont != 0);
+            }
+
+            cont->setUrl(secondaryUrl);
+            const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
+            cont->urlNavigator()->setUrlEditable(editable);
+        } else if (cont != 0) {
+            // no secondary view should be shown, but the default setting shows
+            // one already -> close the view

             toggleSplitView();
             toggleSplitView();

-            cont = m_viewTab[m_tabIndex].secondaryView;
-            Q_ASSERT(cont != 0);

         }
 
         }
 

-        cont->setUrl(secondaryUrl);
-        bool editable = group.readEntry("Secondary Editable Url", false);
-        cont->urlNavigator()->setUrlEditable(editable);
-    } else if (cont != 0) {
-        // no secondary view should be shown, but the default setting shows
-        // one already -> close the view
-        toggleSplitView();
+        // openNewTab() needs to be called only tabCount - 1 times
+        if (i != tabCount - 1) {
+             openNewTab();
+        }

     }
     }

+
+    const int index = group.readEntry("Active Tab Index", 0);
+    m_tabBar->setCurrentIndex(index);

 }
 
 void DolphinMainWindow::updateNewMenu()
 {
 }
 
 void DolphinMainWindow::updateNewMenu()
 {

-    m_newMenu->slotCheckUpToDate();
+    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newMenu->checkUpToDate();
+    m_newMenu->setPopupFiles(activeViewContainer()->url());
+}
+
+void DolphinMainWindow::createDirectory()
+{
+    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());

     m_newMenu->setPopupFiles(activeViewContainer()->url());
     m_newMenu->setPopupFiles(activeViewContainer()->url());

+    m_newMenu->createDirectory();

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


@@ -490,6 +672,35 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
     }
 }
 
     }
 }
 

+void DolphinMainWindow::restoreClosedTab(QAction* action)
+{
+    if (action->data().toBool()) {
+        // clear all actions except the "Empty Recently Closed Tabs"
+        // action and the separator
+        QList<QAction*> actions = m_recentTabsMenu->menu()->actions();
+        const int count = actions.size();
+        for (int i = 2; i < count; ++i) {
+            m_recentTabsMenu->menu()->removeAction(actions.at(i));
+        }
+    } else {
+        const ClosedTab closedTab = action->data().value<ClosedTab>();
+        openNewTab(closedTab.primaryUrl);
+        m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+
+        if (closedTab.isSplit) {
+            // create secondary view
+            toggleSplitView();
+            m_viewTab[m_tabIndex].secondaryView->setUrl(closedTab.secondaryUrl);
+        }
+
+        m_recentTabsMenu->removeAction(action);
+    }
+
+    if (m_recentTabsMenu->menu()->actions().count() == 2) {
+        m_recentTabsMenu->setEnabled(false);
+    }
+}
+

 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));


@@ -536,7 +747,7 @@ void DolphinMainWindow::selectAll()
     // URL instead of all items of the view
 
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     // URL instead of all items of the view
 
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();

-    QLineEdit* lineEdit = urlNavigator->editor()->lineEdit();
+    QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); // krazy:exclude=qclasses

     const bool selectUrl = urlNavigator->isUrlEditable() &&
                            lineEdit->hasFocus();
     if (selectUrl) {
     const bool selectUrl = urlNavigator->isUrlEditable() &&
                            lineEdit->hasFocus();
     if (selectUrl) {


@@ -612,7 +823,7 @@ void DolphinMainWindow::replaceLocation()
     navigator->setFocus();
 
     // select the whole text of the combo box editor
     navigator->setFocus();
 
     // select the whole text of the combo box editor

-    QLineEdit* lineEdit = navigator->editor()->lineEdit();
+    QLineEdit* lineEdit = navigator->editor()->lineEdit();  // krazy:exclude=qclasses

     const QString text = lineEdit->text();
     lineEdit->setSelection(0, text.length());
 }
     const QString text = lineEdit->text();
     lineEdit->setSelection(0, text.length());
 }


@@ -635,6 +846,34 @@ void DolphinMainWindow::goUp()
     m_activeViewContainer->urlNavigator()->goUp();
 }
 
     m_activeViewContainer->urlNavigator()->goUp();
 }
 

+void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
+{
+    // The default case (left button pressed) is handled in goBack().
+    if (buttons == Qt::MidButton) {
+        KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
+        const int index = urlNavigator->historyIndex() + 1;
+        openNewTab(urlNavigator->locationUrl(index));
+    }
+}
+
+void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
+{
+    // The default case (left button pressed) is handled in goForward().
+    if (buttons == Qt::MidButton) {
+        KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
+        const int index = urlNavigator->historyIndex() - 1;
+        openNewTab(urlNavigator->locationUrl(index));
+    }
+}
+
+void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
+{
+    // The default case (left button pressed) is handled in goUp().
+    if (buttons == Qt::MidButton) {
+        openNewTab(activeViewContainer()->url().upUrl());
+    }
+}
+

 void DolphinMainWindow::goHome()
 {
     clearStatusBar();
 void DolphinMainWindow::goHome()
 {
     clearStatusBar();


@@ -695,24 +934,28 @@ void DolphinMainWindow::compareFiles()
     KRun::runCommand(command, "Kompare", "kompare", this);
 }
 
     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::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
     menuBar()->setVisible(!visible);
 }
 

+void DolphinMainWindow::openTerminal()
+{
+    QString dir(QDir::homePath());
+
+    // If the given directory is not local, it can still be the URL of an
+    // ioslave using UDS_LOCAL_PATH which to be converted first.
+    KUrl url = KIO::NetAccess::mostLocalUrl(m_activeViewContainer->url(), this);
+
+    //If the URL is local after the above conversion, set the directory.
+    if (url.isLocalFile()) {
+        dir = url.toLocalFile();
+    }
+
+    KToolInvocation::invokeTerminal(QString(), dir);
+}
+

 void DolphinMainWindow::editSettings()
 {
     if (m_settingsDialog == 0) {
 void DolphinMainWindow::editSettings()
 {
     if (m_settingsDialog == 0) {


@@ -748,7 +991,7 @@ void DolphinMainWindow::setActiveTab(int index)
     m_tabIndex = index;
 
     ViewTab& viewTab = m_viewTab[index];
     m_tabIndex = index;
 
     ViewTab& viewTab = m_viewTab[index];

-    m_centralWidgetLayout->addWidget(viewTab.splitter);
+    m_centralWidgetLayout->addWidget(viewTab.splitter, 1);

     viewTab.primaryView->show();
     if (viewTab.secondaryView != 0) {
         viewTab.secondaryView->show();
     viewTab.primaryView->show();
     if (viewTab.secondaryView != 0) {
         viewTab.secondaryView->show();


@@ -769,7 +1012,7 @@ void DolphinMainWindow::closeTab(int index)
     Q_ASSERT(index >= 0);
     Q_ASSERT(index < m_viewTab.count());
     if (m_viewTab.count() == 1) {
     Q_ASSERT(index >= 0);
     Q_ASSERT(index < m_viewTab.count());
     if (m_viewTab.count() == 1) {

-          // the last tab may never get closed
+        // the last tab may never get closed

         return;
     }
 
         return;
     }
 


@@ -778,6 +1021,7 @@ void DolphinMainWindow::closeTab(int index)
         // previous tab before closing the tab.
         m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
     }
         // previous tab before closing the tab.
         m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
     }

+    rememberClosedTab(index);

 
     // delete tab
     m_viewTab[index].primaryView->deleteLater();
 
     // delete tab
     m_viewTab[index].primaryView->deleteLater();


@@ -812,11 +1056,12 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
     QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab"));
     newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut());
 
     QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab"));
     newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut());
 

+    QAction* detachTabAction = menu.addAction(KIcon("tab-detach"), i18nc("@action:inmenu", "Detach Tab"));
+

     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* 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];
     QAction* selectedAction = menu.exec(pos);
     if (selectedAction == newTabAction) {
         const ViewTab& tab = m_viewTab[index];


@@ -825,6 +1070,25 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
                          tab.secondaryView->url() : tab.primaryView->url();
         openNewTab(url);
         m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
                          tab.secondaryView->url() : tab.primaryView->url();
         openNewTab(url);
         m_tabBar->setCurrentIndex(m_viewTab.count() - 1);

+    } else if (selectedAction == detachTabAction) {
+        const ViewTab& tab = m_viewTab[index];
+        Q_ASSERT(tab.primaryView != 0);
+        const KUrl primaryUrl = tab.primaryView->url();
+        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
+        window->changeUrl(primaryUrl);
+
+        if (tab.secondaryView != 0) {
+            const KUrl secondaryUrl = tab.secondaryView->url();
+            window->toggleSplitView();
+            window->m_viewTab[0].secondaryView->setUrl(secondaryUrl);
+            if (tab.primaryView->isActive()) {
+                window->m_viewTab[0].primaryView->setActive(true);
+            } else {
+                window->m_viewTab[0].secondaryView->setActive(true);
+            }
+        }
+        window->show();
+        closeTab(index);

     } else if (selectedAction == closeOtherTabsAction) {
         const int count = m_tabBar->count();
         for (int i = 0; i < index; ++i) {
     } else if (selectedAction == closeOtherTabsAction) {
         const int count = m_tabBar->count();
         for (int i = 0; i < index; ++i) {


@@ -838,6 +1102,12 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
     }
 }
 
     }
 }
 

+void DolphinMainWindow::slotTabMoved(int from, int to)
+{
+    m_viewTab.move(from, to);
+    m_tabIndex = m_tabBar->currentIndex();
+}
+

 void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons)
 {
     if (buttons & Qt::MidButton) {
 void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons)
 {
     if (buttons & Qt::MidButton) {


@@ -853,11 +1123,82 @@ void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& can
     canDecode = KUrl::List::canDecode(event->mimeData());
 }
 
     canDecode = KUrl::List::canDecode(event->mimeData());
 }
 

-void DolphinMainWindow::searchItems(const KUrl& url)
+void DolphinMainWindow::searchItems()
+{
+#ifdef HAVE_NEPOMUK
+    const KUrl nepomukSearchUrl = m_searchOptionsConfigurator->nepomukSearchUrl();
+    m_activeViewContainer->setUrl(nepomukSearchUrl);
+#endif
+}
+
+void DolphinMainWindow::showSearchOptions()
+{
+#ifdef HAVE_NEPOMUK
+    m_searchOptionsConfigurator->show();
+#endif
+}
+
+void DolphinMainWindow::handleUrl(const KUrl& url)
+{
+    delete m_lastHandleUrlStatJob;
+    m_lastHandleUrlStatJob = 0;
+
+    if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) {
+        activeViewContainer()->setUrl(url);
+    } else if (KProtocolManager::supportsListing(url)) {
+        // stat the URL to see if it is a dir or not
+        m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo);
+        connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)),
+                this, SLOT(slotHandleUrlStatFinished(KJob*)));
+
+    } else {
+        new KRun(url, this);
+    }
+}
+
+void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job)
+{
+    m_lastHandleUrlStatJob = 0;
+    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+    const KUrl url = static_cast<KIO::StatJob*>(job)->url();
+    if ( entry.isDir() ) {
+        activeViewContainer()->setUrl(url);
+    } else {
+        new KRun(url, this);
+    }
+}
+
+void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)
+{
+    const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+    if (!urls.isEmpty() && tab != -1) {
+        const ViewTab& viewTab = m_viewTab[tab];
+        const KUrl destPath = viewTab.isPrimaryViewActive ? viewTab.primaryView->url() : viewTab.secondaryView->url();
+        DragAndDropHelper::instance().dropUrls(KFileItem(), destPath, event, m_tabBar);
+    }
+}
+
+void DolphinMainWindow::slotCaptionStatFinished(KJob* job)

 {
 {

-    m_activeViewContainer->setUrl(url);
+    m_captionStatJob = 0;
+    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+    const QString name = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
+    setCaption(name);

 }
 
 }
 

+void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
+{
+    newMenu()->setEnabled(isFolderWritable);
+}
+
+void DolphinMainWindow::openContextMenu(const KFileItem& item,
+                                        const KUrl& url,
+                                        const QList<QAction*>& customActions)
+{
+    DolphinContextMenu contextMenu(this, item, url);
+    contextMenu.setCustomActions(customActions);
+    contextMenu.open();
+}

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


@@ -874,17 +1215,18 @@ void DolphinMainWindow::init()
     setAcceptDrops(true);
 
     m_viewTab[m_tabIndex].splitter = new QSplitter(this);
     setAcceptDrops(true);
 
     m_viewTab[m_tabIndex].splitter = new QSplitter(this);

+    m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false);

 
     setupActions();
 
     const KUrl& homeUrl = generalSettings->homeUrl();
 
     setupActions();
 
     const KUrl& homeUrl = generalSettings->homeUrl();

-    setCaption(homeUrl.fileName());
+    setUrlAsCaption(homeUrl);

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

+    connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));

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

-    m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(this,
-                                                                 m_viewTab[m_tabIndex].splitter,
-                                                                 homeUrl);
+    m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(homeUrl,
+                                                                 m_viewTab[m_tabIndex].splitter);

 
     m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
     connectViewSignals(m_activeViewContainer);
 
     m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
     connectViewSignals(m_activeViewContainer);


@@ -893,11 +1235,24 @@ void DolphinMainWindow::init()
     m_activeViewContainer->show();
     m_actionHandler->setCurrentView(view);
 
     m_activeViewContainer->show();
     m_actionHandler->setCurrentView(view);
 

+    m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
+    connect(this, SIGNAL(urlChanged(const KUrl&)),
+            m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
+
+#ifdef HAVE_NEPOMUK
+    m_searchOptionsConfigurator = new DolphinSearchOptionsConfigurator(this);
+    m_searchOptionsConfigurator->hide();
+    connect(m_searchOptionsConfigurator, SIGNAL(searchOptionsChanged()),
+            this, SLOT(searchItems()));
+    connect(this, SIGNAL(urlChanged(KUrl)), m_searchOptionsConfigurator, SLOT(setDirectory(KUrl)));
+#endif
+

     m_tabBar = new KTabBar(this);
     m_tabBar = new KTabBar(this);

-    m_tabBar->setCloseButtonEnabled(true);
+    m_tabBar->setMovable(true);
+    m_tabBar->setTabsClosable(true);

     connect(m_tabBar, SIGNAL(currentChanged(int)),
             this, SLOT(setActiveTab(int)));
     connect(m_tabBar, SIGNAL(currentChanged(int)),
             this, SLOT(setActiveTab(int)));

-    connect(m_tabBar, SIGNAL(closeRequest(int)),
+    connect(m_tabBar, SIGNAL(tabCloseRequested(int)),

             this, SLOT(closeTab(int)));
     connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)),
             this, SLOT(openTabContextMenu(int, const QPoint&)));
             this, SLOT(closeTab(int)));
     connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)),
             this, SLOT(openTabContextMenu(int, const QPoint&)));


@@ -906,7 +1261,13 @@ void DolphinMainWindow::init()
     connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
             this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
     connect(m_tabBar, SIGNAL(wheelDelta(int)),
     connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
             this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
     connect(m_tabBar, SIGNAL(wheelDelta(int)),

-           this, SLOT(slotWheelMoved(int)));
+            this, SLOT(slotWheelMoved(int)));
+    connect(m_tabBar, SIGNAL(mouseMiddleClick(int)),
+            this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(tabMoved(int, int)),
+            this, SLOT(slotTabMoved(int, int)));
+    connect(m_tabBar, SIGNAL(receivedDropEvent(int, QDropEvent*)),
+            this, SLOT(tabDropEvent(int, QDropEvent*)));

 
     m_tabBar->blockSignals(true);  // signals get unblocked after at least 2 tabs are open
 
 
     m_tabBar->blockSignals(true);  // signals get unblocked after at least 2 tabs are open
 


@@ -914,8 +1275,11 @@ void DolphinMainWindow::init()
     m_centralWidgetLayout = new QVBoxLayout(centralWidget);
     m_centralWidgetLayout->setSpacing(0);
     m_centralWidgetLayout->setMargin(0);
     m_centralWidgetLayout = new QVBoxLayout(centralWidget);
     m_centralWidgetLayout->setSpacing(0);
     m_centralWidgetLayout->setMargin(0);

+#ifdef HAVE_NEPOMUK
+    m_centralWidgetLayout->addWidget(m_searchOptionsConfigurator);
+#endif

     m_centralWidgetLayout->addWidget(m_tabBar);
     m_centralWidgetLayout->addWidget(m_tabBar);

-    m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter);
+    m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);

 
     setCentralWidget(centralWidget);
     setupDockWidgets();
 
     setCentralWidget(centralWidget);
     setupDockWidgets();


@@ -925,6 +1289,12 @@ void DolphinMainWindow::init()
 
     m_searchBox->setParent(toolBar("searchToolBar"));
     m_searchBox->show();
 
     m_searchBox->setParent(toolBar("searchToolBar"));
     m_searchBox->show();

+    connect(m_searchBox, SIGNAL(requestSearchOptions()),
+            this, SLOT(showSearchOptions()));
+#ifdef HAVE_NEPOMUK
+    connect(m_searchBox, SIGNAL(searchTextChanged(QString)),
+            m_searchOptionsConfigurator, SLOT(setCustomSearchQuery(QString)));
+#endif

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


@@ -977,9 +1347,10 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     updateGoActions();
 
     const KUrl& url = m_activeViewContainer->url();
     updateGoActions();
 
     const KUrl& url = m_activeViewContainer->url();

-    setCaption(url.fileName());
-    if (m_viewTab.count() > 1) {
+    setUrlAsCaption(url);
+    if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {

         m_tabBar->setTabText(m_tabIndex, tabName(url));
         m_tabBar->setTabText(m_tabIndex, tabName(url));

+        m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));

     }
 
     emit urlChanged(url);
     }
 
     emit urlChanged(url);


@@ -1004,10 +1375,10 @@ void DolphinMainWindow::setupActions()
     KAction* newTab = actionCollection()->addAction("new_tab");
     newTab->setIcon(KIcon("tab-new"));
     newTab->setText(i18nc("@action:inmenu File", "New Tab"));
     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::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T));
+    newTab->setShortcut(KShortcut(Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N));

     connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
 
     connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
 

-    QAction* closeTab = actionCollection()->addAction("close_tab");
+    KAction* 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->setIcon(KIcon("tab-close"));
     closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
     closeTab->setShortcut(Qt::CTRL | Qt::Key_W);


@@ -1028,7 +1399,11 @@ void DolphinMainWindow::setupActions()
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
     cut->setShortcut(cutShortcut);
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
     cut->setShortcut(cutShortcut);
     KStandardAction::copy(this, SLOT(copy()), actionCollection());

-    KStandardAction::paste(this, SLOT(paste()), actionCollection());
+    KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
+    // The text of the paste-action is modified dynamically by Dolphin
+    // (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes
+    // due to the long text, the text "Paste" is used:
+    paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));

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


@@ -1056,6 +1431,7 @@ void DolphinMainWindow::setupActions()
 
     KAction* stop = actionCollection()->addAction("stop");
     stop->setText(i18nc("@action:inmenu View", "Stop"));
 
     KAction* stop = actionCollection()->addAction("stop");
     stop->setText(i18nc("@action:inmenu View", "Stop"));

+    stop->setToolTip(i18nc("@info", "Stop loading"));

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


@@ -1071,12 +1447,30 @@ void DolphinMainWindow::setupActions()
 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());

+    connect(backAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons)));

     KShortcut backShortcut = backAction->shortcut();
     backShortcut.setAlternate(Qt::Key_Backspace);
     backAction->setShortcut(backShortcut);
 
     KShortcut backShortcut = backAction->shortcut();
     backShortcut.setAlternate(Qt::Key_Backspace);
     backAction->setShortcut(backShortcut);
 

-    KStandardAction::forward(this, SLOT(goForward()), actionCollection());
-    KStandardAction::up(this, SLOT(goUp()), actionCollection());
+    m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this);
+    m_recentTabsMenu->setIcon(KIcon("edit-undo"));
+    actionCollection()->addAction("closed_tabs", m_recentTabsMenu);
+    connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)),
+            this, SLOT(restoreClosedTab(QAction *)));
+
+    QAction* action = new QAction("Empty Recently Closed Tabs", m_recentTabsMenu);
+    action->setIcon(KIcon("edit-clear-list"));
+    action->setData(QVariant::fromValue(true));
+    m_recentTabsMenu->addAction(action);
+    m_recentTabsMenu->addSeparator();
+    m_recentTabsMenu->setEnabled(false);
+
+    KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
+    connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons)));
+
+    KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
+    connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));
+

     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu


@@ -1087,6 +1481,7 @@ void DolphinMainWindow::setupActions()
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));

+    showFilterBar->setIcon(KIcon("view-filter"));

     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
 
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
 


@@ -1096,32 +1491,34 @@ void DolphinMainWindow::setupActions()
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     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
+    KAction* openTerminal = actionCollection()->addAction("open_terminal");
+    openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
+    openTerminal->setIcon(KIcon("utilities-terminal"));
+    openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4);
+    connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));

 
     // setup 'Settings' menu
     m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
 
     // setup 'Settings' menu
     m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions

+    QList<QKeySequence> nextTabKeys;
+    nextTabKeys.append(KStandardShortcut::tabNext().primary());
+    nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab));
+
+    QList<QKeySequence> prevTabKeys;
+    prevTabKeys.append(KStandardShortcut::tabPrev().primary());
+    prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
+

     KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
     activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
     connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
     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());
+    activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);

 
     KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
     activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
     connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
 
     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());
+    activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);

 
     // for context menu
     KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
 
     // for context menu
     KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");


@@ -1136,7 +1533,7 @@ void DolphinMainWindow::setupActions()
 
     // 'Search' toolbar
     m_searchBox = new DolphinSearchBox(this);
 
     // 'Search' toolbar
     m_searchBox = new DolphinSearchBox(this);

-    connect(m_searchBox, SIGNAL(search(KUrl)), this, SLOT(searchItems(KUrl)));
+    connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(searchItems()));

 
     KAction* search = new KAction(this);
     actionCollection()->addAction("search_bar", search);
 
     KAction* search = new KAction(this);
     actionCollection()->addAction("search_bar", search);


@@ -1152,13 +1549,12 @@ void DolphinMainWindow::setupDockWidgets()
     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     Panel* infoPanel = new InformationPanel(infoDock);
     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     Panel* infoPanel = new InformationPanel(infoDock);

+    connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));

     infoDock->setWidget(infoPanel);
 
     QAction* infoAction = infoDock->toggleViewAction();
     infoDock->setWidget(infoPanel);
 
     QAction* infoAction = infoDock->toggleViewAction();

-    infoAction->setText(i18nc("@title:window", "Information"));
-    infoAction->setShortcut(Qt::Key_F11);

     infoAction->setIcon(KIcon("dialog-information"));
     infoAction->setIcon(KIcon("dialog-information"));

-    actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
+    infoAction->setShortcut(Qt::Key_F11);

 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),


@@ -1176,18 +1572,14 @@ void DolphinMainWindow::setupDockWidgets()
     foldersDock->setWidget(foldersPanel);
 
     QAction* foldersAction = foldersDock->toggleViewAction();
     foldersDock->setWidget(foldersPanel);
 
     QAction* foldersAction = foldersDock->toggleViewAction();

-    foldersAction->setText(i18nc("@title:window", "Folders"));

     foldersAction->setShortcut(Qt::Key_F7);
     foldersAction->setIcon(KIcon("folder"));
     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)));
 
     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
 
     // setup "Terminal"
 #ifndef Q_OS_WIN


@@ -1200,10 +1592,8 @@ void DolphinMainWindow::setupDockWidgets()
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
 
     QAction* terminalAction = terminalDock->toggleViewAction();
     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->setShortcut(Qt::Key_F4);

-    terminalAction->setIcon(KIcon("terminal"));
-    actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
+    terminalAction->setIcon(KIcon("utilities-terminal"));

 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),


@@ -1218,6 +1608,7 @@ void DolphinMainWindow::setupDockWidgets()
 #endif
     }
 
 #endif
     }
 

+    // setup "Places"

     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);


@@ -1228,16 +1619,24 @@ void DolphinMainWindow::setupDockWidgets()
     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     QAction* placesAction = placesDock->toggleViewAction();
     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     QAction* placesAction = placesDock->toggleViewAction();

-    placesAction->setText(i18nc("@title:window", "Places"));

     placesAction->setShortcut(Qt::Key_F9);
     placesAction->setIcon(KIcon("bookmarks"));
     placesAction->setShortcut(Qt::Key_F9);
     placesAction->setIcon(KIcon("bookmarks"));

-    actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());

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

+
+    KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu File", "Panels"), this);
+    actionCollection()->addAction("panels", panelsMenu);
+    panelsMenu->setDelayed(false);
+    panelsMenu->addAction(placesAction);
+    panelsMenu->addAction(infoAction);
+    panelsMenu->addAction(foldersAction);
+#ifndef Q_OS_WIN
+    panelsMenu->addAction(terminalAction);
+#endif

 }
 
 void DolphinMainWindow::updateEditActions()
 }
 
 void DolphinMainWindow::updateEditActions()


@@ -1255,7 +1654,7 @@ void DolphinMainWindow::updateEditActions()
         QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
         QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler
 
         QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
         QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler
 

-        KonqFileItemCapabilities capabilities(list);
+        KFileItemListProperties capabilities(list);

         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
 
         renameAction->setEnabled(capabilities.supportsMoving());
         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
 
         renameAction->setEnabled(capabilities.supportsMoving());


@@ -1288,6 +1687,44 @@ void DolphinMainWindow::updateGoActions()
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 

+void DolphinMainWindow::rememberClosedTab(int index)
+{
+    KMenu* tabsMenu = m_recentTabsMenu->menu();
+
+    const QString primaryPath = m_viewTab[index].primaryView->url().path();
+    const QString iconName = KMimeType::iconNameForUrl(primaryPath);
+
+    QAction* action = new QAction(squeezedText(primaryPath), tabsMenu);
+
+    ClosedTab closedTab;
+    closedTab.primaryUrl = m_viewTab[index].primaryView->url();
+
+    if (m_viewTab[index].secondaryView != 0) {
+        closedTab.secondaryUrl = m_viewTab[index].secondaryView->url();
+        closedTab.isSplit = true;
+    } else {
+        closedTab.isSplit = false;
+    }
+
+    action->setData(QVariant::fromValue(closedTab));
+    action->setIcon(KIcon(iconName));
+
+    // add the closed tab menu entry after the separator and
+    // "Empty Recently Closed Tabs" entry
+    if (tabsMenu->actions().size() == 2) {
+        tabsMenu->addAction(action);
+    } else {
+        tabsMenu->insertAction(tabsMenu->actions().at(2), action);
+    }
+
+    // assure that only up to 8 closed tabs are shown in the menu
+    if (tabsMenu->actions().size() > 8) {
+        tabsMenu->removeAction(tabsMenu->actions().last());
+    }
+    actionCollection()->action("closed_tabs")->setEnabled(true);
+    KAcceleratorManager::manage(tabsMenu);
+}
+

 void DolphinMainWindow::clearStatusBar()
 {
     m_activeViewContainer->statusBar()->clear();
 void DolphinMainWindow::clearStatusBar()
 {
     m_activeViewContainer->statusBar()->clear();


@@ -1297,6 +1734,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
 {
     connect(container, SIGNAL(showFilterBarChanged(bool)),
             this, SLOT(updateFilterBarAction(bool)));
 {
     connect(container, SIGNAL(showFilterBarChanged(bool)),
             this, SLOT(updateFilterBarAction(bool)));

+    connect(container, SIGNAL(writeStateChanged(bool)),
+            this, SLOT(slotWriteStateChanged(bool)));

 
     DolphinView* view = container->view();
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
 
     DolphinView* view = container->view();
     connect(view, SIGNAL(selectionChanged(KFileItemList)),


@@ -1307,6 +1746,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, SLOT(toggleActiveView()));
     connect(view, SIGNAL(tabRequested(const KUrl&)),
             this, SLOT(openNewTab(const KUrl&)));
             this, SLOT(toggleActiveView()));
     connect(view, SIGNAL(tabRequested(const KUrl&)),
             this, SLOT(openNewTab(const KUrl&)));

+    connect(view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)),
+            this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));

 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),


@@ -1315,6 +1756,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, SLOT(updateHistory()));
     connect(navigator, SIGNAL(editableStateChanged(bool)),
             this, SLOT(slotEditableStateChanged(bool)));
             this, SLOT(updateHistory()));
     connect(navigator, SIGNAL(editableStateChanged(bool)),
             this, SLOT(slotEditableStateChanged(bool)));

+    connect(navigator, SIGNAL(tabRequested(const KUrl&)),
+            this, SLOT(openNewTab(KUrl)));

 }
 
 void DolphinMainWindow::updateSplitAction()
 }
 
 void DolphinMainWindow::updateSplitAction()


@@ -1323,13 +1766,16 @@ void DolphinMainWindow::updateSplitAction()
     if (m_viewTab[m_tabIndex].secondaryView != 0) {
         if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
     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->setToolTip(i18nc("@info", "Close right view"));

             splitAction->setIcon(KIcon("view-right-close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
             splitAction->setIcon(KIcon("view-right-close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));

+            splitAction->setToolTip(i18nc("@info", "Close left view"));

             splitAction->setIcon(KIcon("view-left-close"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
             splitAction->setIcon(KIcon("view-left-close"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));

+        splitAction->setToolTip(i18nc("@info", "Split view"));

         splitAction->setIcon(KIcon("view-right-new"));
     }
 }
         splitAction->setIcon(KIcon("view-right-new"));
     }
 }


@@ -1338,7 +1784,7 @@ QString DolphinMainWindow::tabName(const KUrl& url) const
 {
     QString name;
     if (url.equals(KUrl("file:///"))) {
 {
     QString name;
     if (url.equals(KUrl("file:///"))) {

-        name = "/";
+        name = '/';

     } else {
         name = url.fileName();
         if (name.isEmpty()) {
     } else {
         name = url.fileName();
         if (name.isEmpty()) {


@@ -1371,7 +1817,7 @@ void DolphinMainWindow::createSecondaryView(int tabIndex)
     const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2;
 
     const DolphinView* view = m_viewTab[tabIndex].primaryView->view();
     const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2;
 
     const DolphinView* view = m_viewTab[tabIndex].primaryView->view();

-    m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(this, 0, view->rootUrl());
+    m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(view->rootUrl(), 0);

     splitter->addWidget(m_viewTab[tabIndex].secondaryView);
     splitter->setSizes(QList<int>() << newWidth << newWidth);
     connectViewSignals(m_viewTab[tabIndex].secondaryView);
     splitter->addWidget(m_viewTab[tabIndex].secondaryView);
     splitter->setSizes(QList<int>() << newWidth << newWidth);
     connectViewSignals(m_viewTab[tabIndex].secondaryView);


@@ -1380,6 +1826,41 @@ void DolphinMainWindow::createSecondaryView(int tabIndex)
     m_viewTab[tabIndex].secondaryView->show();
 }
 
     m_viewTab[tabIndex].secondaryView->show();
 }
 

+QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const
+{
+    return "Tab " + QString::number(tabIndex) + ' ' + property;
+}
+
+void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
+{
+    delete m_captionStatJob;
+    m_captionStatJob = 0;
+
+    if (url.protocol() == QLatin1String("file")) {
+        QString caption;
+        if (url.equals(KUrl("file:///"))) {
+            caption = '/';
+        } else {
+            caption = url.fileName();
+            if (caption.isEmpty()) {
+                caption = url.protocol();
+            }
+        }
+
+        setCaption(caption);
+    } else {
+        m_captionStatJob = KIO::stat(url, KIO::HideProgressInfo);
+        connect(m_captionStatJob, SIGNAL(result(KJob*)),
+                this, SLOT(slotCaptionStatFinished(KJob*)));
+    }
+}
+
+QString DolphinMainWindow::squeezedText(const QString& text) const
+{
+    const QFontMetrics fm = fontMetrics();
+    return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
+}
+

 DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
     KIO::FileUndoManager::UiInterface()
 {
 DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
     KIO::FileUndoManager::UiInterface()
 {