File 0003-Stop-crashing-when-dropping-on-empty-Archi... of Package ark

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Stop-crashing-when-dropping-on-empty-ArchiveView.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Currently displaying revision ad2d69f4140343ee747a64729f7331a0 , Show latest

From 1f0753660f13ad7e2a2b51aa34b7580118bcbd33 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Thu, 15 Sep 2016 16:13:34 +0200
Subject: [PATCH 03/13] Stop crashing when dropping on empty ArchiveView

ArchiveView was accepting drops events unconditionally, overriding the
MainWindow's ones. This resulted in a crash when the ArchiveView was
empty. Now we initially disable drop events, so that we can actually
open an archive by dropping it to any position in the Ark window.

BUG: 368807
FIXED-IN: 16.08.2
---
 part/archiveview.cpp | 13 ++++---------
 part/archiveview.h   |  2 --
 part/part.cpp        |  5 +++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/part/archiveview.cpp b/part/archiveview.cpp
index 7a31a86..1d678d3 100644
--- a/part/archiveview.cpp
+++ b/part/archiveview.cpp
@@ -33,23 +33,18 @@
 ArchiveView::ArchiveView(QWidget *parent)
     : QTreeView(parent)
 {
-}
-
-void ArchiveView::setModel(QAbstractItemModel *model)
-{
-    QTreeView::setModel(model);
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setAlternatingRowColors(true);
     setAnimated(true);
     setAllColumnsShowFocus(true);
     setSortingEnabled(true);
-
-    //drag and drop
     setDragEnabled(true);
-    setAcceptDrops(true);
     setDropIndicatorShown(true);
-    setDragDropMode(QAbstractItemView::DragDrop);
+    // #368807: drops must be initially disabled, otherwise they will override the MainWindow's ones.
+    // They will be enabled in Part::slotLoadingFinished().
+    setAcceptDrops(false);
+    setDragDropMode(QAbstractItemView::NoDragDrop);
 }
 
 void ArchiveView::startDrag(Qt::DropActions supportedActions)
diff --git a/part/archiveview.h b/part/archiveview.h
index 1f0a63a..27a4f7d 100644
--- a/part/archiveview.h
+++ b/part/archiveview.h
@@ -34,8 +34,6 @@ public:
     virtual void dropEvent(class QDropEvent * event) Q_DECL_OVERRIDE;
     virtual void dragMoveEvent(class QDragMoveEvent * event) Q_DECL_OVERRIDE;
     virtual void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE;
-
-    void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
 };
 
 #endif /* ARCHIVEVIEW_H */
diff --git a/part/part.cpp b/part/part.cpp
index 14054e6..ed6094b 100644
--- a/part/part.cpp
+++ b/part/part.cpp
@@ -287,8 +287,6 @@ void Part::setupView()
 
     m_view->setModel(m_model);
 
-    m_view->setSortingEnabled(true);
-
     connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged,
             this, &Part::updateActions);
     connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged,
@@ -810,6 +808,9 @@ void Part::slotLoadingFinished(KJob *job)
 
     // After loading all files, resize the columns to fit all fields
     m_view->header()->resizeSections(QHeaderView::ResizeToContents);
+    // Now we can start accepting drops in the archive view.
+    m_view->setAcceptDrops(true);
+    m_view->setDragDropMode(QAbstractItemView::DragDrop);
 
     updateActions();
 
-- 
2.10.0

Places

File 0003-Stop-crashing-when-dropping-on-empty-ArchiveView.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Places