Allow dropping paths onto data source select dialog to expand browser…

… paths Makes it a bit easier to fix data sources for files in deep paths
qgis · May 8, 2024 · d95897d · d95897d
1 parent fc0c496
commit d95897d
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 0 deletions.
diff --git a/python/PyQt6/gui/auto_generated/qgsdatasourceselectdialog.sip.in b/python/PyQt6/gui/auto_generated/qgsdatasourceselectdialog.sip.in
@@ -103,6 +103,11 @@ Apply filter to the model
 Scroll to last selected index and expand it's children
 %End
 
+    virtual void dragEnterEvent( QDragEnterEvent *event );
+
+    virtual void dropEvent( QDropEvent *event );
+
+
   signals:
 
     void validationChanged( bool isValid );

diff --git a/python/gui/auto_generated/qgsdatasourceselectdialog.sip.in b/python/gui/auto_generated/qgsdatasourceselectdialog.sip.in
@@ -103,6 +103,11 @@ Apply filter to the model
 Scroll to last selected index and expand it's children
 %End
 
+    virtual void dragEnterEvent( QDragEnterEvent *event );
+
+    virtual void dropEvent( QDropEvent *event );
+
+
   signals:
 
     void validationChanged( bool isValid );

diff --git a/src/gui/qgsdatasourceselectdialog.cpp b/src/gui/qgsdatasourceselectdialog.cpp
@@ -31,6 +31,7 @@
 #include <QFileInfo>
 #include <QUrl>
 #include <QActionGroup>
+#include <QDir>
 
 QgsDataSourceSelectWidget::QgsDataSourceSelectWidget(
   QgsBrowserGuiModel *browserModel,
@@ -116,6 +117,8 @@ QgsDataSourceSelectWidget::QgsDataSourceSelectWidget(
   {
     mActionShowFilter->trigger();
   }
+
+  setAcceptDrops( true );
 }
 
 QgsDataSourceSelectWidget::~QgsDataSourceSelectWidget() = default;
@@ -145,6 +148,58 @@ void QgsDataSourceSelectWidget::showEvent( QShowEvent *e )
   }
 }
 
+QString QgsDataSourceSelectWidget::acceptableFilePath( QDropEvent *event ) const
+{
+  if ( event->mimeData()->hasUrls() )
+  {
+    const QList< QUrl > urls = event->mimeData()->urls();
+    for ( const QUrl &url : urls )
+    {
+      const QString local = url.toLocalFile();
+      if ( local.isEmpty() )
+        continue;
+
+      if ( QFile::exists( local ) )
+      {
+        return local;
+      }
+    }
+  }
+  return QString();
+}
+
+void QgsDataSourceSelectWidget::dragEnterEvent( QDragEnterEvent *event )
+{
+  const QString filePath = acceptableFilePath( event );
+  if ( !filePath.isEmpty() )
+  {
+    event->acceptProposedAction();
+  }
+  else
+  {
+    event->ignore();
+  }
+}
+
+void QgsDataSourceSelectWidget::dropEvent( QDropEvent *event )
+{
+  const QString filePath = acceptableFilePath( event );
+  if ( !filePath.isEmpty() )
+  {
+    event->acceptProposedAction();
+
+    const QFileInfo fi( filePath );
+    if ( fi.isDir() )
+    {
+      expandPath( filePath, true );
+    }
+    else
+    {
+      expandPath( fi.dir().path(), true );
+    }
+  }
+}
+
 void QgsDataSourceSelectWidget::showFilterWidget( bool visible )
 {
   QgsSettings().setValue( QStringLiteral( "datasourceSelectFilterVisible" ), visible, QgsSettings::Section::Gui );

diff --git a/src/gui/qgsdatasourceselectdialog.h b/src/gui/qgsdatasourceselectdialog.h
@@ -104,6 +104,9 @@ class GUI_EXPORT QgsDataSourceSelectWidget: public QgsPanelWidget, private Ui::Q
     //! Scroll to last selected index and expand it's children
     void showEvent( QShowEvent *e ) override;
 
+    void dragEnterEvent( QDragEnterEvent *event ) override;
+    void dropEvent( QDropEvent *event ) override;
+
   signals:
 
     /**
@@ -137,6 +140,9 @@ class GUI_EXPORT QgsDataSourceSelectWidget: public QgsPanelWidget, private Ui::Q
 
     void setValid( bool valid );
 
+    //! Returns file name if object meets drop criteria.
+    QString acceptableFilePath( QDropEvent *event ) const;
+
     QgsBrowserProxyModel mBrowserProxyModel;
     QgsBrowserGuiModel *mBrowserModel = nullptr;
     QgsMimeDataUtils::Uri mUri;