Merge branch 'master' of git://anongit.kde.org/kde-baseapps

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ef3180a0180c0993167b01338f4634663c4090e0..95b08af96e1d8002aea3f5e490f773d77113e270 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *


@@ -20,164 +20,233 @@
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"

-#include "dolphinviewactionhandler.h"
-#include "dolphindropcontroller.h"
-
-#include <config-nepomuk.h>

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

-#include "dolphinfileplacesview.h"
-#include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
-#include "dolphinsettingsdialog.h"
-#include "dolphinstatusbar.h"
+#include "dolphindockwidget.h"
+#include "dolphincontextmenu.h"
+#include "dolphinnewfilemenu.h"
+#include "dolphinrecenttabsmenu.h"
+#include "dolphintabwidget.h"

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

-#include "infosidebarpage.h"
-#include "metadatawidget.h"
-#include "mainwindowadaptor.h"
-#include "treeviewsidebarpage.h"
-#include "viewpropertiesdialog.h"
-#include "viewproperties.h"
+#include "dolphintabpage.h"
+#include "panels/folders/folderspanel.h"
+#include "panels/places/placespanel.h"
+#include "panels/information/informationpanel.h"
+#include "settings/dolphinsettingsdialog.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/draganddrophelper.h"
+#include "views/viewproperties.h"
+#include "views/dolphinnewfilemenuobserver.h"

 
 #ifndef Q_OS_WIN
 
 #ifndef Q_OS_WIN

-#include "terminalsidebarpage.h"
+#include "panels/terminal/terminalpanel.h"

 #endif
 
 #include "dolphin_generalsettings.h"
 #endif
 
 #include "dolphin_generalsettings.h"

-#include "dolphin_iconsmodesettings.h"

 
 

-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kconfig.h>
-#include <kdesktopfile.h>
+#include <KAcceleratorManager>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KConfig>
+#include <KDesktopFile>

 #include <kdeversion.h>
 #include <kdeversion.h>

-#include <kfiledialog.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kurlnavigator.h>
+#include <kdualaction.h>
+#include <KFileDialog>
+#include <KGlobal>
+#include <KLineEdit>
+#include <KToolBar>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KIO/JobUiDelegate>
+#include <KInputDialog>
+#include <KLocale>
+#include <KProtocolManager>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KFileItemListProperties>

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

-#include <kpropertiesdialog.h>
-#include <kprotocolinfo.h>
-#include <ktoggleaction.h>
-#include <krun.h>
-#include <kshell.h>
-#include <kstandarddirs.h>
+#include <KProtocolInfo>
+#include <KRun>
+#include <KShell>
+#include <KStandardDirs>

 #include <kstatusbar.h>
 #include <kstatusbar.h>

-#include <kstandardaction.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
-
+#include <KStandardAction>
+#include <KToggleAction>
+#include <KUrlNavigator>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KToolInvocation>
+
+#include <QDesktopWidget>
+#include <QDBusMessage>

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

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

 
 

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

     KXmlGuiWindow(0),
     KXmlGuiWindow(0),

-    m_newMenu(0),
-    m_showMenuBar(0),
-    m_splitter(0),
+    m_newFileMenu(0),
+    m_tabWidget(0),

     m_activeViewContainer(0),
     m_activeViewContainer(0),

-    m_id(id)
+    m_actionHandler(0),
+    m_remoteEncoding(0),
+    m_settingsDialog(),
+    m_controlButton(0),
+    m_updateToolBarTimer(0),
+    m_lastHandleUrlStatJob(0)

 {
 {

-    setObjectName("Dolphin");
-    m_viewContainer[PrimaryView] = 0;
-    m_viewContainer[SecondaryView] = 0;
+    setObjectName("Dolphin#");

 
 

-    new MainWindowAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
+    connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(errorMessage(QString)),
+            this, SLOT(showErrorMessage(QString)));

 
 

-    KonqFileUndoManager::incRef();
-
-    KonqFileUndoManager* undoManager = KonqFileUndoManager::self();
-    undoManager->setUiInterface(new UndoUiInterface(this));
+    KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
+    undoManager->setUiInterface(new UndoUiInterface());

 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
             this, SLOT(slotUndoAvailable(bool)));

-    connect(undoManager, SIGNAL(undoTextChanged(const QString&)),
-            this, SLOT(slotUndoTextChanged(const QString&)));
-    connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)),
-            this, SLOT(slotHandlePlacesError(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)));
+
+    GeneralSettings* generalSettings = GeneralSettings::self();
+    const bool firstRun = (generalSettings->version() < 200);
+    if (firstRun) {
+        generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
+    }
+
+    setAcceptDrops(true);
+
+    m_tabWidget = new DolphinTabWidget(this);
+    connect(m_tabWidget, SIGNAL(activeViewChanged(DolphinViewContainer*)),
+            this, SLOT(activeViewChanged(DolphinViewContainer*)));
+    connect(m_tabWidget, SIGNAL(tabCountChanged(int)),
+            this, SLOT(tabCountChanged(int)));
+    connect(m_tabWidget, SIGNAL(currentUrlChanged(KUrl)),
+            this, SLOT(setUrlAsCaption(KUrl)));
+    setCentralWidget(m_tabWidget);
+
+    setupActions();
+
+    m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
+    connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
+    connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));
+
+    m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+            m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
+
+    setupDockWidgets();
+
+    setupGUI(Keys | Save | Create | ToolBar);
+    stateChanged("new_file");
+
+    QClipboard* clipboard = QApplication::clipboard();
+    connect(clipboard, SIGNAL(dataChanged()),
+            this, SLOT(updatePasteAction()));
+
+    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()
 {

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

 }
 
 }
 

-void DolphinMainWindow::toggleViews()
+void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)

 {
 {

-    if (m_viewContainer[SecondaryView] == 0) {
-        return;
-    }
-
-    // move secondary view from the last position of the splitter
-    // to the first position
-    m_splitter->insertWidget(0, m_viewContainer[SecondaryView]);
-
-    DolphinViewContainer* container = m_viewContainer[PrimaryView];
-    m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
-    m_viewContainer[SecondaryView] = container;
+    m_tabWidget->openDirectories(dirs);

 }
 
 }
 

-void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType)
+void DolphinMainWindow::openFiles(const QList<KUrl>& files)

 {
 {

-    clearStatusBar();
-    m_undoCommandTypes.append(commandType);
+    m_tabWidget->openFiles(files);

 }
 
 }
 

