Skip to content
Permalink
Browse files

Remove QgsFileDropEdit widget and integrate functionality into QgsFil…

…eWidget

It makes no sense to have two classes covering this use case, with
partial functionality in each. Smash the two together so we can
safely use QgsFileWidget for all use cases in future.
  • Loading branch information
nyalldawson committed Aug 6, 2017
1 parent 10968ae commit b1a6c790cfa51d8db5e3308da7f72ea68adb880c
@@ -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.
@@ -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
@@ -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 customise
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 *
* *
@@ -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

This file was deleted.

This file was deleted.

0 comments on commit b1a6c79

Please sign in to comment.
You can’t perform that action at this time.