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 d287318d01e6e7028c47a9729f0d231dd367fd97..30e47da899fc3be77dc2438977bd5f5a39f758a8 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -19,13 +19,14 @@
 
 #include "dolphiniconsview.h"
 
 
 #include "dolphiniconsview.h"
 

+#include "dolphincategorydrawer.h"

 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"

-#include "dolphinitemcategorizer.h"

 
 #include "dolphin_iconsmodesettings.h"
 
 #include <kdialog.h>
 
 #include "dolphin_iconsmodesettings.h"
 
 #include <kdialog.h>

+#include <kdirmodel.h>

 
 #include <QAbstractProxyModel>
 #include <QApplication>
 
 #include <QAbstractProxyModel>
 #include <QApplication>


@@ -35,6 +36,7 @@
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KCategorizedView(parent),
     m_controller(controller),
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KCategorizedView(parent),
     m_controller(controller),

+    m_categoryDrawer(0),

     m_itemSize(),
     m_dragging(false),
     m_dropRect()
     m_itemSize(),
     m_dragging(false),
     m_dropRect()


@@ -52,24 +54,27 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     // RETURN-key in keyPressEvent().
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
     // 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&)),
     } 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(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));

-    connect(controller, SIGNAL(showPreviewChanged(bool)),
-            this, SLOT(slotShowPreviewChanged(bool)));
-    connect(controller, SIGNAL(showAdditionalInfoChanged(bool)),
-            this, SLOT(slotShowAdditionalInfoChanged(bool)));

     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(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);
     // apply the icons mode settings to the widget
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);


@@ -83,7 +88,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     m_viewOptions.font = font;
 
     setWordWrap(settings->numberOfTextlines() > 1);
     m_viewOptions.font = font;
 
     setWordWrap(settings->numberOfTextlines() > 1);

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

 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
 
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);


@@ -93,10 +98,17 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
         m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
     }
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
         m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
     }

+
+    m_categoryDrawer = new DolphinCategoryDrawer();
+    setCategoryDrawer(m_categoryDrawer);
+
+    setFocus();

 }
 
 DolphinIconsView::~DolphinIconsView()
 {
 }
 
 DolphinIconsView::~DolphinIconsView()
 {

+    delete m_categoryDrawer;
+    m_categoryDrawer = 0;

 }
 
 QRect DolphinIconsView::visualRect(const QModelIndex& index) const
 }
 
 QRect DolphinIconsView::visualRect(const QModelIndex& index) const


@@ -141,7 +153,7 @@ void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinIconsView::mousePressEvent(QMouseEvent* 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)) {
     if (!indexAt(event->pos()).isValid()) {
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {


@@ -185,12 +197,18 @@ 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()) {

-            m_controller->indicateDroppedUrls(urls,
-                                              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();
+            }

         }
     }
         }
     }

+

     KCategorizedView::dropEvent(event);
     m_dragging = false;
 }
     KCategorizedView::dropEvent(event);
     m_dragging = false;
 }


@@ -212,22 +230,35 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 
     const QItemSelectionModel* selModel = selectionModel();
     const QModelIndex currentIndex = selModel->currentIndex();
 
     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)

 {
 {

-    updateGridSize(showPreview, m_controller->showAdditionalInfo());
+    m_controller->triggerItem(itemForIndex(index));

 }
 
 }
 

-void DolphinIconsView::slotShowAdditionalInfoChanged(bool showAdditionalInfo)
+void DolphinIconsView::slotEntered(const QModelIndex& index)

 {
 {

-    updateGridSize(m_controller->showPreview(), showAdditionalInfo);
+    m_controller->emitItemEntered(itemForIndex(index));
+}
+
+void DolphinIconsView::slotShowPreviewChanged()
+{
+    const DolphinView* view = m_controller->dolphinView();
+    const int infoCount = view->additionalInfo().count();
+    updateGridSize(view->showPreview(), infoCount);
+}
+
+void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
+{
+    const bool showPreview = m_controller->dolphinView()->showPreview();
+    updateGridSize(showPreview, info.count());

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


@@ -238,7 +269,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);


@@ -256,7 +287,8 @@ 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->showAdditionalInfo());
+        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+        updateGridSize(showPreview, infoCount);

     }
 }
 
     }
 }
 