-void DolphinMainWindow::refreshViews()
+void DolphinMainWindow::showCommand(CommandType command)

 {
 {

-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+    DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
+    switch (command) {
+    case KIO::FileUndoManager::Copy:
+        statusBar->setText(i18nc("@info:status", "Successfully copied."));
+        break;
+    case KIO::FileUndoManager::Move:
+        statusBar->setText(i18nc("@info:status", "Successfully moved."));
+        break;
+    case KIO::FileUndoManager::Link:
+        statusBar->setText(i18nc("@info:status", "Successfully linked."));
+        break;
+    case KIO::FileUndoManager::Trash:
+        statusBar->setText(i18nc("@info:status", "Successfully moved to trash."));
+        break;
+    case KIO::FileUndoManager::Rename:
+        statusBar->setText(i18nc("@info:status", "Successfully renamed."));
+        break;

 
 

-    // remember the current active view, as because of
-    // the refreshing the active view might change to
-    // the secondary view
-    DolphinViewContainer* activeViewContainer = m_activeViewContainer;
+    case KIO::FileUndoManager::Mkdir:
+        statusBar->setText(i18nc("@info:status", "Created folder."));
+        break;

 
 

-    m_viewContainer[PrimaryView]->view()->refresh();
-    if (m_viewContainer[SecondaryView] != 0) {
-        m_viewContainer[SecondaryView]->view()->refresh();
+    default:
+        break;

     }
     }

-
-    setActiveViewContainer(activeViewContainer);

 }
 
 }
 

-void DolphinMainWindow::dropUrls(const KUrl::List& urls,
-                                 const KUrl& destination)
+void DolphinMainWindow::pasteIntoFolder()

 {
 {

-    DolphinDropController dropController(this);
-    connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
-            this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));
-    dropController.dropUrls(urls, destination);
+    m_activeViewContainer->view()->pasteIntoFolder();

 }
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
 }
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {

-    DolphinViewContainer* view = activeViewContainer();
-    if (view != 0) {
-        view->setUrl(url);
-        updateEditActions();
-        updateViewActions();
-        updateGoActions();
-        setCaption(url.fileName());
-        emit urlChanged(url);
+    if (!KProtocolManager::supportsListing(url)) {
+        // The URL navigator only checks for validity, not
+        // if the URL can be listed. An error message is
+        // shown due to DolphinViewContainer::restoreView().
+        return;

     }
     }

+
+    m_activeViewContainer->setUrl(url);
+    updateEditActions();
+    updatePasteAction();
+    updateViewActions();
+    updateGoActions();
+
+    emit urlChanged(url);

 }
 
 }
 

-void DolphinMainWindow::changeSelection(const KFileItemList& selection)
+void DolphinMainWindow::slotTerminalDirectoryChanged(const KUrl& url)

 {
 {

-    activeViewContainer()->view()->changeSelection(selection);
+    m_activeViewContainer->setAutoGrabFocus(false);
+    changeUrl(url);
+    m_activeViewContainer->setAutoGrabFocus(true);

 }
 
 void DolphinMainWindow::slotEditableStateChanged(bool editable)
 }
 
 void DolphinMainWindow::slotEditableStateChanged(bool editable)


@@ -191,22 +260,15 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 
 {
     updateEditActions();
 

-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
-    int selectedUrlsCount = m_viewContainer[PrimaryView]->view()->selectedUrls().count();
-    if (m_viewContainer[SecondaryView] != 0) {
-        selectedUrlsCount += m_viewContainer[SecondaryView]->view()->selectedUrls().count();
-    }
+    const int selectedUrlsCount = m_tabWidget->currentTabPage()->selectedItemsCount();

 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     if (selectedUrlsCount == 2) {
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     if (selectedUrlsCount == 2) {

-        const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty();
-        compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled);
+        compareFilesAction->setEnabled(isKompareInstalled());

     } else {
         compareFilesAction->setEnabled(false);
     }
 
     } else {
         compareFilesAction->setEnabled(false);
     }
 

-    m_activeViewContainer->updateStatusBar();
-

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


@@ -221,12 +283,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");

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

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

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


@@ -239,92 +303,145 @@ void DolphinMainWindow::updateFilterBarAction(bool show)
 
 void DolphinMainWindow::openNewMainWindow()
 {
 
 void DolphinMainWindow::openNewMainWindow()
 {

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

 }
 
 }
 

-void DolphinMainWindow::toggleActiveView()
+void DolphinMainWindow::openNewActivatedTab()

 {
 {

-    if (m_viewContainer[SecondaryView] == 0) {
-        // only one view is available
-        return;
-    }
+    m_tabWidget->openNewActivatedTab();
+}

 
 

-    Q_ASSERT(m_activeViewContainer != 0);
-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+void DolphinMainWindow::openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
+{
+    m_tabWidget->openNewTab(primaryUrl, secondaryUrl);
+}

 
 

-    DolphinViewContainer* left  = m_viewContainer[PrimaryView];
-    DolphinViewContainer* right = m_viewContainer[SecondaryView];
-    setActiveViewContainer(m_activeViewContainer == right ? left : right);
+void DolphinMainWindow::openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
+{
+    m_tabWidget->openNewActivatedTab(primaryUrl, secondaryUrl);

 }
 
 }
 

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

 {
 {

-    DolphinSettings& settings = DolphinSettings::instance();
-    GeneralSettings* generalSettings = settings.generalSettings();
-    generalSettings->setFirstRun(false);
+    const KFileItemList& list = m_activeViewContainer->view()->selectedItems();
+    if (list.isEmpty()) {
+        openNewTab(m_activeViewContainer->url());
+    } else {
+        foreach (const KFileItem& item, list) {
+            const KUrl& url = DolphinView::openItemAsFolderUrl(item);
+            if (!url.isEmpty()) {
+                openNewTab(url);
+            }
+        }
+    }
+}

 
 

-    settings.save();
+void DolphinMainWindow::openInNewWindow()
+{
+    KUrl newWindowUrl;

 
 

-    KXmlGuiWindow::closeEvent(event);
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if (list.isEmpty()) {
+        newWindowUrl = m_activeViewContainer->url();
+    } else if (list.count() == 1) {
+        const KFileItem& item = list.first();
+        newWindowUrl = DolphinView::openItemAsFolderUrl(item);
+    }
+
+    if (!newWindowUrl.isEmpty()) {
+        KRun::run("dolphin %u", KUrl::List() << newWindowUrl, this);
+    }

 }
 
 }
 

