minor adjustment to prevent code duplication

[dolphin.git] / src / dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 7085355674a7224b6ffd0def1af3202e26492ddc..613141535684f206cb75d4d184f9e1dd90113016 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -219,9 +219,10 @@ public:
     KUrl::List selectedUrls() const;
 
     /**
-     * Returns the file item for the given model index \a index.
+     * Returns the number of selected items (this is faster than
+     * invoking selectedItems().count()).
      */
-    KFileItem fileItem(const QModelIndex& index) const;
+    int selectedItemsCount() const;
 
     /**
      * Sets the upper left position of the view content
@@ -234,17 +235,16 @@ public:
     QPoint contentsPosition() const;
 
     /**
-     * Sets the current item (= item that has the keyboard focus) to
-     * the item with the URL \a url.
+     * Sets the zoom level to \a level. It is assured that the used
+     * level is adjusted to be inside the range DolphinView::zoomLevelMinimum() and
+     * DolphinView::zoomLevelMaximum().
      */
-    void setCurrentItem(const KUrl& url);
-
-    /** Increases the size of the current set view mode. */
-    void zoomIn();
-
-    /** Decreases the size of the current set view mode. */
-    void zoomOut();
-
+    void setZoomLevel(int level);
+    int zoomLevel() const;
+    
+    int zoomLevelMinimum() const;
+    int zoomLevelMaximum() const;
+    
     /**
      * Returns true, if zooming in is possible. If false is returned,
      * the minimal zoom size is possible.
@@ -426,6 +426,12 @@ signals:
     /** Is emitted if URL of the view has been changed to \a url. */
     void urlChanged(const KUrl& url);
 
+    /**
+     * Is emitted if the view requests a changing of the current
+     * URL to \a url (see DolphinController::triggerUrlChangeRequest()).
+     */
+    void requestUrlChange(const KUrl& url);
+
     /**
      * Is emitted when clicking on an item with the left mouse button.
      */
@@ -459,6 +465,9 @@ signals:
 
     /** Is emitted if the additional information shown for this view has been changed. */
     void additionalInfoChanged();
+    
+    /** Is emitted if the zoom level has been changed by zooming in or out. */
+    void zoomLevelChanged(int level);
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the sidebar.
@@ -551,12 +560,6 @@ private slots:
                   const KUrl& destPath,
                   const KFileItem& destItem);
 
-    /**
-     * Handles the dropping of URLs to the given destination.
-     * @see DolphinDropController
-     */
-    void dropUrls(const KUrl::List& urls,
-                  const KUrl& destination);
     /**
      * Updates the view properties of the current URL to the
      * sorting given by \a sorting.
@@ -601,6 +604,24 @@ private slots:
      */
     void slotDeleteFileFinished(KJob* job);
 
+    /**
+     * Called when KDirLister emits redirection.
+     * Testcase: fish://localhost
+     */
+    void slotRedirection(const KUrl& oldUrl, const KUrl& newUrl);
+
+    /**
+     * Is emitted if the controller requests a changing of the current
+     * URL to \a url
+     */
+    void slotRequestUrlChange(const KUrl& url);
+
+    /**
+     * Restores the current item (= item that has the keyboard focus)
+     * to m_currentItemUrl.
+     */
+    void restoreCurrentItem();
+
 private:
     void loadDirectory(const KUrl& url, bool reload = false);
 
@@ -644,16 +665,28 @@ private:
      * Pastes the clipboard data into the URL \a url.
      */
     void pasteToUrl(const KUrl& url);
+    
+    /**
+     * Checks whether the current item view has the same zoom level
+     * as \a oldZoomLevel. If this is not the case, the zoom level
+     * of the controller is updated and a zoomLevelChanged() signal
+     * is emitted.
+     */
+    void updateZoomLevel(int oldZoomLevel);
+    
+    /**
+     * Returns a list of URLs for all selected items. The list is
+     * simplified, so that when the URLs are part of different tree
+     * levels, only the parent is returned.
+     */
+    KUrl::List simplifiedSelectedUrls() const;
 
     /**
      * Returns true, if the ColumnView is activated. As the column view
      * requires some special handling for iterating through directories,
      * this method has been introduced for convenience.
      */
-    bool isColumnViewActive() const
-    {
-        return m_columnView != 0;
-    }
+    bool isColumnViewActive() const;
 
 private:
     bool m_active : 1;
@@ -683,8 +716,14 @@ private:
     ToolTipManager* m_toolTipManager;
 
     KUrl m_rootUrl;
+    KUrl m_currentItemUrl;
 };
 
+inline bool DolphinView::isColumnViewActive() const
+{
+    return m_columnView != 0;
+}
+
 /// Allow using DolphinView::Mode in QVariant
 Q_DECLARE_METATYPE(DolphinView::Mode)