@@ -268,7 +300,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);


@@ -287,34 +319,36 @@ 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->showAdditionalInfo());
+        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+        updateGridSize(showPreview, infoCount);

     }
 }
 
 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();
-    return size < K3Icon::SizeEnormous;
+    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();
 }
 
 bool DolphinIconsView::isZoomOutPossible() const
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

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

 }
 
 int DolphinIconsView::increasedIconSize(int size) const
 {
 }
 
 int DolphinIconsView::increasedIconSize(int size) const
 {

-    // TODO: get rid of K3Icon sizes

     int incSize = 0;
     switch (size) {
     int incSize = 0;
     switch (size) {

-    case K3Icon::SizeSmall:       incSize = K3Icon::SizeSmallMedium; break;
-    case K3Icon::SizeSmallMedium: incSize = K3Icon::SizeMedium; break;
-    case K3Icon::SizeMedium:      incSize = K3Icon::SizeLarge; break;
-    case K3Icon::SizeLarge:       incSize = K3Icon::SizeHuge; break;
-    case K3Icon::SizeHuge:        incSize = K3Icon::SizeEnormous; break;
+    case KIconLoader::SizeSmall:       incSize = KIconLoader::SizeSmallMedium; break;
+    case KIconLoader::SizeSmallMedium: incSize = KIconLoader::SizeMedium; break;
+    case KIconLoader::SizeMedium:      incSize = KIconLoader::SizeLarge; break;
+    case KIconLoader::SizeLarge:       incSize = KIconLoader::SizeHuge; break;
+    case KIconLoader::SizeHuge:        incSize = KIconLoader::SizeEnormous; break;

     default: Q_ASSERT(false); break;
     }
     return incSize;
     default: Q_ASSERT(false); break;
     }
     return incSize;


@@ -322,20 +356,19 @@ int DolphinIconsView::increasedIconSize(int size) const
 
 int DolphinIconsView::decreasedIconSize(int size) const
 {
 
 int DolphinIconsView::decreasedIconSize(int size) const
 {

-    // TODO: get rid of K3Icon sizes

     int decSize = 0;
     switch (size) {
     int decSize = 0;
     switch (size) {

-    case K3Icon::SizeSmallMedium: decSize = K3Icon::SizeSmall; break;
-    case K3Icon::SizeMedium: decSize = K3Icon::SizeSmallMedium; break;
-    case K3Icon::SizeLarge: decSize = K3Icon::SizeMedium; break;
-    case K3Icon::SizeHuge: decSize = K3Icon::SizeLarge; break;
-    case K3Icon::SizeEnormous: decSize = K3Icon::SizeHuge; break;
+    case KIconLoader::SizeSmallMedium: decSize = KIconLoader::SizeSmall; break;
+    case KIconLoader::SizeMedium: decSize = KIconLoader::SizeSmallMedium; break;
+    case KIconLoader::SizeLarge: decSize = KIconLoader::SizeMedium; break;
+    case KIconLoader::SizeHuge: decSize = KIconLoader::SizeLarge; break;
+    case KIconLoader::SizeEnormous: decSize = KIconLoader::SizeHuge; break;

     default: Q_ASSERT(false); break;
     }
     return decSize;
 }
 
     default: Q_ASSERT(false); break;
     }
     return decSize;
 }
 

-void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo)
+void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)

 {
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 {
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);


@@ -354,9 +387,8 @@ void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo)
         size = previewSize;
     }
 
         size = previewSize;
     }
 

-    if (showAdditionalInfo) {
-        itemHeight += m_viewOptions.font.pointSize() * 2;
-    }
+    Q_ASSERT(additionalInfoCount >= 0);
+    itemHeight += additionalInfoCount * m_viewOptions.font.pointSize() * 2;

 
     if (settings->arrangement() == QListView::TopToBottom) {
         // The decoration width indirectly defines the maximum
 
     if (settings->arrangement() == QListView::TopToBottom) {
         // The decoration width indirectly defines the maximum


@@ -376,4 +408,13 @@ void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo)
     m_controller->setZoomOutPossible(isZoomOutPossible());
 }
 
     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"
 #include "dolphiniconsview.moc"