-void DolphinMainWindow::saveProperties(KConfigGroup& group)
+void DolphinMainWindow::showEvent(QShowEvent* event)

 {
 {

-    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
-    group.writeEntry("Primary Url", cont->url().url());
-    group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+    KXmlGuiWindow::showEvent(event);

 
 

-    cont = m_viewContainer[SecondaryView];
-    if (cont != 0) {
-        group.writeEntry("Secondary Url", cont->url().url());
-        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());
+    if (!event->spontaneous()) {
+        m_activeViewContainer->view()->setFocus();

     }
 }
 
     }
 }
 

-void DolphinMainWindow::readProperties(const KConfigGroup& group)
+void DolphinMainWindow::closeEvent(QCloseEvent* event)

 {
 {

-    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
-
-    cont->setUrl(group.readEntry("Primary Url"));
-    bool editable = group.readEntry("Primary Editable Url", false);
-    cont->urlNavigator()->setUrlEditable(editable);
-
-    cont = m_viewContainer[SecondaryView];
-    const QString secondaryUrl = group.readEntry("Secondary Url");
-    if (!secondaryUrl.isEmpty()) {
-        if (cont == 0) {
-            // a secondary view should be shown, but no one is available
-            // currently -> create a new view
-            toggleSplitView();
-            cont = m_viewContainer[SecondaryView];
-            Q_ASSERT(cont != 0);
+    // Find out if Dolphin is closed directly by the user or
+    // by the session manager because the session is closed
+    bool closedByUser = true;
+    DolphinApplication *application = qobject_cast<DolphinApplication*>(qApp);
+    if (application && application->sessionSaving()) {
+        closedByUser = false;
+    }
+
+    if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
+        // Ask the user if he really wants to quit and close all tabs.
+        // Open a confirmation dialog with 3 buttons:
+        // KDialog::Yes    -> Quit
+        // KDialog::No     -> Close only the current tab
+        // KDialog::Cancel -> do nothing
+        KDialog *dialog = new KDialog(this, Qt::Dialog);
+        dialog->setCaption(i18nc("@title:window", "Confirmation"));
+        dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
+        dialog->setModal(true);
+        dialog->setButtonGuiItem(KDialog::Yes, KStandardGuiItem::quit());
+        dialog->setButtonGuiItem(KDialog::No, KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close")));
+        dialog->setButtonGuiItem(KDialog::Cancel, KStandardGuiItem::cancel());
+        dialog->setDefaultButton(KDialog::Yes);
+
+        bool doNotAskAgainCheckboxResult = false;
+
+        const int result = KMessageBox::createKMessageBox(dialog,
+            QMessageBox::Warning,
+            i18n("You have multiple tabs open in this window, are you sure you want to quit?"),
+            QStringList(),
+            i18n("Do not ask again"),
+            &doNotAskAgainCheckboxResult,
+            KMessageBox::Notify);
+
+        if (doNotAskAgainCheckboxResult) {
+            GeneralSettings::setConfirmClosingMultipleTabs(false);

         }
 
         }
 

-        cont->setUrl(secondaryUrl);
-        bool editable = group.readEntry("Secondary Editable Url", false);
-        cont->urlNavigator()->setUrlEditable(editable);
-    } else if (cont != 0) {
-        // no secondary view should be shown, but the default setting shows
-        // one already -> close the view
-        toggleSplitView();
+        switch (result) {
+            case KDialog::Yes:
+                // Quit
+                break;
+            case KDialog::No:
+                // Close only the current tab
+                m_tabWidget->closeTab();
+            default:
+                event->ignore();
+                return;
+        }

     }
     }

+
+    GeneralSettings::setVersion(CurrentDolphinVersion);
+    GeneralSettings::self()->writeConfig();
+
+    KXmlGuiWindow::closeEvent(event);

 }
 
 }
 

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

 {
 {

-    m_newMenu->slotCheckUpToDate();
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
+    m_tabWidget->saveProperties(group);

 }
 
 }
 

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

 {
 {

-    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    m_tabWidget->readProperties(group);
+}

 
 

-    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-    dialog->raise();
-    dialog->activateWindow();
+void DolphinMainWindow::updateNewMenu()
+{
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown());
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());
+}
+
+void DolphinMainWindow::createDirectory()
+{
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown());
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->createDirectory();

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


@@ -332,62 +449,23 @@ void DolphinMainWindow::quit()
     close();
 }
 
     close();
 }
 

-void DolphinMainWindow::slotHandlePlacesError(const QString &message)
+void DolphinMainWindow::showErrorMessage(const QString& message)

 {
 {

-    if (!message.isEmpty()) {
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        statusBar->setMessage(message, DolphinStatusBar::Error);
-    }
+    m_activeViewContainer->showMessage(message, DolphinViewContainer::Error);

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

-
-    if (available && (m_undoCommandTypes.count() > 0)) {
-        const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        switch (command) {
-        case KonqFileUndoManager::COPY:
-            statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::MOVE:
-            statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::LINK:
-            statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::TRASH:
-            statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-        case KonqFileUndoManager::RENAME:
-            statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-
-        case KonqFileUndoManager::MKDIR:
-            statusBar->setMessage(i18nc("@info:status", "Created folder."),
-                                  DolphinStatusBar::OperationCompleted);
-            break;
-
-        default:
-            break;
-        }
-
-    }

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


@@ -395,7 +473,8 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 void DolphinMainWindow::undo()
 {
     clearStatusBar();
 void DolphinMainWindow::undo()
 {
     clearStatusBar();

-    KonqFileUndoManager::self()->undo();
+    KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this);
+    KIO::FileUndoManager::self()->undo();

 }
 
 void DolphinMainWindow::cut()
 }
 
 void DolphinMainWindow::cut()


@@ -413,13 +492,14 @@ void DolphinMainWindow::paste()
     m_activeViewContainer->view()->paste();
 }
 
     m_activeViewContainer->view()->paste();
 }
 

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

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

-    if (pasteAction == 0) {
-        return;
-    }
-

     QPair<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
     pasteAction->setEnabled(pasteInfo.first);
     pasteAction->setText(pasteInfo.second);
     QPair<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
     pasteAction->setEnabled(pasteInfo.first);
     pasteAction->setText(pasteInfo.second);


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

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

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


