The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 0523085ae7a46d8c6ae39a025e199ebc8fc59ab5..0913503d2b3fac166dce9fd7870037f12454881b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -20,26 +20,24 @@
  ***************************************************************************/
 
 #include "dolphinmainwindow.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 "dolphinnewmenu.h"
-#include "search/dolphinsearchbox.h"
-#include "settings/dolphinsettings.h"
-#include "settings/dolphinsettingsdialog.h"
+#include "dolphincontextmenu.h"
+#include "dolphinnewfilemenu.h"

 #include "dolphinviewcontainer.h"
 #include "dolphinviewcontainer.h"

+#include "mainwindowadaptor.h"

 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"

-#include "mainwindowadaptor.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"

 #include "statusbar/dolphinstatusbar.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "viewproperties.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/draganddrophelper.h"
+#include "views/viewproperties.h"

 
 #ifndef Q_OS_WIN
 #include "panels/terminal/terminalpanel.h"
 
 #ifndef Q_OS_WIN
 #include "panels/terminal/terminalpanel.h"


@@ -47,10 +45,10 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"

-#include "draganddrophelper.h"

 
 #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>


@@ -105,22 +103,24 @@ Q_DECLARE_METATYPE(ClosedTab)
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),

-    m_newMenu(0),
+    m_newFileMenu(0),

     m_showMenuBar(0),
     m_tabBar(0),
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),
     m_showMenuBar(0),
     m_tabBar(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_remoteEncoding(0),
     m_id(id),
     m_tabIndex(0),
     m_viewTab(),
     m_actionHandler(0),
     m_remoteEncoding(0),

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

 {
 {

+    // Workaround for a X11-issue in combination with KModifierInfo
+    // (see DolphinContextMenu::initializeModifierKeyInfo() for
+    // more information):
+    DolphinContextMenu::initializeModifierKeyInfo();
+

     setObjectName("Dolphin#");
 
     m_viewTab.append(ViewTab());
     setObjectName("Dolphin#");
 
     m_viewTab.append(ViewTab());


@@ -339,15 +339,6 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     emit selectionChanged(selection);
 }
 
     emit selectionChanged(selection);
 }
 

-void DolphinMainWindow::slotWheelMoved(int wheelDelta)
-{
-    if (wheelDelta > 0) {
-        activatePrevTab();
-    } else {
-        activateNextTab();
-    }
-}
-

 void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
 {
     emit requestItemInfo(item);
 void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
 {
     emit requestItemInfo(item);


@@ -384,12 +375,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();
     }


@@ -414,7 +411,7 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
     viewTab.splitter->setChildrenCollapsible(false);
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
     viewTab.splitter->setChildrenCollapsible(false);

-    viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
+    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();


@@ -465,17 +462,27 @@ void DolphinMainWindow::activatePrevTab()
 void DolphinMainWindow::openInNewTab()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
 void DolphinMainWindow::openInNewTab()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();

-    if ((list.count() == 1) && list[0].isDir()) {
-        openNewTab(m_activeViewContainer->view()->selectedUrls()[0]);
+    if (list.isEmpty()) {
+        openNewTab(m_activeViewContainer->url());
+    } else if ((list.count() == 1) && list[0].isDir()) {
+        openNewTab(list[0].url());

     }
 }
 
 void DolphinMainWindow::openInNewWindow()
 {
     }
 }
 
 void DolphinMainWindow::openInNewWindow()
 {

+    KUrl newWindowUrl;
+

     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();

-    if ((list.count() == 1) && list[0].isDir()) {
+    if (list.isEmpty()) {
+        newWindowUrl = m_activeViewContainer->url();
+    } else if ((list.count() == 1) && list[0].isDir()) {
+        newWindowUrl = list[0].url();
+    }
+
+    if (!newWindowUrl.isEmpty()) {

         DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
         DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();

-        window->changeUrl(m_activeViewContainer->view()->selectedUrls()[0]);
+        window->changeUrl(newWindowUrl);

         window->show();
     }
 }
         window->show();
     }
 }


