Simplify DolphinController: don't remember the show-preview state in the controller...

[dolphin.git] / src / dolphiniconsview.h

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 560d4976a5adbc88aa65e42275bf6caf9e0ea7ae..ae0a6299dfbb6d7e9928b792e10b70247d7dbb12 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -20,14 +20,18 @@
 #ifndef DOLPHINICONSVIEW_H
 #define DOLPHINICONSVIEW_H
 
-#include <klistview.h>
-#include <kitemcategorizer.h>
-#include <QtGui/QStyleOption>
+#include <kcategorizedview.h>
+
+#include <kfileitem.h>
+#include <kfileitemdelegate.h>
+
+#include <QSize>
+#include <QStyleOption>
+
 #include <libdolphin_export.h>
 
 class DolphinController;
-class DolphinItemCategorizer;
-class DolphinView;
+class DolphinCategoryDrawer;
 
 /**
  * @brief Represents the view, where each item is shown as an icon.
@@ -35,7 +39,7 @@ class DolphinView;
  * It is also possible that instead of the icon a preview of the item
  * content is shown.
  */
-class LIBDOLPHINPRIVATE_EXPORT DolphinIconsView : public KListView
+class LIBDOLPHINPRIVATE_EXPORT DolphinIconsView : public KCategorizedView
 {
     Q_OBJECT
 
@@ -43,16 +47,25 @@ public:
     explicit DolphinIconsView(QWidget* parent, DolphinController* controller);
     virtual ~DolphinIconsView();
 
+    /** @see QAbstractItemView::visualRect() */
+    virtual QRect visualRect(const QModelIndex& index) const;
+
 protected:
     virtual QStyleOptionViewItem viewOptions() const;
     virtual void contextMenuEvent(QContextMenuEvent* event);
-    virtual void mouseReleaseEvent(QMouseEvent* event);
+    virtual void mousePressEvent(QMouseEvent* event);
     virtual void dragEnterEvent(QDragEnterEvent* event);
+    virtual void dragLeaveEvent(QDragLeaveEvent* event);
+    virtual void dragMoveEvent(QDragMoveEvent* event);
     virtual void dropEvent(QDropEvent* event);
+    virtual void paintEvent(QPaintEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event);
 
 private slots:
-    void slotShowPreviewChanged(bool show);
-    void slotShowAdditionalInfoChanged(bool show);
+    void triggerItem(const QModelIndex& index);
+    void slotEntered(const QModelIndex& index);
+    void slotShowPreviewChanged();
+    void slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info);
     void zoomIn();
     void zoomOut();
 
@@ -68,13 +81,21 @@ private:
 
     /**
      * Updates the size of the grid depending on the state
-     * of \a showPreview and \a showAdditionalInfo.
+     * of \a showPreview and \a additionalInfoCount.
      */
-    void updateGridSize(bool showPreview, bool showAdditionalInfo);
+    void updateGridSize(bool showPreview, int additionalInfoCount);
+
+    KFileItem itemForIndex(const QModelIndex& index) const;
 
 private:
     DolphinController* m_controller;
+    DolphinCategoryDrawer* m_categoryDrawer;
     QStyleOptionViewItem m_viewOptions;
+
+    QSize m_itemSize;
+
+    bool m_dragging;   // TODO: remove this property when the issue #160611 is solved in Qt 4.4
+    QRect m_dropRect;  // TODO: remove this property when the issue #160611 is solved in Qt 4.4
 };
 
 #endif