@@ -451,37 +531,10 @@ void DolphinMainWindow::invertSelection()
 
 void DolphinMainWindow::toggleSplitView()
 {
 
 void DolphinMainWindow::toggleSplitView()
 {

-    if (m_viewContainer[SecondaryView] == 0) {
-        // create a secondary view
-        const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;
-
-        const DolphinView* view = m_viewContainer[PrimaryView]->view();
-        m_viewContainer[SecondaryView] = new DolphinViewContainer(this, 0, view->rootUrl());
-        connectViewSignals(SecondaryView);
-        m_splitter->addWidget(m_viewContainer[SecondaryView]);
-        m_splitter->setSizes(QList<int>() << newWidth << newWidth);
-        m_viewContainer[SecondaryView]->view()->reload();
-        m_viewContainer[SecondaryView]->setActive(false);
-        m_viewContainer[SecondaryView]->show();
-    } else if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
-        // remove secondary view
-        m_viewContainer[SecondaryView]->close();
-        m_viewContainer[SecondaryView]->deleteLater();
-        m_viewContainer[SecondaryView] = 0;
-    } else {
-        // The secondary view is active, hence from a users point of view
-        // the content of the secondary view should be moved to the primary view.
-        // From an implementation point of view it is more efficient to close
-        // the primary view and exchange the internal pointers afterwards.
-        m_viewContainer[PrimaryView]->close();
-        m_viewContainer[PrimaryView]->deleteLater();
-        m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
-        m_viewContainer[SecondaryView] = 0;
-    }
+    DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
+    tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled());

 
 

-    setActiveViewContainer(m_viewContainer[PrimaryView]);

     updateViewActions();
     updateViewActions();

-    emit activeViewChanged(); // TODO unused; remove?

 }
 
 void DolphinMainWindow::reloadView()
 }
 
 void DolphinMainWindow::reloadView()


@@ -492,11 +545,22 @@ void DolphinMainWindow::reloadView()
 
 void DolphinMainWindow::stopLoading()
 {
 
 void DolphinMainWindow::stopLoading()
 {

+    m_activeViewContainer->view()->stopLoading();

 }
 
 }
 

-void DolphinMainWindow::toggleFilterBarVisibility(bool show)
+void DolphinMainWindow::enableStopAction()

 {
 {

-    m_activeViewContainer->showFilterBar(show);
+    actionCollection()->action("stop")->setEnabled(true);
+}
+
+void DolphinMainWindow::disableStopAction()
+{
+    actionCollection()->action("stop")->setEnabled(false);
+}
+
+void DolphinMainWindow::showFilterBar()
+{
+    m_activeViewContainer->setFilterBarVisible(true);

 }
 
 void DolphinMainWindow::toggleEditLocation()
 }
 
 void DolphinMainWindow::toggleEditLocation()


@@ -508,216 +572,415 @@ void DolphinMainWindow::toggleEditLocation()
     urlNavigator->setUrlEditable(action->isChecked());
 }
 
     urlNavigator->setUrlEditable(action->isChecked());
 }
 

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

 {
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
     navigator->setFocus();
 
     // select the whole text of the combo box editor
 {
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
     navigator->setFocus();
 
     // select the whole text of the combo box editor

-    QLineEdit* lineEdit = navigator->editor()->lineEdit();
-    const QString text = lineEdit->text();
-    lineEdit->setSelection(0, text.length());
+    QLineEdit* lineEdit = navigator->editor()->lineEdit();  // krazy:exclude=qclasses
+    lineEdit->selectAll();

 }
 
 }
 

-void DolphinMainWindow::adjustViewProperties()
+void DolphinMainWindow::togglePanelLockState()

 {
 {

-    clearStatusBar();
-    ViewPropertiesDialog dlg(m_activeViewContainer->view());
-    dlg.exec();
+    const bool newLockState = !GeneralSettings::lockPanels();
+    foreach (QObject* child, children()) {
+        DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
+        if (dock) {
+            dock->setLocked(newLockState);
+        }
+    }
+
+    GeneralSettings::setLockPanels(newLockState);

 }
 
 void DolphinMainWindow::goBack()
 {
 }
 
 void DolphinMainWindow::goBack()
 {

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

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

-    clearStatusBar();

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

-    clearStatusBar();

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

-    clearStatusBar();

     m_activeViewContainer->urlNavigator()->goHome();
 }
 
     m_activeViewContainer->urlNavigator()->goHome();
 }
 

-void DolphinMainWindow::findFile()
+void DolphinMainWindow::goBack(Qt::MouseButtons buttons)

 {
 {

-    KRun::run("kfind", m_activeViewContainer->url(), this);
+    // The default case (left button pressed) is handled in goBack().
+    if (buttons == Qt::MidButton) {
+        KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
+        const int index = urlNavigator->historyIndex() + 1;
+        openNewTab(urlNavigator->locationUrl(index));
+    }

 }
 
 }
 

-void DolphinMainWindow::compareFiles()
+void DolphinMainWindow::goForward(Qt::MouseButtons buttons)

 {
 {

-    // The method is only invoked if exactly 2 files have
-    // been selected. The selected files may be:
-    // - both in the primary view
-    // - both in the secondary view
-    // - one in the primary view and the other in the secondary
-    //   view
-    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
-
-    KUrl urlA;
-    KUrl urlB;
-    KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls();
-
-    switch (urls.count()) {
-    case 0: {
-        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
-        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
-        Q_ASSERT(urls.count() == 2);
-        urlA = urls[0];
-        urlB = urls[1];
-        break;
+    // The default case (left button pressed) is handled in goForward().
+    if (buttons == Qt::MidButton) {
+        KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
+        const int index = urlNavigator->historyIndex() - 1;
+        openNewTab(urlNavigator->locationUrl(index));

     }
     }

+}

 
 

-    case 1: {
-        urlA = urls[0];
-        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
-        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
-        Q_ASSERT(urls.count() == 1);
-        urlB = urls[0];
-        break;
+void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
+{
+    // The default case (left button pressed) is handled in goUp().
+    if (buttons == Qt::MidButton) {
+        openNewTab(activeViewContainer()->url().upUrl());

     }
     }

+}

 
 

-    case 2: {
-        urlA = urls[0];
-        urlB = urls[1];
-        break;
+void DolphinMainWindow::goHome(Qt::MouseButtons buttons)
+{
+    // The default case (left button pressed) is handled in goHome().
+    if (buttons == Qt::MidButton) {
+        openNewTab(GeneralSettings::self()->homeUrl());

     }
     }

+}

 
 

-    default: {
-        // may not happen: compareFiles may only get invoked if 2
-        // files are selected
-        Q_ASSERT(false);
-    }
+void DolphinMainWindow::compareFiles()
+{
+    const KFileItemList items = m_tabWidget->currentTabPage()->selectedItems();
+    if (items.count() != 2) {
+        // The action is disabled in this case, but it could have been triggered
+        // via D-Bus, see https://bugs.kde.org/show_bug.cgi?id=325517
+        return;

     }
 
     }
 

+    KUrl urlA = items.at(0).url();
+    KUrl urlB = items.at(1).url();
+

     QString command("kompare -c \"");
     command.append(urlA.pathOrUrl());
     command.append("\" \"");
     command.append(urlB.pathOrUrl());
     command.append('\"');
     KRun::runCommand(command, "Kompare", "kompare", this);
     QString command("kompare -c \"");
     command.append(urlA.pathOrUrl());
     command.append("\" \"");
     command.append(urlB.pathOrUrl());
     command.append('\"');
     KRun::runCommand(command, "Kompare", "kompare", this);

-

 }
 
 void DolphinMainWindow::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
     menuBar()->setVisible(!visible);
 }
 
 void DolphinMainWindow::toggleShowMenuBar()
 {
     const bool visible = menuBar()->isVisible();
     menuBar()->setVisible(!visible);

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

 }
 
 void DolphinMainWindow::editSettings()
 {
 }
 
 void DolphinMainWindow::editSettings()
 {

-    DolphinSettingsDialog dialog(this);
-    dialog.exec();
+    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 {
+        m_settingsDialog.data()->raise();
+    }

 }
 
 }
 

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

 {
 {

-    DolphinSettings& settings = DolphinSettings::instance();
+    delete m_lastHandleUrlStatJob;
+    m_lastHandleUrlStatJob = 0;
+
+    if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) {
+        activeViewContainer()->setUrl(url);
+    } else if (KProtocolManager::supportsListing(url)) {
+        // stat the URL to see if it is a dir or not
+        m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo);
+        if (m_lastHandleUrlStatJob->ui()) {
+            m_lastHandleUrlStatJob->ui()->setWindow(this);
+        }
+        connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)),
+                this, SLOT(slotHandleUrlStatFinished(KJob*)));

 
 

