Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinviewcontainer.cpp

1 files changed, 258 insertions, 0 deletions

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
new file mode 100644
index 000000000..c8e426335
--- /dev/null
+++ b/src/dolphintabpage.cpp
@@ -0,0 +1,258 @@
+/***************************************************************************
+ * Copyright (C) 2014 by Emmanuel Pescosta <[email protected]> *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#include "dolphintabpage.h"
+
+#include "dolphinviewcontainer.h"
+#include "dolphin_generalsettings.h"
+
+#include <QSplitter>
+
+DolphinTabPage::DolphinTabPage(const KUrl& primaryUrl, const KUrl& secondaryUrl, QWidget* parent) :
+    QWidget(parent),
+    m_primaryViewActive(true),
+    m_splitViewEnabled(false)
+{
+    QVBoxLayout* layout = new QVBoxLayout(this);
+    layout->setSpacing(0);
+    layout->setMargin(0);
+
+    m_splitter = new QSplitter(Qt::Horizontal, this);
+    m_splitter->setChildrenCollapsible(false);
+    layout->addWidget(m_splitter);
+
+    // Create a new primary view
+    m_primaryViewContainer = createViewContainer(primaryUrl);
+    connect(m_primaryViewContainer->view(), SIGNAL(urlChanged(KUrl)),
+            this, SIGNAL(activeViewUrlChanged(KUrl)));
+
+    m_splitter->addWidget(m_primaryViewContainer);
+    m_primaryViewContainer->show();
+
+    if (secondaryUrl.isValid() || GeneralSettings::splitView()) {
+        // Provide a secondary view, if the given secondary url is valid or if the
+        // startup settings are set this way (use the url of the primary view).
+        m_splitViewEnabled = true;
+        const KUrl& url = secondaryUrl.isValid() ? secondaryUrl : primaryUrl;
+        m_secondaryViewContainer = createViewContainer(url);
+        m_splitter->addWidget(m_secondaryViewContainer);
+        m_secondaryViewContainer->show();
+    }
+
+    m_primaryViewContainer->setActive(true);
+}
+
+bool DolphinTabPage::primaryViewActive() const
+{
+    return m_primaryViewActive;
+}
+
+bool DolphinTabPage::splitViewEnabled() const
+{
+    return m_splitViewEnabled;
+}
+
+void DolphinTabPage::setSplitViewEnabled(bool enabled)
+{
+    if (m_splitViewEnabled != enabled) {
+        m_splitViewEnabled = enabled;
+
+        if (enabled) {
+            const KUrl& url = m_primaryViewContainer->url();
+            m_secondaryViewContainer = createViewContainer(url);
+            m_splitter->addWidget(m_secondaryViewContainer);
+            m_secondaryViewContainer->show();
+            m_secondaryViewContainer->setActive(true);
+        } else {
+            // Close the view which is active.
+            DolphinViewContainer* view = activeViewContainer();
+            if (m_primaryViewActive) {
+                // If the primary view is active, we have to swap the pointers
+                // because the secondary view will be the new primary view.
+                qSwap(m_primaryViewContainer, m_secondaryViewContainer);
+            }
+            m_primaryViewContainer->setActive(true);
+            view->close();
+            view->deleteLater();
+        }
+    }
+}
+
+DolphinViewContainer* DolphinTabPage::primaryViewContainer() const
+{
+    return m_primaryViewContainer;
+}
+
+DolphinViewContainer* DolphinTabPage::secondaryViewContainer() const
+{
+    return m_secondaryViewContainer;
+}
+
+DolphinViewContainer* DolphinTabPage::activeViewContainer() const
+{
+    return m_primaryViewActive ? m_primaryViewContainer :
+                                 m_secondaryViewContainer;
+}
+
+KFileItemList DolphinTabPage::selectedItems() const
+{
+    KFileItemList items = m_primaryViewContainer->view()->selectedItems();
+    if (m_splitViewEnabled) {
+        items += m_secondaryViewContainer->view()->selectedItems();
+    }
+    return items;
+}
+
+int DolphinTabPage::selectedItemsCount() const
+{
+    int selectedItemsCount = m_primaryViewContainer->view()->selectedItemsCount();
+    if (m_splitViewEnabled) {
+        selectedItemsCount += m_secondaryViewContainer->view()->selectedItemsCount();
+    }
+    return selectedItemsCount;
+}
+
+void DolphinTabPage::markUrlsAsSelected(const QList<KUrl>& urls)
+{
+    m_primaryViewContainer->view()->markUrlsAsSelected(urls);
+    if (m_splitViewEnabled) {
+        m_secondaryViewContainer->view()->markUrlsAsSelected(urls);
+    }
+}
+
+void DolphinTabPage::markUrlAsCurrent(const KUrl& url)
+{
+    m_primaryViewContainer->view()->markUrlAsCurrent(url);
+    if (m_splitViewEnabled) {
+        m_secondaryViewContainer->view()->markUrlAsCurrent(url);
+    }
+}
+
+void DolphinTabPage::setPlacesSelectorVisible(bool visible)
+{
+    m_primaryViewContainer->urlNavigator()->setPlacesSelectorVisible(visible);
+    if (m_splitViewEnabled) {
+        m_secondaryViewContainer->urlNavigator()->setPlacesSelectorVisible(visible);
+    }
+}
+
+void DolphinTabPage::refreshViews()
+{
+    m_primaryViewContainer->readSettings();
+    if (m_splitViewEnabled) {
+        m_secondaryViewContainer->readSettings();
+    }
+}
+
+QByteArray DolphinTabPage::saveState() const
+{
+    QByteArray state;
+    QDataStream stream(&state, QIODevice::WriteOnly);
+
+    stream << m_splitViewEnabled;
+
+    stream << m_primaryViewContainer->url();
+    stream << m_primaryViewContainer->urlNavigator()->isUrlEditable();
+
+    if (m_splitViewEnabled) {
+        stream << m_secondaryViewContainer->url();
+        stream << m_secondaryViewContainer->urlNavigator()->isUrlEditable();
+    }
+
+    stream << m_primaryViewActive;
+    stream << m_splitter->saveState();
+
+    return state;
+}
+
+void DolphinTabPage::restoreState(const QByteArray& state)
+{
+    QByteArray sd = state;
+    QDataStream stream(&sd, QIODevice::ReadOnly);
+
+    bool isSplitViewEnabled = false;
+    stream >> isSplitViewEnabled;
+    setSplitViewEnabled(isSplitViewEnabled);
+
+    KUrl primaryUrl;
+    stream >> primaryUrl;
+    m_primaryViewContainer->setUrl(primaryUrl);
+    bool primaryUrlEditable;
+    stream >> primaryUrlEditable;
+    m_primaryViewContainer->urlNavigator()->setUrlEditable(primaryUrlEditable);
+
+    if (isSplitViewEnabled) {
+        KUrl secondaryUrl;
+        stream >> secondaryUrl;
+        m_secondaryViewContainer->setUrl(secondaryUrl);
+        bool secondaryUrlEditable;
+        stream >> secondaryUrlEditable;
+        m_secondaryViewContainer->urlNavigator()->setUrlEditable(secondaryUrlEditable);
+    }
+
+    stream >> m_primaryViewActive;
+    if (m_primaryViewActive) {
+        m_primaryViewContainer->setActive(true);
+    } else {
+        Q_ASSERT(m_splitViewEnabled);
+        m_secondaryViewContainer->setActive(true);
+    }
+
+    QByteArray splitterState;
+    stream >> splitterState;
+    m_splitter->restoreState(splitterState);
+}
+
+void DolphinTabPage::slotViewActivated()
+{
+    const DolphinView* oldActiveView = activeViewContainer()->view();
+
+    // Set the view, which was active before, to inactive
+    // and update the active view type.
+    if (m_splitViewEnabled) {
+        activeViewContainer()->setActive(false);
+        m_primaryViewActive = !m_primaryViewActive;
+    } else {
+        m_primaryViewActive = true;
+    }
+
+    const DolphinView* newActiveView = activeViewContainer()->view();
+
+    if (newActiveView != oldActiveView) {
+        disconnect(oldActiveView, SIGNAL(urlChanged(KUrl)),
+                   this, SIGNAL(activeViewUrlChanged(KUrl)));
+        connect(newActiveView, SIGNAL(urlChanged(KUrl)),
+                this, SIGNAL(activeViewUrlChanged(KUrl)));
+    }
+
+    emit activeViewUrlChanged(activeViewContainer()->url());
+    emit activeViewChanged();
+}
+
+DolphinViewContainer* DolphinTabPage::createViewContainer(const KUrl& url) const
+{
+    DolphinViewContainer* container = new DolphinViewContainer(url, m_splitter);
+    container->setActive(false);
+
+    const DolphinView* view = container->view();
+    connect(view, SIGNAL(activated()),
+            this, SLOT(slotViewActivated()));
+
+    return container;
+}