X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2a5b3ec615bb4e8123bdf5572eb9058d73740f22..41d8b21edef00745ff2f17b6bd54fca29d6cd598:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index c50a42a40..dbb46a239 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -30,7 +30,7 @@
 #include "dolphinviewcontainer.h"
 #include "mainwindowadaptor.h"
 #ifdef HAVE_NEPOMUK
-    #include "panels/filter/filterpanel.h"
+    #include "panels/search/searchpanel.h"
     #include <Nepomuk/ResourceManager>
 #endif
 #include "panels/folders/folderspanel.h"
@@ -51,7 +51,9 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "dolphin_searchsettings.h"
 
+#include <KAcceleratorManager>
 #include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>
@@ -63,7 +65,7 @@
 #include <KFilePlacesModel>
 #include <KGlobal>
 #include <KLineEdit>
-#include <ktoolbar.h>
+#include <KToolBar>
 #include <KIcon>
 #include <KIconLoader>
 #include <KIO/NetAccess>
@@ -88,11 +90,24 @@
 #include <KUrlComboBox>
 #include <KToolInvocation>
 
+#include <QDesktopWidget>
 #include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>
+#include <QToolButton>
 #include <QSplitter>
-#include <kacceleratormanager.h>
+
+/*
+ * Menu shown when pressing the configure-button in the toolbar.
+ */
+class ToolBarMenu : public KMenu
+{
+public:
+    ToolBarMenu(QWidget* parent);
+    virtual ~ToolBarMenu();
+protected:
+    virtual void showEvent(QShowEvent* event);
+};
 
 /*
  * Remembers the tab configuration if a tab has been closed.
@@ -110,7 +125,6 @@ Q_DECLARE_METATYPE(ClosedTab)
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newFileMenu(0),
-    m_showMenuBar(0),
     m_tabBar(0),
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),
@@ -120,8 +134,11 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_settingsDialog(0),
+    m_toolBarSpacer(0),
+    m_openToolBarMenuButton(0),
+    m_updateToolBarTimer(0),
     m_lastHandleUrlStatJob(0),
-    m_filterDockIsTemporaryVisible(false)
+    m_searchDockIsTemporaryVisible(false)
 {
     // Workaround for a X11-issue in combination with KModifierInfo
     // (see DolphinContextMenu::initializeModifierKeyInfo() for
@@ -163,6 +180,11 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
         return;
     }
 
+    if (dirs.count() == 1) {
+        m_activeViewContainer->setUrl(dirs.first());
+        return;
+    }
+
     const int oldOpenTabsCount = m_viewTab.count();
 
     const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
@@ -416,10 +438,9 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
     viewTab.splitter->setChildrenCollapsible(false);
-    viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter);
+    viewTab.primaryView = createViewContainer(url, viewTab.splitter);
     viewTab.primaryView->setActive(false);
     connectViewSignals(viewTab.primaryView);
-    viewTab.primaryView->view()->reload();
 
     m_viewTab.append(viewTab);
 
@@ -574,12 +595,12 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     settings.save();
 
-    if (m_filterDockIsTemporaryVisible) {
-        QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-        if (filterDock) {
-            filterDock->hide();
+    if (m_searchDockIsTemporaryVisible) {
+        QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+        if (searchDock) {
+            searchDock->hide();
         }
-        m_filterDockIsTemporaryVisible = false;
+        m_searchDockIsTemporaryVisible = false;
     }
 
     KXmlGuiWindow::closeEvent(event);
@@ -867,10 +888,21 @@ void DolphinMainWindow::togglePanelLockState()
     generalSettings->setLockPanels(newLockState);
 }
 
-void DolphinMainWindow::goBack()
+void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible)
 {
-    clearStatusBar();
+    const int tabCount = m_viewTab.count();
+    for (int i = 0; i < tabCount; ++i) {
+        ViewTab& tab = m_viewTab[i];
+        Q_ASSERT(tab.primaryView);
+        tab.primaryView->urlNavigator()->setPlacesSelectorVisible(!visible);
+        if (tab.secondaryView) {
+            tab.secondaryView->urlNavigator()->setPlacesSelectorVisible(!visible);
+        }
+    }
+}
 
+void DolphinMainWindow::goBack()
+{
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     urlNavigator->goBack();
 
@@ -883,16 +915,19 @@ void DolphinMainWindow::goBack()
 
 void DolphinMainWindow::goForward()
 {
-    clearStatusBar();
     m_activeViewContainer->urlNavigator()->goForward();
 }
 
 void DolphinMainWindow::goUp()
 {
-    clearStatusBar();
     m_activeViewContainer->urlNavigator()->goUp();
 }
 
+void DolphinMainWindow::goHome()
+{
+    m_activeViewContainer->urlNavigator()->goHome();
+}
+
 void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goBack().
@@ -921,12 +956,6 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
     }
 }
 
-void DolphinMainWindow::goHome()
-{
-    clearStatusBar();
-    m_activeViewContainer->urlNavigator()->goHome();
-}
-
 void DolphinMainWindow::compareFiles()
 {
     // The method is only invoked if exactly 2 files have
@@ -986,6 +1015,11 @@ void DolphinMainWindow::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
     menuBar()->setVisible(!visible);
+    if (visible) {
+        createToolBarMenuButton();
+    } else {
+        deleteToolBarMenuButton();
+    }
 }
 
 void DolphinMainWindow::openTerminal()
@@ -1227,21 +1261,35 @@ void DolphinMainWindow::slotSearchModeChanged(bool enabled)
         return;
     }
 
-    QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-    if (!filterDock) {
+    QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+    if (!searchDock) {
         return;
     }
 
     if (enabled) {
-        if (!filterDock->isVisible()) {
-            m_filterDockIsTemporaryVisible = true;
+        if (!searchDock->isVisible()) {
+            m_searchDockIsTemporaryVisible = true;
         }
-        filterDock->show();
+        searchDock->show();
     } else {
-        if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) {
-            filterDock->hide();
+        if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) {
+            searchDock->hide();
+        }
+        m_searchDockIsTemporaryVisible = false;
+    }
+
+    SearchPanel* searchPanel = qobject_cast<SearchPanel*>(searchDock->widget());
+    if (searchPanel) {
+        // Per default any search-operation triggered by the Search Panel is done
+        // "Everywhere".
+        SearchPanel::SearchMode searchMode = SearchPanel::Everywhere;
+
+        if (enabled && (SearchSettings::location() == QLatin1String("FromHere"))) {
+            // Only if the search-mode is enabled it is visible for the user whether
+            // a searching is done "Everywhere" or "From Here" (= current directory).
+            searchMode = SearchPanel::FromCurrentDir;
         }
-        m_filterDockIsTemporaryVisible = false;
+        searchPanel->setSearchMode(searchMode);
     }
 #else
     Q_UNUSED(enabled);
@@ -1276,6 +1324,125 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item,
     delete contextMenu;
 }
 
+void DolphinMainWindow::updateToolBarMenu()
+{
+    KMenu* menu = qobject_cast<KMenu*>(sender());
+    Q_ASSERT(menu);
+
+    // All actions get cleared by KMenu::clear(). The sub-menus are deleted
+    // by connecting to the aboutToHide() signal from the parent-menu.
+    menu->clear();
+
+    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+
+    KActionCollection* ac = actionCollection();
+
+    // Add "Edit" actions
+    bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
+                 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
+                 addActionToMenu(ac->action("select_all"), menu) |
+                 addActionToMenu(ac->action("invert_selection"), menu);
+
+    if (added) {
+        menu->addSeparator();
+    }
+
+    // Add "View" actions
+    if (!generalSettings->showZoomSlider()) {
+        addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
+        addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
+        menu->addSeparator();
+    }
+
+    added = addActionToMenu(ac->action("view_mode"), menu) |
+            addActionToMenu(ac->action("sort"), menu) |
+            addActionToMenu(ac->action("additional_info"), menu) |
+            addActionToMenu(ac->action("show_preview"), menu) |
+            addActionToMenu(ac->action("show_in_groups"), menu) |
+            addActionToMenu(ac->action("show_hidden_files"), menu);
+
+    if (added) {
+        menu->addSeparator();
+    }
+
+    added = addActionToMenu(ac->action("split_view"), menu) |
+            addActionToMenu(ac->action("reload"), menu) |
+            addActionToMenu(ac->action("view_properties"), menu);
+    if (added) {
+        menu->addSeparator();
+    }
+
+    addActionToMenu(ac->action("panels"), menu);
+    KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu);
+    locationBarMenu->addAction(ac->action("editable_location"));
+    locationBarMenu->addAction(ac->action("replace_location"));
+    menu->addMenu(locationBarMenu);
+
+    menu->addSeparator();
+
+    // Add "Go" menu
+    KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu);
+    connect(menu, SIGNAL(aboutToHide()), goMenu, SLOT(deleteLater()));
+    goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
+    goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
+    goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
+    goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
+    goMenu->addAction(ac->action("closed_tabs"));
+    menu->addMenu(goMenu);
+
+    // Add "Tool" menu
+    KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu);
+    connect(menu, SIGNAL(aboutToHide()), toolsMenu, SLOT(deleteLater()));
+    toolsMenu->addAction(ac->action("show_filter_bar"));
+    toolsMenu->addAction(ac->action("compare_files"));
+    toolsMenu->addAction(ac->action("open_terminal"));
+    toolsMenu->addAction(ac->action("change_remote_encoding"));
+    menu->addMenu(toolsMenu);
+
+    // Add "Settings" menu entries
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
+
+    // Add "Help" menu
+    KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu);
+    connect(menu, SIGNAL(aboutToHide()), helpMenu, SLOT(deleteLater()));
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp)));
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE)));
+    menu->addMenu(helpMenu);
+
+    menu->addSeparator();
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
+}
+
+void DolphinMainWindow::updateToolBar()
+{
+    if (!menuBar()->isVisible()) {
+        createToolBarMenuButton();
+    }
+}
+
+void DolphinMainWindow::slotToolBarSpacerDeleted()
+{
+    m_toolBarSpacer = 0;
+    m_updateToolBarTimer->start();
+}
+
+void DolphinMainWindow::slotToolBarMenuButtonDeleted()
+{
+    m_openToolBarMenuButton = 0;
+    m_updateToolBarTimer->start();
+}
+
+void DolphinMainWindow::slotToolBarIconSizeChanged(const QSize& iconSize)
+{
+    if (m_openToolBarMenuButton) {
+        m_openToolBarMenuButton->setIconSize(iconSize);
+    }
+}
+
 void DolphinMainWindow::init()
 {
     DolphinSettings& settings = DolphinSettings::instance();
@@ -1300,14 +1467,12 @@ void DolphinMainWindow::init()
     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(homeUrl,
-                                                                 m_viewTab[m_tabIndex].splitter);
+
+    m_viewTab[m_tabIndex].primaryView = createViewContainer(homeUrl, m_viewTab[m_tabIndex].splitter);
 
     m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
     connectViewSignals(m_activeViewContainer);
     DolphinView* view = m_activeViewContainer->view();
-    view->reload();
     m_activeViewContainer->show();
     m_actionHandler->setCurrentView(view);
 
@@ -1366,11 +1531,17 @@ void DolphinMainWindow::init()
     showFilterBarAction->setChecked(generalSettings->filterBar());
 
     if (firstRun) {
-        // assure a proper default size if Dolphin runs the first time
+        menuBar()->setVisible(false);
+        // Assure a proper default size if Dolphin runs the first time
         resize(750, 500);
     }
 
-    m_showMenuBar->setChecked(!menuBar()->isHidden());  // workaround for bug #171080
+    const bool showMenu = !menuBar()->isHidden();
+    QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar));
+    showMenuBarAction->setChecked(showMenu);  // workaround for bug #171080
+    if (!showMenu) {
+        createToolBarMenuButton();
+    }
 }
 
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
@@ -1409,6 +1580,18 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     emit urlChanged(url);
 }
 
+DolphinViewContainer* DolphinMainWindow::createViewContainer(const KUrl& url, QWidget* parent)
+{
+    DolphinViewContainer* container = new DolphinViewContainer(url, parent);
+
+    // The places-selector from the URL navigator should only be shown
+    // if the places dock is invisible
+    QDockWidget* placesDock = findChild<QDockWidget*>("placesDock");
+    container->urlNavigator()->setPlacesSelectorVisible(!placesDock || !placesDock->isVisible());
+
+    return container;
+}
+
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
@@ -1490,10 +1673,10 @@ void DolphinMainWindow::setupActions()
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
-    KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
-    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
-    showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
-    connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
+    KToggleAction* editableLocation = actionCollection()->add<KToggleAction>("editable_location");
+    editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
+    editableLocation->setShortcut(Qt::CTRL | Qt::Key_L);
+    connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
     KAction* replaceLocation = actionCollection()->addAction("replace_location");
     replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
@@ -1513,7 +1696,7 @@ void DolphinMainWindow::setupActions()
     connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)),
             this, SLOT(restoreClosedTab(QAction *)));
 
-    QAction* action = new QAction("Empty Recently Closed Tabs", m_recentTabsMenu);
+    QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu);
     action->setIcon(KIcon("edit-clear-list"));
     action->setData(QVariant::fromValue(true));
     m_recentTabsMenu->addAction(action);
@@ -1548,7 +1731,7 @@ void DolphinMainWindow::setupActions()
     connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
 
     // setup 'Settings' menu
-    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
+    KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
@@ -1659,24 +1842,24 @@ void DolphinMainWindow::setupDockWidgets()
             terminalPanel, SLOT(setUrl(KUrl)));
 #endif
 
-    // Setup "Filter"
+    // Setup "Search"
 #ifdef HAVE_NEPOMUK
-    DolphinDockWidget* filterDock = new DolphinDockWidget(i18nc("@title:window", "Filter"));
-    filterDock->setLocked(lock);
-    filterDock->setObjectName("filterDock");
-    filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-    Panel* filterPanel = new FilterPanel(filterDock);
-    filterPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
-    connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
-    filterDock->setWidget(filterPanel);
-
-    QAction* filterAction = filterDock->toggleViewAction();
-    filterAction->setShortcut(Qt::Key_F12);
-    filterAction->setIcon(KIcon("view-filter"));
-    addActionCloneToCollection(filterAction, "show_filter_panel");
-    addDockWidget(Qt::RightDockWidgetArea, filterDock);
+    DolphinDockWidget* searchDock = new DolphinDockWidget(i18nc("@title:window", "Search"));
+    searchDock->setLocked(lock);
+    searchDock->setObjectName("searchDock");
+    searchDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    Panel* searchPanel = new SearchPanel(searchDock);
+    searchPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    connect(searchPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
+    searchDock->setWidget(searchPanel);
+
+    QAction* searchAction = searchDock->toggleViewAction();
+    searchAction->setShortcut(Qt::Key_F12);
+    searchAction->setIcon(KIcon("system-search"));
+    addActionCloneToCollection(searchAction, "show_search_panel");
+    addDockWidget(Qt::RightDockWidgetArea, searchDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
-            filterPanel, SLOT(setUrl(KUrl)));
+            searchPanel, SLOT(setUrl(KUrl)));
 #endif
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
@@ -1687,7 +1870,7 @@ void DolphinMainWindow::setupDockWidgets()
         terminalDock->hide();
 #endif
 #ifdef HAVE_NEPOMUK
-        filterDock->hide();
+        searchDock->hide();
 #endif
     }
 
@@ -1718,6 +1901,8 @@ void DolphinMainWindow::setupDockWidgets()
             this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
     connect(this, SIGNAL(urlChanged(KUrl)),
             placesPanel, SLOT(setUrl(KUrl)));
+    connect(placesDock, SIGNAL(visibilityChanged(bool)),
+            this, SLOT(slotPlacesPanelVisibilityChanged(bool)));
 
     // Add actions into the "Panels" menu
     KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
@@ -1730,7 +1915,7 @@ void DolphinMainWindow::setupDockWidgets()
     panelsMenu->addAction(terminalAction);
 #endif
 #ifdef HAVE_NEPOMUK
-    panelsMenu->addAction(filterAction);
+    panelsMenu->addAction(searchAction);
 #endif
     panelsMenu->addSeparator();
     panelsMenu->addAction(lockLayoutAction);
@@ -1784,6 +1969,69 @@ void DolphinMainWindow::updateGoActions()
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
+void DolphinMainWindow::createToolBarMenuButton()
+{
+    if (m_toolBarSpacer && m_openToolBarMenuButton) {
+        return;
+    }
+    Q_ASSERT(!m_toolBarSpacer);
+    Q_ASSERT(!m_openToolBarMenuButton);
+
+    m_toolBarSpacer = new QWidget(this);
+    m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+
+    m_openToolBarMenuButton = new QToolButton(this);
+    m_openToolBarMenuButton->setIcon(KIcon("configure"));
+    m_openToolBarMenuButton->setPopupMode(QToolButton::InstantPopup);
+    m_openToolBarMenuButton->setToolTip(i18nc("@info:tooltip", "Configure and control Dolphin"));
+
+    KMenu* toolBarMenu = new ToolBarMenu(m_openToolBarMenuButton);
+    connect(toolBarMenu, SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu()));
+
+    m_openToolBarMenuButton->setMenu(toolBarMenu);
+
+    toolBar()->addWidget(m_toolBarSpacer);
+    toolBar()->addWidget(m_openToolBarMenuButton);
+    connect(toolBar(), SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged(QSize)));
+
+    // The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar
+    // gets edited. In this case we must add them again. The adding is done asynchronously by
+    // m_updateToolBarTimer.
+    connect(m_toolBarSpacer, SIGNAL(destroyed()), this, SLOT(slotToolBarSpacerDeleted()));
+    connect(m_openToolBarMenuButton, SIGNAL(destroyed()), this, SLOT(slotToolBarMenuButtonDeleted()));
+    m_updateToolBarTimer = new QTimer(this);
+    m_updateToolBarTimer->setInterval(500);
+    connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar()));
+}
+
+void DolphinMainWindow::deleteToolBarMenuButton()
+{
+    delete m_toolBarSpacer;
+    m_toolBarSpacer = 0;
+
+    delete m_openToolBarMenuButton;
+    m_openToolBarMenuButton = 0;
+
+    delete m_updateToolBarTimer;
+    m_updateToolBarTimer = 0;
+}
+
+bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu)
+{
+    Q_ASSERT(action);
+    Q_ASSERT(menu);
+
+    const KToolBar* toolBarWidget = toolBar();
+    foreach (const QWidget* widget, action->associatedWidgets()) {
+        if (widget == toolBarWidget) {
+            return false;
+        }
+    }
+
+    menu->addAction(action);
+    return true;
+}
+
 void DolphinMainWindow::rememberClosedTab(int index)
 {
     KMenu* tabsMenu = m_recentTabsMenu->menu();
@@ -1920,11 +2168,10 @@ void DolphinMainWindow::createSecondaryView(int tabIndex)
     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(view->rootUrl(), 0);
+    m_viewTab[tabIndex].secondaryView = createViewContainer(view->rootUrl(), 0);
     splitter->addWidget(m_viewTab[tabIndex].secondaryView);
     splitter->setSizes(QList<int>() << newWidth << newWidth);
     connectViewSignals(m_viewTab[tabIndex].secondaryView);
-    m_viewTab[tabIndex].secondaryView->view()->reload();
     m_viewTab[tabIndex].secondaryView->setActive(false);
     m_viewTab[tabIndex].secondaryView->show();
 }
@@ -1984,4 +2231,47 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
     }
 }
 
+ToolBarMenu::ToolBarMenu(QWidget* parent) :
+    KMenu(parent)
+{
+}
+
+ToolBarMenu::~ToolBarMenu()
+{
+}
+
+void ToolBarMenu::showEvent(QShowEvent* event)
+{
+    KMenu::showEvent(event);
+
+    // Adjust the position of the menu to be shown within the
+    // Dolphin window to reduce the cases that sub-menus might overlap
+    // the right screen border.
+    QPoint pos;
+    QWidget* button = parentWidget();
+    if (layoutDirection() == Qt::RightToLeft) {
+        pos = button->mapToGlobal(QPoint(0, button->height()));
+    } else {
+        pos = button->mapToGlobal(QPoint(button->width(), button->height()));
+        pos.rx() -= width();
+    }
+
+    // Assure that the menu is not shown outside the screen boundaries and
+    // that it does not overlap with the parent button.
+    const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
+    if (pos.x() < 0) {
+        pos.rx() = 0;
+    } else if (pos.x() + width() >= screen.width()) {
+        pos.rx() = screen.width() - width();
+    }
+
+    if (pos.y() < 0) {
+        pos.ry() = 0;
+    } else if (pos.y() + height() >= screen.height()) {
+        pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height();
+    }
+
+    move(pos);
+}
+
 #include "dolphinmainwindow.moc"