-    // 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());
+    } else {
+        new KRun(url, this); // Automatically deletes itself after being finished

     }
     }

+}

 
 

-    setAcceptDrops(true);
+void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job)
+{
+    m_lastHandleUrlStatJob = 0;
+    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+    const KUrl url = static_cast<KIO::StatJob*>(job)->url();
+    if (entry.isDir()) {
+        activeViewContainer()->setUrl(url);
+    } else {
+        new KRun(url, this);  // Automatically deletes itself after being finished
+    }
+}

 
 

-    m_splitter = new QSplitter(this);
+void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
+{
+    newFileMenu()->setEnabled(isFolderWritable);
+}

 
 

-    setupActions();
+void DolphinMainWindow::openContextMenu(const QPoint& pos,
+                                        const KFileItem& item,
+                                        const KUrl& url,
+                                        const QList<QAction*>& customActions)
+{
+    QWeakPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
+    contextMenu.data()->setCustomActions(customActions);
+    const DolphinContextMenu::Command command = contextMenu.data()->open();

 
 

-    const KUrl& homeUrl = generalSettings->homeUrl();
-    setCaption(homeUrl.fileName());
-    m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
-    connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
-    ViewProperties props(homeUrl);
-    m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
-                                                            m_splitter,
-                                                            homeUrl);
-
-    m_activeViewContainer = m_viewContainer[PrimaryView];
-    connectViewSignals(PrimaryView);
-    DolphinView* view = m_viewContainer[PrimaryView]->view();
-    view->reload();
-    m_viewContainer[PrimaryView]->show();
-    m_actionHandler->setCurrentView(view);
-
-    setCentralWidget(m_splitter);
-    setupDockWidgets();
+    switch (command) {
+    case DolphinContextMenu::OpenParentFolderInNewWindow: {
+        KRun::run("dolphin %u", KUrl::List() << item.url().upUrl(), this);
+        break;
+    }

 
 

-    setupGUI(Keys | Save | Create | ToolBar);
-    createGUI();
+    case DolphinContextMenu::OpenParentFolderInNewTab:
+        openNewTab(item.url().upUrl());
+        break;

 
 

-    stateChanged("new_file");
-    setAutoSaveSettings();
+    case DolphinContextMenu::None:
+    default:
+        break;
+    }

 
 

-    QClipboard* clipboard = QApplication::clipboard();
-    connect(clipboard, SIGNAL(dataChanged()),
-            this, SLOT(updatePasteAction()));
-    updatePasteAction();
-    updateGoActions();
+    delete contextMenu.data();
+}

 
 

-    if (generalSettings->splitView()) {
-        toggleSplitView();
+void DolphinMainWindow::updateControlMenu()
+{
+    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();
+
+    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();

     }
     }

-    updateViewActions();

 
 

-    if (firstRun) {
-        // assure a proper default size if Dolphin runs the first time
-        resize(700, 500);
+    // 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();

     }
 
     }
 