@@ -526,7 +533,6 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
         dialog->setCaption(i18nc("@title:window", "Confirmation"));
         dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
         dialog->setModal(true);
         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->setButtonGuiItem(KDialog::Yes, KStandardGuiItem::quit());
         dialog->setButtonGuiItem(KDialog::No, KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close")));
         dialog->setButtonGuiItem(KDialog::Cancel, KStandardGuiItem::cancel());


@@ -552,7 +558,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
                 break;
             case KDialog::No:
                 // Close only the current tab
                 break;
             case KDialog::No:
                 // Close only the current tab

-             closeTab();
+              closeTab();

             default:
                 event->ignore();
                 return;
             default:
                 event->ignore();
                 return;


@@ -575,12 +581,14 @@ void DolphinMainWindow::saveProperties(KConfigGroup& group)
     for (int i = 0; i < tabCount; ++i) {
         const DolphinViewContainer* cont = m_viewTab[i].primaryView;
         group.writeEntry(tabProperty("Primary URL", i), cont->url().url());
     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->isUrlEditable());
+        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());
 
         cont = m_viewTab[i].secondaryView;
         if (cont != 0) {
             group.writeEntry(tabProperty("Secondary URL", i), cont->url().url());

-            group.writeEntry(tabProperty("Secondary Editable", i), cont->isUrlEditable());
+            group.writeEntry(tabProperty("Secondary Editable", i),
+                             cont->urlNavigator()->isUrlEditable());

         }
     }
 }
         }
     }
 }


@@ -627,16 +635,16 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
 
 void DolphinMainWindow::updateNewMenu()
 {
 
 void DolphinMainWindow::updateNewMenu()
 {

-    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
-    m_newMenu->slotCheckUpToDate();
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());

 }
 
 void DolphinMainWindow::createDirectory()
 {
 }
 
 void DolphinMainWindow::createDirectory()
 {

-    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
-    m_newMenu->createDirectory();
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->createDirectory();

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


@@ -719,6 +727,11 @@ void DolphinMainWindow::paste()
     m_activeViewContainer->view()->paste();
 }
 
     m_activeViewContainer->view()->paste();
 }
 

+void DolphinMainWindow::find()
+{
+    m_activeViewContainer->setSearchModeEnabled(true);
+}
+

 void DolphinMainWindow::updatePasteAction()
 {
     QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
 void DolphinMainWindow::updatePasteAction()
 {
     QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));


@@ -788,6 +801,17 @@ void DolphinMainWindow::reloadView()
 
 void DolphinMainWindow::stopLoading()
 {
 
 void DolphinMainWindow::stopLoading()
 {

+    m_activeViewContainer->view()->stopLoading();
+}
+
+void DolphinMainWindow::enableStopAction()
+{
+    actionCollection()->action("stop")->setEnabled(true);
+}
+
+void DolphinMainWindow::disableStopAction()
+{
+    actionCollection()->action("stop")->setEnabled(false);

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


@@ -819,7 +843,15 @@ void DolphinMainWindow::replaceLocation()
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();

-    m_activeViewContainer->urlNavigator()->goBack();
+    
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    urlNavigator->goBack();
+    
+    if (urlNavigator->locationState().isEmpty()) {
+        // An empty location state indicates a redirection URL,
+        // which must be skipped too
+        urlNavigator->goBack();       
+    }

 }
 
 void DolphinMainWindow::goForward()
 }
 
 void DolphinMainWindow::goForward()


@@ -839,7 +871,8 @@ void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
     // The default case (left button pressed) is handled in goBack().
     if (buttons == Qt::MidButton) {
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
     // The default case (left button pressed) is handled in goBack().
     if (buttons == Qt::MidButton) {
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();

-        openNewTab(urlNavigator->historyUrl(urlNavigator->historyIndex() + 1));
+        const int index = urlNavigator->historyIndex() + 1;
+        openNewTab(urlNavigator->locationUrl(index));

     }
 }
 
     }
 }
 


@@ -848,7 +881,8 @@ void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
     // The default case (left button pressed) is handled in goForward().
     if (buttons == Qt::MidButton) {
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
     // The default case (left button pressed) is handled in goForward().
     if (buttons == Qt::MidButton) {
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();

-        openNewTab(urlNavigator->historyUrl(urlNavigator->historyIndex() - 1));
+        const int index = urlNavigator->historyIndex() - 1;
+        openNewTab(urlNavigator->locationUrl(index));

     }
 }
 
     }
 }
 


@@ -878,30 +912,31 @@ void DolphinMainWindow::compareFiles()
 
     KUrl urlA;
     KUrl urlB;
 
     KUrl urlA;
     KUrl urlB;

-    KUrl::List urls = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls();

 
 

