prevent crash in model when invoking KDirModel::expandToUrl() before the directory...

svn path=/trunk/KDE/kdebase/apps/; revision=717158

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index a85e0198a6ebe17e6e47a28c07d9ab8d1ad2face..b748dad5e607aa017c36df4404131daad5ad3422 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -117,7 +117,9 @@ ColumnWidget::ColumnWidget(QWidget* parent,
     viewport()->setAttribute(Qt::WA_Hover);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     viewport()->setAttribute(Qt::WA_Hover);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);

-    setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    // TODO: enable ScrollPerPixel again as soon as a Qt-patch
+    // is supplied which fixes a possible crash
+    //setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);

     setSelectionBehavior(SelectItems);
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setDragDropMode(QAbstractItemView::DragDrop);
     setSelectionBehavior(SelectItems);
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setDragDropMode(QAbstractItemView::DragDrop);


@@ -296,7 +298,7 @@ void ColumnWidget::keyPressEvent(QKeyEvent* event)
                              && (event->key() == Qt::Key_Return)
                              && (selModel->selectedIndexes().count() <= 1);
     if (triggerItem) {
                              && (event->key() == Qt::Key_Return)
                              && (selModel->selectedIndexes().count() <= 1);
     if (triggerItem) {

-        m_view->m_controller->triggerItem(currentIndex);
+        m_view->triggerItem(currentIndex);

     }
 }
 
     }
 }
 


@@ -338,10 +340,10 @@ void ColumnWidget::activate()
     // necessary connecting the signal 'singleClick()' or 'doubleClick'.
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
     // necessary connecting the signal 'singleClick()' or 'doubleClick'.
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),

-                m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
+                m_view, SLOT(triggerItem(const QModelIndex&)));

     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),

-                m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
+                m_view, SLOT(triggerItem(const QModelIndex&)));

     }
 
     const QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     }
 
     const QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();


@@ -367,10 +369,10 @@ void ColumnWidget::deactivate()
     // necessary connecting the signal 'singleClick()' or 'doubleClick'.
     if (KGlobalSettings::singleClick()) {
         disconnect(this, SIGNAL(clicked(const QModelIndex&)),
     // necessary connecting the signal 'singleClick()' or 'doubleClick'.
     if (KGlobalSettings::singleClick()) {
         disconnect(this, SIGNAL(clicked(const QModelIndex&)),

-                   m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
+                   m_view, SLOT(triggerItem(const QModelIndex&)));

     } else {
         disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)),
     } else {
         disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)),

-                   m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));
+                   m_view, SLOT(triggerItem(const QModelIndex&)));

     }
 
     const QPalette palette = m_view->viewport()->palette();
     }
 
     const QPalette palette = m_view->viewport()->palette();


@@ -386,6 +388,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control
     QAbstractItemView(parent),
     m_controller(controller),
     m_restoreActiveColumnFocus(false),
     QAbstractItemView(parent),
     m_controller(controller),
     m_restoreActiveColumnFocus(false),

+    m_initializedDirLister(false),

     m_index(-1),
     m_contentX(0),
     m_columns(),
     m_index(-1),
     m_contentX(0),
     m_columns(),


@@ -476,6 +479,23 @@ void DolphinColumnView::setModel(QAbstractItemModel* model)
     QAbstractItemView::setModel(model);
 }
 
     QAbstractItemView::setModel(model);
 }
 

+void DolphinColumnView::invertSelection()
+{
+    // TODO: this approach of inverting the selection is quite slow. It should
+    // be possible to speedup the implementation by using QItemSelection, but
+    // all adempts have failed yet...
+
+    ColumnWidget* column = activeColumn();
+    QItemSelectionModel* selModel = column->selectionModel();
+
+    KDirLister* dirLister = m_dolphinModel->dirLister();
+    const KFileItemList list = dirLister->itemsForDir(column->url());
+    foreach (KFileItem* item, list) {
+        const QModelIndex index = m_dolphinModel->indexForUrl(item->url());
+        selModel->select(m_proxyModel->mapFromSource(index), QItemSelectionModel::Toggle);
+    }
+}
+

 void DolphinColumnView::reload()
 {
     // Due to the reloading of the model all columns will be reset to show
 void DolphinColumnView::reload()
 {
     // Due to the reloading of the model all columns will be reset to show


@@ -493,31 +513,15 @@ void DolphinColumnView::reload()
             m_restoreActiveColumnFocus = true;
         }
         column->hide();
             m_restoreActiveColumnFocus = true;
         }
         column->hide();

-   }
+    }

 
     // all columns are hidden, now reload the directory lister
     KDirLister* dirLister = m_dolphinModel->dirLister();
     connect(dirLister, SIGNAL(completed()),
             this, SLOT(expandToActiveUrl()));
 
     // all columns are hidden, now reload the directory lister
     KDirLister* dirLister = m_dolphinModel->dirLister();
     connect(dirLister, SIGNAL(completed()),
             this, SLOT(expandToActiveUrl()));

