GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 52fd688f6fc32f279149b3ee154bc31de5a49705..90df69c8e8b27d40b17e1dcd10f3132ffc342ada 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,13 +20,10 @@
 #include <QPushButton>
 #include <QWidget>
 
-#if HAVE_KACTIVITIES
-namespace KActivities
+namespace Admin
 {
-class ResourceInstance;
+class Bar;
 }
-#endif
-
 class FilterBar;
 class KMessageWidget;
 class QAction;
@@ -164,7 +161,8 @@ public:
      */
     void readSettings();
 
-    /** Returns true, if the filter bar is visible. */
+    /** @returns true, if the filter bar is visible.
+     *           false, if it is hidden or currently animating towards a hidden state. */
     bool isFilterBarVisible() const;
 
     /** Returns true if the search mode is enabled. */
@@ -337,6 +335,11 @@ private Q_SLOTS:
      */
     void showItemInfo(const KFileItem &item);
 
+    /**
+     * Sets the Admin::Bar visible or invisible based on whether \a url is an admin url.
+     */
+    void updateAdminBarVisibility(const QUrl &url);
+
     void closeFilterBar();
 
     /**
@@ -453,6 +456,9 @@ private:
     DolphinSearchBox *m_searchBox;
     bool m_searchModeEnabled;
 
+    /// A bar shown at the top of the view to signify that the view is currently viewed and acted on with elevated privileges.
+    Admin::Bar *m_adminBar;
+
     KMessageWidget *m_messageWidget;
 
     /// A bar shown at the top of the view to signify that selection mode is currently active.
@@ -474,11 +480,6 @@ private:
      * connected to this ViewContainer.
      */
     std::unique_ptr<DolphinUrlNavigator::VisualState> m_urlNavigatorVisualState;
-
-#if HAVE_KACTIVITIES
-private:
-    KActivities::ResourceInstance *m_activityResourceInstance;
-#endif
 };
 
 #endif // DOLPHINVIEWCONTAINER_H