-    switch (urls.count()) {
+    KFileItemList items = m_viewTab[m_tabIndex].primaryView->view()->selectedItems();
+
+    switch (items.count()) {

     case 0: {
         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
     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];
+        items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+        Q_ASSERT(items.count() == 2);
+        urlA = items[0].url();
+        urlB = items[1].url();

         break;
     }
 
     case 1: {
         break;
     }
 
     case 1: {

-        urlA = urls[0];
+        urlA = items[0].url();

         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 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];
+        items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+        Q_ASSERT(items.count() == 1);
+        urlB = items[0].url();

         break;
     }
 
     case 2: {
         break;
     }
 
     case 2: {

-        urlA = urls[0];
-        urlB = urls[1];
+        urlA = items[0].url();
+        urlB = items[1].url();

         break;
     }
 
         break;
     }
 


@@ -945,7 +980,7 @@ void DolphinMainWindow::openTerminal()
 void DolphinMainWindow::editSettings()
 {
     if (m_settingsDialog == 0) {
 void DolphinMainWindow::editSettings()
 {
     if (m_settingsDialog == 0) {

-        const KUrl& url = activeViewContainer()->url();
+        const KUrl url = activeViewContainer()->url();

         m_settingsDialog = new DolphinSettingsDialog(url, this);
         m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
         m_settingsDialog->show();
         m_settingsDialog = new DolphinSettingsDialog(url, this);
         m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
         m_settingsDialog->show();


@@ -1042,6 +1077,8 @@ 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"));
     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"));


@@ -1054,6 +1091,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) {


@@ -1067,6 +1123,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) {


@@ -1082,25 +1144,75 @@ void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& can
     canDecode = KUrl::List::canDecode(event->mimeData());
 }
 
     canDecode = KUrl::List::canDecode(event->mimeData());
 }
 

-void DolphinMainWindow::searchItems()
+void DolphinMainWindow::handleUrl(const KUrl& url)

 {
 {

-#ifdef HAVE_NEPOMUK
-    const KUrl nepomukSearchUrl = m_searchOptionsConfigurator->nepomukSearchUrl();
-    m_activeViewContainer->setUrl(nepomukSearchUrl);
-#endif
+    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::slotTabMoved(int from, int to)
+void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job)

 {
 {

-    m_viewTab.move(from, to);
-    m_tabIndex = m_tabBar->currentIndex();
+    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::showSearchOptions()
+void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)

 {
 {

-#ifdef HAVE_NEPOMUK
-    m_searchOptionsConfigurator->show();
-#endif
+    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::slotWriteStateChanged(bool isFolderWritable)
+{
+    newFileMenu()->setEnabled(isFolderWritable);
+}
+
+void DolphinMainWindow::openContextMenu(const KFileItem& item,
+                                        const KUrl& url,
+                                        const QList<QAction*>& customActions)
+{
+    DolphinContextMenu contextMenu(this, item, url);
+    contextMenu.setCustomActions(customActions);
+    const DolphinContextMenu::Command command = contextMenu.open();
+
+    switch (command) {
+    case DolphinContextMenu::OpenParentFolderInNewWindow: {
+        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
+        window->changeUrl(item.url().upUrl());
+        window->show();
+        break;
+    }
+
+    case DolphinContextMenu::OpenParentFolderInNewTab:
+        openNewTab(item.url().upUrl());
+        break;
+
+    case DolphinContextMenu::None:
+    default:
+        break;
+    }

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


@@ -1122,15 +1234,14 @@ void DolphinMainWindow::init()
 
     setupActions();
 
 
     setupActions();
 

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

     setUrlAsCaption(homeUrl);
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
     connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));
     ViewProperties props(homeUrl);
     setUrlAsCaption(homeUrl);
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
     connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));
     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);


@@ -1143,14 +1254,6 @@ void DolphinMainWindow::init()
     connect(this, SIGNAL(urlChanged(const KUrl&)),
             m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
 
     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->setMovable(true);
     m_tabBar->setTabsClosable(true);
     m_tabBar = new KTabBar(this);
     m_tabBar->setMovable(true);
     m_tabBar->setTabsClosable(true);


@@ -1164,12 +1267,12 @@ void DolphinMainWindow::init()
             this, SLOT(openNewTab()));
     connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
             this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
             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)));
     connect(m_tabBar, SIGNAL(tabMoved(int, int)),
             this, SLOT(slotTabMoved(int, 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
 


@@ -1177,9 +1280,6 @@ 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_viewTab[m_tabIndex].splitter, 1);
 
     m_centralWidgetLayout->addWidget(m_tabBar);
     m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);
 


@@ -1188,28 +1288,18 @@ void DolphinMainWindow::init()
     emit urlChanged(homeUrl);
 
     setupGUI(Keys | Save | Create | ToolBar);
     emit urlChanged(homeUrl);
 
     setupGUI(Keys | Save | Create | ToolBar);

-
-    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");
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));
     stateChanged("new_file");
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));

