KFileItemModel: interface cleanups

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f0335a4cdb1e2a3534f409f9a2669a79fe32edc8..aca4d15b68ba11831ae488455efc9280f36c89ee 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -28,16 +28,15 @@
 #include "dolphincontextmenu.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphinviewcontainer.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphinviewcontainer.h"

-#include "mainwindowadaptor.h"

 #ifdef HAVE_NEPOMUK
 #ifdef HAVE_NEPOMUK

-    #include "panels/filter/filterpanel.h"
+    #include "panels/search/searchpanel.h"

     #include <Nepomuk/ResourceManager>
 #endif
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
     #include <Nepomuk/ResourceManager>
 #endif
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"

+#include "search/dolphinsearchbox.h"

 #include "search/dolphinsearchinformation.h"
 #include "search/dolphinsearchinformation.h"

-#include "settings/dolphinsettings.h"

 #include "settings/dolphinsettingsdialog.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "views/dolphinviewactionhandler.h"
 #include "settings/dolphinsettingsdialog.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "views/dolphinviewactionhandler.h"


@@ -50,8 +49,9 @@
 #endif
 
 #include "dolphin_generalsettings.h"
 #endif
 
 #include "dolphin_generalsettings.h"

-#include "dolphin_iconsmodesettings.h"
+#include "dolphin_searchsettings.h"

 
 

+#include <KAcceleratorManager>

 #include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>


@@ -63,7 +63,7 @@
 #include <KFilePlacesModel>
 #include <KGlobal>
 #include <KLineEdit>
 #include <KFilePlacesModel>
 #include <KGlobal>
 #include <KLineEdit>

-#include <ktoolbar.h>
+#include <KToolBar>

 #include <KIcon>
 #include <KIconLoader>
 #include <KIO/NetAccess>
 #include <KIcon>
 #include <KIconLoader>
 #include <KIO/NetAccess>


@@ -88,11 +88,20 @@
 #include <KUrlComboBox>
 #include <KToolInvocation>
 
 #include <KUrlComboBox>
 #include <KToolInvocation>
 

+#include "views/dolphinplacesmodel.h"
+
+#include <QDesktopWidget>

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

+#include <QToolButton>

 #include <QSplitter>
 #include <QSplitter>