-    emit urlChanged(homeUrl);
+    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->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);
+
+    menu->addSeparator();
+    addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);

 }
 
 }
 

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

 {
 {

-    Q_ASSERT(viewContainer != 0);
-    Q_ASSERT((viewContainer == m_viewContainer[PrimaryView]) || (viewContainer == m_viewContainer[SecondaryView]));
-    if (m_activeViewContainer == viewContainer) {
-        return;
+    if (!menuBar()->isVisible()) {
+        createControlButton();
+    }
+}
+
+void DolphinMainWindow::slotControlButtonDeleted()
+{
+    m_controlButton = 0;
+    m_updateToolBarTimer->start();
+}
+
+void DolphinMainWindow::slotPanelErrorMessage(const QString& error)
+{
+    activeViewContainer()->showMessage(error, DolphinViewContainer::Error);
+}
+
+void DolphinMainWindow::slotPlaceActivated(const KUrl& url)
+{
+    DolphinViewContainer* view = activeViewContainer();
+
+    if (view->url() == url) {
+        // We can end up here if the user clicked a device in the Places Panel
+        // which had been unmounted earlier, see https://bugs.kde.org/show_bug.cgi?id=161385.
+        reloadView();
+    } else {
+        changeUrl(url);

     }
     }

+}
+
+void DolphinMainWindow::closedTabsCountChanged(unsigned int count)
+{
+    actionCollection()->action("undo_close_tab")->setEnabled(count > 0);
+}
+
+void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
+{
+    DolphinViewContainer* oldViewContainer = m_activeViewContainer;
+    Q_ASSERT(viewContainer);

 
 

-    m_activeViewContainer->setActive(false);

     m_activeViewContainer = viewContainer;
     m_activeViewContainer = viewContainer;

-    m_activeViewContainer->setActive(true);
+
+    if (oldViewContainer) {
+        // Disconnect all signals between the old view container (container,
+        // view and url navigator) and main window.
+        oldViewContainer->disconnect(this);
+        oldViewContainer->view()->disconnect(this);
+        oldViewContainer->urlNavigator()->disconnect(this);
+    }
+
+    connectViewSignals(viewContainer);
+
+    m_actionHandler->setCurrentView(viewContainer->view());

 
     updateHistory();
     updateEditActions();
 
     updateHistory();
     updateEditActions();

+    updatePasteAction();

     updateViewActions();
     updateGoActions();
 
     updateViewActions();
     updateGoActions();
 

-    const KUrl& url = m_activeViewContainer->url();
-    setCaption(url.fileName());
+    const KUrl url = viewContainer->url();
+    emit urlChanged(url);
+}

 
 

-    m_actionHandler->setCurrentView(viewContainer->view());
+void DolphinMainWindow::tabCountChanged(int count)
+{
+    const bool enableTabActions = (count > 1);
+    actionCollection()->action("close_tab")->setEnabled(enableTabActions);
+    actionCollection()->action("activate_next_tab")->setEnabled(enableTabActions);
+    actionCollection()->action("activate_prev_tab")->setEnabled(enableTabActions);
+}

 
 

-    emit activeViewChanged(); // TODO unused; remove?
-    emit urlChanged(url);
+void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
+{
+    QString caption;
+    if (!url.isLocalFile()) {
+        caption.append(url.protocol() + " - ");
+        if (url.hasHost()) {
+            caption.append(url.host() + " - ");
+        }
+    }
+
+    const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
+    caption.append(fileName);
+
+    setCaption(caption);

 }
 
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 }
 
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu

-    m_newMenu = new DolphinNewMenu(this);
-    KMenu* menu = m_newMenu->menu();
-    menu->setTitle(i18nc("@title:menu", "Create New"));
+    m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
+    KMenu* menu = m_newFileMenu->menu();
+    menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

     menu->setIcon(KIcon("document-new"));
     menu->setIcon(KIcon("document-new"));

+    m_newFileMenu->setDelayed(false);

     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 


@@ -727,10 +990,18 @@ void DolphinMainWindow::setupActions()
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 

-    KAction* properties = actionCollection()->addAction("properties");
-    properties->setText(i18nc("@action:inmenu File", "Properties"));
-    properties->setShortcut(Qt::ALT | Qt::Key_Return);
-    connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
+    KAction* newTab = actionCollection()->addAction("new_tab");
+    newTab->setIcon(KIcon("tab-new"));
+    newTab->setText(i18nc("@action:inmenu File", "New Tab"));
+    newTab->setShortcut(KShortcut(Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N));
+    connect(newTab, SIGNAL(triggered()), this, SLOT(openNewActivatedTab()));
+
+    KAction* closeTab = actionCollection()->addAction("close_tab");
+    closeTab->setIcon(KIcon("tab-close"));
+    closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
+    closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
+    closeTab->setEnabled(false);
+    connect(closeTab, SIGNAL(triggered()), m_tabWidget, SLOT(closeTab()));

 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
 
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 


@@ -743,14 +1014,20 @@ 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());
     cut->setShortcut(cutShortcut);
     KStandardAction::copy(this, SLOT(copy()), actionCollection());

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

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


@@ -763,7 +1040,6 @@ void DolphinMainWindow::setupActions()
 
     KAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F3);
 
     KAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F3);

-    updateSplitAction();

     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     KAction* reload = actionCollection()->addAction("reload");
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     KAction* reload = actionCollection()->addAction("reload");


@@ -774,45 +1050,58 @@ void DolphinMainWindow::setupActions()
 
     KAction* stop = actionCollection()->addAction("stop");
     stop->setText(i18nc("@action:inmenu View", "Stop"));
 
     KAction* stop = actionCollection()->addAction("stop");
     stop->setText(i18nc("@action:inmenu View", "Stop"));

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

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

-    // TODO: the naming "Show full Location" is currently confusing...
-    KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
-    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
-    showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
-    connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
-
-    KAction* editLocation = actionCollection()->addAction("edit_location");
-    editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location"));
-    editLocation->setShortcut(Qt::Key_F6);
-    connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
+    KToggleAction* editableLocation = actionCollection()->add<KToggleAction>("editable_location");
+    editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
+    editableLocation->setShortcut(Qt::Key_F6);
+    connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));

 
 

-    KAction* adjustViewProps = actionCollection()->addAction("view_properties");
-    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
-    connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
+    KAction* replaceLocation = actionCollection()->addAction("replace_location");
+    replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
+    replaceLocation->setShortcut(Qt::CTRL | Qt::Key_L);
+    connect(replaceLocation, SIGNAL(triggered()), this, SLOT(replaceLocation()));

 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());

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

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

-    KStandardAction::forward(this, SLOT(goForward()), actionCollection());
-    KStandardAction::up(this, SLOT(goUp()), actionCollection());
-    KStandardAction::home(this, SLOT(goHome()), actionCollection());
+    DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this);
+    actionCollection()->addAction("closed_tabs", recentTabsMenu);
+    connect(m_tabWidget, SIGNAL(rememberClosedTab(KUrl,QByteArray)),
+            recentTabsMenu, SLOT(rememberClosedTab(KUrl,QByteArray)));
+    connect(recentTabsMenu, SIGNAL(restoreClosedTab(QByteArray)),
+            m_tabWidget, SLOT(restoreClosedTab(QByteArray)));
+    connect(recentTabsMenu, SIGNAL(closedTabsCountChanged(uint)),
+            this, SLOT(closedTabsCountChanged(uint)));

 
 

-    // setup 'Tools' menu
-    QAction* findFile = actionCollection()->addAction("find_file");
-    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
-    findFile->setShortcut(Qt::CTRL | Qt::Key_F);
-    findFile->setIcon(KIcon("edit-find"));
-    connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
+    KAction* undoCloseTab = actionCollection()->addAction("undo_close_tab");
+    undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab"));
+    undoCloseTab->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_T);
+    undoCloseTab->setIcon(KIcon("edit-undo"));
+    undoCloseTab->setEnabled(false);
+    connect(undoCloseTab, SIGNAL(triggered()), recentTabsMenu, SLOT(undoCloseTab()));
+
+    KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
+    connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons)));

 
 