-    updatePasteAction();
-    updateGoActions();

 
     if (generalSettings->splitView()) {
         toggleSplitView();
     }
 
     if (generalSettings->splitView()) {
         toggleSplitView();
     }

+    updateEditActions();

     updateViewActions();
     updateViewActions();

+    updateGoActions();

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


@@ -1248,9 +1338,9 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     updateViewActions();
     updateGoActions();
 
     updateViewActions();
     updateGoActions();
 

-    const KUrl& url = m_activeViewContainer->url();
+    const KUrl url = m_activeViewContainer->url();

     setUrlAsCaption(url);
     setUrlAsCaption(url);

-    if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {
+    if (m_viewTab.count() > 1) {

         m_tabBar->setTabText(m_tabIndex, tabName(url));
         m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
     }
         m_tabBar->setTabText(m_tabIndex, tabName(url));
         m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
     }


@@ -1261,8 +1351,8 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu

-    m_newMenu = new DolphinNewMenu(this, this);
-    KMenu* menu = m_newMenu->menu();
+    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    KMenu* menu = m_newFileMenu->menu();

     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),


@@ -1307,6 +1397,8 @@ void DolphinMainWindow::setupActions()
     // due to the long text, the text "Paste" is used:
     paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
 
     // due to the long text, the text "Paste" is used:
     paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
 

+    KStandardAction::find(this, SLOT(find()), actionCollection());
+

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


@@ -1376,11 +1468,6 @@ void DolphinMainWindow::setupActions()
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu

-    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");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setIcon(KIcon("view-filter"));
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setIcon(KIcon("view-filter"));


@@ -1404,17 +1491,23 @@ void DolphinMainWindow::setupActions()
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
     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");


@@ -1426,16 +1519,6 @@ void DolphinMainWindow::setupActions()
     openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
     openInNewWindow->setIcon(KIcon("window-new"));
     connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow()));
     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(QString)), this, SLOT(searchItems()));
-
-    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()


@@ -1449,10 +1532,8 @@ void DolphinMainWindow::setupDockWidgets()
     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)),


@@ -1470,10 +1551,8 @@ 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)),
 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, SIGNAL(urlChanged(KUrl)),


@@ -1492,10 +1571,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->setIcon(KIcon("utilities-terminal"));
     terminalAction->setShortcut(Qt::Key_F4);
     terminalAction->setIcon(KIcon("utilities-terminal"));

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

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


@@ -1504,12 +1581,14 @@ void DolphinMainWindow::setupDockWidgets()
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {

+        infoDock->hide();

         foldersDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
 #endif
     }
 
         foldersDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
 #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);


@@ -1520,16 +1599,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 View", "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()


@@ -1576,7 +1663,7 @@ void DolphinMainWindow::updateViewActions()
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));

-    const KUrl& currentUrl = m_activeViewContainer->url();
+    const KUrl currentUrl = m_activeViewContainer->url();

     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 


@@ -1627,6 +1714,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)),


@@ -1637,6 +1726,12 @@ 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*>&)));
+    connect(view, SIGNAL(startedPathLoading(KUrl)),
+            this, SLOT(enableStopAction()));
+    connect(view, SIGNAL(finishedPathLoading(KUrl)),
+            this, SLOT(disableStopAction()));

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


@@ -1645,6 +1740,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()


@@ -1704,7 +1801,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);


@@ -1721,26 +1818,17 @@ QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) co
 void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
 {
     QString caption;
 void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
 {
     QString caption;

-    if (url.equals(KUrl("file:///"))) {
-        caption = '/';
-    } else {
-        caption = url.fileName();
-        if (caption.isEmpty()) {
-            caption = url.protocol();
-       }
+    if (!url.isLocalFile()) {
+        caption.append(url.protocol() + " - ");
+        if (url.hasHost()) {
+            caption.append(url.host() + " - ");
+        }

     }
 
     }
 

-    setCaption(caption);
-}
+    const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
+    caption.append(fileName);

 
 

-void DolphinMainWindow::handleUrl(const KUrl& url)
-{
-    if (KProtocolManager::supportsListing(url)) {
-        activeViewContainer()->setUrl(url);
-    }
-    else {
-        new KRun(url, this);
-    }
+    setCaption(caption);

 }
 
 QString DolphinMainWindow::squeezedText(const QString& text) const
 }
 
 QString DolphinMainWindow::squeezedText(const QString& text) const