X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ed5b2e54736b04d551eae01d976038fb7d5aac35..b1c9b5126d:/src/dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index a0ddcb711..da317761b 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -105,6 +105,11 @@ public:
     const DolphinView* view() const;
     DolphinView* view();
 
+    /**
+     * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
+     */
+    void refresh();
+
     /** Returns true, if the filter bar is visible. */
     bool isFilterBarVisible() const;
 
@@ -137,10 +142,19 @@ private slots:
     void slotDirListerCompleted();
 
     /**
-     * Handles clicking on an item
+     * Handles clicking on an item. If the item is a directory, the
+     * directory is opened in the view. If the item is a file, the file
+     * gets started by the corresponding application.
      */
     void slotItemTriggered(const KFileItem& item);
 
+    /**
+     * Opens a the file \a url by opening the corresponding application.
+     * Is connected with the signal urlIsFile() from DolphinDirLister and will
+     * get invoked if the user manually has entered a file into the URL navigator.
+     */
+    void openFile(const KUrl& url);
+
     /**
      * Shows the information for the item \a item inside the statusbar. If the
      * item is null, the default statusbar information is shown.
@@ -166,11 +180,15 @@ private slots:
 
     /**
      * Opens the context menu on the current mouse position.
-     * @item  File item context. If item is 0, the context menu
-     *        should be applied to \a url.
-     * @url   URL which contains \a item.
+     * @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);
+    void openContextMenu(const KFileItem& item,
+                         const KUrl& url,
+                         const QList<QAction*>& customActions);
 
     /**
      * Saves the position of the contents to the
@@ -202,21 +220,25 @@ private slots:
      */
     void saveRootUrl(const KUrl& url);
 
-private:
     /**
-     * Returns the default text of the status bar, if no item is
-     * selected.
+     * Is connected with the URL navigator and drops the URLs
+     * above the destination \a destination.
      */
-    QString defaultStatusBarText() const;
+    void dropUrls(const KUrl& destination, QDropEvent* event);
 
     /**
-     * Returns the text for the status bar, if at least one item
-     * is selected.
+     * Is invoked when a redirection is done and changes the
+     * URL of the URL navigator to \a newUrl without triggering
+     * a reloading of the directory.
      */
-    QString selectionStatusBarText() const;
+    void redirect(const KUrl& oldUrl, const KUrl& newUrl);
+
+    /** Requests the focus for the view \a m_view. */
+    void requestFocus();
 
 private:
     bool m_showProgress;
+    bool m_isFolderWritable;
 
     DolphinMainWindow* m_mainWindow;
     QVBoxLayout* m_topLayout;
@@ -230,9 +252,6 @@ private:
     DolphinModel* m_dolphinModel;
     DolphinDirLister* m_dirLister;
     DolphinSortFilterProxyModel* m_proxyModel;
-
-    KUrl m_previousUrl;
-    KUrl m_currentUrl;
 };
 
 inline const DolphinStatusBar* DolphinViewContainer::statusBar() const