X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3d4e6938f57fcf010b4fda7255384098327eb67d..eaefe4250c3af559d259ed954a322a463f55ede5:/src/dolphincolumnwidget.cpp

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index ba5632502..09dfccc82 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -73,22 +73,21 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     setDropIndicatorShown(false);
     setSelectionRectVisible(true);
 
-// 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.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
-#endif
 
     // apply the column mode settings to the widget
     const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
     Q_ASSERT(settings != 0);
 
-    m_font = QFont(settings->fontFamily(), settings->fontSize());
-    m_font.setItalic(settings->italicFont());
-    m_font.setBold(settings->boldFont());
+    if (settings->useSystemFont()) {
+        m_font = KGlobalSettings::generalFont();
+    } else {
+        m_font = QFont(settings->fontFamily(),
+                       settings->fontSize(),
+                       settings->fontWeight(),
+                       settings->italicFont());
+    }
 
     const int iconSize = settings->iconSize();
     setDecorationSize(QSize(iconSize, iconSize));
@@ -106,7 +105,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     //m_dirLister = new DolphinDirLister(); TODO
     m_dirLister = new KDirLister();
     m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
+    m_dirLister->setMainWindow(window());
     m_dirLister->setDelayedMimeTypes(true);
     const bool showHiddenFiles = m_view->m_controller->dolphinView()->showHiddenFiles();
     m_dirLister->setShowingDotFiles(showHiddenFiles);
@@ -131,12 +130,16 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
                 this, SLOT(requestActivation()));
         connect(m_view->m_controller, SIGNAL(urlChanged(const KUrl&)),
                 selManager, SLOT(reset()));
-}
+    }
+
     new KMimeTypeResolver(this, m_dolphinModel);
     m_iconManager = new IconManager(this, m_proxyModel);
     m_iconManager->setShowPreview(m_view->m_controller->dolphinView()->showPreview());
 
     m_dirLister->openUrl(url, KDirLister::NoFlags);
+
+    connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
+            this, SLOT(updateFont()));
 }
 
 DolphinColumnWidget::~DolphinColumnWidget()
@@ -268,7 +271,8 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event)
 
     m_dropRect.setSize(QSize()); // set as invalid
     if (index.isValid()) {
-        const KFileItem item = itemForIndex(index);
+        m_view->m_controller->setItemView(this);
+        const KFileItem item = m_view->m_controller->itemForIndex(index);
         if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
         }
@@ -286,7 +290,8 @@ void DolphinColumnWidget::dropEvent(QDropEvent* event)
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
     if (!urls.isEmpty()) {
         const QModelIndex index = indexAt(event->pos());
-        const KFileItem item = itemForIndex(index);
+        m_view->m_controller->setItemView(this);
+        const KFileItem item = m_view->m_controller->itemForIndex(index);
         m_view->m_controller->indicateDroppedUrls(urls,
                                                   url(),
                                                   item);
@@ -335,21 +340,15 @@ void DolphinColumnWidget::mousePressEvent(QMouseEvent* event)
 void DolphinColumnWidget::keyPressEvent(QKeyEvent* event)
 {
     QListView::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);
-    }
+    requestActivation();
+    m_view->m_controller->handleKeyPressEvent(event);
 }
 
 void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
 {
     if (!m_active) {
         m_view->requestActivation(this);
+        Q_ASSERT(m_view->m_controller->itemView() == this);
         m_view->m_controller->triggerUrlChangeRequest(m_url);
     }
 
@@ -360,6 +359,7 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
         // Only open a context menu above an item or if the mouse is above
         // the active column.
         const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
+        Q_ASSERT(m_view->m_controller->itemView() == this);
         m_view->m_controller->triggerContextMenuRequest(pos);
     }
 }
@@ -367,9 +367,9 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
 void DolphinColumnWidget::wheelEvent(QWheelEvent* event)
 {
     // let Ctrl+wheel events propagate to the DolphinView for icon zooming
-    if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
+    if (event->modifiers() & Qt::ControlModifier) {
         event->ignore();
-	return;
+        return;
     }
     QListView::wheelEvent(event);
 }
@@ -383,17 +383,10 @@ void DolphinColumnWidget::selectionChanged(const QItemSelection& selected, const
     selModel->select(deselected, QItemSelectionModel::Deselect);
 }
 
-void DolphinColumnWidget::triggerItem(const QModelIndex& index)
-{
-    const KFileItem item = itemForIndex(index);
-    m_view->m_controller->triggerItem(item);
-}
-
 void DolphinColumnWidget::slotEntered(const QModelIndex& index)
 {
-    const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-    const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
-    m_view->m_controller->emitItemEntered(item);
+    m_view->m_controller->setItemView(this);
+    m_view->m_controller->emitItemEntered(index);
 }
 
 void DolphinColumnWidget::requestActivation()
@@ -404,6 +397,17 @@ void DolphinColumnWidget::requestActivation()
         m_view->m_controller->triggerUrlChangeRequest(m_url);
         selectionModel()->clear();
     }
+    Q_ASSERT(m_view->m_controller->itemView() == this);
+}
+
+void DolphinColumnWidget::updateFont()
+{
+    const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+    Q_ASSERT(settings != 0);
+
+    if (settings->useSystemFont()) {
+        m_font = KGlobalSettings::generalFont();
+    }
 }
 
 void DolphinColumnWidget::activate()
@@ -415,10 +419,10 @@ void DolphinColumnWidget::activate()
     // necessary connecting the signal 'singleClick()' or 'doubleClick'.
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
-                this, SLOT(triggerItem(const QModelIndex&)));
+                m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
-                this, SLOT(triggerItem(const QModelIndex&)));
+                m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
     }
 
     if (selectionModel() && selectionModel()->currentIndex().isValid())
@@ -448,11 +452,4 @@ void DolphinColumnWidget::deactivate()
     updateBackground();
 }
 
-KFileItem DolphinColumnWidget::itemForIndex(const QModelIndex& index) const
-{
-    const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-    return m_dolphinModel->itemForIndex(dirIndex);
-}
-
-
 #include "dolphincolumnwidget.moc"