Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index d741eb21ed455aa84e1f85c05e3347c4fdc5b355..c7a06c00a9e67f9c5c22888709592cb47564f2b3 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -46,6 +46,10 @@ class KJob;
 class KNewFileMenu;
 class QToolButton;
 class QIcon;
 class KNewFileMenu;
 class QToolButton;
 class QIcon;

+class PlacesPanel;
+#ifndef Q_OS_WIN
+class TerminalPanel;
+#endif

 
 /**
  * @short Main window for Dolphin.
 
 /**
  * @short Main window for Dolphin.


@@ -60,7 +64,7 @@ class DolphinMainWindow: public KXmlGuiWindow
 
 public:
     DolphinMainWindow();
 
 public:
     DolphinMainWindow();

-    virtual ~DolphinMainWindow();
+    ~DolphinMainWindow() override;

 
     /**
      * Returns the currently active view.
 
     /**
      * Returns the currently active view.


@@ -90,6 +94,8 @@ public:
      */
     KNewFileMenu* newFileMenu() const;
 
      */
     KNewFileMenu* newFileMenu() const;
 

+    void setTabsToHomeIfMountPathOpen(const QString& mountPath);
+

 public slots:
     /**
      * Pastes the clipboard data into the currently selected folder
 public slots:
     /**
      * Pastes the clipboard data into the currently selected folder


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

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

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

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

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

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

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

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

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


@@ -267,28 +273,17 @@ private slots:
     /** Changes the location to the home URL. */
     void goHome();
 
     /** Changes the location to the home URL. */
     void goHome();
 

-    /**
-     * Open the previous URL in the URL history in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goBack(Qt::MouseButtons buttons);
+    /** Open the previous URL in the URL history in a new tab. */
+    void goBackInNewTab();

 
 

-    /**
-     * Open the next URL in the URL history in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goForward(Qt::MouseButtons buttons);
+    /** Open the next URL in the URL history in a new tab. */
+    void goForwardInNewTab();

 
 

-    /**
-     * Open the URL one hierarchy above the current URL in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goUp(Qt::MouseButtons buttons);
+    /** Open the URL one hierarchy above the current URL in a new tab. */
+    void goUpInNewTab();

 
 

-    /**
-     * Open the home URL in a new tab
-     */
-    void goHome(Qt::MouseButtons buttons);
+    /** * Open the home URL in a new tab. */
+    void goHomeInNewTab();

 
     /** Opens Kompare for 2 selected files. */
     void compareFiles();
 
     /** Opens Kompare for 2 selected files. */
     void compareFiles();


@@ -420,11 +415,34 @@ private slots:
      */
     void setUrlAsCaption(const QUrl& url);
 
      */
     void setUrlAsCaption(const QUrl& url);
 

+    /**
+     * This slot is called when the user requested to unmount a removable media
+     * from the places menu
+     */
+    void slotStorageTearDownFromPlacesRequested(const QString& mountPath);
+
+    /**
+     * This slot is called when the user requested to unmount a removable media
+     * _not_ from the dolphin's places menu (from the notification area for e.g.)
+     * This slot is basically connected to each removable device's
+     * Solid::StorageAccess::teardownRequested(const QString & udi)
+     * signal through the places panel.
+     */
+    void slotStorageTearDownExternallyRequested(const QString& mountPath);
+

     /**
      * Is called when the view has finished loading the directory.
      */
     void slotDirectoryLoadingCompleted();
 
     /**
      * Is called when the view has finished loading the directory.
      */
     void slotDirectoryLoadingCompleted();
 

+    /**
+     * Is called when the user middle clicks a toolbar button.
+     *
+     * Here middle clicking Back/Forward/Up/Home will open the resulting
+     * folder in a new tab.
+     */
+    void slotToolBarActionMiddleClicked(QAction *action);
+

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


@@ -481,8 +499,8 @@ private:
     {
     public:
         UndoUiInterface();
     {
     public:
         UndoUiInterface();

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

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


@@ -499,6 +517,12 @@ private:
     QTimer* m_updateToolBarTimer;
 
     KIO::Job* m_lastHandleUrlStatJob;
     QTimer* m_updateToolBarTimer;
 
     KIO::Job* m_lastHandleUrlStatJob;

+
+#ifndef Q_OS_WIN
+    TerminalPanel* m_terminalPanel;
+#endif
+    PlacesPanel* m_placesPanel;
+    bool m_tearDownFromPlacesRequested;

 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const