-    KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
+    KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
+    connect(upAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));
+
+    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");

     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));

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

     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);

-    connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
+    connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar()));

 
     KAction* compareFiles = actionCollection()->addAction("compare_files");
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
 
     KAction* compareFiles = actionCollection()->addAction("compare_files");
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));


@@ -820,99 +1109,186 @@ void DolphinMainWindow::setupActions()
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 

+    KAction* openTerminal = actionCollection()->addAction("open_terminal");
+    openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
+    openTerminal->setIcon(KIcon("utilities-terminal"));
+    openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4);
+    connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
+

     // setup 'Settings' menu
     // 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());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());

+
+    // not in menu actions
+    QList<QKeySequence> nextTabKeys;
+    nextTabKeys.append(KStandardShortcut::tabNext().primary());
+    nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
+
+    QList<QKeySequence> prevTabKeys;
+    prevTabKeys.append(KStandardShortcut::tabPrev().primary());
+    prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
+
+    KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
+    activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
+    activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
+    activateNextTab->setEnabled(false);
+    connect(activateNextTab, SIGNAL(triggered()), m_tabWidget, SLOT(activateNextTab()));
+    activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
+
+    KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
+    activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
+    activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
+    activatePrevTab->setEnabled(false);
+    connect(activatePrevTab, SIGNAL(triggered()), m_tabWidget, SLOT(activatePrevTab()));
+    activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
+
+    // for context menu
+    KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
+    openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));
+    openInNewTab->setIcon(KIcon("tab-new"));
+    connect(openInNewTab, SIGNAL(triggered()), this, SLOT(openInNewTab()));
+
+    KAction* openInNewTabs = actionCollection()->addAction("open_in_new_tabs");
+    openInNewTabs->setText(i18nc("@action:inmenu", "Open in New Tabs"));
+    openInNewTabs->setIcon(KIcon("tab-new"));
+    connect(openInNewTabs, SIGNAL(triggered()), this, SLOT(openInNewTab()));
+
+    KAction* openInNewWindow = actionCollection()->addAction("open_in_new_window");
+    openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
+    openInNewWindow->setIcon(KIcon("window-new"));
+    connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow()));

 }
 
 void DolphinMainWindow::setupDockWidgets()
 {
 }
 
 void DolphinMainWindow::setupDockWidgets()
 {

-    // setup "Information"
-    QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information"));
+    const bool lock = GeneralSettings::lockPanels();
+
+    KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>("lock_panels");
+    lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
+    lockLayoutAction->setActiveIcon(KIcon("object-unlocked"));
+    lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels"));
+    lockLayoutAction->setInactiveIcon(KIcon("object-locked"));
+    lockLayoutAction->setActive(lock);
+    connect(lockLayoutAction, SIGNAL(triggered()), this, SLOT(togglePanelLockState()));
+
+    // Setup "Information"
+    DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information"));
+    infoDock->setLocked(lock);

     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);

-    SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
-    infoDock->setWidget(infoWidget);
+    Panel* infoPanel = new InformationPanel(infoDock);
+    infoPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
+    infoDock->setWidget(infoPanel);

 
 

-    infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information"));
-    infoDock->toggleViewAction()->setShortcut(Qt::Key_F11);
-    actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
+    QAction* infoAction = infoDock->toggleViewAction();
+    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)),

-            infoWidget, SLOT(setUrl(KUrl)));
+            infoPanel, SLOT(setUrl(KUrl)));

     connect(this, SIGNAL(selectionChanged(KFileItemList)),
     connect(this, SIGNAL(selectionChanged(KFileItemList)),

-            infoWidget, SLOT(setSelection(KFileItemList)));
+            infoPanel, SLOT(setSelection(KFileItemList)));

     connect(this, SIGNAL(requestItemInfo(KFileItem)),
     connect(this, SIGNAL(requestItemInfo(KFileItem)),

-            infoWidget, SLOT(requestDelayedItemInfo(KFileItem)));
+            infoPanel, SLOT(requestDelayedItemInfo(KFileItem)));

 
 

-    // setup "Tree View"
-    QDockWidget* treeViewDock = new QDockWidget(i18nc("@title:window", "Folders"));
-    treeViewDock->setObjectName("treeViewDock");
-    treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-    TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
-    treeViewDock->setWidget(treeWidget);
+    // Setup "Folders"
+    DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders"));
+    foldersDock->setLocked(lock);
+    foldersDock->setObjectName("foldersDock");
+    foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
+    foldersPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    foldersDock->setWidget(foldersPanel);

 
 

-    treeViewDock->toggleViewAction()->setText(i18nc("@title:window", "Folders"));
-    treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7);
-    actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
+    QAction* foldersAction = foldersDock->toggleViewAction();
+    createPanelAction(KIcon("folder"), Qt::Key_F7, foldersAction, "show_folders_panel");

 
 

-    addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
+    addDockWidget(Qt::LeftDockWidgetArea, foldersDock);

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

-            treeWidget, SLOT(setUrl(KUrl)));
-    connect(treeWidget, SIGNAL(changeUrl(KUrl)),
+            foldersPanel, SLOT(setUrl(KUrl)));
+    connect(foldersPanel, SIGNAL(folderActivated(KUrl)),

             this, SLOT(changeUrl(KUrl)));
             this, SLOT(changeUrl(KUrl)));

-    connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
-            this, SLOT(changeSelection(KFileItemList)));
-    connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
-            this, SLOT(dropUrls(KUrl::List, KUrl)));
+    connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)),
+            this, SLOT(openNewTab(KUrl)));
+    connect(foldersPanel, SIGNAL(errorMessage(QString)),
+            this, SLOT(slotPanelErrorMessage(QString)));

 
 

-    // setup "Terminal"
+    // Setup "Terminal"

 #ifndef Q_OS_WIN
 #ifndef Q_OS_WIN

-    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal"));
+    DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
+    terminalDock->setLocked(lock);

     terminalDock->setObjectName("terminalDock");
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     terminalDock->setObjectName("terminalDock");
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);

-    SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
-    terminalDock->setWidget(terminalWidget);
+    Panel* terminalPanel = new TerminalPanel(terminalDock);
+    terminalPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    terminalDock->setWidget(terminalPanel);

 
 

-    connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+    connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
+    connect(terminalPanel, SIGNAL(changeUrl(KUrl)), this, SLOT(slotTerminalDirectoryChanged(KUrl)));
+    connect(terminalDock, SIGNAL(visibilityChanged(bool)),
+            terminalPanel, SLOT(dockVisibilityChanged()));

 
 

