Blend in a toggle button when hovering items. This allows selecting items without...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 7b8fa869d1e976827befe8d3c868560ad58fe4a4..18d4accec5291f74bb85c1c26523d07f82bf8cfa 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -22,9 +22,12 @@
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"

-

 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"

+#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"
+#include "selectionmanager.h"

 
 

+#include <kcategorizedsortfilterproxymodel.h>

 #include <kdialog.h>
 #include <kdirmodel.h>
 
 #include <kdialog.h>
 #include <kdirmodel.h>
 


@@ -32,11 +35,16 @@
 #include <QApplication>
 #include <QPainter>
 #include <QPoint>
 #include <QApplication>
 #include <QPainter>
 #include <QPoint>

+#include <QScrollBar>

 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KCategorizedView(parent),
     m_controller(controller),
     m_categoryDrawer(0),
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     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()
     m_itemSize(),
     m_dragging(false),
     m_dropRect()


@@ -45,6 +53,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
     setSpacing(KDialog::spacingHint());
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
     setSpacing(KDialog::spacingHint());

+    setMovement(QListView::Static);
+    setDragEnabled(true);
+    viewport()->setAcceptDrops(true);
+

     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 


@@ -55,21 +67,28 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
                 this, SLOT(triggerItem(const QModelIndex&)));
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
                 this, SLOT(triggerItem(const QModelIndex&)));

+        if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) {
+            SelectionManager* selManager = new SelectionManager(this);
+            connect(selManager, SIGNAL(selectionChanged()),
+                    this, SLOT(requestActivation()));
+        }

     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
                 this, SLOT(triggerItem(const QModelIndex&)));
     }
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));
     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
                 this, SLOT(triggerItem(const QModelIndex&)));
     }
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));

-    connect(controller, SIGNAL(showPreviewChanged(bool)),
-            this, SLOT(slotShowPreviewChanged(bool)));
-    connect(controller, SIGNAL(additionalInfoCountChanged(int)),
-            this, SLOT(slotAdditionalInfoCountChanged(int)));

     connect(controller, SIGNAL(zoomIn()),
             this, SLOT(zoomIn()));
     connect(controller, SIGNAL(zoomOut()),
             this, SLOT(zoomOut()));
 
     connect(controller, SIGNAL(zoomIn()),
             this, SLOT(zoomIn()));
     connect(controller, SIGNAL(zoomOut()),
             this, SLOT(zoomOut()));
 

+    const DolphinView* view = controller->dolphinView();
+    connect(view, SIGNAL(showPreviewChanged()),
+            this, SLOT(slotShowPreviewChanged()));
+    connect(view, SIGNAL(additionalInfoChanged()),
+            this, SLOT(slotAdditionalInfoChanged()));
+

     connect(this, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
 
     connect(this, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
 


@@ -77,24 +96,21 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 
     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);
 
     setWordWrap(settings->numberOfTextlines() > 1);

-    updateGridSize(controller->showPreview(), controller->additionalInfoCount());
+    updateGridSize(view->showPreview(), 0);

 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
 
     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);
     } 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();
     }
 
     m_categoryDrawer = new DolphinCategoryDrawer();


@@ -114,6 +130,7 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
     const bool leftToRightFlow = (flow() == QListView::LeftToRight);
 
     QRect itemRect = KCategorizedView::visualRect(index);
     const bool leftToRightFlow = (flow() == QListView::LeftToRight);
 
     QRect itemRect = KCategorizedView::visualRect(index);

+

     const int maxWidth  = m_itemSize.width();
     const int maxHeight = m_itemSize.height();
 
     const int maxWidth  = m_itemSize.width();
     const int maxHeight = m_itemSize.height();
 


@@ -135,12 +152,32 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
         itemRect.setHeight(maxHeight);
     }
 
         itemRect.setHeight(maxHeight);
     }
 

+    KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
+    if (leftToRightFlow && !proxyModel->isCategorizedModel()) {
+        // TODO: QListView::visualRect() calculates a wrong position of the items under
+        // certain circumstances (e. g. if the text is too long). This issue is bypassed
+        // by the following code (I'll try create a patch for Qt but as Dolphin must also work with
+        // Qt 4.3.0 this workaround must get applied at least for KDE 4.0).
+        const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+        const int margin = settings->gridSpacing();
+        const int gridWidth = gridSize().width();
+        const int gridIndex = (itemRect.left() - margin + 1) / gridWidth;
+        const int centerInc = (maxWidth - itemRect.width()) / 2;
+        itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc);
+    }
+

     return itemRect;
 }
 
 QStyleOptionViewItem DolphinIconsView::viewOptions() const
 {
     return itemRect;
 }
 
 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)
 }
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)


