Rough draft for getting back the header for the details-view

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c2a867664b644625adbfb7b5efbb60a95343a32..0eedece947a3c82da26f84e411076b7ae238399c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ set(dolphinprivate_LIB_SRCS
     kitemviews/kitemlistcontainer.cpp
     kitemviews/kitemlistcontroller.cpp
     kitemviews/kitemlistgroupheader.cpp
     kitemviews/kitemlistcontainer.cpp
     kitemviews/kitemlistcontroller.cpp
     kitemviews/kitemlistgroupheader.cpp

+    kitemviews/kitemlistheader.cpp

     kitemviews/kitemlistkeyboardsearchmanager.cpp
     kitemviews/kitemlistrubberband.cpp
     kitemviews/kitemlistselectionmanager.cpp
     kitemviews/kitemlistkeyboardsearchmanager.cpp
     kitemviews/kitemlistrubberband.cpp
     kitemviews/kitemlistselectionmanager.cpp

diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
new file mode 100644 (file)
index 0000000..89b28bc
--- /dev/null
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#include "kitemlistheader_p.h"
+
+#include <QPainter>
+
+KItemListHeader::KItemListHeader(QGraphicsWidget* parent) :
+    QGraphicsWidget(parent)
+{
+    resize(0, 20); // TODO...
+}
+
+KItemListHeader::~KItemListHeader()
+{
+}
+
+void KItemListHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+    painter->setPen(Qt::red);
+    painter->drawRect(rect());
+}
+
+#include "kitemlistheader_p.moc"

diff --git a/src/kitemviews/kitemlistheader_p.h b/src/kitemviews/kitemlistheader_p.h
new file mode 100644 (file)
index 0000000..6f04ac9
--- /dev/null
+++ b/src/kitemviews/kitemlistheader_p.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#ifndef KITEMLISTHEADER_H
+#define KITEMLISTHEADER_H
+
+#include <libdolphin_export.h>
+#include <QGraphicsWidget>
+
+/**
+ * @brief Header for KItemListView that shows the currently used roles.
+ */
+class LIBDOLPHINPRIVATE_EXPORT KItemListHeader : public QGraphicsWidget
+{
+    Q_OBJECT
+
+public:
+    KItemListHeader(QGraphicsWidget* parent = 0);
+    virtual ~KItemListHeader();
+
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+};
+
+#endif
+
+

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 2a7b0e4cdd7b171efca6636b343246810d59a8b5..1dc05e38f5b653689db1aa8661a71227ac1ca0f7 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -24,6 +24,7 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistgroupheader.h"
 
 #include "kitemlistcontroller.h"
 #include "kitemlistgroupheader.h"

+#include "kitemlistheader_p.h"

 #include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
 #include "kitemlistsizehintresolver_p.h"
 #include "kitemlistrubberband_p.h"
 #include "kitemlistselectionmanager.h"
 #include "kitemlistsizehintresolver_p.h"


@@ -74,7 +75,8 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
     m_rubberBand(0),
     m_mousePos(),
     m_autoScrollIncrement(0),
     m_rubberBand(0),
     m_mousePos(),
     m_autoScrollIncrement(0),

-    m_autoScrollTimer(0)
+    m_autoScrollTimer(0),
+    m_header(0)

 {
     setAcceptHoverEvents(true);
 
 {
     setAcceptHoverEvents(true);
 


@@ -223,6 +225,24 @@ bool KItemListView::autoScroll() const
     return m_autoScrollTimer != 0;
 }
 
     return m_autoScrollTimer != 0;
 }
 

+void KItemListView::setHeaderShown(bool show)
+{
+    if (show && !m_header) {
+        m_header = new KItemListHeader(this);
+        updateHeaderWidth();
+        m_layouter->setHeaderHeight(m_header->size().height());
+    } else if (!show && m_header) {
+        delete m_header;
+        m_header = 0;
+        m_layouter->setHeaderHeight(0);
+    }
+}
+
+bool KItemListView::isHeaderShown() const
+{
+    return m_header != 0;
+}
+

 KItemListController* KItemListView::controller() const
 {
     return m_controller;
 KItemListController* KItemListView::controller() const
 {
     return m_controller;


@@ -532,6 +552,12 @@ QList<KItemListWidget*> KItemListView::visibleItemListWidgets() const
     return m_visibleItems.values();
 }
 
     return m_visibleItems.values();
 }
 

