SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 1ed8310a6404bc3bea0d6ee9b9dbd141b5cbbbd9..3fec8fdfb0d3087a0eb943f6e35a3ab8005658df 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -537,6 +537,20 @@ void DolphinView::mouseReleaseEvent(QMouseEvent* event)
     QWidget::mouseReleaseEvent(event);
     setActive(true);
 }
+
+void DolphinView::wheelEvent(QWheelEvent* event)
+{
+    if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
+        int d = event->delta();
+        if (d > 0 && isZoomInPossible()) {
+            zoomIn();
+        } else if (d < 0 && isZoomOutPossible()) {
+            zoomOut();
+        }
+       event->accept();
+    }
+}
+
 void DolphinView::activate()
 {
     setActive(true);
@@ -594,7 +608,7 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
 KUrl DolphinView::viewPropertiesUrl() const
 {
     if (isColumnViewActive()) {
-        return m_dirLister->url();
+        return m_columnView->rootUrl();
     }
 
     return url();