Merge branch 'Applications/18.08'

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 837b168d704c4fe1a939d068023274d59115e688..409aecfcfaf6e0ab063cb2db221eb543164e9d84 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,18 +20,18 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <KFileItem>
+#include "config-dolphin.h"
+#include "views/dolphinview.h"
+
 #include <KCompletion>
+#include <KFileItem>
 #include <KIO/Job>
-
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
+#include <QPushButton>
 #include <QWidget>
 
-#include <views/dolphinview.h>
-#include <config-dolphin.h>
-
 #ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;
@@ -136,6 +136,13 @@ public:
      */
     void reload();
 
+    /**
+     * @return Returns a Caption suitable for display to the user. It is
+     * calculated depending on settings, if a search is active and other
+     * factors.
+     */
+    QString caption() const;
+
 public slots:
     /**
      * Sets the current active URL, where all actions are applied. The
@@ -320,7 +327,9 @@ private:
 
 private:
     QVBoxLayout* m_topLayout;
+    QWidget* m_navigatorWidget;
     KUrlNavigator* m_urlNavigator;
+    QPushButton* m_emptyTrashButton;
     DolphinSearchBox* m_searchBox;
     KMessageWidget* m_messageWidget;