+void KItemListView::resizeEvent(QGraphicsSceneResizeEvent* event)
+{
+    QGraphicsWidget::resizeEvent(event);
+    updateHeaderWidth();
+}
+

 void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
 {
     markVisibleRolesSizesAsDirty();
 void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
 {
     markVisibleRolesSizesAsDirty();


@@ -1295,6 +1321,16 @@ void KItemListView::updateWidgetProperties(KItemListWidget* widget, int index)
     widget->setData(m_model->data(index));
 }
 
     widget->setData(m_model->data(index));
 }
 

+void KItemListView::updateHeaderWidth()
+{
+    if (!m_header) {
+        return;
+    }
+
+    // TODO 1: Use the required width of all roles
+    m_header->resize(size().width(), m_header->size().height());
+}
+

 int KItemListView::calculateAutoScrollingIncrement(int pos, int range, int oldInc)
 {
     int inc = 0;
 int KItemListView::calculateAutoScrollingIncrement(int pos, int range, int oldInc)
 {
     int inc = 0;

diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 55a5c334428a9cb81d7fe6ce09533b7535c032c9..a2fa23f3e83f8cfbdd5fcfd7afa5f514a0581548 100644 (file)
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -33,14 +33,15 @@
 #include <QSet>
 
 class KItemListController;
 #include <QSet>
 
 class KItemListController;

-class KItemListWidgetCreatorBase;

 class KItemListGroupHeader;
 class KItemListGroupHeaderCreatorBase;
 class KItemListGroupHeader;
 class KItemListGroupHeaderCreatorBase;

+class KItemListHeader;

 class KItemListSizeHintResolver;
 class KItemListRubberBand;
 class KItemListViewAnimation;
 class KItemListViewLayouter;
 class KItemListWidget;
 class KItemListSizeHintResolver;
 class KItemListRubberBand;
 class KItemListViewAnimation;
 class KItemListViewLayouter;
 class KItemListWidget;

+class KItemListWidgetCreatorBase;

 class KItemListViewCreatorBase;
 class QTimer;
 
 class KItemListViewCreatorBase;
 class QTimer;
 


@@ -97,6 +98,13 @@ public:
     void setAutoScroll(bool enabled);
     bool autoScroll() const;
 
     void setAutoScroll(bool enabled);
     bool autoScroll() const;
 

+    /**
+     * Turns on the header if \p show is true. Per default the
+     * header is not shown.
+     */
+    void setHeaderShown(bool show);
+    bool isHeaderShown() const;
+

     /**
      * @return Controller of the item-list. The controller gets
      *         initialized by KItemListController::setView() and will
     /**
      * @return Controller of the item-list. The controller gets
      *         initialized by KItemListController::setView() and will


@@ -206,6 +214,8 @@ protected:
 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 
 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 

+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+

 protected slots:
     virtual void slotItemsInserted(const KItemRangeList& itemRanges);
     virtual void slotItemsRemoved(const KItemRangeList& itemRanges);
 protected slots:
     virtual void slotItemsInserted(const KItemRangeList& itemRanges);
     virtual void slotItemsRemoved(const KItemRangeList& itemRanges);


@@ -292,6 +302,12 @@ private:
      */
     void updateWidgetProperties(KItemListWidget* widget, int index);
 
      */
     void updateWidgetProperties(KItemListWidget* widget, int index);
 

+    /**
+     * Updates the width of the KItemListHeader corresponding to the required width of
+     * the roles.
+     */
+    void updateHeaderWidth();
+

     /**
      * Helper function for triggerAutoScrolling().
      * @param pos    Logical position of the mouse relative to the range.
     /**
      * Helper function for triggerAutoScrolling().
      * @param pos    Logical position of the mouse relative to the range.


@@ -336,6 +352,8 @@ private:
     int m_autoScrollIncrement;
     QTimer* m_autoScrollTimer;
 
     int m_autoScrollIncrement;
     QTimer* m_autoScrollTimer;
 

+    KItemListHeader* m_header;
+

     friend class KItemListController;
 };
 
     friend class KItemListController;
 };
 

diff --git a/src/kitemviews/kitemlistviewlayouter.cpp b/src/kitemviews/kitemlistviewlayouter.cpp
index 4adb612e9d36990b1a520aedb268f53ceb2dcfb3..78688c9414465b6891e9b31de63c96249d1fd49d 100644 (file)
--- a/src/kitemviews/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/kitemlistviewlayouter.cpp
@@ -39,6 +39,7 @@ KItemListViewLayouter::KItemListViewLayouter(QObject* parent) :
     m_scrollOrientation(Qt::Vertical),
     m_size(),
     m_itemSize(128, 128),
     m_scrollOrientation(Qt::Vertical),
     m_size(),
     m_itemSize(128, 128),

+    m_headerHeight(0),

     m_model(0),
     m_sizeHintResolver(0),
     m_offset(0),
     m_model(0),
     m_sizeHintResolver(0),
     m_offset(0),


@@ -98,6 +99,19 @@ QSizeF KItemListViewLayouter::itemSize() const
     return m_itemSize;
 }
 
     return m_itemSize;
 }
 

+void KItemListViewLayouter::setHeaderHeight(qreal height)
+{
+    if (m_headerHeight != height) {
+        m_headerHeight = height;
+        m_dirty = true;
+    }
+}
+
+qreal KItemListViewLayouter::headerHeight() const
+{
+    return m_headerHeight;
+}
+

 void KItemListViewLayouter::setOffset(qreal offset)
 {
     if (m_offset != offset) {
 void KItemListViewLayouter::setOffset(qreal offset)
 {
     if (m_offset != offset) {


@@ -216,7 +230,6 @@ void KItemListViewLayouter::doLayout()
         QElapsedTimer timer;
         timer.start();
 #endif
         QElapsedTimer timer;
         timer.start();
 #endif

-

         m_visibleIndexesDirty = true;
 
         QSizeF itemSize = m_itemSize;
         m_visibleIndexesDirty = true;
 
         QSizeF itemSize = m_itemSize;


@@ -250,7 +263,7 @@ void KItemListViewLayouter::doLayout()
 
         m_itemBoundingRects.reserve(itemCount);
 
 
         m_itemBoundingRects.reserve(itemCount);
 

-        qreal y = 0;
+        qreal y = m_headerHeight;

         int rowIndex = 0;
 
         int index = 0;
         int rowIndex = 0;
 
         int index = 0;

diff --git a/src/kitemviews/kitemlistviewlayouter_p.h b/src/kitemviews/kitemlistviewlayouter_p.h
index f774814ebe7bc99398b21d84c0e33881fa0aa7ce..18ffb4caabe271aa65d8647bfb6cfd25d3270904 100644 (file)
--- a/src/kitemviews/kitemlistviewlayouter_p.h
+++ b/src/kitemviews/kitemlistviewlayouter_p.h
@@ -47,6 +47,14 @@ public:
     void setItemSize(const QSizeF& size);
     QSizeF itemSize() const;
 
     void setItemSize(const QSizeF& size);
     QSizeF itemSize() const;
 

+    /**
+     * Sets the height of the header that is always aligned
+     * at the top. A height of <= 0.0 means that no header is
+     * used.
+     */
+    void setHeaderHeight(qreal height);
+    qreal headerHeight() const;
+

     // TODO: add note that offset can be < 0 or > maximumOffset!
     void setOffset(qreal offset);
     qreal offset() const;
     // TODO: add note that offset can be < 0 or > maximumOffset!
     void setOffset(qreal offset);
     qreal offset() const;


@@ -95,6 +103,7 @@ private:
     QSizeF m_size;
 
     QSizeF m_itemSize;
     QSizeF m_size;
 
     QSizeF m_itemSize;

+    qreal m_headerHeight;

     const KItemModelBase* m_model;
     const KItemListSizeHintResolver* m_sizeHintResolver;
 
     const KItemModelBase* m_model;
     const KItemListSizeHintResolver* m_sizeHintResolver;
 

diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp
index 1ee8f8aa4cf756971bc18dc10aea85281decc955..404b1d92b73350f4ed3965056f65e557cbe15b61 100644 (file)
--- a/src/views/dolphinitemlistcontainer.cpp
+++ b/src/views/dolphinitemlistcontainer.cpp
@@ -189,11 +189,16 @@ void DolphinItemListContainer::setItemLayout(KFileItemListView::Layout layout)
 
     switch (layout) {
     case KFileItemListView::IconsLayout:
 
     switch (layout) {
     case KFileItemListView::IconsLayout:

-    case KFileItemListView::DetailsLayout:

         m_fileItemListView->setScrollOrientation(Qt::Vertical);
         m_fileItemListView->setScrollOrientation(Qt::Vertical);

+        m_fileItemListView->setHeaderShown(false);

         break;
     case KFileItemListView::CompactLayout:
         m_fileItemListView->setScrollOrientation(Qt::Horizontal);
         break;
     case KFileItemListView::CompactLayout:
         m_fileItemListView->setScrollOrientation(Qt::Horizontal);

+        m_fileItemListView->setHeaderShown(false);
+        break;
+    case KFileItemListView::DetailsLayout:
+        m_fileItemListView->setScrollOrientation(Qt::Vertical);
+        m_fileItemListView->setHeaderShown(true);

         break;
     default:
         Q_ASSERT(false);
         break;
     default:
         Q_ASSERT(false);