After renaming an item the view should be scrolled in a way to still have a fully...

[dolphin.git] / src / dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 7d8d06bf2503fead4e7bb49803f5a4a4d5b59dbf..1498de08aac98e0b57067935061fad4175a39c8f 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -85,7 +85,7 @@ public:
     {
         /**
          * The directory items are shown as icons including an
-         * icon name. 
+         * icon name.
          */
         IconsView = 0,
 
@@ -242,7 +242,7 @@ public:
      */
     void setZoomLevel(int level);
     int zoomLevel() const;
-    
+
     /**
      * Returns true, if zooming in is possible. If false is returned,
      * the maximum zooming level has been reached.
@@ -308,7 +308,7 @@ public:
      * filtering and hierarchical previews into account.
      */
     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.
@@ -476,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);
@@ -496,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
@@ -560,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
@@ -626,12 +629,18 @@ private slots:
      * to m_currentItemUrl.
      */
     void restoreCurrentItem();
-    
+
+    /**
+     * Is invoked when the KDirLister indicates refreshed items.
+     */
+    void slotRefreshItems();
+
     /**
-     * Is connected to the enterDir() signal from the FolderExpander
-     * and triggers the entering of the directory indicated by \a index.
+     * 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 enterDir(const QModelIndex& index, QAbstractItemView* view);
+    void deleteWhenNotDragSource(QAbstractItemView* view);
 
 private:
     void loadDirectory(const KUrl& url, bool reload = false);
@@ -676,7 +685,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
@@ -684,7 +693,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
@@ -698,13 +707,7 @@ private:
      * this method has been introduced for convenience.
      */
     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.
      */
@@ -717,6 +720,8 @@ private:
     bool m_storedCategorizedSorting : 1;
     bool m_tabsForFiles : 1;
     bool m_isContextMenuOpen : 1;   // TODO: workaround for Qt-issue 207192
+    bool m_ignoreViewProperties : 1;
+    bool m_assureVisibleCurrentIndex : 1;
 
     Mode m_mode;
 
@@ -739,8 +744,8 @@ private:
 
     KUrl m_rootUrl;
     KUrl m_currentItemUrl;
-    
-    QList<QAbstractItemView*> m_expandedViews;
+
+    QAbstractItemView* m_expandedDragSource;
 };
 
 inline bool DolphinView::isColumnViewActive() const