-    terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
-    terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
-    actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
+    QAction* terminalAction = terminalDock->toggleViewAction();
+    createPanelAction(KIcon("utilities-terminal"), Qt::Key_F4, terminalAction, "show_terminal_panel");

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

-            terminalWidget, SLOT(setUrl(KUrl)));
+            terminalPanel, SLOT(setUrl(KUrl)));

 #endif
 #endif

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

         infoDock->hide();
         infoDock->hide();

-        treeViewDock->hide();
+        foldersDock->hide();

 #ifndef Q_OS_WIN
         terminalDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();

-#endif         
+#endif

     }
 
     }
 

-    QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
+    // Setup "Places"
+    DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places"));
+    placesDock->setLocked(lock);

     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 

-    DolphinFilePlacesView* placesView = new DolphinFilePlacesView(placesDock);
-    placesDock->setWidget(placesView);
-    placesView->setModel(DolphinSettings::instance().placesModel());
-    placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    PlacesPanel* placesPanel = new PlacesPanel(placesDock);
+    placesPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    placesDock->setWidget(placesPanel);

 
 

-    placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
-    placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);
-    actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
+    QAction* placesAction = placesDock->toggleViewAction();
+    createPanelAction(KIcon("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel");

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

-    connect(placesView, SIGNAL(urlChanged(KUrl)),
-            this, SLOT(changeUrl(KUrl)));
+    connect(placesPanel, SIGNAL(placeActivated(KUrl)),
+            this, SLOT(slotPlaceActivated(KUrl)));
+    connect(placesPanel, SIGNAL(placeMiddleClicked(KUrl)),
+            this, SLOT(openNewTab(KUrl)));
+    connect(placesPanel, SIGNAL(errorMessage(QString)),
+            this, SLOT(slotPanelErrorMessage(QString)));

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

-            placesView, SLOT(setUrl(KUrl)));
+            placesPanel, SLOT(setUrl(KUrl)));
+    connect(placesDock, SIGNAL(visibilityChanged(bool)),
+            m_tabWidget, SLOT(slotPlacesPanelVisibilityChanged(bool)));
+    connect(this, SIGNAL(settingsChanged()),
+           placesPanel, SLOT(readSettings()));
+
+    m_tabWidget->slotPlacesPanelVisibilityChanged(placesPanel->isVisible());
+
+    // Add actions into the "Panels" menu
+    KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
+    actionCollection()->addAction("panels", panelsMenu);
+    panelsMenu->setDelayed(false);
+    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
+    panelsMenu->addAction(ac->action("show_terminal_panel"));
+#endif
+    panelsMenu->addSeparator();
+    panelsMenu->addAction(lockLayoutAction);

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


@@ -923,28 +1299,22 @@ void DolphinMainWindow::updateEditActions()
     } else {
         stateChanged("has_selection");
 
     } else {
         stateChanged("has_selection");
 

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

 
 

-        bool enableMoveToTrash = true;
+        KFileItemListProperties capabilities(list);
+        const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();

 
 

-        KFileItemList::const_iterator it = list.begin();
-        const KFileItemList::const_iterator end = list.end();
-        while (it != end) {
-            const KUrl& url = (*it).url();
-            // only enable the 'Move to Trash' action for local files
-            if (!url.isLocalFile()) {
-                enableMoveToTrash = false;
-            }
-            ++it;
-        }
-
-        QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
+        renameAction->setEnabled(capabilities.supportsMoving());

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

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

     }
     }

-    updatePasteAction();

 }
 
 void DolphinMainWindow::updateViewActions()
 }
 
 void DolphinMainWindow::updateViewActions()


@@ -964,62 +1334,177 @@ void DolphinMainWindow::updateViewActions()
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));

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

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

+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::refreshViews()
+{
+    m_tabWidget->refreshViews();
+
+    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();
+        m_tabWidget->currentTabPage()->setSplitViewEnabled(splitView);
+        updateSplitAction();
+    }
+
+    emit settingsChanged();
+}
+

 void DolphinMainWindow::clearStatusBar()
 {
 void DolphinMainWindow::clearStatusBar()
 {

-    m_activeViewContainer->statusBar()->clear();
+    m_activeViewContainer->statusBar()->resetToDefaultText();

 }
 
 }
 

-void DolphinMainWindow::connectViewSignals(int viewIndex)
+void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)

 {
 {

-    DolphinViewContainer* container = m_viewContainer[viewIndex];

     connect(container, SIGNAL(showFilterBarChanged(bool)),
             this, SLOT(updateFilterBarAction(bool)));
     connect(container, SIGNAL(showFilterBarChanged(bool)),
             this, SLOT(updateFilterBarAction(bool)));

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

 
 

-    DolphinView* view = container->view();
+    const DolphinView* view = container->view();

     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));

-    connect(view, SIGNAL(activated()),
-            this, SLOT(toggleActiveView()));
-    connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
-            this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));
+    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()));
+    connect(view, SIGNAL(directoryLoadingCompleted()),
+            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(KUrl)),
+            this, SLOT(openNewTab(KUrl)));

 }
 
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");
 }
 
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");

-    if (m_viewContainer[SecondaryView] != 0) {
-        if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
-            splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
-            splitAction->setIcon(KIcon("view-right-close"));
-        } else {
+    const DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
+    if (tabPage->splitViewEnabled()) {
+        if (tabPage->primaryViewActive()) {

             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));

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

             splitAction->setIcon(KIcon("view-left-close"));
             splitAction->setIcon(KIcon("view-left-close"));

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

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

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

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

-DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
-    KonqFileUndoManager::UiInterface(mainWin),
-    m_mainWin(mainWin)
+bool DolphinMainWindow::isKompareInstalled() const
+{
+    static bool initialized = false;
+    static bool installed = false;
+    if (!initialized) {
+        // TODO: maybe replace this approach later by using a menu
+        // plugin like kdiff3plugin.cpp
+        installed = !KGlobal::dirs()->findExe("kompare").isEmpty();
+        initialized = true;
+    }
+    return installed;
+}
+
+void DolphinMainWindow::createPanelAction(const KIcon& icon,
+                                          const QKeySequence& shortcut,
+                                          QAction* dockAction,
+                                          const QString& actionName)
+{
+    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() :
+    KIO::FileUndoManager::UiInterface()

 {
 {

-    Q_ASSERT(m_mainWin != 0);

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


@@ -1028,8 +1513,13 @@ DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
 
 void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
 {
 
 void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
 {

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

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