Merge pull request #4982 from nyalldawson/drop_file_drop_file_drop_fi…

…le_drop_file_drop Remove QgsFileDropEdit widget and integrate functionality into QgsFileWidget
qgis · Aug 6, 2017 · 434bda7 · 434bda7
2 parents 42d7e0b + c3b62ad
commit 434bda7
Show file tree

Hide file tree

Showing 11 changed files with 270 additions and 248 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -267,6 +267,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsDataDefinedSymbolDialog was removed. Code using this dialog should be reworked to use QgsPropertyOverrideButton
 - QgsDefaultPluginLayerLegend was removed. Use QgsMapLayer::setLegend() to provide legend nodes for plugin layers.
 - QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
+- QgsFileDropEdit was removed. Use QgsFileWidget instead.
 - QgsFormAnnotationItem. Use QgsFormAnnotation instead.
 - QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.
 - QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.

diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -4,7 +4,6 @@
 %Include qgscustomdrophandler.sip
 %Include qgsdetaileditemdata.sip
 %Include qgsexpressionbuilderdialog.sip
-%Include qgsfiledropedit.sip
 %Include qgsgeometryrubberband.sip
 %Include qgsgui.sip
 %Include qgshelp.sip

diff --git a/python/gui/qgsfilewidget.sip b/python/gui/qgsfilewidget.sip
@@ -9,8 +9,6 @@
 
 
 
-
-
 class QgsFileWidget : QWidget
 {
 %Docstring
@@ -149,6 +147,14 @@ returns if the relative path is with respect to the project path or the default
 determines if the relative path is with respect to the project path or the default path
 %End
 
+    QLineEdit *lineEdit();
+%Docstring
+ Returns a pointer to the widget's line edit, which can be used to customize
+ the appearance and behavior of the line edit portion of the widget.
+.. versionadded:: 3.0
+ :rtype: QLineEdit
+%End
+
   signals:
     void fileChanged( const QString & );
 %Docstring
@@ -157,6 +163,10 @@ emitted as soon as the current file or directory is changed
 
 };
 
+
+
+
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -243,7 +243,6 @@ SET(QGIS_GUI_SRCS
   qgsfieldexpressionwidget.cpp
   qgsfieldvalidator.cpp
   qgsfieldvalueslineedit.cpp
-  qgsfiledropedit.cpp
   qgsfilewidget.cpp
   qgsfilterlineedit.cpp
   qgsfloatingwidget.cpp
@@ -408,7 +407,6 @@ SET(QGIS_GUI_MOC_HDRS
   qgsfieldexpressionwidget.h
   qgsfieldvalidator.h
   qgsfieldvalueslineedit.h
-  qgsfiledropedit.h
   qgsfilewidget.h
   qgsfilterlineedit.h
   qgsfloatingwidget.h
@@ -691,7 +689,6 @@ SET(QGIS_GUI_HDRS
   qgscustomdrophandler.h
   qgsdetaileditemdata.h
   qgsexpressionbuilderdialog.h
-  qgsfiledropedit.h
   qgsgeometryrubberband.h
   qgsgui.h
   qgsguiutils.h

diff --git a/src/gui/qgsfiledropedit.cpp b/src/gui/qgsfiledropedit.cpp
diff --git a/src/gui/qgsfiledropedit.h b/src/gui/qgsfiledropedit.h