X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/994095076cccdb703b2bb285d4118bd9c654fd93..b1c9b5126d:/src/dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 2a70352e7..5cedeecfa 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -85,7 +85,8 @@ public:
     {
         /**
          * The directory items are shown as icons including an
-         * icon name. */
+         * icon name.
+         */
         IconsView = 0,
 
         /**
@@ -241,10 +242,10 @@ public:
      */
     void setZoomLevel(int level);
     int zoomLevel() const;
-    
+
     /**
      * Returns true, if zooming in is possible. If false is returned,
-     * the maximimum zooming level has been reached.
+     * the maximum zooming level has been reached.
      */
     bool isZoomInPossible() const;
 
@@ -301,12 +302,13 @@ public:
     /**
      * Calculates the number of currently shown files into
      * \a fileCount and the number of folders into \a folderCount.
+     * The size of all files is written into \a totalFileSize.
      * It is recommend using this method instead of asking the
      * directory lister or the model directly, as it takes
      * filtering and hierarchical previews into account.
      */
-    void calculateItemCount(int& fileCount, int& folderCount) const;
-    
+    void calculateItemCount(int& fileCount, int& folderCount, KIO::filesize_t& totalFileSize) const;
+
     /**
      * Returns a textual representation of the state of the current
      * folder or selected items, suitable for use in the status bar.
@@ -474,12 +476,12 @@ 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.
+     * Is emitted if information of an item is requested to be shown e. g. in the panel.
      * If item is null, no item information request is pending.
      */
     void requestItemInfo(const KFileItem& item);
@@ -494,10 +496,13 @@ signals:
 
     /**
      * Is emitted if a context menu is requested for the item \a item,
-     * which is part of \a url. If the item is 0, the context menu
-     * for the URL should be shown.
+     * which is part of \a url. If the item is null, the context menu
+     * for the URL should be shown and the custom actions \a customActions
+     * will be added.
      */
-    void requestContextMenu(const KFileItem& item, const KUrl& url);
+    void requestContextMenu(const KFileItem& item,
+                            const KUrl& url,
+                            const QList<QAction*>& customActions);
 
     /**
      * Is emitted if an information message with the content \a msg
@@ -525,6 +530,12 @@ signals:
      */
     void startedPathLoading(const KUrl& url);
 
+    /**
+     * Emitted when KDirLister emits redirection.
+     * Testcase: fish://localhost
+     */
+    void redirection(const KUrl& oldUrl, const KUrl& newUrl);
+
 protected:
     /** @see QWidget::mouseReleaseEvent */
     virtual void mouseReleaseEvent(QMouseEvent* event);
@@ -552,7 +563,7 @@ private slots:
      * is used to check whether the context menu is related to an
      * item or to the viewport.
      */
-    void openContextMenu(const QPoint& pos);
+    void openContextMenu(const QPoint& pos, const QList<QAction*>& customActions);
 
     /**
      * Drops dragged URLs to the destination path \a destPath. If
@@ -607,12 +618,6 @@ 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
@@ -625,6 +630,13 @@ private slots:
      */
     void restoreCurrentItem();
 
+    /**
+     * If \a view can be positively identified as not being the source for the
+     * current drag operation, deleteLater() it immediately.  Else stores
+     * it for later deletion.
+     */
+    void deleteWhenNotDragSource(QAbstractItemView* view);
+
 private:
     void loadDirectory(const KUrl& url, bool reload = false);
 
@@ -668,7 +680,7 @@ 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
@@ -676,7 +688,7 @@ private:
      * 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
@@ -691,6 +703,11 @@ private:
      */
     bool isColumnViewActive() const;
 
+    /**
+     * Returns the MIME data for all selected items.
+     */
+    QMimeData* selectionMimeData() const;
+
 private:
     bool m_active : 1;
     bool m_showPreview : 1;
@@ -698,6 +715,7 @@ private:
     bool m_storedCategorizedSorting : 1;
     bool m_tabsForFiles : 1;
     bool m_isContextMenuOpen : 1;   // TODO: workaround for Qt-issue 207192
+    bool m_ignoreViewProperties : 1;
 
     Mode m_mode;
 
@@ -720,6 +738,8 @@ private:
 
     KUrl m_rootUrl;
     KUrl m_currentItemUrl;
+
+    QAbstractItemView*  m_expandedDragSource;
 };
 
 inline bool DolphinView::isColumnViewActive() const