X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bd30bb6ca98374b37db20d14a41542c21acdd5e0..39f89141b06c:/src/dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 6d4b9b1a4..aa43e8e66 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -21,8 +21,6 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include "dolphinview.h"
-
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 #include <kglobalsettings.h>
@@ -30,18 +28,17 @@
 
 #include <kurlnavigator.h>
 
-#include <QtGui/QKeyEvent>
-#include <QtCore/QLinkedList>
-#include <QtGui/QListView>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QWidget>
+#include <QElapsedTimer>
+#include <QWidget>
+
+#include <views/dolphinview.h>
 
 class FilterBar;
 class KUrl;
 class DolphinModel;
 class KUrlNavigator;
 class DolphinDirLister;
-class DolphinMainWindow;
+class DolphinSearchBox;
 class DolphinSortFilterProxyModel;
 class DolphinStatusBar;
 
@@ -62,26 +59,14 @@ class DolphinViewContainer : public QWidget
     Q_OBJECT
 
 public:
-    DolphinViewContainer(DolphinMainWindow* mainwindow,
-                         QWidget *parent,
-                         const KUrl& url);
-
+    DolphinViewContainer(const KUrl& url, QWidget* parent);
     virtual ~DolphinViewContainer();
 
-    /**
-     * Sets the current active URL, where all actions are applied. The
-     * URL navigator is synchronized with this URL. The signals
-     * KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged()
-     * are emitted.
-     * @see DolphinViewContainer::urlNavigator()
-     */
-    void setUrl(const KUrl& url);
-
     /**
      * Returns the current active URL, where all actions are applied.
      * The URL navigator is synchronized with this URL.
      */
-    const KUrl& url() const;
+    KUrl url() const;
 
     /**
      * If \a active is true, the view container will marked as active. The active
@@ -93,12 +78,6 @@ public:
     const DolphinStatusBar* statusBar() const;
     DolphinStatusBar* statusBar();
 
-    /**
-     * Returns true, if the URL shown by the navigation bar is editable.
-     * @see KUrlNavigator
-     */
-    bool isUrlEditable() const;
-
     const KUrlNavigator* urlNavigator() const;
     KUrlNavigator* urlNavigator();
 
@@ -113,7 +92,23 @@ public:
     /** Returns true, if the filter bar is visible. */
     bool isFilterBarVisible() const;
 
+    /**
+     * Enables the search mode, if \p enabled is true. In the search mode the URL navigator
+     * will be hidden and replaced by a line editor that allows to enter a search term.
+     */
+    void setSearchModeEnabled(bool enabled);
+    bool isSearchModeEnabled() const;
+
 public slots:
+    /**
+     * Sets the current active URL, where all actions are applied. The
+     * URL navigator is synchronized with this URL. The signals
+     * KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged()
+     * are emitted.
+     * @see DolphinViewContainer::urlNavigator()
+     */
+    void setUrl(const KUrl& url);
+
     /**
      * Popups the filter bar above the status bar if \a show is true.
      */
@@ -125,7 +120,14 @@ signals:
      */
     void showFilterBarChanged(bool shown);
 
-private slots: 
+    /**
+     * Is emitted when the write state of the folder has been changed. The application
+     * should disable all actions like "Create New..." that depend on the write
+     * state.
+     */
+    void writeStateChanged(bool isFolderWritable);
+
+private slots:
     /**
      * Updates the number of items (= number of files + number of
      * directories) in the statusbar. If files are selected, the number
@@ -188,30 +190,6 @@ private slots:
      */
     void setNameFilter(const QString& nameFilter);
 
-    /**
-     * Opens the context menu on the current mouse position.
-     * @item          File item context. If item is null, the context menu
-     *                should be applied to \a url.
-     * @url           URL which contains \a item.
-     * @customActions Actions that should be added to the context menu,
-     *                if the file item is null.
-     */
-    void openContextMenu(const KFileItem& item,
-                         const KUrl& url,
-                         const QList<QAction*>& customActions);
-
-    /**
-     * Saves the position of the contents to the
-     * current history element.
-     */
-    void saveContentsPos(int x, int y);
-
-    /**
-     * Restores the contents position of the view, if the view
-     * is part of the history.
-     */
-    void restoreContentsPos();
-
     /**
      * Marks the view container as active
      * (see DolphinViewContainer::setActive()).
@@ -219,16 +197,16 @@ private slots:
     void activate();
 
     /**
-     * Restores the current view to show \a url and assures
-     * that the root URL of the view is respected.
+     * Saves the state of the current view: contents position,
+     * root URL, ...
      */
-    void restoreView(const KUrl& url);
+    void saveViewState();
 
     /**
-     * Saves the root URL of the current URL \a url
-     * into the URL navigator.
+     * Restores the current view to show \a url and assures
+     * that the root URL of the view is respected.
      */
-    void saveRootUrl(const KUrl& url);
+    void slotUrlNavigatorLocationChanged(const KUrl& url);
 
     /**
      * Is connected with the URL navigator and drops the URLs
@@ -254,19 +232,30 @@ private slots:
 
     void slotHistoryChanged();
 
+    /**
+     * Gets the search URL from the searchbox and starts searching.
+     * @param text Text the user has entered into the searchbox.
+     */
+    void startSearching(const QString& text);
+    void closeSearchBox();
+
+private:
+    bool isSearchUrl(const KUrl& url) const;
+
 private:
     bool m_isFolderWritable;
 
-    DolphinMainWindow* m_mainWindow;
     QVBoxLayout* m_topLayout;
     KUrlNavigator* m_urlNavigator;
+    DolphinSearchBox* m_searchBox;
 
     DolphinView* m_view;
 
     FilterBar* m_filterBar;
 
     DolphinStatusBar* m_statusBar;
-    QTimer* m_statusBarTimer;
+    QTimer* m_statusBarTimer;            // Triggers a delayed update
+    QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
 
     DolphinModel* m_dolphinModel;
     DolphinDirLister* m_dirLister;