Simplify DolphinController: don't remember the show-preview state in the controller...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 6b584612cc9cec51fcfb74ba9b84370c314f132e..30e47da899fc3be77dc2438977bd5f5a39f758a8 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -26,6 +26,7 @@
 #include "dolphin_iconsmodesettings.h"
 
 #include <kdialog.h>
+#include <kdirmodel.h>
 
 #include <QAbstractProxyModel>
 #include <QApplication>
@@ -53,24 +54,27 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     // RETURN-key in keyPressEvent().
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
-                controller, SLOT(triggerItem(const QModelIndex&)));
+                this, SLOT(triggerItem(const QModelIndex&)));
     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
-                controller, SLOT(triggerItem(const QModelIndex&)));
+                this, SLOT(triggerItem(const QModelIndex&)));
     }
-    connect(this, SIGNAL(entered(const QModelIndex&)),
-            controller, SLOT(emitItemEntered(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()));
 
+    const DolphinView* view = controller->dolphinView();
+    connect(view, SIGNAL(showPreviewChanged()),
+            this, SLOT(slotShowPreviewChanged()));
+    connect(view, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+            this, SLOT(slotAdditionalInfoChanged(const KFileItemDelegate::InformationList&)));
+
+    connect(this, SIGNAL(entered(const QModelIndex&)),
+            this, SLOT(slotEntered(const QModelIndex&)));
+
     // apply the icons mode settings to the widget
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
@@ -84,7 +88,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     m_viewOptions.font = font;
 
     setWordWrap(settings->numberOfTextlines() > 1);
-    updateGridSize(controller->showPreview(), controller->additionalInfoCount());
+    updateGridSize(view->showPreview(), 0);
 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
@@ -97,6 +101,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
 
     m_categoryDrawer = new DolphinCategoryDrawer();
     setCategoryDrawer(m_categoryDrawer);
+
+    setFocus();
 }
 
 DolphinIconsView::~DolphinIconsView()
@@ -147,7 +153,7 @@ void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinIconsView::mousePressEvent(QMouseEvent* event)
 {
-    m_controller->triggerActivation();
+    m_controller->requestActivation();
     if (!indexAt(event->pos()).isValid()) {
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
@@ -191,11 +197,15 @@ void DolphinIconsView::dropEvent(QDropEvent* event)
     if (!selectionModel()->isSelected(indexAt(event->pos()))) {
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if (!urls.isEmpty()) {
-            m_controller->indicateDroppedUrls(urls,
-                                              m_controller->url(),
-                                              indexAt(event->pos()),
-                                              event->source());
-            event->acceptProposedAction();
+            const QModelIndex index = indexAt(event->pos());
+            if (index.isValid()) {
+                const KFileItem item = itemForIndex(index);
+                m_controller->indicateDroppedUrls(urls,
+                                                  m_controller->url(),
+                                                  item,
+                                                  event->source());
+                event->acceptProposedAction();
+            }
         }
     }
 
@@ -220,22 +230,35 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 
     const QItemSelectionModel* selModel = selectionModel();
     const QModelIndex currentIndex = selModel->currentIndex();
-    const bool triggerItem = currentIndex.isValid()
-                             && (event->key() == Qt::Key_Return)
-                             && (selModel->selectedIndexes().count() <= 1);
-    if (triggerItem) {
-        m_controller->triggerItem(currentIndex);
+    const bool trigger = currentIndex.isValid()
+                         && (event->key() == Qt::Key_Return)
+                         && (selModel->selectedIndexes().count() <= 1);
+    if (trigger) {
+        triggerItem(currentIndex);
     }
 }
 
-void DolphinIconsView::slotShowPreviewChanged(bool showPreview)
+void DolphinIconsView::triggerItem(const QModelIndex& index)
+{
+    m_controller->triggerItem(itemForIndex(index));
+}
+
+void DolphinIconsView::slotEntered(const QModelIndex& index)
+{
+    m_controller->emitItemEntered(itemForIndex(index));
+}
+
+void DolphinIconsView::slotShowPreviewChanged()
 {
-    updateGridSize(showPreview, m_controller->additionalInfoCount());
+    const DolphinView* view = m_controller->dolphinView();
+    const int infoCount = view->additionalInfo().count();
+    updateGridSize(view->showPreview(), infoCount);
 }
 
-void DolphinIconsView::slotAdditionalInfoCountChanged(int count)
+void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
 {
-    updateGridSize(m_controller->showPreview(), count);
+    const bool showPreview = m_controller->dolphinView()->showPreview();
+    updateGridSize(showPreview, info.count());
 }
 
 void DolphinIconsView::zoomIn()
@@ -246,7 +269,7 @@ void DolphinIconsView::zoomIn()
         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);
@@ -264,7 +287,8 @@ void DolphinIconsView::zoomIn()
         settings->setItemWidth(settings->itemWidth() + diff);
         settings->setItemHeight(settings->itemHeight() + diff);
 
-        updateGridSize(showPreview, m_controller->additionalInfoCount());
+        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+        updateGridSize(showPreview, infoCount);
     }
 }
 
@@ -276,7 +300,7 @@ void DolphinIconsView::zoomOut()
         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);
@@ -295,21 +319,24 @@ void DolphinIconsView::zoomOut()
         settings->setItemWidth(settings->itemWidth() - diff);
         settings->setItemHeight(settings->itemHeight() - diff);
 
-        updateGridSize(showPreview, m_controller->additionalInfoCount());
+        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+        updateGridSize(showPreview, infoCount);
     }
 }
 
 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();
-    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;
 }
 
@@ -381,4 +408,13 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
     m_controller->setZoomOutPossible(isZoomOutPossible());
 }
 
+KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const
+{
+    QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(model());
+    KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
+    const QModelIndex dirIndex = proxyModel->mapToSource(index);
+    return dirModel->itemForIndex(dirIndex);
+}
+
+
 #include "dolphiniconsview.moc"