File 0006-Accept-drop-events-when-creating-a-new-arc... of Package ark

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Accept-drop-events-when-creating-a-new-archive.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Currently displaying revision ad2d69f4140343ee747a64729f7331a0 , Show latest

From e90f49e0b66ee1ae4cc421ecfc4ba36c7581c2c3 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Mon, 19 Sep 2016 13:36:14 +0200
Subject: [PATCH 06/13] Accept drop events when creating a new archive

This fixes a small regression introduced by 1f0753660f.
---
 part/archiveview.cpp | 8 ++++++--
 part/archiveview.h   | 5 +++++
 part/part.cpp        | 4 ++--
 part/part.h          | 3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/part/archiveview.cpp b/part/archiveview.cpp
index 1d678d3..762b7ad 100644
--- a/part/archiveview.cpp
+++ b/part/archiveview.cpp
@@ -43,8 +43,7 @@ ArchiveView::ArchiveView(QWidget *parent)
     setDropIndicatorShown(true);
     // #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);
+    setDropsEnabled(false);
 }
 
 void ArchiveView::startDrag(Qt::DropActions supportedActions)
@@ -58,6 +57,11 @@ void ArchiveView::startDrag(Qt::DropActions supportedActions)
     QTreeView::startDrag(supportedActions);
 }
 
+void ArchiveView::setDropsEnabled(bool enabled)
+{
+    setAcceptDrops(enabled);
+    setDragDropMode(enabled ? QAbstractItemView::DragDrop : QAbstractItemView::NoDragDrop);
+}
 
 void ArchiveView::dragEnterEvent(QDragEnterEvent * event)
 {
diff --git a/part/archiveview.h b/part/archiveview.h
index 27a4f7d..c0253db 100644
--- a/part/archiveview.h
+++ b/part/archiveview.h
@@ -34,6 +34,11 @@ 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;
+
+    /**
+     * Set whether the view should accept drop events.
+     */
+    void setDropsEnabled(bool enabled);
 };
 
 #endif /* ARCHIVEVIEW_H */
diff --git a/part/part.cpp b/part/part.cpp
index bc08b6a..0bb2bcb 100644
--- a/part/part.cpp
+++ b/part/part.cpp
@@ -674,6 +674,7 @@ bool Part::openFile()
         job->start();
     } else {
         updateActions();
+        m_view->setDropsEnabled(true);
     }
 
     m_infoPanel->setIndex(QModelIndex());
@@ -805,8 +806,7 @@ 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);
+    m_view->setDropsEnabled(true);
 
     updateActions();
 
diff --git a/part/part.h b/part/part.h
index 00b5a54..25741c4 100644
--- a/part/part.h
+++ b/part/part.h
@@ -33,6 +33,7 @@
 #include <QModelIndex>
 
 class ArchiveModel;
+class ArchiveView;
 class InfoPanel;
 
 class KAboutData;
@@ -145,7 +146,7 @@ private:
     void registerJob(KJob *job);
 
     ArchiveModel         *m_model;
-    QTreeView            *m_view;
+    ArchiveView          *m_view;
     QAction *m_previewAction;
     QAction *m_openFileAction;
     QAction *m_openFileWithAction;
-- 
2.10.0

Places

File 0006-Accept-drop-events-when-creating-a-new-archive.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Places