layout improvements in the icons view:

* do a text wrapping if the number of lines is > 1 (TODO: bugfix of KFileItemDelegate necessary, currently the text might overlap with the icon)
* increase the height for the text area if an additional information like type, date, ... is shown

svn path=/trunk/KDE/kdebase/apps/; revision=663320

1 files changed, 9 insertions, 7 deletions

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index fce8f62bd..212ed3e78 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -51,12 +51,8 @@ protected:
     virtual void dropEvent(QDropEvent* event);
 
 private slots:
-    /**
-     * Updates the size of the grid
-     * depending on the state of \a showPreview.
-     */
-    void updateGridSize(bool showPreview);
-
+    void slotShowPreviewChanged(bool show);
+    void slotShowAdditionalInfoChanged(bool show);
     void zoomIn();
     void zoomOut();
 
@@ -70,9 +66,15 @@ private:
     /** Returns the decreased icon size for the size \a size. */
     int decreasedIconSize(int size) const;
 
+    /**
+     * Updates the size of the grid depending on the state
+     * of \a showPreview and \a showAdditionalInfo.
+     */
+    void updateGridSize(bool showPreview, bool showAdditionalInfo);
+
 private:
     DolphinController* m_controller;
-    QStyleOptionViewItem m_viewOptions;
+    QStyleOptionViewItemV2 m_viewOptions;
 };
 
 #endif