Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index ae30197945fa8dcde7effb6bf2d3417caaa07254..7003e94744769450656d3bf3ab84152178059074 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -24,20 +24,18 @@
 
 #include <config-baloo.h>
 
 
 #include <config-baloo.h>
 

-#include <KFileItemDelegate>

 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <QIcon>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <QIcon>

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

 
 #include <QList>
 
 #include <QList>

-#include <QWeakPointer>
+#include <QPointer>

 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinViewActionHandler;
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinViewActionHandler;

-class DolphinApplication;

 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;


@@ -59,7 +57,6 @@ class DolphinMainWindow: public KXmlGuiWindow
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
     Q_PROPERTY(int id READ getId SCRIPTABLE true)
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
     Q_PROPERTY(int id READ getId SCRIPTABLE true)

-    friend class DolphinApplication;

 
 public:
     DolphinMainWindow();
 
 public:
     DolphinMainWindow();


@@ -74,17 +71,18 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
     DolphinViewContainer* activeViewContainer() const;
 
     /**

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

 
     /**
      * Returns the 'Create New...' sub menu which also can be shared
 
     /**
      * Returns the 'Create New...' sub menu which also can be shared


@@ -110,14 +108,14 @@ public slots:
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */

-    void changeUrl(const KUrl& url);
+    void changeUrl(const QUrl& url);

 
     /**
      * The current directory of the Terminal Panel has changed, probably because
      * the user entered a 'cd' command. This slot calls changeUrl(url) and makes
      * sure that the panel keeps the keyboard focus.
      */
 
     /**
      * The current directory of the Terminal Panel has changed, probably because
      * the user entered a 'cd' command. This slot calls changeUrl(url) and makes
      * sure that the panel keeps the keyboard focus.
      */

-    void slotTerminalDirectoryChanged(const KUrl& url);
+    void slotTerminalDirectoryChanged(const QUrl& url);

 
     /** Stores all settings and quits Dolphin. */
     void quit();
 
     /** Stores all settings and quits Dolphin. */
     void quit();


@@ -133,7 +131,7 @@ signals:
      * Is sent if the url of the currently active view has
      * been changed.
      */
      * Is sent if the url of the currently active view has
      * been changed.
      */

-    void urlChanged(const KUrl& url);
+    void urlChanged(const QUrl& url);

 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the panel.
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the panel.


@@ -148,16 +146,16 @@ signals:
 
 protected:
     /** @see QWidget::showEvent() */
 
 protected:
     /** @see QWidget::showEvent() */

-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;

 
     /** @see QMainWindow::closeEvent() */
 
     /** @see QMainWindow::closeEvent() */

-    virtual void closeEvent(QCloseEvent* event);
+    virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;

 
     /** @see KMainWindow::saveProperties() */
 
     /** @see KMainWindow::saveProperties() */

-    virtual void saveProperties(KConfigGroup& group);
+    virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE;

 
     /** @see KMainWindow::readProperties() */
 
     /** @see KMainWindow::readProperties() */

-    virtual void readProperties(const KConfigGroup& group);
+    virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE;

 
 private slots:
     /**
 
 private slots:
     /**


@@ -313,9 +311,6 @@ private slots:
      */
     void slotSelectionChanged(const KFileItemList& selection);
 
      */
     void slotSelectionChanged(const KFileItemList& selection);
 

-    /** Emits the signal requestItemInfo(). */
-    void slotRequestItemInfo(const KFileItem&);
-

     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.
     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.


@@ -335,16 +330,9 @@ private slots:
     void openNewActivatedTab();
 
     /**
     void openNewActivatedTab();
 
     /**

-     * 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 url.

      */
      */

-    void openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
-
-    /**
-     * 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 openNewTab(const QUrl& url);

 
     /**
      * Opens the selected folder in a new tab.
 
     /**
      * Opens the selected folder in a new tab.


@@ -366,7 +354,7 @@ private slots:
      * If the URL can be listed, open it in the current view, otherwise
      * run it through KRun.
      */
      * If the URL can be listed, open it in the current view, otherwise
      * run it through KRun.
      */

-    void handleUrl(const KUrl& url);
+    void handleUrl(const QUrl& url);

 
     /**
      * handleUrl() can trigger a stat job to see if the url can actually
 
     /**
      * handleUrl() can trigger a stat job to see if the url can actually


@@ -391,25 +379,19 @@ private slots:
      */
     void openContextMenu(const QPoint& pos,
                          const KFileItem& item,
      */
     void openContextMenu(const QPoint& pos,
                          const KFileItem& item,

-                         const KUrl& url,
+                         const QUrl& url,

                          const QList<QAction*>& customActions);
 
     void updateControlMenu();
     void updateToolBar();
     void slotControlButtonDeleted();
 
                          const QList<QAction*>& customActions);
 
     void updateControlMenu();
     void updateToolBar();
     void slotControlButtonDeleted();
 

-    /**
-     * Is called if a panel emits an error-message and shows
-     * the error-message in the active view-container.
-     */
-    void slotPanelErrorMessage(const QString& error);
-

     /**
      * Is called if the user clicked an item in the Places Panel.
      * Reloads the view if \a url is the current URL already, and changes the
      * current URL otherwise.
      */
     /**
      * Is called if the user clicked an item in the Places Panel.
      * Reloads the view if \a url is the current URL already, and changes the
      * current URL otherwise.
      */

-    void slotPlaceActivated(const KUrl& url);
+    void slotPlaceActivated(const QUrl& url);

 
     /**
      * Is called if the another view has been activated by changing the current
 
     /**
      * Is called if the another view has been activated by changing the current


@@ -433,7 +415,12 @@ private slots:
      * Sets the window caption to url.fileName() if this is non-empty,
      * "/" if the URL is "file:///", and url.protocol() otherwise.
      */
      * Sets the window caption to url.fileName() if this is non-empty,
      * "/" if the URL is "file:///", and url.protocol() otherwise.
      */

-    void setUrlAsCaption(const KUrl& url);
+    void setUrlAsCaption(const QUrl& url);
+
+    /**
+     * Is called when the view has finished loading the directory.
+     */
+    void slotDirectoryLoadingCompleted();

 
 private:
     void setupActions();
 
 private:
     void setupActions();


@@ -450,7 +437,7 @@ private:
      * case if it has not added already to the toolbar.
      * @return True if the action has been added to the menu.
      */
      * case if it has not added already to the toolbar.
      * @return True if the action has been added to the menu.
      */

-    bool addActionToMenu(QAction* action, KMenu* menu);
+    bool addActionToMenu(QAction* action, QMenu* menu);

 
     /**
      * Connects the signals from the created DolphinView with
 
     /**
      * Connects the signals from the created DolphinView with


@@ -492,7 +479,7 @@ private:
     public:
         UndoUiInterface();
         virtual ~UndoUiInterface();
     public:
         UndoUiInterface();
         virtual ~UndoUiInterface();

-        virtual void jobError(KIO::Job* job);
+        virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE;

     };
 
     KNewFileMenu* m_newFileMenu;
     };
 
     KNewFileMenu* m_newFileMenu;


@@ -502,7 +489,7 @@ private:
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;

-    QWeakPointer<DolphinSettingsDialog> m_settingsDialog;
+    QPointer<DolphinSettingsDialog> m_settingsDialog;

 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QToolButton* m_controlButton;
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QToolButton* m_controlButton;