@@ -162,6 +199,14 @@ void DolphinIconsView::mousePressEvent(QMouseEvent* event)
     KCategorizedView::mousePressEvent(event);
 }
 
     KCategorizedView::mousePressEvent(event);
 }
 

+void DolphinIconsView::startDrag(Qt::DropActions supportedActions)
+{
+    // TODO: invoking KCategorizedView::startDrag() should not be necessary, we'll
+    // fix this in KDE 4.1
+    KCategorizedView::startDrag(supportedActions);
+    DragAndDropHelper::startDrag(this, supportedActions);
+}
+

 void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 {
     if (event->mimeData()->hasUrls()) {
 void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 {
     if (event->mimeData()->hasUrls()) {


@@ -186,7 +231,21 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);

-    m_dropRect = visualRect(index);
+
+    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);
 }
 
     setDirtyRegion(m_dropRect);
 }
 


@@ -195,15 +254,17 @@ void DolphinIconsView::dropEvent(QDropEvent* event)
     if (!selectionModel()->isSelected(indexAt(event->pos()))) {
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if (!urls.isEmpty()) {
     if (!selectionModel()->isSelected(indexAt(event->pos()))) {
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if (!urls.isEmpty()) {

+            const QModelIndex index = indexAt(event->pos());
+            const KFileItem item = itemForIndex(index);

             m_controller->indicateDroppedUrls(urls,
                                               m_controller->url(),
             m_controller->indicateDroppedUrls(urls,
                                               m_controller->url(),

-                                              indexAt(event->pos()),
-                                              event->source());
+                                              item);

             event->acceptProposedAction();
         }
     }
 
     KCategorizedView::dropEvent(event);
             event->acceptProposedAction();
         }
     }
 
     KCategorizedView::dropEvent(event);

+

     m_dragging = false;
 }
 
     m_dragging = false;
 }
 


@@ -213,8 +274,8 @@ void DolphinIconsView::paintEvent(QPaintEvent* event)
 
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     if (m_dragging) {
 
     // 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);
-        DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
+        const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
+        DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);

     }
 }
 
     }
 }
 


@@ -232,6 +293,25 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
     }
 }
 
     }
 }
 

+void DolphinIconsView::wheelEvent(QWheelEvent* event)
+{
+    KCategorizedView::wheelEvent(event);
+
+    // if the icons are aligned left to right, the vertical wheel event should
+    // be applied to the horizontal scrollbar
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const bool scrollHorizontal = (event->orientation() == Qt::Vertical) &&
+                                  (settings->arrangement() == QListView::LeftToRight);
+    if (scrollHorizontal) {
+        QWheelEvent horizEvent(event->pos(),
+                               event->delta(),
+                               event->buttons(),
+                               event->modifiers(),
+                               Qt::Horizontal);
+        QApplication::sendEvent(horizontalScrollBar(), &horizEvent);
+    }
+}
+

 void DolphinIconsView::triggerItem(const QModelIndex& index)
 {
     m_controller->triggerItem(itemForIndex(index));
 void DolphinIconsView::triggerItem(const QModelIndex& index)
 {
     m_controller->triggerItem(itemForIndex(index));


@@ -242,14 +322,17 @@ void DolphinIconsView::slotEntered(const QModelIndex& index)
     m_controller->emitItemEntered(itemForIndex(index));
 }
 
     m_controller->emitItemEntered(itemForIndex(index));
 }
 

-void DolphinIconsView::slotShowPreviewChanged(bool showPreview)
+void DolphinIconsView::slotShowPreviewChanged()

 {
 {

-    updateGridSize(showPreview, m_controller->additionalInfoCount());
+    const DolphinView* view = m_controller->dolphinView();
+    updateGridSize(view->showPreview(), additionalInfoCount());

 }
 
 }
 

