X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/702429ac8e64a5aff4e110a56f526b96ecb795fd..b8f8c9027549e3d317dbe1659cb925bb1943c168:/src/dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 837b168d7..2c4c7a7e1 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,19 +20,19 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <KFileItem>
+#include "config-kactivities.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
+#ifdef HAVE_KACTIVITIES
 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,8 +327,11 @@ private:
 
 private:
     QVBoxLayout* m_topLayout;
+    QWidget* m_navigatorWidget;
     KUrlNavigator* m_urlNavigator;
+    QPushButton* m_emptyTrashButton;
     DolphinSearchBox* m_searchBox;
+    bool m_searchModeEnabled;
     KMessageWidget* m_messageWidget;
 
     DolphinView* m_view;
@@ -333,7 +343,7 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
-#ifdef KF5Activities_FOUND
+#ifdef HAVE_KACTIVITIES
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #endif