SVN_SILENT: minor coding style fixes

[dolphin.git] / src / dolphiniconsview.h

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index c58cd4c532f08791cef9f83de86c0a9e26109ad4..06c41786822c537dac08863ad9621ae60fce5e08 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -20,12 +20,19 @@
 #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 <QFont>
+#include <QSize>
+#include <QStyleOption>
+
 #include <libdolphin_export.h>
 
 class DolphinController;
+class DolphinCategoryDrawer;
 
 /**
  * @brief Represents the view, where each item is shown as an icon.
@@ -33,7 +40,7 @@ class DolphinController;
  * 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
 
@@ -41,20 +48,26 @@ 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 mousePressEvent(QMouseEvent* event);
-    virtual void mouseReleaseEvent(QMouseEvent* event);
+    virtual void startDrag(Qt::DropActions supportedActions);
     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();
 
@@ -70,13 +83,28 @@ 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, int additionalInfoCount);
+
+    KFileItem itemForIndex(const QModelIndex& index) const;
+
+    /**
+     * Returns the number of additional information lines that should
+     * be shown below the item name.
      */
-    void updateGridSize(bool showPreview, bool showAdditionalInfo);
+    int additionalInfoCount() const;
 
 private:
     DolphinController* m_controller;
-    QStyleOptionViewItem m_viewOptions;
+    DolphinCategoryDrawer* m_categoryDrawer;
+
+    QFont m_font;
+    QSize m_decorationSize;
+    QStyleOptionViewItem::Position m_decorationPosition;
+    Qt::Alignment m_displayAlignment;
+
+    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