reactivate ScrollPerPixel again, as the Qt-patch for "divide by zero" has been applie...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ab413f765e9a60796610f5a8644e83b8514ce4c4..8b36e4ec3c45b6e6c472c96ed2471c2bfe50f6db 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -51,7 +51,6 @@
 #include "viewproperties.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"

-#include "dolphincategorydrawer.h"

 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,


@@ -71,8 +70,7 @@ DolphinView::DolphinView(QWidget* parent,
     m_fileItemDelegate(0),
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_fileItemDelegate(0),
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),

-    m_proxyModel(proxyModel),
-    m_rootUrl(url)
+    m_proxyModel(proxyModel)

 {
     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);
 {
     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);


@@ -122,11 +120,6 @@ const KUrl& DolphinView::url() const
     return m_controller->url();
 }
 
     return m_controller->url();
 }
 

-void DolphinView::setRootUrl(const KUrl& url)
-{
-    m_rootUrl = url;
-}
-

 KUrl DolphinView::rootUrl() const
 {
     return isColumnViewActive() ? m_dirLister->url() : url();
 KUrl DolphinView::rootUrl() const
 {
     return isColumnViewActive() ? m_dirLister->url() : url();


@@ -175,6 +168,17 @@ void DolphinView::setMode(Mode mode)
     props.setViewMode(m_mode);
 
     createView();
     props.setViewMode(m_mode);
 
     createView();

+
+    // Not all view modes support categorized sorting. Adjust the sorting model
+    // if changing the view mode results in a change of the categorized sorting
+    // capabilities.
+    const bool categorized = props.categorizedSorting() && supportsCategorizedSorting();
+    if (categorized != categorizedSorting()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
+        emit categorizedSortingChanged();
+    }
+

     startDirLister(viewPropsUrl);
 
     emit modeChanged();
     startDirLister(viewPropsUrl);
 
     emit modeChanged();


@@ -225,11 +229,13 @@ bool DolphinView::showHiddenFiles() const
 
 void DolphinView::setCategorizedSorting(bool categorized)
 {
 
 void DolphinView::setCategorizedSorting(bool categorized)
 {

-    if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) {
+    if (categorized == categorizedSorting()) {

         return;
     }
 
         return;
     }
 

-    Q_ASSERT(m_iconsView != 0);
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());

 
     ViewProperties props(viewPropertiesUrl());
     props.setCategorizedSorting(categorized);
 
     ViewProperties props(viewPropertiesUrl());
     props.setCategorizedSorting(categorized);


@@ -258,15 +264,24 @@ void DolphinView::selectAll()
 
 void DolphinView::invertSelection()
 {
 
 void DolphinView::invertSelection()
 {

-    QItemSelectionModel* selectionModel = itemView()->selectionModel();
-    const QAbstractItemModel* itemModel = selectionModel->model();
+    if (isColumnViewActive()) {
+        // QAbstractItemView does not offer a virtual method invertSelection()
+        // as counterpart to QAbstractItemView::selectAll(). This makes it
+        // necessary to delegate the inverting of the selection to the
+        // column view, as only the selection of the active column should get
+        // inverted.
+        m_columnView->invertSelection();
+    } else {
+        QItemSelectionModel* selectionModel = itemView()->selectionModel();
+        const QAbstractItemModel* itemModel = selectionModel->model();

 
 

-    const QModelIndex topLeft = itemModel->index(0, 0);
-    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
-                                                     itemModel->columnCount() - 1);
+        const QModelIndex topLeft = itemModel->index(0, 0);
+        const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                         itemModel->columnCount() - 1);

 
 

-    QItemSelection selection(topLeft, bottomRight);
-    selectionModel->select(selection, QItemSelectionModel::Toggle);
+        const QItemSelection selection(topLeft, bottomRight);
+        selectionModel->select(selection, QItemSelectionModel::Toggle);
+    }

 }
 
 bool DolphinView::hasSelection() const
 }
 
 bool DolphinView::hasSelection() const


@@ -414,22 +429,22 @@ void DolphinView::refresh()
     updateViewportColor();
 }
 
     updateViewportColor();
 }
 

-void DolphinView::setUrl(const KUrl& url)
+void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)

 {
     if (m_controller->url() == url) {
         return;
     }
 
 {
     if (m_controller->url() == url) {
         return;
     }
 

-    const KUrl oldRootUrl = rootUrl();
+    const bool restoreColumnView =  !rootUrl.isEmpty()
+                                    && !rootUrl.equals(url, KUrl::CompareWithoutTrailingSlash)
+                                    && rootUrl.isParentOf(url);
+

     m_controller->setUrl(url); // emits urlChanged, which we forward
 
     m_controller->setUrl(url); // emits urlChanged, which we forward
 

-    const bool restoreColumnView = !isColumnViewActive()
-                                   && m_rootUrl.isParentOf(url)
-                                   && (m_rootUrl != url);

     if (restoreColumnView) {
     if (restoreColumnView) {

-        applyViewProperties(m_rootUrl);
-        startDirLister(m_rootUrl);
+        applyViewProperties(rootUrl);

         Q_ASSERT(itemView() == m_columnView);
         Q_ASSERT(itemView() == m_columnView);

+        startDirLister(rootUrl);

         m_columnView->showColumn(url);
     } else {
         applyViewProperties(url);
         m_columnView->showColumn(url);
     } else {
         applyViewProperties(url);


@@ -438,10 +453,12 @@ void DolphinView::setUrl(const KUrl& url)
 
     itemView()->setFocus();
 
 
     itemView()->setFocus();
 

-    const KUrl newRootUrl = rootUrl();
-    if (newRootUrl != oldRootUrl) {
-        emit rootUrlChanged(newRootUrl);
-    }
+    emit startedPathLoading(url);
+}
+
+void DolphinView::setUrl(const KUrl& url)
+{
+    updateView(url, KUrl());

 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)


@@ -601,9 +618,10 @@ void DolphinView::applyViewProperties(const KUrl& url)
         emit showHiddenFilesChanged();
     }
 
         emit showHiddenFilesChanged();
     }
 

-    const bool categorized = props.categorizedSorting();
+    const bool categorized = props.categorizedSorting() && supportsCategorizedSorting();

     if (categorized != categorizedSorting()) {
         m_proxyModel->setCategorizedModel(categorized);
     if (categorized != categorizedSorting()) {
         m_proxyModel->setCategorizedModel(categorized);

+        m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());

         emit categorizedSortingChanged();
     }
 
         emit categorizedSortingChanged();
     }
 


@@ -789,11 +807,11 @@ void DolphinView::createView()
 
     // ... and recreate it representing the current mode
     switch (m_mode) {
 
     // ... and recreate it representing the current mode
     switch (m_mode) {

-    case IconsView:
+    case IconsView: {

         m_iconsView = new DolphinIconsView(this, m_controller);
         m_iconsView = new DolphinIconsView(this, m_controller);

-        m_iconsView->setCategoryDrawer(new DolphinCategoryDrawer());

         view = m_iconsView;
         break;
         view = m_iconsView;
         break;

+    }

 
     case DetailsView:
         m_detailsView = new DolphinDetailsView(this, m_controller);
 
     case DetailsView:
         m_detailsView = new DolphinDetailsView(this, m_controller);