X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ca7aaecbdbddb27f7442e69d2770b97b4307f338..fbd7cb02a511ff869d74aa4e758203a1cd340962:/src/dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index acc9ba363..d558b4c5a 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -41,15 +41,15 @@
 class DolphinController;
 class DolphinColumnView;
 class DolphinDetailsView;
+class DolphinFileItemDelegate;
 class DolphinIconsView;
 class DolphinMainWindow;
 class DolphinModel;
 class DolphinSortFilterProxyModel;
-class IconManager;
+class KFilePreviewGenerator;
 class KAction;
 class KActionCollection;
 class KDirLister;
-class KFileItemDelegate;
 class KUrl;
 class KToggleAction;
 class ToolTipManager;
@@ -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,11 +302,18 @@ 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);
+    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.
+     */
+    QString statusBarText() const;
 
     /**
      * Updates the state of the 'Additional Information' actions in \a collection.
@@ -328,6 +336,12 @@ public:
     void setTabsForFilesEnabled(bool tabsForFiles);
     bool isTabsForFilesEnabled() const;
 
+    /**
+     * Returns true if the current view allows folders to be expanded,
+     * i.e. presents a hierarchical view to the user.
+     */
+    bool itemsExpandable() const;
+
 public slots:
     /**
      * Changes the directory to \a url. If the current directory is equal to
@@ -462,7 +476,7 @@ 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);
 
@@ -514,10 +528,10 @@ signals:
     void startedPathLoading(const KUrl& url);
 
     /**
-     * Is emitted when renaming, copying, moving, linking etc.
-     * Used for feedback in the mainwindow.
+     * Emitted when KDirLister emits redirection.
+     * Testcase: fish://localhost
      */
-    void doingOperation(KIO::FileUndoManager::CommandType type);
+    void redirection(const KUrl& oldUrl, const KUrl& newUrl);
 
 protected:
     /** @see QWidget::mouseReleaseEvent */
@@ -549,13 +563,13 @@ private slots:
     void openContextMenu(const QPoint& pos);
 
     /**
-     * Drops the URLs \a urls to the destination path \a destPath. If
+     * Drops dragged URLs to the destination path \a destPath. If
      * the URLs are dropped above an item inside the destination path,
      * the item is indicated by \a destItem.
      */
-    void dropUrls(const KUrl::List& urls,
+    void dropUrls(const KFileItem& destItem,
                   const KUrl& destPath,
-                  const KFileItem& destItem);
+                  QDropEvent* event);
 
     /**
      * Updates the view properties of the current URL to the
@@ -601,12 +615,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
@@ -619,6 +627,12 @@ private slots:
      */
     void restoreCurrentItem();
 
+    /**
+     * Is connected to the enterDir() signal from the FolderExpander
+     * and triggers the entering of the directory indicated by \a index.
+     */
+    void enterDir(const QModelIndex& index, QAbstractItemView* view);
+
 private:
     void loadDirectory(const KUrl& url, bool reload = false);
 
@@ -662,7 +676,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
@@ -670,7 +684,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
@@ -685,6 +699,17 @@ private:
      */
     bool isColumnViewActive() const;
 
+    /**
+     * Deletes all views from m_expandedViews except if the view
+     * is currently shown.
+     */
+    void deleteExpandedViews();
+
+    /**
+     * Returns the MIME data for all selected items.
+     */
+    QMimeData* selectionMimeData() const;
+
 private:
     bool m_active : 1;
     bool m_showPreview : 1;
@@ -692,6 +717,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;
 
@@ -702,18 +728,20 @@ private:
     DolphinIconsView* m_iconsView;
     DolphinDetailsView* m_detailsView;
     DolphinColumnView* m_columnView;
-    KFileItemDelegate* m_fileItemDelegate;
+    DolphinFileItemDelegate* m_fileItemDelegate;
     QItemSelectionModel* m_selectionModel;
 
     DolphinModel* m_dolphinModel;
     KDirLister* m_dirLister;
     DolphinSortFilterProxyModel* m_proxyModel;
 
-    IconManager* m_iconManager;
+    KFilePreviewGenerator* m_previewGenerator;
     ToolTipManager* m_toolTipManager;
 
     KUrl m_rootUrl;
     KUrl m_currentItemUrl;
+
+    QList<QAbstractItemView*> m_expandedViews;
 };
 
 inline bool DolphinView::isColumnViewActive() const