-#include <kacceleratormanager.h>
+
+namespace {
+    // Used for GeneralSettings::version() to determine whether
+    // an updated version of Dolphin is running.
+    const int CurrentDolphinVersion = 200;
+};

 
 /*
  * Remembers the tab configuration if a tab has been closed.
 
 /*
  * Remembers the tab configuration if a tab has been closed.


@@ -107,22 +116,26 @@ struct ClosedTab
 };
 Q_DECLARE_METATYPE(ClosedTab)
 
 };
 Q_DECLARE_METATYPE(ClosedTab)
 

-DolphinMainWindow::DolphinMainWindow(int id) :
+DolphinMainWindow::DolphinMainWindow() :

     KXmlGuiWindow(0),
     m_newFileMenu(0),
     KXmlGuiWindow(0),
     m_newFileMenu(0),

-    m_showMenuBar(0),

     m_tabBar(0),
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),
     m_tabBar(0),
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),

-    m_id(id),

     m_tabIndex(0),
     m_viewTab(),
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_tabIndex(0),
     m_viewTab(),
     m_actionHandler(0),
     m_remoteEncoding(0),

-    m_settingsDialog(0),
+    m_settingsDialog(),
+    m_controlButton(0),
+    m_updateToolBarTimer(0),

     m_lastHandleUrlStatJob(0),
     m_lastHandleUrlStatJob(0),

-    m_filterDockIsTemporaryVisible(false)
+    m_searchDockIsTemporaryVisible(false)

 {
 {

+    DolphinPlacesModel::setModel(new KFilePlacesModel(this));
+    connect(DolphinPlacesModel::instance(), SIGNAL(errorMessage(QString)),
+            this, SLOT(showErrorMessage(QString)));
+

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


@@ -131,30 +144,118 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     setObjectName("Dolphin#");
 
     m_viewTab.append(ViewTab());
     setObjectName("Dolphin#");
 
     m_viewTab.append(ViewTab());

-
-    new MainWindowAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
+    ViewTab& viewTab = m_viewTab[m_tabIndex];
+    viewTab.wasActive = true; // The first opened tab is automatically active

 
     KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
     undoManager->setUiInterface(new UndoUiInterface());
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));
 
     KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
     undoManager->setUiInterface(new UndoUiInterface());
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));

-    connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
-            this, SLOT(slotUndoTextChanged(const QString&)));
+    connect(undoManager, SIGNAL(undoTextChanged(QString)),
+            this, SLOT(slotUndoTextChanged(QString)));

     connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)),
             this, SLOT(clearStatusBar()));
     connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
             this, SLOT(showCommand(CommandType)));
     connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)),
             this, SLOT(clearStatusBar()));
     connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
             this, SLOT(showCommand(CommandType)));

-    connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
-    connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
+
+    GeneralSettings* generalSettings = GeneralSettings::self();
+    const bool firstRun = (generalSettings->version() < 200);
+    if (firstRun) {
+        generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
+    }
+
+    setAcceptDrops(true);
+
+    viewTab.splitter = new QSplitter(this);
+    viewTab.splitter->setChildrenCollapsible(false);
+
+    setupActions();
+
+    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()));
+
+    viewTab.primaryView = createViewContainer(homeUrl, viewTab.splitter);
+
+    m_activeViewContainer = viewTab.primaryView;
+    connectViewSignals(m_activeViewContainer);
+    DolphinView* view = m_activeViewContainer->view();
+    m_activeViewContainer->show();
+    m_actionHandler->setCurrentView(view);
+
+    m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
+
+    m_tabBar = new KTabBar(this);
+    m_tabBar->setMovable(true);
+    m_tabBar->setTabsClosable(true);
+    connect(m_tabBar, SIGNAL(currentChanged(int)),
+            this, SLOT(setActiveTab(int)));
+    connect(m_tabBar, SIGNAL(tabCloseRequested(int)),
+            this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(contextMenu(int,QPoint)),
+            this, SLOT(openTabContextMenu(int,QPoint)));
+    connect(m_tabBar, SIGNAL(newTabRequest()),
+            this, SLOT(openNewTab()));
+    connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*,bool&)),
+            this, SLOT(slotTestCanDecode(const QDragMoveEvent*,bool&)));
+    connect(m_tabBar, SIGNAL(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
+
+    QWidget* centralWidget = new QWidget(this);
+    m_centralWidgetLayout = new QVBoxLayout(centralWidget);
+    m_centralWidgetLayout->setSpacing(0);
+    m_centralWidgetLayout->setMargin(0);
+    m_centralWidgetLayout->addWidget(m_tabBar);
+    m_centralWidgetLayout->addWidget(viewTab.splitter, 1);
+
+    setCentralWidget(centralWidget);
+    setupDockWidgets();
+    emit urlChanged(homeUrl);
+
+    setupGUI(Keys | Save | Create | ToolBar);
+    stateChanged("new_file");
+
+    QClipboard* clipboard = QApplication::clipboard();
+    connect(clipboard, SIGNAL(dataChanged()),
+            this, SLOT(updatePasteAction()));
+
+    if (generalSettings->splitView()) {
+        toggleSplitView();
+    }
+    updateEditActions();
+    updateViewActions();
+    updateGoActions();
+
+    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    showFilterBarAction->setChecked(generalSettings->filterBar());
+
+    if (firstRun) {
+        menuBar()->setVisible(false);
+        // Assure a proper default size if Dolphin runs the first time
+        resize(750, 500);
+    }
+
+    const bool showMenu = !menuBar()->isHidden();
+    QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar));
+    showMenuBarAction->setChecked(showMenu);  // workaround for bug #171080
+    if (!showMenu) {
+        createControlButton();
+    }

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

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

 }
 
 void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
 }
 
 void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)


@@ -163,10 +264,14 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
         return;
     }
 
         return;
     }
 

+    if (dirs.count() == 1) {
+        m_activeViewContainer->setUrl(dirs.first());
+        return;
+    }
+

     const int oldOpenTabsCount = m_viewTab.count();
 
     const int oldOpenTabsCount = m_viewTab.count();
 

-    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
-    const bool hasSplitView = generalSettings->splitView();
+    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.
 
     // Open each directory inside a new tab. If the "split view" option has been enabled,
     // always show two directories within one tab.


@@ -182,7 +287,7 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
         }
     }
 
         }
     }
 

-    // remove the previously opened tabs
+    // Remove the previously opened tabs

     for (int i = 0; i < oldOpenTabsCount; ++i) {
         closeTab(0);
     }
     for (int i = 0; i < oldOpenTabsCount; ++i) {
         closeTab(0);
     }


@@ -213,8 +318,10 @@ void DolphinMainWindow::openFiles(const QList<KUrl>& files)
     const int tabCount = m_viewTab.count();
     for (int i = 0; i < tabCount; ++i) {
         m_viewTab[i].primaryView->view()->markUrlsAsSelected(files);
     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].primaryView->view()->markUrlAsCurrent(files.at(0));
+        if (m_viewTab[i].secondaryView) {

             m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files);
             m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files);

+            m_viewTab[i].secondaryView->view()->markUrlAsCurrent(files.at(0));

         }
     }
 }
         }
     }
 }


@@ -254,39 +361,6 @@ void DolphinMainWindow::showCommand(CommandType command)
     }
 }
 
     }
 }
 

-void DolphinMainWindow::refreshViews()
-{
-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
-
-    // remember the current active view, as because of
-    // the refreshing the active view might change to
-    // the secondary view
-    DolphinViewContainer* activeViewContainer = m_activeViewContainer;
-
-    const int tabCount = m_viewTab.count();
-    for (int i = 0; i < tabCount; ++i) {
-        m_viewTab[i].primaryView->refresh();
-        if (m_viewTab[i].secondaryView != 0) {
-            m_viewTab[i].secondaryView->refresh();
-        }
-    }
-
-    setActiveViewContainer(activeViewContainer);
-
-    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
-    if (generalSettings->modifiedStartupSettings()) {
-        // The startup settings have been changed by the user (see bug #254947).
-        // Synchronize the split-view setting with the active view:
-        const bool splitView = generalSettings->splitView();
-        const ViewTab& activeTab = m_viewTab[m_tabIndex];
-        const bool toggle =    ( splitView && (activeTab.secondaryView == 0))
-                            || (!splitView && (activeTab.secondaryView != 0));
-        if (toggle) {
-            toggleSplitView();
-        }
-    }
-}
-

 void DolphinMainWindow::pasteIntoFolder()
 {
     m_activeViewContainer->view()->pasteIntoFolder();
 void DolphinMainWindow::pasteIntoFolder()
 {
     m_activeViewContainer->view()->pasteIntoFolder();


@@ -302,7 +376,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
     }
 
     DolphinViewContainer* view = activeViewContainer();
     }
 
     DolphinViewContainer* view = activeViewContainer();

-    if (view != 0) {
+    if (view) {

         view->setUrl(url);
         updateEditActions();
         updateViewActions();
         view->setUrl(url);
         updateEditActions();
         updateViewActions();


@@ -328,9 +402,9 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 
 {
     updateEditActions();
 

-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);

     int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
     int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();

-    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+    if (m_viewTab[m_tabIndex].secondaryView) {

         selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();
     }
 
         selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();
     }
 


@@ -355,14 +429,14 @@ 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) {
+    if (backAction) {
+        backAction->setToolTip(i18nc("@info", "Go back"));

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

-    forwardAction->setToolTip(i18nc("@info", "Go forward"));
-    if (forwardAction != 0) {
+    if (forwardAction) {
+        forwardAction->setToolTip(i18nc("@info", "Go forward"));

         forwardAction->setEnabled(index > 0);
     }
 }
         forwardAction->setEnabled(index > 0);
     }
 }


@@ -375,7 +449,7 @@ void DolphinMainWindow::updateFilterBarAction(bool show)
 
 void DolphinMainWindow::openNewMainWindow()
 {
 
 void DolphinMainWindow::openNewMainWindow()
 {

-    DolphinApplication::app()->createMainWindow()->show();
+    KRun::run("dolphin", KUrl::List(), this);

 }
 
 void DolphinMainWindow::openNewTab()
 }
 
 void DolphinMainWindow::openNewTab()


@@ -416,25 +490,23 @@ 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(url, viewTab.splitter);
+    viewTab.primaryView = createViewContainer(url, viewTab.splitter);

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

-    viewTab.primaryView->view()->reload();

 
     m_viewTab.append(viewTab);
 
     actionCollection()->action("close_tab")->setEnabled(true);
 
 
     m_viewTab.append(viewTab);
 
     actionCollection()->action("close_tab")->setEnabled(true);
 

-    // provide a split view, if the startup settings are set this way
-    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
-    if (generalSettings->splitView()) {
-        const int tabIndex = m_viewTab.count() - 1;
-        createSecondaryView(tabIndex);
-        m_viewTab[tabIndex].secondaryView->setActive(true);
-        m_viewTab[tabIndex].isPrimaryViewActive = false;
+    // Provide a split view, if the startup settings are set this way
+    if (GeneralSettings::splitView()) {
+        const int newTabIndex = m_viewTab.count() - 1;
+        createSecondaryView(newTabIndex);
+        m_viewTab[newTabIndex].secondaryView->setActive(true);
+        m_viewTab[newTabIndex].isPrimaryViewActive = false;

     }
 
     }
 

-    if (focusWidget != 0) {
+    if (focusWidget) {

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


@@ -443,25 +515,21 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
 
 void DolphinMainWindow::activateNextTab()
 {
 
 void DolphinMainWindow::activateNextTab()
 {

-    if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) {
-        return;
+    if (m_viewTab.count() >= 2) {
+        const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count();
+        m_tabBar->setCurrentIndex(tabIndex);

     }
     }

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

 }
 
 void DolphinMainWindow::activatePrevTab()
 {
 }
 
 void DolphinMainWindow::activatePrevTab()
 {

-    if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) {
-        return;
-    }
-
-    int tabIndex = m_tabBar->currentIndex() - 1;
-    if (tabIndex == -1) {
-        tabIndex = m_tabBar->count() - 1;
+    if (m_viewTab.count() >= 2) {
+        int tabIndex = m_tabBar->currentIndex() - 1;
+        if (tabIndex == -1) {
+            tabIndex = m_tabBar->count() - 1;
+        }
+        m_tabBar->setCurrentIndex(tabIndex);

     }
     }

-    m_tabBar->setCurrentIndex(tabIndex);

 }
 
 void DolphinMainWindow::openInNewTab()
 }
 
 void DolphinMainWindow::openInNewTab()


@@ -486,21 +554,19 @@ void DolphinMainWindow::openInNewWindow()
     }
 
     if (!newWindowUrl.isEmpty()) {
     }
 
     if (!newWindowUrl.isEmpty()) {

-        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
-        window->changeUrl(newWindowUrl);
-        window->show();
+        KRun::run("dolphin", KUrl::List() << newWindowUrl, this);

     }
 }
 
 void DolphinMainWindow::toggleActiveView()
 {
     }
 }
 
 void DolphinMainWindow::toggleActiveView()
 {

-    if (m_viewTab[m_tabIndex].secondaryView == 0) {
+    if (!m_viewTab[m_tabIndex].secondaryView) {

         // only one view is available
         return;
     }
 
         // only one view is available
         return;
     }
 

-    Q_ASSERT(m_activeViewContainer != 0);
-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_activeViewContainer);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);

 
     DolphinViewContainer* left  = m_viewTab[m_tabIndex].primaryView;
     DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView;
 
     DolphinViewContainer* left  = m_viewTab[m_tabIndex].primaryView;
     DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView;


@@ -517,9 +583,6 @@ void DolphinMainWindow::showEvent(QShowEvent* event)
 
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
 
 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;
     // Find out if Dolphin is closed directly by the user or
     // by the session manager because the session is closed
     bool closedByUser = true;


@@ -528,7 +591,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
         closedByUser = false;
     }
 
         closedByUser = false;
     }
 

-    if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs() && closedByUser) {
+    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
         // Ask the user if he really wants to quit and close all tabs.
         // Open a confirmation dialog with 3 buttons:
         // KDialog::Yes    -> Quit


@@ -554,7 +617,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
             KMessageBox::Notify);
 
         if (doNotAskAgainCheckboxResult) {
             KMessageBox::Notify);
 
         if (doNotAskAgainCheckboxResult) {

-            generalSettings->setConfirmClosingMultipleTabs(false);
+            GeneralSettings::setConfirmClosingMultipleTabs(false);

         }
 
         switch (result) {
         }
 
         switch (result) {


@@ -570,16 +633,15 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
         }
     }
 
         }
     }
 

-    generalSettings->setFirstRun(false);
-
-    settings.save();
+    GeneralSettings::setVersion(CurrentDolphinVersion);
+    GeneralSettings::self()->writeConfig();

 
 

-    if (m_filterDockIsTemporaryVisible) {
-        QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-        if (filterDock != 0) {
-            filterDock->hide();
+    if (m_searchDockIsTemporaryVisible) {
+        QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+        if (searchDock) {
+            searchDock->hide();

         }
         }

-        m_filterDockIsTemporaryVisible = false;
+        m_searchDockIsTemporaryVisible = false;

     }
 
     KXmlGuiWindow::closeEvent(event);
     }
 
     KXmlGuiWindow::closeEvent(event);


@@ -598,7 +660,7 @@ void DolphinMainWindow::saveProperties(KConfigGroup& group)
                          cont->urlNavigator()->isUrlEditable());
 
         cont = m_viewTab[i].secondaryView;
                          cont->urlNavigator()->isUrlEditable());
 
         cont = m_viewTab[i].secondaryView;

-        if (cont != 0) {
+        if (cont) {

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


@@ -619,18 +681,18 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
         cont = m_viewTab[i].secondaryView;
         const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i));
         if (!secondaryUrl.isEmpty()) {
         cont = m_viewTab[i].secondaryView;
         const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i));
         if (!secondaryUrl.isEmpty()) {

-            if (cont == 0) {
+            if (!cont) {

                 // a secondary view should be shown, but no one is available
                 // currently -> create a new view
                 toggleSplitView();
                 cont = m_viewTab[i].secondaryView;
                 // 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);
+                Q_ASSERT(cont);

             }
 
             cont->setUrl(secondaryUrl);
             const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
             cont->urlNavigator()->setUrlEditable(editable);
             }
 
             cont->setUrl(secondaryUrl);
             const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
             cont->urlNavigator()->setUrlEditable(editable);

-        } else if (cont != 0) {
+        } else if (cont) {

             // no secondary view should be shown, but the default setting shows
             // one already -> close the view
             toggleSplitView();
             // no secondary view should be shown, but the default setting shows
             // one already -> close the view
             toggleSplitView();


@@ -648,14 +710,14 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
 
 void DolphinMainWindow::updateNewMenu()
 {
 
 void DolphinMainWindow::updateNewMenu()
 {

-    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown());

     m_newFileMenu->checkUpToDate();
     m_newFileMenu->setPopupFiles(activeViewContainer()->url());
 }
 
 void DolphinMainWindow::createDirectory()
 {
     m_newFileMenu->checkUpToDate();
     m_newFileMenu->setPopupFiles(activeViewContainer()->url());
 }
 
 void DolphinMainWindow::createDirectory()
 {

-    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown());

     m_newFileMenu->setPopupFiles(activeViewContainer()->url());
     m_newFileMenu->createDirectory();
 }
     m_newFileMenu->setPopupFiles(activeViewContainer()->url());
     m_newFileMenu->createDirectory();
 }


@@ -676,7 +738,7 @@ void DolphinMainWindow::showErrorMessage(const QString& message)
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));

-    if (undoAction != 0) {
+    if (undoAction) {

         undoAction->setEnabled(available);
     }
 }
         undoAction->setEnabled(available);
     }
 }


@@ -713,7 +775,7 @@ void DolphinMainWindow::restoreClosedTab(QAction* action)
 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));

-    if (undoAction != 0) {
+    if (undoAction) {

         undoAction->setText(text);
     }
 }
         undoAction->setText(text);
     }
 }


@@ -745,6 +807,23 @@ void DolphinMainWindow::find()
     m_activeViewContainer->setSearchModeEnabled(true);
 }
 
     m_activeViewContainer->setSearchModeEnabled(true);
 }
 

+void DolphinMainWindow::slotSearchLocationChanged()
+{
+#ifdef HAVE_NEPOMUK
+    QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+    if (!searchDock) {
+        return;
+    }
+
+    SearchPanel* searchPanel = qobject_cast<SearchPanel*>(searchDock->widget());
+    if (searchPanel) {
+        searchPanel->setSearchLocation(SearchSettings::location() == QLatin1String("FromHere")
+                                       ? SearchPanel::FromCurrentDir
+                                       : SearchPanel::Everywhere);
+    }
+#endif
+}
+

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


@@ -779,7 +858,7 @@ void DolphinMainWindow::invertSelection()
 
 void DolphinMainWindow::toggleSplitView()
 {
 
 void DolphinMainWindow::toggleSplitView()
 {

-    if (m_viewTab[m_tabIndex].secondaryView == 0) {
+    if (!m_viewTab[m_tabIndex].secondaryView) {

         createSecondaryView(m_tabIndex);
         setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
     } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
         createSecondaryView(m_tabIndex);
         setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
     } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {


@@ -854,23 +933,32 @@ void DolphinMainWindow::replaceLocation()
 
 void DolphinMainWindow::togglePanelLockState()
 {
 
 void DolphinMainWindow::togglePanelLockState()
 {

-    GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
-
-    const bool newLockState = !generalSettings->lockPanels();
+    const bool newLockState = !GeneralSettings::lockPanels();

     foreach (QObject* child, children()) {
         DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
     foreach (QObject* child, children()) {
         DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);

-        if (dock != 0) {
+        if (dock) {

             dock->setLocked(newLockState);
         }
     }
 
             dock->setLocked(newLockState);
         }
     }
 

-    generalSettings->setLockPanels(newLockState);
+    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();
 
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     urlNavigator->goBack();
 


@@ -883,16 +971,19 @@ void DolphinMainWindow::goBack()
 
 void DolphinMainWindow::goForward()
 {
 
 void DolphinMainWindow::goForward()
 {

-    clearStatusBar();

     m_activeViewContainer->urlNavigator()->goForward();
 }
 
 void DolphinMainWindow::goUp()
 {
     m_activeViewContainer->urlNavigator()->goForward();
 }
 
 void DolphinMainWindow::goUp()
 {

-    clearStatusBar();

     m_activeViewContainer->urlNavigator()->goUp();
 }
 
     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().
 void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goBack().


@@ -921,10 +1012,12 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
     }
 }
 
     }
 }
 

-void DolphinMainWindow::goHome()
+void DolphinMainWindow::goHome(Qt::MouseButtons buttons)

 {
 {

-    clearStatusBar();
-    m_activeViewContainer->urlNavigator()->goHome();
+    // The default case (left button pressed) is handled in goHome().
+    if (buttons == Qt::MidButton) {
+        openNewTab(GeneralSettings::self()->homeUrl());
+    }

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


@@ -935,7 +1028,7 @@ void DolphinMainWindow::compareFiles()
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view

-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);

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


@@ -944,7 +1037,7 @@ void DolphinMainWindow::compareFiles()
 
     switch (items.count()) {
     case 0: {
 
     switch (items.count()) {
     case 0: {

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

         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(items.count() == 2);
         urlA = items[0].url();
         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(items.count() == 2);
         urlA = items[0].url();


@@ -954,7 +1047,7 @@ void DolphinMainWindow::compareFiles()
 
     case 1: {
         urlA = items[0].url();
 
     case 1: {
         urlA = items[0].url();

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

         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(items.count() == 1);
         urlB = items[0].url();
         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(items.count() == 1);
         urlB = items[0].url();


@@ -986,6 +1079,11 @@ void DolphinMainWindow::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
     menuBar()->setVisible(!visible);
 {
     const bool visible = menuBar()->isVisible();
     menuBar()->setVisible(!visible);

+    if (visible) {
+        createControlButton();
+    } else {
+        deleteControlButton();
+    }

 }
 
 void DolphinMainWindow::openTerminal()
 }
 
 void DolphinMainWindow::openTerminal()


@@ -1006,13 +1104,18 @@ void DolphinMainWindow::openTerminal()
 
 void DolphinMainWindow::editSettings()
 {
 
 void DolphinMainWindow::editSettings()
 {

-    if (m_settingsDialog == 0) {
-        const KUrl url = activeViewContainer()->url();
-        m_settingsDialog = new DolphinSettingsDialog(url, this);
-        m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
-        m_settingsDialog->show();
+    if (!m_settingsDialog) {
+        DolphinViewContainer* container = activeViewContainer();
+        container->view()->writeSettings();
+
+        const KUrl url = container->url();
+        DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this);
+        connect(settingsDialog, SIGNAL(settingsChanged()), this, SLOT(refreshViews()));
+        settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
+        settingsDialog->show();
+        m_settingsDialog = settingsDialog;

     } else {
     } else {

-        m_settingsDialog->raise();
+        m_settingsDialog.data()->raise();

     }
 }
 
     }
 }
 


@@ -1028,7 +1131,7 @@ void DolphinMainWindow::setActiveTab(int index)
     ViewTab& hiddenTab = m_viewTab[m_tabIndex];
     hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive();
     hiddenTab.primaryView->setActive(false);
     ViewTab& hiddenTab = m_viewTab[m_tabIndex];
     hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive();
     hiddenTab.primaryView->setActive(false);

-    if (hiddenTab.secondaryView != 0) {
+    if (hiddenTab.secondaryView) {

         hiddenTab.secondaryView->setActive(false);
     }
     QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
         hiddenTab.secondaryView->setActive(false);
     }
     QSplitter* splitter = m_viewTab[m_tabIndex].splitter;


@@ -1041,11 +1144,23 @@ void DolphinMainWindow::setActiveTab(int index)
     ViewTab& viewTab = m_viewTab[index];
     m_centralWidgetLayout->addWidget(viewTab.splitter, 1);
     viewTab.primaryView->show();
     ViewTab& viewTab = m_viewTab[index];
     m_centralWidgetLayout->addWidget(viewTab.splitter, 1);
     viewTab.primaryView->show();

-    if (viewTab.secondaryView != 0) {
+    if (viewTab.secondaryView) {

         viewTab.secondaryView->show();
     }
     viewTab.splitter->show();
 
         viewTab.secondaryView->show();
     }
     viewTab.splitter->show();
 

+    if (!viewTab.wasActive) {
+        viewTab.wasActive = true;
+
+        // If the tab has not been activated yet the size of the KItemListView is
+        // undefined and results in an unwanted animation. To prevent this a
+        // reloading of the directory gets triggered.
+        viewTab.primaryView->view()->reload();
+        if (viewTab.secondaryView) {
+            viewTab.secondaryView->view()->reload();
+        }
+    }
+

     setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView :
                                                          viewTab.secondaryView);
 }
     setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView :
                                                          viewTab.secondaryView);
 }


@@ -1073,7 +1188,7 @@ void DolphinMainWindow::closeTab(int index)
 
     // delete tab
     m_viewTab[index].primaryView->deleteLater();
 
     // delete tab
     m_viewTab[index].primaryView->deleteLater();

-    if (m_viewTab[index].secondaryView != 0) {
+    if (m_viewTab[index].secondaryView) {

         m_viewTab[index].secondaryView->deleteLater();
     }
     m_viewTab[index].splitter->deleteLater();
         m_viewTab[index].secondaryView->deleteLater();
     }
     m_viewTab[index].splitter->deleteLater();


@@ -1113,31 +1228,26 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
     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];

-        Q_ASSERT(tab.primaryView != 0);
-        const KUrl url = (tab.secondaryView != 0) && tab.secondaryView->isActive() ?
+        Q_ASSERT(tab.primaryView);
+        const KUrl url = tab.secondaryView && tab.secondaryView->isActive() ?

                          tab.secondaryView->url() : tab.primaryView->url();
         openNewTab(url);
         m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
     } else if (selectedAction == detachTabAction) {
                          tab.secondaryView->url() : tab.primaryView->url();
         openNewTab(url);
         m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
     } else if (selectedAction == detachTabAction) {

+        const QString separator(QLatin1Char(' '));
+        QString command = QLatin1String("dolphin");
+

         const ViewTab& tab = m_viewTab[index];
         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();
-            if (window->m_viewTab[0].secondaryView == 0) {
-                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);
-            }
+        Q_ASSERT(tab.primaryView);
+
+        command += separator + tab.primaryView->url().url();
+        if (tab.secondaryView) {
+            command += separator + tab.secondaryView->url().url();
+            command += separator + QLatin1String("-split");

         }
         }

-        window->show();
+
+        KRun::runCommand(command, this);
+

         closeTab(index);
     } else if (selectedAction == closeOtherTabsAction) {
         const int count = m_tabBar->count();
         closeTab(index);
     } else if (selectedAction == closeOtherTabsAction) {
         const int count = m_tabBar->count();


@@ -1208,8 +1318,9 @@ 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::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);
+        const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view()
+                                                              : viewTab.secondaryView->view();
+        DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event);

     }
 }
 
     }
 }
 


@@ -1221,46 +1332,61 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
 void DolphinMainWindow::slotSearchModeChanged(bool enabled)
 {
 #ifdef HAVE_NEPOMUK
 void DolphinMainWindow::slotSearchModeChanged(bool enabled)
 {
 #ifdef HAVE_NEPOMUK

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

     const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
     const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();

-    if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) {
+    if (!searchInfo.isIndexingEnabled()) {

         return;
     }
 
         return;
     }
 

-    QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-    if (filterDock == 0) {
+    QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+    if (!searchDock) {

         return;
     }
 
     if (enabled) {
         return;
     }
 
     if (enabled) {

-        if (!filterDock->isVisible()) {
-            m_filterDockIsTemporaryVisible = true;
+        if (!searchDock->isVisible()) {
+            m_searchDockIsTemporaryVisible = true;

         }
         }

-        filterDock->show();
+        searchDock->show();

     } else {
     } else {

-        if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) {
-            filterDock->hide();
+        if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) {
+            searchDock->hide();

         }
         }

-        m_filterDockIsTemporaryVisible = false;
+        m_searchDockIsTemporaryVisible = false;
+    }
+
+    SearchPanel* searchPanel = qobject_cast<SearchPanel*>(searchDock->widget());
+    if (!searchPanel) {
+        return;
+    }
+
+    if (enabled) {
+        SearchPanel::SearchLocation searchLocation = SearchPanel::Everywhere;
+        const KUrl url = m_activeViewContainer->url();
+        const bool isSearchUrl = (url.protocol() == QLatin1String("nepomuksearch"));
+        if ((SearchSettings::location() == QLatin1String("FromHere") && !isSearchUrl)) {
+            searchLocation = SearchPanel::FromCurrentDir;
+        }
+        searchPanel->setSearchLocation(searchLocation);
+    } else {
+        searchPanel->setSearchLocation(SearchPanel::Everywhere);

     }
 #else
     Q_UNUSED(enabled);
 #endif
 }
 
     }
 #else
     Q_UNUSED(enabled);
 #endif
 }
 

-void DolphinMainWindow::openContextMenu(const KFileItem& item,
+void DolphinMainWindow::openContextMenu(const QPoint& pos,
+                                        const KFileItem& item,

                                         const KUrl& url,
                                         const QList<QAction*>& customActions)
 {
                                         const KUrl& url,
                                         const QList<QAction*>& customActions)
 {

-    QPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, item, url);
-    contextMenu->setCustomActions(customActions);
-    const DolphinContextMenu::Command command = contextMenu->open();
+    QWeakPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
+    contextMenu.data()->setCustomActions(customActions);
+    const DolphinContextMenu::Command command = contextMenu.data()->open();

 
     switch (command) {
     case DolphinContextMenu::OpenParentFolderInNewWindow: {
 
     switch (command) {
     case DolphinContextMenu::OpenParentFolderInNewWindow: {

-        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
-        window->changeUrl(item.url().upUrl());
-        window->show();
+        KRun::run("dolphin", KUrl::List() << item.url().upUrl(), this);

         break;
     }
 
         break;
     }
 


@@ -1273,109 +1399,121 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item,
         break;
     }
 
         break;
     }
 

-    delete contextMenu;
+    delete contextMenu.data();

 }
 
 }
 

-void DolphinMainWindow::init()
+void DolphinMainWindow::updateControlMenu()

 {
 {

-    DolphinSettings& settings = DolphinSettings::instance();
+    KMenu* menu = qobject_cast<KMenu*>(sender());
+    Q_ASSERT(menu);

 
 

-    // Check whether Dolphin runs the first time. If yes then
-    // a proper default window size is given at the end of DolphinMainWindow::init().
-    GeneralSettings* generalSettings = settings.generalSettings();
-    const bool firstRun = generalSettings->firstRun();
-    if (firstRun) {
-        generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
-    }
+    // All actions get cleared by KMenu::clear(). The sub-menus are deleted
+    // by connecting to the aboutToHide() signal from the parent-menu.
+    menu->clear();

 
 

-    setAcceptDrops(true);
+    KActionCollection* ac = actionCollection();

 
 

-    m_viewTab[m_tabIndex].splitter = new QSplitter(this);
-    m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false);
+    // 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);

 
 

-    setupActions();
+    if (added) {
+        menu->addSeparator();
+    }

 
 

-    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);
-    m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(homeUrl,
-                                                                 m_viewTab[m_tabIndex].splitter);
+    // Add "View" actions
+    if (!GeneralSettings::showZoomSlider()) {
+        addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
+        addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
+        menu->addSeparator();
+    }

 
 

-    m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
-    connectViewSignals(m_activeViewContainer);
-    DolphinView* view = m_activeViewContainer->view();
-    view->reload();
-    m_activeViewContainer->show();
-    m_actionHandler->setCurrentView(view);
+    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);

 
 

-    m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
-    connect(this, SIGNAL(urlChanged(const KUrl&)),
-            m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
+    if (added) {
+        menu->addSeparator();
+    }

 
 

-    m_tabBar = new KTabBar(this);
-    m_tabBar->setMovable(true);
-    m_tabBar->setTabsClosable(true);
-    connect(m_tabBar, SIGNAL(currentChanged(int)),
-            this, SLOT(setActiveTab(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&)));
-    connect(m_tabBar, SIGNAL(newTabRequest()),
-            this, SLOT(openNewTab()));
-    connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
-            this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
-    connect(m_tabBar, SIGNAL(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*)));
+    added = addActionToMenu(ac->action("split_view"), menu) |
+            addActionToMenu(ac->action("reload"), menu) |
+            addActionToMenu(ac->action("view_properties"), menu);
+    if (added) {
+        menu->addSeparator();
+    }

 
 

-    m_tabBar->blockSignals(true);  // signals get unblocked after at least 2 tabs are open
+    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);

 
 

-    QWidget* centralWidget = new QWidget(this);
-    m_centralWidgetLayout = new QVBoxLayout(centralWidget);
-    m_centralWidgetLayout->setSpacing(0);
-    m_centralWidgetLayout->setMargin(0);
-    m_centralWidgetLayout->addWidget(m_tabBar);
-    m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);
+    menu->addSeparator();

 
 

-    setCentralWidget(centralWidget);
-    setupDockWidgets();
-    emit urlChanged(homeUrl);
+    // 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);

 
 

-    setupGUI(Keys | Save | Create | ToolBar);
-    stateChanged("new_file");
+    // 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);

 
 

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

 
 

-    if (generalSettings->splitView()) {
-        toggleSplitView();
-    }
-    updateEditActions();
-    updateViewActions();
-    updateGoActions();
+    // 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->addSeparator();
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::ReportBug)));
+    helpMenu->addSeparator();
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::SwitchApplicationLanguage)));
+    helpMenu->addSeparator();
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp)));
+    helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE)));
+    menu->addMenu(helpMenu);

 
 

-    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
-    showFilterBarAction->setChecked(generalSettings->filterBar());
+    menu->addSeparator();
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
+}

 
 

-    if (firstRun) {
-        // assure a proper default size if Dolphin runs the first time
-        resize(750, 500);
+void DolphinMainWindow::updateToolBar()
+{
+    if (!menuBar()->isVisible()) {
+        createControlButton();

     }
     }

+}

 
 

-    m_showMenuBar->setChecked(!menuBar()->isHidden());  // workaround for bug #171080
+void DolphinMainWindow::slotControlButtonDeleted()
+{
+    m_controlButton = 0;
+    m_updateToolBarTimer->start();

 }
 
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
 {
 }
 
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
 {

-    Q_ASSERT(viewContainer != 0);
+    Q_ASSERT(viewContainer);

     Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
              (viewContainer == m_viewTab[m_tabIndex].secondaryView));
     if (m_activeViewContainer == viewContainer) {
     Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
              (viewContainer == m_viewTab[m_tabIndex].secondaryView));
     if (m_activeViewContainer == viewContainer) {


@@ -1409,10 +1547,22 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     emit urlChanged(url);
 }
 
     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
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu

-    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    m_newFileMenu = new DolphinNewFileMenu(this);

     KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));


@@ -1449,7 +1599,7 @@ void DolphinMainWindow::setupActions()
     // doesn't work
     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
     // doesn't work
     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();

-    cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
+    cutShortcut.remove(Qt::SHIFT | Qt::Key_Delete, KShortcut::KeepEmpty);

     cut->setShortcut(cutShortcut);
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
     cut->setShortcut(cutShortcut);
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());


@@ -1462,7 +1612,7 @@ void DolphinMainWindow::setupActions()
 
     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"));

-    selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
+    selectAll->setShortcut(Qt::CTRL | Qt::Key_A);

     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 
     KAction* invertSelection = actionCollection()->addAction("invert_selection");
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 
     KAction* invertSelection = actionCollection()->addAction("invert_selection");


@@ -1490,10 +1640,10 @@ void DolphinMainWindow::setupActions()
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
     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"));
 
     KAction* replaceLocation = actionCollection()->addAction("replace_location");
     replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));


@@ -1502,7 +1652,7 @@ 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)));
+    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);


@@ -1510,10 +1660,10 @@ void DolphinMainWindow::setupActions()
     m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this);
     m_recentTabsMenu->setIcon(KIcon("edit-undo"));
     actionCollection()->addAction("closed_tabs", m_recentTabsMenu);
     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 *)));
+    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);
     action->setIcon(KIcon("edit-clear-list"));
     action->setData(QVariant::fromValue(true));
     m_recentTabsMenu->addAction(action);


@@ -1521,12 +1671,13 @@ void DolphinMainWindow::setupActions()
     m_recentTabsMenu->setEnabled(false);
 
     KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     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)));
+    connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons)));

 
     KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
 
     KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());

-    connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));
+    connect(upAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));

 
 

-    KStandardAction::home(this, SLOT(goHome()), actionCollection());
+    KAction* homeAction = KStandardAction::home(this, SLOT(goHome()), actionCollection());
+    connect(homeAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goHome(Qt::MouseButtons)));

 
     // setup 'Tools' menu
     KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
 
     // setup 'Tools' menu
     KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");


@@ -1548,17 +1699,19 @@ void DolphinMainWindow::setupActions()
     connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
 
     // setup 'Settings' menu
     connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
 
     // setup 'Settings' menu

-    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
+    KToggleAction* showMenuBar = KStandardAction::showMenubar(0, 0, actionCollection());
+    connect(showMenuBar, SIGNAL(triggered(bool)),                   // Fixes #286822
+            this, SLOT(toggleShowMenuBar()), Qt::QueuedConnection);

     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
     QList<QKeySequence> nextTabKeys;
     nextTabKeys.append(KStandardShortcut::tabNext().primary());
     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));
+    nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));

 
     QList<QKeySequence> prevTabKeys;
     prevTabKeys.append(KStandardShortcut::tabPrev().primary());
 
     QList<QKeySequence> prevTabKeys;
     prevTabKeys.append(KStandardShortcut::tabPrev().primary());

-    prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
+    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"));
 
     KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
     activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));


@@ -1584,7 +1737,7 @@ void DolphinMainWindow::setupActions()
 
 void DolphinMainWindow::setupDockWidgets()
 {
 
 void DolphinMainWindow::setupDockWidgets()
 {

-    const bool lock = DolphinSettings::instance().generalSettings()->lockPanels();
+    const bool lock = GeneralSettings::lockPanels();

 
     KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>("lock_panels");
     lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
 
     KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>("lock_panels");
     lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));


@@ -1605,9 +1758,7 @@ void DolphinMainWindow::setupDockWidgets()
     infoDock->setWidget(infoPanel);
 
     QAction* infoAction = infoDock->toggleViewAction();
     infoDock->setWidget(infoPanel);
 
     QAction* infoAction = infoDock->toggleViewAction();

-    infoAction->setIcon(KIcon("dialog-information"));
-    infoAction->setShortcut(Qt::Key_F11);
-    addActionCloneToCollection(infoAction, "show_information_panel");
+    createPanelAction(KIcon("dialog-information"), Qt::Key_F11, infoAction, "show_information_panel");

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


@@ -1627,15 +1778,13 @@ void DolphinMainWindow::setupDockWidgets()
     foldersDock->setWidget(foldersPanel);
 
     QAction* foldersAction = foldersDock->toggleViewAction();
     foldersDock->setWidget(foldersPanel);
 
     QAction* foldersAction = foldersDock->toggleViewAction();

-    foldersAction->setShortcut(Qt::Key_F7);
-    foldersAction->setIcon(KIcon("folder"));
-    addActionCloneToCollection(foldersAction, "show_folders_panel");
+    createPanelAction(KIcon("folder"), Qt::Key_F7, foldersAction, "show_folders_panel");

 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             foldersPanel, SLOT(setUrl(KUrl)));
 
     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(changeUrl(KUrl,Qt::MouseButtons)),
+            this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons)));

 
     // Setup "Terminal"
 #ifndef Q_OS_WIN
 
     // Setup "Terminal"
 #ifndef Q_OS_WIN


@@ -1648,46 +1797,43 @@ void DolphinMainWindow::setupDockWidgets()
     terminalDock->setWidget(terminalPanel);
 
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
     terminalDock->setWidget(terminalPanel);
 
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));

+    connect(terminalDock, SIGNAL(visibilityChanged(bool)),
+            terminalPanel, SLOT(dockVisibilityChanged()));

 
     QAction* terminalAction = terminalDock->toggleViewAction();
 
     QAction* terminalAction = terminalDock->toggleViewAction();

-    terminalAction->setShortcut(Qt::Key_F4);
-    terminalAction->setIcon(KIcon("utilities-terminal"));
-    addActionCloneToCollection(terminalAction, "show_terminal_panel");
+    createPanelAction(KIcon("utilities-terminal"), Qt::Key_F4, terminalAction, "show_terminal_panel");

 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalPanel, SLOT(setUrl(KUrl)));
 #endif
 
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalPanel, SLOT(setUrl(KUrl)));
 #endif
 

-    // Setup "Filter"
+    // Setup "Search"

 #ifdef HAVE_NEPOMUK
 #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();
+    createPanelAction(KIcon("system-search"), Qt::Key_F12, searchAction, "show_search_panel");
+    addDockWidget(Qt::RightDockWidgetArea, searchDock);

     connect(this, SIGNAL(urlChanged(KUrl)),
     connect(this, SIGNAL(urlChanged(KUrl)),

-            filterPanel, SLOT(setUrl(KUrl)));
+            searchPanel, SLOT(setUrl(KUrl)));

 #endif
 
 #endif
 

-    const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
-    if (firstRun) {
+    if (GeneralSettings::version() < 200) {

         infoDock->hide();
         foldersDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
 #endif
 #ifdef HAVE_NEPOMUK
         infoDock->hide();
         foldersDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
 #endif
 #ifdef HAVE_NEPOMUK

-        filterDock->hide();
+        searchDock->hide();

 #endif
     }
 
 #endif
     }
 


@@ -1704,33 +1850,34 @@ void DolphinMainWindow::setupDockWidgets()
     placesActions.append(separator);
     placesActions.append(lockLayoutAction);
     placesPanel->addActions(placesActions);
     placesActions.append(separator);
     placesActions.append(lockLayoutAction);
     placesPanel->addActions(placesActions);

-    placesPanel->setModel(DolphinSettings::instance().placesModel());
+    placesPanel->setModel(DolphinPlacesModel::instance());

     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     placesDock->setWidget(placesPanel);
 
     QAction* placesAction = placesDock->toggleViewAction();
     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     placesDock->setWidget(placesPanel);
 
     QAction* placesAction = placesDock->toggleViewAction();

-    placesAction->setShortcut(Qt::Key_F9);
-    placesAction->setIcon(KIcon("bookmarks"));
-    addActionCloneToCollection(placesAction, "show_places_panel");
+    createPanelAction(KIcon("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel");

 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);

-    connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
-            this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
+    connect(placesPanel, SIGNAL(urlChanged(KUrl,Qt::MouseButtons)),
+            this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons)));

     connect(this, SIGNAL(urlChanged(KUrl)),
             placesPanel, SLOT(setUrl(KUrl)));
     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);
     actionCollection()->addAction("panels", panelsMenu);
     panelsMenu->setDelayed(false);
 
     // Add actions into the "Panels" menu
     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);
+    const KActionCollection* ac = actionCollection();
+    panelsMenu->addAction(ac->action("show_places_panel"));
+    panelsMenu->addAction(ac->action("show_information_panel"));
+    panelsMenu->addAction(ac->action("show_folders_panel"));

 #ifndef Q_OS_WIN
 #ifndef Q_OS_WIN

-    panelsMenu->addAction(terminalAction);
+    panelsMenu->addAction(ac->action("show_terminal_panel"));

 #endif
 #ifdef HAVE_NEPOMUK
 #endif
 #ifdef HAVE_NEPOMUK

-    panelsMenu->addAction(filterAction);
+    panelsMenu->addAction(ac->action("show_search_panel"));

 #endif
     panelsMenu->addSeparator();
     panelsMenu->addAction(lockLayoutAction);
 #endif
     panelsMenu->addSeparator();
     panelsMenu->addAction(lockLayoutAction);


@@ -1784,6 +1931,64 @@ void DolphinMainWindow::updateGoActions()
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 

+void DolphinMainWindow::createControlButton()
+{
+    if (m_controlButton) {
+        return;
+    }
+    Q_ASSERT(!m_controlButton);
+
+    m_controlButton = new QToolButton(this);
+    m_controlButton->setIcon(KIcon("applications-system"));
+    m_controlButton->setText(i18nc("@action", "Control"));
+    m_controlButton->setPopupMode(QToolButton::InstantPopup);
+    m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
+
+    KMenu* controlMenu = new KMenu(m_controlButton);
+    connect(controlMenu, SIGNAL(aboutToShow()), this, SLOT(updateControlMenu()));
+
+    m_controlButton->setMenu(controlMenu);
+
+    toolBar()->addWidget(m_controlButton);
+    connect(toolBar(), SIGNAL(iconSizeChanged(QSize)),
+            m_controlButton, SLOT(setIconSize(QSize)));
+    connect(toolBar(), SIGNAL(toolButtonStyleChanged(Qt::ToolButtonStyle)),
+            m_controlButton, SLOT(setToolButtonStyle(Qt::ToolButtonStyle)));
+
+    // 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_controlButton, SIGNAL(destroyed()), this, SLOT(slotControlButtonDeleted()));
+    m_updateToolBarTimer = new QTimer(this);
+    m_updateToolBarTimer->setInterval(500);
+    connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar()));
+}
+
+void DolphinMainWindow::deleteControlButton()
+{
+    delete m_controlButton;
+    m_controlButton = 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();
 void DolphinMainWindow::rememberClosedTab(int index)
 {
     KMenu* tabsMenu = m_recentTabsMenu->menu();


@@ -1796,7 +2001,7 @@ void DolphinMainWindow::rememberClosedTab(int index)
     ClosedTab closedTab;
     closedTab.primaryUrl = m_viewTab[index].primaryView->url();
 
     ClosedTab closedTab;
     closedTab.primaryUrl = m_viewTab[index].primaryView->url();
 

-    if (m_viewTab[index].secondaryView != 0) {
+    if (m_viewTab[index].secondaryView) {

         closedTab.secondaryUrl = m_viewTab[index].secondaryView->url();
         closedTab.isSplit = true;
     } else {
         closedTab.secondaryUrl = m_viewTab[index].secondaryView->url();
         closedTab.isSplit = true;
     } else {


@@ -1822,6 +2027,38 @@ void DolphinMainWindow::rememberClosedTab(int index)
     KAcceleratorManager::manage(tabsMenu);
 }
 
     KAcceleratorManager::manage(tabsMenu);
 }
 

+void DolphinMainWindow::refreshViews()
+{
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
+
+    // remember the current active view, as because of
+    // the refreshing the active view might change to
+    // the secondary view
+    DolphinViewContainer* activeViewContainer = m_activeViewContainer;
+
+    const int tabCount = m_viewTab.count();
+    for (int i = 0; i < tabCount; ++i) {
+        m_viewTab[i].primaryView->readSettings();
+        if (m_viewTab[i].secondaryView) {
+            m_viewTab[i].secondaryView->readSettings();
+        }
+    }
+
+    setActiveViewContainer(activeViewContainer);
+
+    if (GeneralSettings::modifiedStartupSettings()) {
+        // The startup settings have been changed by the user (see bug #254947).
+        // Synchronize the split-view setting with the active view:
+        const bool splitView = GeneralSettings::splitView();
+        const ViewTab& activeTab = m_viewTab[m_tabIndex];
+        const bool toggle =    ( splitView && !activeTab.secondaryView)
+                            || (!splitView &&  activeTab.secondaryView);
+        if (toggle) {
+            toggleSplitView();
+        }
+    }
+}
+

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


@@ -1836,6 +2073,10 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
     connect(container, SIGNAL(searchModeChanged(bool)),
             this, SLOT(slotSearchModeChanged(bool)));
 
     connect(container, SIGNAL(searchModeChanged(bool)),
             this, SLOT(slotSearchModeChanged(bool)));
 

+    const DolphinSearchBox* searchBox = container->searchBox();
+    connect(searchBox, SIGNAL(searchLocationChanged(SearchLocation)),
+            this, SLOT(slotSearchLocationChanged()));
+

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


@@ -1843,30 +2084,34 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             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)),
+    connect(view, SIGNAL(tabRequested(KUrl)),
+            this, SLOT(openNewTab(KUrl)));
+    connect(view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList<QAction*>)),
+            this, SLOT(openContextMenu(QPoint,KFileItem,KUrl,QList<QAction*>)));
+    connect(view, SIGNAL(directoryLoadingStarted()),

             this, SLOT(enableStopAction()));
             this, SLOT(enableStopAction()));

-    connect(view, SIGNAL(finishedPathLoading(KUrl)),
+    connect(view, SIGNAL(directoryLoadingCompleted()),

             this, SLOT(disableStopAction()));
             this, SLOT(disableStopAction()));

+    connect(view, SIGNAL(goBackRequested()),
+            this, SLOT(goBack()));
+    connect(view, SIGNAL(goForwardRequested()),
+            this, SLOT(goForward()));

 
     const KUrlNavigator* navigator = container->urlNavigator();
 
     const KUrlNavigator* navigator = container->urlNavigator();

-    connect(navigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(changeUrl(const KUrl&)));
+    connect(navigator, SIGNAL(urlChanged(KUrl)),
+            this, SLOT(changeUrl(KUrl)));

     connect(navigator, SIGNAL(historyChanged()),
             this, SLOT(updateHistory()));
     connect(navigator, SIGNAL(editableStateChanged(bool)),
             this, SLOT(slotEditableStateChanged(bool)));
     connect(navigator, SIGNAL(historyChanged()),
             this, SLOT(updateHistory()));
     connect(navigator, SIGNAL(editableStateChanged(bool)),
             this, SLOT(slotEditableStateChanged(bool)));

-    connect(navigator, SIGNAL(tabRequested(const KUrl&)),
+    connect(navigator, SIGNAL(tabRequested(KUrl)),

             this, SLOT(openNewTab(KUrl)));
 }
 
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");
             this, SLOT(openNewTab(KUrl)));
 }
 
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");

-    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+    if (m_viewTab[m_tabIndex].secondaryView) {

         if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));
         if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));


@@ -1916,17 +2161,20 @@ bool DolphinMainWindow::isKompareInstalled() const
 
 void DolphinMainWindow::createSecondaryView(int tabIndex)
 {
 
 void DolphinMainWindow::createSecondaryView(int tabIndex)
 {

-    QSplitter* splitter = m_viewTab[tabIndex].splitter;
-    const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2;
+    ViewTab& viewTab = m_viewTab[tabIndex];
+
+    QSplitter* splitter = viewTab.splitter;
+    const int newWidth = (viewTab.primaryView->width() - splitter->handleWidth()) / 2;

 
 

-    const DolphinView* view = m_viewTab[tabIndex].primaryView->view();
-    m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(view->rootUrl(), 0);
-    splitter->addWidget(m_viewTab[tabIndex].secondaryView);
+    const DolphinView* view = viewTab.primaryView->view();
+    viewTab.secondaryView = createViewContainer(view->url(), 0);
+    splitter->addWidget(viewTab.secondaryView);

     splitter->setSizes(QList<int>() << newWidth << newWidth);
     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();
+
+    connectViewSignals(viewTab.secondaryView);
+    viewTab.secondaryView->setActive(false);
+    viewTab.secondaryView->resize(newWidth, viewTab.primaryView->height());
+    viewTab.secondaryView->show();

 }
 
 QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const
 }
 
 QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const


@@ -1956,12 +2204,20 @@ QString DolphinMainWindow::squeezedText(const QString& text) const
     return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
 }
 
     return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
 }
 

-void DolphinMainWindow::addActionCloneToCollection(QAction* action, const QString& actionName)
+void DolphinMainWindow::createPanelAction(const KIcon& icon,
+                                          const QKeySequence& shortcut,
+                                          QAction* dockAction,
+                                          const QString& actionName)

 {
 {

-    KAction* actionClone = actionCollection()->addAction(actionName);
-    actionClone->setText(action->text());
-    actionClone->setIcon(action->icon());
-    connect(actionClone, SIGNAL(triggered()), action, SLOT(trigger()));
+    KAction* panelAction = actionCollection()->addAction(actionName);
+    panelAction->setCheckable(true);
+    panelAction->setChecked(dockAction->isChecked());
+    panelAction->setText(dockAction->text());
+    panelAction->setIcon(icon);
+    panelAction->setShortcut(shortcut);
+
+    connect(panelAction, SIGNAL(triggered()), dockAction, SLOT(trigger()));
+    connect(dockAction, SIGNAL(toggled(bool)), panelAction, SLOT(setChecked(bool)));

 }
 
 DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
 }
 
 DolphinMainWindow::UndoUiInterface::UndoUiInterface() :