Apply 1 suggestion(s) to 1 file(s)

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 0c8b184fe3e2a94e76ebd3574792218482e41b5e..be28ecdebd71098ae7462740ee861dc688cb6846 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -14,21 +14,20 @@
 
 #include <KFileItem>
 #include <KIO/Job>
 
 #include <KFileItem>
 #include <KIO/Job>

+#include <KMessageWidget>

 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
 #include <QPushButton>
 #include <QWidget>
 
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
 #include <QPushButton>
 #include <QWidget>
 

-#if HAVE_KACTIVITIES
-namespace KActivities
+#include <initializer_list>
+
+namespace Admin

 {
 {

-class ResourceInstance;
+class Bar;

 }
 }

-#endif
-

 class FilterBar;
 class FilterBar;

-class KMessageWidget;

 class QAction;
 class QGridLayout;
 class QUrl;
 class QAction;
 class QGridLayout;
 class QUrl;


@@ -56,8 +55,6 @@ class DolphinViewContainer : public QWidget
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    enum MessageType { Information, Warning, Error };
-

     DolphinViewContainer(const QUrl &url, QWidget *parent);
     ~DolphinViewContainer() override;
 
     DolphinViewContainer(const QUrl &url, QWidget *parent);
     ~DolphinViewContainer() override;
 


@@ -154,17 +151,18 @@ public:
     bool isSelectionModeEnabled() const;
 
     /**
     bool isSelectionModeEnabled() const;
 
     /**

-     * Shows the message \msg with the given type non-modal above
-     * the view-content.
+     * Shows the message \message with the given type \messageType non-modal above the view-content.
+     * \buttonActions defines actions which the user can trigger as a response to this message. They are presented as buttons below the \message.

      */
      */

-    void showMessage(const QString &msg, MessageType type);
+    void showMessage(const QString &message, KMessageWidget::MessageType messageType, std::initializer_list<QAction *> buttonActions = {});

 
     /**
      * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
      */
     void readSettings();
 
 
     /**
      * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
      */
     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. */
     bool isFilterBarVisible() const;
 
     /** Returns true if the search mode is enabled. */


@@ -285,10 +283,6 @@ private Q_SLOTS:
      */
     void updateStatusBar();
 
      */
     void updateStatusBar();
 

-    void updateDirectoryLoadingProgress(int percent);
-
-    void updateDirectorySortingProgress(int percent);
-

     /**
      * Updates the statusbar to show an undetermined progress with the correct
      * context information whether a searching or a directory loading is done.
     /**
      * Updates the statusbar to show an undetermined progress with the correct
      * context information whether a searching or a directory loading is done.


@@ -382,6 +376,7 @@ private Q_SLOTS:
      * Gets the search URL from the searchbox and starts searching.
      */
     void startSearching();
      * Gets the search URL from the searchbox and starts searching.
      */
     void startSearching();

+    void openSearchBox();

     void closeSearchBox();
 
     /**
     void closeSearchBox();
 
     /**


@@ -393,9 +388,14 @@ private Q_SLOTS:
     void slotStatusBarZoomLevelChanged(int zoomLevel);
 
     /**
     void slotStatusBarZoomLevelChanged(int zoomLevel);
 
     /**

-     * Slot that calls showMessage(msg, Error).
+     * Creates and shows an error message based on \p message and \p kioErrorCode.

      */
      */

-    void showErrorMessage(const QString &msg);
+    void slotErrorMessageFromView(const QString &message, const int kioErrorCode);
+
+    /**
+     * Slot that calls showMessage(message, KMessageWidget::Error).
+     */
+    void showErrorMessage(const QString &message);

 
     /**
      * Is invoked when a KFilePlacesModel has been changed
 
     /**
      * Is invoked when a KFilePlacesModel has been changed


@@ -452,6 +452,11 @@ private:
     DolphinSearchBox *m_searchBox;
     bool m_searchModeEnabled;
 
     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;
+    /// An action to switch to the admin protocol. This variable will always be nullptr unless kio-admin was installed. @see Admin::WorkerIntegration.
+    QAction *m_authorizeToEnterFolderAction;
+

     KMessageWidget *m_messageWidget;
 
     /// A bar shown at the top of the view to signify that selection mode is currently active.
     KMessageWidget *m_messageWidget;
 
     /// A bar shown at the top of the view to signify that selection mode is currently active.


@@ -473,11 +478,6 @@ private:
      * connected to this ViewContainer.
      */
     std::unique_ptr<DolphinUrlNavigator::VisualState> m_urlNavigatorVisualState;
      * connected to this ViewContainer.
      */
     std::unique_ptr<DolphinUrlNavigator::VisualState> m_urlNavigatorVisualState;

-
-#if HAVE_KACTIVITIES
-private:
-    KActivities::ResourceInstance *m_activityResourceInstance;
-#endif

 };
 
 #endif // DOLPHINVIEWCONTAINER_H
 };
 
 #endif // DOLPHINVIEWCONTAINER_H