-    const KUrl rootUrl = m_columns[0]->url();
-    dirLister->openUrl(rootUrl, false, true);
-}
-
-void DolphinColumnView::invertSelection()
-{
-    // TODO: this approach of inverting the selection is quite slow. It should
-    // be possible to speedup the implementation by using QItemSelection, but
-    // all adempts have failed yet...
-
-    ColumnWidget* column = activeColumn();
-    QItemSelectionModel* selModel = column->selectionModel();
-
-    KDirLister* dirLister = m_dolphinModel->dirLister();
-    const KFileItemList list = dirLister->itemsForDir(column->url());
-    foreach (KFileItem* item, list) {
-        const QModelIndex index = m_dolphinModel->indexForUrl(item->url());
-        selModel->select(m_proxyModel->mapFromSource(index), QItemSelectionModel::Toggle);
-    }
+    const KUrl& rootUrl = m_columns[0]->url();
+    m_initializedDirLister = dirLister->openUrl(m_columns[0]->url(), false, true);
+    reloadColumns();

 }
 
 void DolphinColumnView::showColumn(const KUrl& url)
 }
 
 void DolphinColumnView::showColumn(const KUrl& url)


@@ -635,9 +639,13 @@ void DolphinColumnView::showColumn(const KUrl& url)
     m_index = columnIndex;
     activeColumn()->setActive(true);
 
     m_index = columnIndex;
     activeColumn()->setActive(true);
 

-    connect(dirLister, SIGNAL(completed()),
-            this, SLOT(expandToActiveUrl()));
-    dirLister->openUrl(rootUrl, false, true);
+    if (m_initializedDirLister) {
+        // expanding the active URL may only be done if the directory lister
+        // has been initialized
+        QMetaObject::invokeMethod(this, "expandToActiveUrl", Qt::QueuedConnection);
+    } else {
+        QMetaObject::invokeMethod(this, "reload", Qt::QueuedConnection);
+    }

 }
 
 void DolphinColumnView::selectAll()
 }
 
 void DolphinColumnView::selectAll()


@@ -791,8 +799,8 @@ void DolphinColumnView::expandToActiveUrl()
                         && !rootUrl.equals(activeUrl, KUrl::CompareWithoutTrailingSlash);
     if (expand) {
         m_dolphinModel->expandToUrl(activeUrl);
                         && !rootUrl.equals(activeUrl, KUrl::CompareWithoutTrailingSlash);
     if (expand) {
         m_dolphinModel->expandToUrl(activeUrl);

-        reloadColumns();

     }
     }

+    reloadColumns();

 }
 
 void DolphinColumnView::triggerReloadColumns(const QModelIndex& index)
 }
 
 void DolphinColumnView::triggerReloadColumns(const QModelIndex& index)


@@ -827,6 +835,12 @@ void DolphinColumnView::reloadColumns()
     assureVisibleActiveColumn();
 }
 
     assureVisibleActiveColumn();
 }
 

+void DolphinColumnView::triggerItem(const QModelIndex& index)
+{
+    m_initializedDirLister = true;
+    m_controller->triggerItem(index);
+}
+

 bool DolphinColumnView::isZoomInPossible() const
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 bool DolphinColumnView::isZoomInPossible() const
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 639ccec32af0ebd7dd07815de8631d6e21b416de..5a20b1f9f45999808420f9a8a6f945eb2548b8dd 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -50,6 +50,10 @@ public:
     virtual QRect visualRect(const QModelIndex& index) const;
     virtual void setModel(QAbstractItemModel* model);
 
     virtual QRect visualRect(const QModelIndex& index) const;
     virtual void setModel(QAbstractItemModel* model);
 

+    /** Inverts the selection of the currently active column. */
+    void invertSelection();
+
+public slots:

     /**
      * Reloads the content of all columns. In opposite to non-hierarchical views
      * it is not enough to reload the KDirLister, instead this method must be explicitly
     /**
      * Reloads the content of all columns. In opposite to non-hierarchical views
      * it is not enough to reload the KDirLister, instead this method must be explicitly


@@ -57,10 +61,6 @@ public:
      */
     void reload();
 
      */
     void reload();
 

-    /** Inverts the selection of the currently active column. */
-    void invertSelection();
-
-public slots:

     /**
      * Shows the column which represents the URL \a url. If the column
      * is already shown, it gets activated, otherwise it will be created.
     /**
      * Shows the column which represents the URL \a url. If the column
      * is already shown, it gets activated, otherwise it will be created.


@@ -118,6 +118,8 @@ private slots:
      */
     void reloadColumns();
 
      */
     void reloadColumns();
 

+    void triggerItem(const QModelIndex& index);
+

 private:
     bool isZoomInPossible() const;
     bool isZoomOutPossible() const;
 private:
     bool isZoomInPossible() const;
     bool isZoomOutPossible() const;


@@ -151,6 +153,7 @@ private:
 private:
     DolphinController* m_controller;
     bool m_restoreActiveColumnFocus;
 private:
     DolphinController* m_controller;
     bool m_restoreActiveColumnFocus;

+    bool m_initializedDirLister;

     int m_index;
     int m_contentX;
     QList<ColumnWidget*> m_columns;
     int m_index;
     int m_contentX;
     QList<ColumnWidget*> m_columns;