-void DolphinIconsView::slotAdditionalInfoCountChanged(int count)
+void DolphinIconsView::slotAdditionalInfoChanged()

 {
 {

-    updateGridSize(m_controller->showPreview(), count);
+    const DolphinView* view = m_controller->dolphinView();
+    const bool showPreview = view->showPreview();
+    updateGridSize(showPreview, view->additionalInfo().count());

 }
 
 void DolphinIconsView::zoomIn()
 }
 
 void DolphinIconsView::zoomIn()


@@ -260,7 +343,7 @@ void DolphinIconsView::zoomIn()
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 

-        const bool showPreview = m_controller->showPreview();
+        const bool showPreview = m_controller->dolphinView()->showPreview();

         if (showPreview) {
             const int previewSize = increasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
         if (showPreview) {
             const int previewSize = increasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);


@@ -278,7 +361,7 @@ void DolphinIconsView::zoomIn()
         settings->setItemWidth(settings->itemWidth() + diff);
         settings->setItemHeight(settings->itemHeight() + diff);
 
         settings->setItemWidth(settings->itemWidth() + diff);
         settings->setItemHeight(settings->itemHeight() + diff);
 

-        updateGridSize(showPreview, m_controller->additionalInfoCount());
+        updateGridSize(showPreview, additionalInfoCount());

     }
 }
 
     }
 }
 


@@ -290,7 +373,7 @@ void DolphinIconsView::zoomOut()
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 
         const int oldIconSize = settings->iconSize();
         int newIconSize = oldIconSize;
 

-        const bool showPreview = m_controller->showPreview();
+        const bool showPreview = m_controller->dolphinView()->showPreview();

         if (showPreview) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
         if (showPreview) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);


@@ -309,21 +392,28 @@ void DolphinIconsView::zoomOut()
         settings->setItemWidth(settings->itemWidth() - diff);
         settings->setItemHeight(settings->itemHeight() - diff);
 
         settings->setItemWidth(settings->itemWidth() - diff);
         settings->setItemHeight(settings->itemHeight() - diff);
 

-        updateGridSize(showPreview, m_controller->additionalInfoCount());
+        updateGridSize(showPreview, additionalInfoCount());

     }
 }
 
     }
 }
 

+void DolphinIconsView::requestActivation()
+{
+    m_controller->requestActivation();
+}
+

 bool DolphinIconsView::isZoomInPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
 bool DolphinIconsView::isZoomInPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

-    const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
+    const bool showPreview = m_controller->dolphinView()->showPreview();
+    const int size = showPreview ? settings->previewSize() : settings->iconSize();

     return size < KIconLoader::SizeEnormous;
 }
 
 bool DolphinIconsView::isZoomOutPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     return size < KIconLoader::SizeEnormous;
 }
 
 bool DolphinIconsView::isZoomOutPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

-    const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
+    const bool showPreview = m_controller->dolphinView()->showPreview();
+    const int size = showPreview ? settings->previewSize() : settings->iconSize();

     return size > KIconLoader::SizeSmall;
 }
 
     return size > KIconLoader::SizeSmall;
 }
 


@@ -373,24 +463,25 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
 
         size = previewSize;
     }
 
         size = previewSize;
     }

+    setIconSize(QSize(size, size));

 
     Q_ASSERT(additionalInfoCount >= 0);
 
     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.
 
     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 {
     } else {

-        m_viewOptions.decorationSize = QSize(size, size);
+        m_decorationSize = QSize(size, size);

     }
 
     }
 

-    const int spacing = settings->gridSpacing();
-    setGridSize(QSize(itemWidth + spacing, itemHeight + spacing));
-

     m_itemSize = QSize(itemWidth, itemHeight);
 
     m_itemSize = QSize(itemWidth, itemHeight);
 

+    const int spacing = settings->gridSpacing();
+    setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
+

     m_controller->setZoomInPossible(isZoomInPossible());
     m_controller->setZoomOutPossible(isZoomOutPossible());
 }
     m_controller->setZoomInPossible(isZoomInPossible());
     m_controller->setZoomOutPossible(isZoomOutPossible());
 }


@@ -403,5 +494,10 @@ KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const
     return dirModel->itemForIndex(dirIndex);
 }
 
     return dirModel->itemForIndex(dirIndex);
 }
 

+int DolphinIconsView::additionalInfoCount() const
+{
+    const DolphinView* view = m_controller->dolphinView();
+    return view->additionalInfo().count();
+}

 
 #include "dolphiniconsview.moc"
 
 #include "dolphiniconsview.moc"