Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinmainwindow.h
	dolphin/src/dolphinrecenttabsmenu.cpp
	dolphin/src/dolphinviewcontainer.cpp
	kfind/CMakeLists.txt

1 files changed, 190 insertions, 0 deletions

diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h
new file mode 100644
index 000000000..98bcd985a
--- /dev/null
+++ b/src/dolphintabwidget.h
@@ -0,0 +1,190 @@
+/***************************************************************************
+ * 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            *
+ ***************************************************************************/
+
+#ifndef DOLPHIN_TAB_WIDGET_H
+#define DOLPHIN_TAB_WIDGET_H
+
+#include <QTabWidget>
+#include <KUrl>
+
+class DolphinViewContainer;
+class DolphinTabPage;
+class KConfigGroup;
+
+class DolphinTabWidget : public QTabWidget
+{
+    Q_OBJECT
+
+public:
+    explicit DolphinTabWidget(QWidget* parent);
+
+    /**
+     * @return Tab page at the current index (can be 0 if tabs count is smaller than 1)
+     */
+    DolphinTabPage* currentTabPage() const;
+
+    /**
+     * @return Tab page at the given \a index (can be 0 if the index is out-of-range)
+     */
+    DolphinTabPage* tabPageAt(const int index) const;
+
+    void saveProperties(KConfigGroup& group) const;
+    void readProperties(const KConfigGroup& group);
+
+    /**
+     * Refreshes the views of the main window by recreating them according to
+     * the given Dolphin settings.
+     */
+    void refreshViews();
+
+signals:
+    /**
+     * Is emitted when the active view has been changed, by changing the current
+     * tab or by activating another view when split view is enabled in the current
+     * tab.
+     */
+    void activeViewChanged(DolphinViewContainer* viewContainer);
+
+    /**
+     * Is emitted when the number of open tabs has changed (e.g. by opening or
+     * closing a tab)
+     */
+    void tabCountChanged(int count);
+
+    /**
+     * Is emitted when a tab has been closed.
+     */
+    void rememberClosedTab(const KUrl& url, const QByteArray& state);
+
+    /**
+     * Is emitted when the url of the current tab has been changed. This signal
+     * is also emitted when the active view has been changed.
+     */
+    void currentUrlChanged(const KUrl& url);
+
+public slots:
+    /**
+     * Opens a new view with the current URL that is part of a tab and activates
+     * the tab.
+     */
+    void openNewActivatedTab();
+
+    /**
+     * Opens a new tab showing the  URL \a primaryUrl and the optional URL
+     * \a secondaryUrl and activates the tab.
+     */
+    void openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
+
+    /**
+     * Opens a new tab in the background showing the URL \a primaryUrl and the
+     * optional URL \a secondaryUrl.
+     */
+    void openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
+
+    /**
+     * Opens each directory in \p dirs in a separate tab. If the "split view"
+     * option is enabled, 2 directories are collected within one tab.
+     */
+    void openDirectories(const QList<KUrl>& dirs);
+
+    /**
+     * Opens the directory which contains the files \p files
+     * and selects all files (implements the --select option
+     * of Dolphin).
+     */
+    void openFiles(const QList<KUrl>& files);
+
+    /**
+     * Closes the currently active tab.
+     */
+    void closeTab();
+
+    /**
+     * Closes the tab with the index \a index and activates the tab with index - 1.
+     */
+    void closeTab(const int index);
+
+    /**
+     * Activates the next tab in the tab bar.
+     * If the current active tab is the last tab, it activates the first tab.
+     */
+    void activateNextTab();
+
+    /**
+     * Activates the previous tab in the tab bar.
+     * If the current active tab is the first tab, it activates the last tab.
+     */
+    void activatePrevTab();
+
+    /**
+     * Is invoked if the Places panel got visible/invisible and takes care
+     * that the places-selector of all views is only shown if the Places panel
+     * is invisible.
+     */
+    void slotPlacesPanelVisibilityChanged(bool visible);
+
+    /**
+     * Is called when the user wants to reopen a previously closed tab from
+     * the recent tabs menu.
+     */
+    void restoreClosedTab(const QByteArray& state);
+
+private slots:
+    /**
+     * Opens the tab with the index \a index in a new Dolphin instance and closes
+     * this tab.
+     */
+    void detachTab(int index);
+
+    /**
+     * Opens a new tab showing the url from tab at the given \a index and
+     * activates the tab.
+     */
+    void openNewActivatedTab(int index);
+
+    /**
+     * Is connected to the KTabBar signal receivedDropEvent.
+     * Allows dragging and dropping files onto tabs.
+     */
+    void tabDropEvent(int tab, QDropEvent* event);
+
+    /**
+     * The active view url of a tab has been changed so update the text and the
+     * icon of the corresponding tab.
+     */
+    void tabUrlChanged(const KUrl& url);
+
+    void currentTabChanged(int index);
+
+protected:
+    virtual void tabInserted(int index);
+    virtual void tabRemoved(int index);
+
+private:
+    /**
+     * Returns the name of the tab for the URL \a url.
+     */
+    QString tabName(const KUrl& url) const;
+
+private:
+    /** Caches the (negated) places panel visibility */
+    bool m_placesSelectorVisible;
+};
+
+#endif
\ No newline at end of file