forwardport r757231

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 1e2e66f5aa6a7d92bf473b7a2f45a91caf8b8a0a..de0aaec97c1ed7391982a236efa4a117d3eb95f6 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -38,6 +38,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     KCategorizedView(parent),
     m_controller(controller),
     m_categoryDrawer(0),
+    m_font(),
+    m_decorationSize(),
+    m_decorationPosition(QStyleOptionViewItem::Top),
+    m_displayAlignment(Qt::AlignHCenter),
     m_itemSize(),
     m_dragging(false),
     m_dropRect()
@@ -84,24 +88,21 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 
-    m_viewOptions = KCategorizedView::viewOptions();
-    m_viewOptions.showDecorationSelected = true;
-
-    QFont font(settings->fontFamily(), settings->fontSize());
-    font.setItalic(settings->italicFont());
-    font.setBold(settings->boldFont());
-    m_viewOptions.font = font;
+    m_font = QFont(settings->fontFamily(), settings->fontSize());
+    m_font.setItalic(settings->italicFont());
+    m_font.setBold(settings->boldFont());
 
     setWordWrap(settings->numberOfTextlines() > 1);
     updateGridSize(view->showPreview(), 0);
 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
-        m_viewOptions.decorationPosition = QStyleOptionViewItem::Top;
+        m_decorationPosition = QStyleOptionViewItem::Top;
+        m_displayAlignment = Qt::AlignHCenter;
     } else {
         setFlow(QListView::TopToBottom);
-        m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
-        m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
+        m_decorationPosition = QStyleOptionViewItem::Left;
+        m_displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
     }
 
     m_categoryDrawer = new DolphinCategoryDrawer();
@@ -121,6 +122,7 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
     const bool leftToRightFlow = (flow() == QListView::LeftToRight);
 
     QRect itemRect = KCategorizedView::visualRect(index);
+
     const int maxWidth  = m_itemSize.width();
     const int maxHeight = m_itemSize.height();
 
@@ -152,7 +154,8 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
         const int margin = settings->gridSpacing();
         const int gridWidth = gridSize().width();
         const int gridIndex = (itemRect.left() - margin + 1) / gridWidth;
-        itemRect.moveLeft(gridIndex * gridWidth + margin);
+        const int centerInc = (maxWidth - itemRect.width()) / 2;
+        itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc);
     }
 
     return itemRect;
@@ -160,7 +163,13 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
 
 QStyleOptionViewItem DolphinIconsView::viewOptions() const
 {
-    return m_viewOptions;
+    QStyleOptionViewItem viewOptions = KCategorizedView::viewOptions();
+    viewOptions.font = m_font;
+    viewOptions.decorationPosition = m_decorationPosition;
+    viewOptions.decorationSize = m_decorationSize;
+    viewOptions.displayAlignment = m_displayAlignment;
+    viewOptions.showDecorationSelected = true;
+    return viewOptions;
 }
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
@@ -215,18 +224,20 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
 
-    if(!index.isValid()) {
-        m_dropRect.setSize(QSize()); // set as invalid
-    } else {
-        KFileItem item = itemForIndex(index);
-        if (item.isNull()) {
-            kWarning(7007) << "Invalid item returned for index";
-        } else if (itemForIndex(index).isDir()) {
+    m_dropRect.setSize(QSize()); // set as invalid
+    if (index.isValid()) {
+        const KFileItem item = itemForIndex(index);
+        if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
         } else {
             m_dropRect.setSize(QSize()); // set as invalid
-       }
+        }
+    }
+    if (event->mimeData()->hasUrls()) {
+        // accept url drops, independently from the destination item
+        event->acceptProposedAction();
     }
+
     setDirtyRegion(m_dropRect);
 }
 
@@ -255,8 +266,8 @@ void DolphinIconsView::paintEvent(QPaintEvent* event)
 
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     if (m_dragging) {
-        const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
-        DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush);
+        const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
+        DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);
     }
 }
 
@@ -287,12 +298,16 @@ void DolphinIconsView::slotEntered(const QModelIndex& index)
 void DolphinIconsView::slotShowPreviewChanged()
 {
     const DolphinView* view = m_controller->dolphinView();
-    const int infoCount = view->additionalInfo().count();
-    updateGridSize(view->showPreview(), infoCount);
+    updateGridSize(view->showPreview(), additionalInfoCount());
 }
 
 void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
 {
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    if (!settings->showAdditionalInfo()) {
+        return;
+    }
+
     const bool showPreview = m_controller->dolphinView()->showPreview();
     updateGridSize(showPreview, info.count());
 }
@@ -323,8 +338,7 @@ void DolphinIconsView::zoomIn()
         settings->setItemWidth(settings->itemWidth() + diff);
         settings->setItemHeight(settings->itemHeight() + diff);
 
-        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
-        updateGridSize(showPreview, infoCount);
+        updateGridSize(showPreview, additionalInfoCount());
     }
 }
 
@@ -355,8 +369,7 @@ void DolphinIconsView::zoomOut()
         settings->setItemWidth(settings->itemWidth() - diff);
         settings->setItemHeight(settings->itemHeight() - diff);
 
-        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
-        updateGridSize(showPreview, infoCount);
+        updateGridSize(showPreview, additionalInfoCount());
     }
 }
 
@@ -424,22 +437,22 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
     }
 
     Q_ASSERT(additionalInfoCount >= 0);
-    itemHeight += additionalInfoCount * m_viewOptions.font.pointSize() * 2;
+    itemHeight += additionalInfoCount * m_font.pointSize() * 2;
 
     if (settings->arrangement() == QListView::TopToBottom) {
         // The decoration width indirectly defines the maximum
         // width for the text wrapping. To use the maximum item width
         // for text wrapping, it is used as decoration width.
-        m_viewOptions.decorationSize = QSize(itemWidth, size);
+        m_decorationSize = QSize(itemWidth, size);
     } else {
-        m_viewOptions.decorationSize = QSize(size, size);
+        m_decorationSize = QSize(size, size);
     }
 
+    m_itemSize = QSize(itemWidth, itemHeight);
+
     const int spacing = settings->gridSpacing();
     setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
 
-    m_itemSize = QSize(itemWidth, itemHeight);
-
     m_controller->setZoomInPossible(isZoomInPossible());
     m_controller->setZoomOutPossible(isZoomOutPossible());
 }
@@ -452,4 +465,11 @@ KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const
     return dirModel->itemForIndex(dirIndex);
 }
 
+int DolphinIconsView::additionalInfoCount() const
+{
+    const DolphinView* view = m_controller->dolphinView();
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    return settings->showAdditionalInfo() ? view->additionalInfo().count() : 0;
+}
+
 #include "dolphiniconsview.moc"