Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphintabwidget.h

diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h
index a9bef11be155374dc98f6899b11e0e1a7c3adb1f..ba2fd4867ab109dad2db80a300abb9f4d5be97c9 100644 (file)
--- a/src/dolphintabwidget.h
+++ b/src/dolphintabwidget.h
@@ -21,7 +21,7 @@
 #define DOLPHIN_TAB_WIDGET_H
 
 #include <QTabWidget>
 #define DOLPHIN_TAB_WIDGET_H
 
 #include <QTabWidget>

-#include <KUrl>
+#include <QUrl>

 
 class DolphinViewContainer;
 class DolphinTabPage;
 
 class DolphinViewContainer;
 class DolphinTabPage;


@@ -70,7 +70,13 @@ signals:
     /**
      * Is emitted when a tab has been closed.
      */
     /**
      * Is emitted when a tab has been closed.
      */

-    void rememberClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+    void rememberClosedTab(const QUrl& 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 QUrl& url);

 
 public slots:
     /**
 
 public slots:
     /**


@@ -83,26 +89,27 @@ public slots:
      * Opens a new tab showing the  URL \a primaryUrl and the optional URL
      * \a secondaryUrl and activates the tab.
      */
      * 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());
+    void openNewActivatedTab(const QUrl& primaryUrl, const QUrl& secondaryUrl = QUrl());

 
     /**
      * Opens a new tab in the background showing the URL \a primaryUrl and the
      * optional URL \a secondaryUrl.
      */
 
     /**
      * 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());
+    void openNewTab(const QUrl &primaryUrl, const QUrl &secondaryUrl = QUrl());

 
     /**
 
     /**

-     * Opens each directory in \p dirs in a separate tab. If the "split view"
-     * option is enabled, 2 directories are collected within one tab.
+     * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
+     * 2 directories are collected within one tab.
+     * \pre \a dirs must contain at least one url.

      */
      */

-    void openDirectories(const QList<KUrl>& dirs);
+    void openDirectories(const QList<QUrl>& dirs, bool splitView);

 
     /**
 
     /**

-     * Opens the directory which contains the files \p files
-     * and selects all files (implements the --select option
-     * of Dolphin).
+     * Opens the directories which contain the files \p files and selects all files.
+     * If \a splitView is set, 2 directories are collected within one tab.
+     * \pre \a files must contain at least one url.

      */
      */

-    void openFiles(const QList<KUrl>& files);
+    void openFiles(const QList<QUrl> &files, bool splitView);

 
     /**
      * Closes the currently active tab.
 
     /**
      * Closes the currently active tab.


@@ -133,6 +140,12 @@ public slots:
      */
     void slotPlacesPanelVisibilityChanged(bool visible);
 
      */
     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
 private slots:
     /**
      * Opens the tab with the index \a index in a new Dolphin instance and closes


@@ -156,23 +169,25 @@ private slots:
      * The active view url of a tab has been changed so update the text and the
      * icon of the corresponding tab.
      */
      * 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 tabUrlChanged(const QUrl& url);

 
     void currentTabChanged(int index);
 
 protected:
 
     void currentTabChanged(int index);
 
 protected:

-    virtual void tabInserted(int index);
-    virtual void tabRemoved(int index);
+    void tabInserted(int index) override;
+    void tabRemoved(int index) override;

 
 private:
     /**
      * Returns the name of the tab for the URL \a url.
      */
 
 private:
     /**
      * Returns the name of the tab for the URL \a url.
      */

-    QString tabName(const KUrl& url) const;
+    QString tabName(const QUrl& url) const;

 
 private:
     /** Caches the (negated) places panel visibility */
     bool m_placesSelectorVisible;
 
 private:
     /** Caches the (negated) places panel visibility */
     bool m_placesSelectorVisible;

+
+    int m_previousTab;

 };
 
 };
 

-#endif
\ No newline at end of file
+#endif