Merge branch 'Applications/17.04'

[dolphin.git] / src / views / dolphinview.h

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index d1a5d5005f81bfc07dcb62bfc38b3d0ac06a5f11..6b62b5da68c1f7474abff80510fc3d24508c7ddc 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -378,13 +378,6 @@ signals:
      */
     void activated();
 
      */
     void activated();
 

-    /**
-     * Is emitted if the URL of the view will be changed to \a url.
-     * After the URL has been changed the signal urlChanged() will
-     * be emitted.
-     */
-    void urlAboutToBeChanged(const QUrl& url);
-

     /** Is emitted if the URL of the view has been changed to \a url. */
     void urlChanged(const QUrl& url);
 
     /** Is emitted if the URL of the view has been changed to \a url. */
     void urlChanged(const QUrl& url);
 


@@ -546,6 +539,17 @@ signals:
      */
     void goForwardRequested();
 
      */
     void goForwardRequested();
 

+    /**
+     * Is emitted when the user wants to move the focus to another view.
+     */
+    void toggleActiveViewRequested();
+
+    /**
+     * Is emitted when the user clicks a tag or a link
+     * in the metadata widget of a tooltip.
+     */
+    void urlActivated(const QUrl& url);
+

 protected:
     /** Changes the zoom level if Control is pressed during a wheel event. */
     virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
 protected:
     /** Changes the zoom level if Control is pressed during a wheel event. */
     virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;


@@ -757,6 +761,8 @@ private:
     QUrl viewPropertiesUrl() const;
 
 private:
     QUrl viewPropertiesUrl() const;
 
 private:

+    void updatePalette();
+

     bool m_active;
     bool m_tabsForFiles;
     bool m_assureVisibleCurrentIndex;
     bool m_active;
     bool m_tabsForFiles;
     bool m_assureVisibleCurrentIndex;