Prevent code duplication by moving the duplications into the DolphinController.

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index df5246bedba18d9f103d6c08308d21f950fd5b6b..f364900b6b7f9c12829e9a68c5bba6566162c7a6 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -54,17 +54,19 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     m_elasticBandOrigin(),
     m_elasticBandDestination()
 {
+    const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+    Q_ASSERT(settings != 0);
     Q_ASSERT(controller != 0);
 
     setAcceptDrops(true);
-    setRootIsDecorated(false);
     setSortingEnabled(true);
     setUniformRowHeights(true);
     setSelectionBehavior(SelectItems);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setAlternatingRowColors(true);
-    setItemsExpandable(false);
+    setRootIsDecorated(settings->expandableFolders());
+    setItemsExpandable(settings->expandableFolders());
 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
@@ -118,11 +120,14 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
             this, SLOT(updateColumnVisibility()));
 
-    // apply the details mode settings to the widget
-    const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    Q_ASSERT(settings != 0);
-
-    m_font = QFont(settings->fontFamily(), settings->fontSize());
+    if (settings->useSystemFont()) {
+        m_font = KGlobalSettings::generalFont();
+    } else {
+        m_font = QFont(settings->fontFamily(),
+                       settings->fontSize(),
+                       settings->fontWeight(),
+                       settings->italicFont());
+    }
 
 // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
 //       check avoids a division by zero happening on versions before 4.3.1.
@@ -136,6 +141,9 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     updateDecorationSize();
 
     setFocus();
+
+    connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
+            this, SLOT(updateFont()));
 }
 
 DolphinDetailsView::~DolphinDetailsView()
@@ -229,11 +237,30 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
             setSelection(selRect, QItemSelectionModel::Select);
         }
 
-        QTreeView::mouseMoveEvent(event);
+        // TODO: see comment at end of method
+        // QTreeView::mouseMoveEvent(event);
+        QAbstractItemView::mouseMoveEvent(event);
         updateElasticBand();
     } else {
-        QTreeView::mouseMoveEvent(event);
+        // TODO: see comment at end of method
+        //QTreeView::mouseMoveEvent(event);
+        QAbstractItemView::mouseMoveEvent(event);
     }
+
+    // The original implementation of QTreeView::mouseMoveEvent() looks like this (Qt4.4):
+    //
+    // void QTreeView::mouseMoveEvent(QMouseEvent *event)
+    // {
+    //     Q_D(QTreeView);
+    //     if (d->itemDecorationAt(event->pos()) == -1) // ### what about expanding/collapsing state ?
+    //         QAbstractItemView::mouseMoveEvent(event);
+    // }
+    //
+    // This prevents that the signal 'entered()' is emitted when the mouse is above a decoration,
+    // although the hovered item has changed. The SelectionManager is connected to 'entered()'
+    // and assumes that the old item is selected. This is currently bypassed by skipping
+    // the base implementation and invoking QAbstractItemView::mouseMoveEvent() directly.
+    // Submitted a bug report to Trolltech, bug ID is still pending.
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
@@ -283,7 +310,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
         m_dragging = false;
     } else {
         m_dragging = true;
-        const KFileItem item = itemForIndex(index);
+        const KFileItem item = m_controller->itemForIndex(index, this);
         if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
         } else {
@@ -306,7 +333,7 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
         const QModelIndex index = indexAt(event->pos());
         KFileItem item;
         if (index.isValid() && (index.column() == DolphinModel::Name)) {
-            item = itemForIndex(index);
+            item = m_controller->itemForIndex(index, this);
         }
         m_controller->indicateDroppedUrls(urls,
                                           m_controller->url(),
@@ -345,15 +372,7 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
 void DolphinDetailsView::keyPressEvent(QKeyEvent* event)
 {
     QTreeView::keyPressEvent(event);
-
-    const QItemSelectionModel* selModel = selectionModel();
-    const QModelIndex currentIndex = selModel->currentIndex();
-    const bool trigger = currentIndex.isValid()
-                         && (event->key() == Qt::Key_Return)
-                         && (selModel->selectedIndexes().count() <= 1);
-    if (trigger) {
-        triggerItem(currentIndex);
-    }
+    m_controller->handleKeyPressEvent(event, this);
 }
 
 void DolphinDetailsView::resizeEvent(QResizeEvent* event)
@@ -401,7 +420,7 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
     const QPoint pos = viewport()->mapFromGlobal(QCursor::pos());
     const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
     if (pos.x() < nameColumnWidth) {
-        m_controller->emitItemEntered(itemForIndex(index));
+        m_controller->emitItemEntered(index, this);
     }
     else {
         m_controller->emitViewportEntered();
@@ -453,13 +472,7 @@ void DolphinDetailsView::zoomOut()
 
 void DolphinDetailsView::triggerItem(const QModelIndex& index)
 {
-    const KFileItem item = itemForIndex(index);
-    if (index.isValid() && (index.column() == KDirModel::Name)) {
-        m_controller->triggerItem(item);
-    } else {
-        clearSelection();
-        m_controller->emitItemEntered(item);
-    }
+    m_controller->triggerItem(index, this);
 }
 
 void DolphinDetailsView::configureColumns(const QPoint& pos)
@@ -532,6 +545,16 @@ void DolphinDetailsView::requestActivation()
     m_controller->requestActivation();
 }
 
+void DolphinDetailsView::updateFont()
+{
+    const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+    Q_ASSERT(settings != 0);
+
+    if (settings->useSystemFont()) {
+        m_font = KGlobalSettings::generalFont();
+    }
+}
+
 bool DolphinDetailsView::isZoomInPossible() const
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
@@ -575,14 +598,6 @@ QPoint DolphinDetailsView::contentsPos() const
     return QPoint(0, y);
 }
 
-KFileItem DolphinDetailsView::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);
-}
-
 KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
 {
     KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;