From 24bde35ce67a0996e2673afa450fc1feb0cd6f53 Mon Sep 17 00:00:00 2001
From: Patrick Valsecchi <patrick.valsecchi@camptocamp.com>
Date: Fri, 15 Jul 2016 12:11:43 +0200
Subject: [PATCH] Smarter default edit widgets with plugins to pick them

Now the widgets factories can give a score on how good they could handle
a widget.

Additionaly, plugins can be added to choose a widget factory in function
of an external information. One of them uses a table in PostgresQL to
allow specification of the widget type and configuration.

I took the opportunity to remove a few deprecated method in relation to
this.
---
 doc/api_break.dox                             |  17 +++
 python/core/qgseditformconfig.sip             |  48 ++-----
 python/core/qgsfield.sip                      |  45 +++++++
 .../core/qgseditorwidgetautoconf.sip          |  41 ++++++
 .../core/qgseditorwidgetfactory.sip           |  14 ++-
 .../core/qgseditorwidgetregistry.sip          |  19 +++
 python/gui/gui.sip                            |   1 +
 src/app/ogr/qgsvectorlayersaveasdialog.cpp    |  10 +-
 src/app/qgisapp.cpp                           |   6 +-
 src/app/qgsattributetabledialog.cpp           |   7 +-
 src/app/qgsfieldsproperties.cpp               |   9 +-
 src/app/qgsidentifyresultsdialog.cpp          |  20 +--
 src/app/qgsidentifyresultsdialog.h            |   3 +-
 src/app/qgsmergeattributesdialog.cpp          |   7 +-
 src/core/qgseditformconfig.cpp                |  69 +++++-----
 src/core/qgseditformconfig.h                  |  37 ++----
 src/core/qgsfield.cpp                         |  10 ++
 src/core/qgsfield.h                           |  50 ++++++++
 src/core/qgsfield_p.h                         |   2 +
 src/core/qgsvectorlayerundocommand.cpp        |   2 +-
 src/gui/CMakeLists.txt                        |   1 +
 .../qgsattributetabledelegate.cpp             |   4 +-
 .../attributetable/qgsattributetablemodel.cpp |   8 +-
 src/gui/attributetable/qgsdualview.cpp        |   3 +-
 .../core/qgseditorwidgetautoconf.cpp          | 112 +++++++++++++++++
 .../core/qgseditorwidgetautoconf.h            |  88 +++++++++++++
 .../core/qgseditorwidgetfactory.cpp           |   4 +-
 .../core/qgseditorwidgetfactory.h             |  18 ++-
 .../core/qgseditorwidgetregistry.cpp          |  30 ++++-
 .../core/qgseditorwidgetregistry.h            |  37 ++++++
 .../qgscheckboxwidgetfactory.cpp              |   6 +
 .../editorwidgets/qgscheckboxwidgetfactory.h  |   1 +
 .../editorwidgets/qgscolorwidgetfactory.cpp   |  14 +++
 src/gui/editorwidgets/qgscolorwidgetfactory.h |   1 +
 .../editorwidgets/qgsdatetimeeditfactory.cpp  |  15 +++
 .../editorwidgets/qgsdatetimeeditfactory.h    |   1 +
 .../qgsenumerationwidgetfactory.cpp           |   6 +-
 .../qgsenumerationwidgetfactory.h             |   3 +-
 .../qgsexternalresourcewidgetfactory.cpp      |   6 +-
 .../qgsexternalresourcewidgetfactory.h        |   4 +-
 .../editorwidgets/qgsrangewidgetfactory.cpp   |  13 +-
 src/gui/editorwidgets/qgsrangewidgetfactory.h |   2 +-
 .../qgstexteditwidgetfactory.cpp              |   7 ++
 .../editorwidgets/qgstexteditwidgetfactory.h  |   3 +-
 .../editorwidgets/qgsuuidwidgetfactory.cpp    |   6 +
 src/gui/editorwidgets/qgsuuidwidgetfactory.h  |   1 +
 src/gui/qgsattributeeditor.cpp                |   5 +-
 src/gui/qgsattributeform.cpp                  |  33 +++--
 src/providers/postgres/CMakeLists.txt         |   1 -
 src/providers/postgres/qgspostgresconn.cpp    |   2 +
 .../postgres/qgspostgresprovider.cpp          |  88 +++++++++----
 src/providers/postgres/qgspostgresprovider.h  |   4 +
 src/server/qgsserverprojectparser.cpp         |   7 +-
 src/server/qgswmsserver.cpp                   |   8 +-
 tests/src/core/testqgsfield.cpp               |  13 ++
 tests/src/gui/CMakeLists.txt                  |   1 +
 tests/src/gui/testqgsattributeform.cpp        |   1 +
 tests/src/gui/testqgseditorwidgetregistry.cpp | 119 ++++++++++++++++++
 tests/src/python/test_provider_postgres.py    |  23 ++++
 tests/testdata/provider/testdata_pg.sh        |   1 +
 tests/testdata/provider/testdata_pg.sql       |  24 ++++
 61 files changed, 908 insertions(+), 233 deletions(-)
 create mode 100644 python/gui/editorwidgets/core/qgseditorwidgetautoconf.sip
 create mode 100644 src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp
 create mode 100644 src/gui/editorwidgets/core/qgseditorwidgetautoconf.h
 create mode 100644 tests/src/gui/testqgseditorwidgetregistry.cpp

diff --git a/doc/api_break.dox b/doc/api_break.dox
index 597318f6ecb..45feb2f15bf 100644
--- a/doc/api_break.dox
+++ b/doc/api_break.dox
@@ -492,6 +492,8 @@ place of a null pointer.</li>
 
 <ul>
 <li>Does no longer inherit QObject
+<li>widgetType() and widgetConfig() now reflect only the user configured values.
+QgsEditorWidgetRegistry::instance()->findBest() must be used instead.</li>
 </ul>
 
 \subsection qgis_api_break_3_0_QgsExpression QgsExpression
@@ -590,6 +592,13 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().<
 plugins calling this method will need to be updated.</li>
 </ul>
 
+\subsection qgis_api_break_3_0_QgsEditorWidgetRegistry QgsEditorWidgetRegistry
+
+<ul>
+<li>The signature of isFieldSupported() has been changed to return an unsigned (how good it supports the given field)
+and to const-correct it.</li>
+</ul>
+
 \subsection qgis_api_break_3_0_QgsGroupWMSDataDialog QgsGroupWMSDataDialog
 
 <ul>
@@ -817,6 +826,14 @@ plugins calling this method will need to be updated.</li>
 
 <ul>
 <li>setMapRenderer() has been removed. Use setMapSettings() instead.</li>
+<li>excludeAttributesWMS() and setExcludeAttributesWMS() have been renamed to excludeAttributesWms() and
+setExcludeAttributesWms()</li>
+<li>excludeAttributesWFS() and setExcludeAttributesWFS() have been renamed to excludeAttributesWfs() and 
+setExcludeAttributesWfs()</li>
+<li>editorWidgetV2() and editorWidgetV2Config() have been removed and QgsEditorWidgetRegistry::instance()->findBest() must be used instead.</li>
+<li>setEditorWidgetV2(), setEditorWidgetV2Config() have been removed and their equivalent in editFormConfig() must be used instead.</li>
+<li>setCheckedState() is removed. Use editFormConfig()->setWidgetConfig()` instead.</li>
+<li>valueMap(), valueRelation(), dateFormat(), widgetSize() have been removed. Use QgsEditorWidgetRegistry::instance()->findBest().config() instead.</li>
 </ul>
 
 \subsection qgis_api_break_3_0_QgsRenderContext QgsRenderContext
diff --git a/python/core/qgseditformconfig.sip b/python/core/qgseditformconfig.sip
index 7b5422b291c..7f169521792 100644
--- a/python/core/qgseditformconfig.sip
+++ b/python/core/qgseditformconfig.sip
@@ -142,15 +142,6 @@ class QgsEditFormConfig
      */
     void setWidgetType( int fieldIdx, const QString& widgetType );
 
-    /**
-     * Get the id for the editor widget used to represent the field at the given index
-     *
-     * @param fieldIdx  The index of the field
-     *
-     * @return The id for the editor widget or a NULL string if not applicable
-     */
-    QString widgetType( int fieldIdx ) const;
-
     /**
      * Get the id for the editor widget used to represent the field at the given index
      *
@@ -177,40 +168,14 @@ class QgsEditFormConfig
      */
     void setWidgetConfig( int attrIdx, const QgsEditorWidgetConfig& config );
 
-    /**
-     * Set the editor widget config for a widget.
-     *
-     * Example:
-     * \code{.py}
-     *   layer.setWidgetConfig( 'relation_id', { 'nm-rel': 'other_relation' } )
-     * \endcode
-     *
-     * @param widgetName  The name of the widget or field to configure
-     * @param config      The config to set for this field
-     *
-     * @see setWidgetType() for a list of widgets and choose the widget to see the available options.
-     *
-     * @note not available in python bindings
-     */
-    // void setWidgetConfig( const QString& widgetName, const QgsEditorWidgetConfig& config );
-
-    /**
-     * Get the configuration for the editor widget used to represent the field at the given index
-     *
-     * @param fieldIdx  The index of the field
-     *
-     * @return The configuration for the editor widget or an empty config if the field does not exist
-     */
-    QgsEditorWidgetConfig widgetConfig( int fieldIdx ) const;
-
     /**
      * Get the configuration for the editor widget used to represent the field with the given name
      *
-     * @param widgetName The name of the widget. This can be a field name or the name of an additional widget.
+     * @param fieldName The name of the field.
      *
      * @return The configuration for the editor widget or an empty config if the field does not exist
      */
-    QgsEditorWidgetConfig widgetConfig( const QString& widgetName ) const;
+    QgsEditorWidgetConfig widgetConfig( const QString& fieldName ) const;
 
     /**
      * Remove the configuration for the editor widget used to represent the field at the given index
@@ -224,11 +189,11 @@ class QgsEditFormConfig
     /**
      * Remove the configuration for the editor widget used to represent the field with the given name
      *
-     * @param widgetName The name of the widget. This can be a field name or the name of an additional widget.
+     * @param fieldName The name of the field.
      *
      * @return true if successful, false if the field does not exist
      */
-    bool removeWidgetConfig( const QString& widgetName );
+    bool removeWidgetConfig( const QString& fieldName );
 
     /**
      * This returns true if the field is manually set to read only or if the field
@@ -372,4 +337,9 @@ class QgsEditFormConfig
      * Deserialize drag and drop designer elements.
      */
     QgsAttributeEditorElement* attributeEditorElementFromDomElement( QDomElement &elem, QgsAttributeEditorElement* parent );
+
+     /**
+      * Parse the XML for the config of one editor widget.
+      */
+    static QgsEditorWidgetConfig parseEditorWidgetConfig( const QDomElement& cfgElem );
 };
diff --git a/python/core/qgsfield.sip b/python/core/qgsfield.sip
index 9a53f0e3634..a906fe40d09 100644
--- a/python/core/qgsfield.sip
+++ b/python/core/qgsfield.sip
@@ -1,3 +1,35 @@
+/** \ingroup core
+ * Holder for the widget type and its configuration for a field.
+ */
+class QgsEditorWidgetSetup
+{
+%TypeHeaderCode
+#include <qgsfield.h>
+%End
+  public:
+    /**
+     * Constructor
+     */
+    QgsEditorWidgetSetup( const QString& type, const QgsEditorWidgetConfig& config );
+    QgsEditorWidgetSetup();
+
+    /**
+     * @return the widget type to use
+     */
+    QString type() const;
+
+    /**
+     * @return the widget configuration to used
+     */
+    QgsEditorWidgetConfig config() const;
+
+    /**
+     * @return true if there is no widget configured.
+     */
+    bool isNull() const;
+};
+
+
 /** \class QgsField
   * \ingroup core
   * Encapsulate a field in an attribute table or data source.
@@ -179,6 +211,19 @@ class QgsField
     //! Allows direct construction of QVariants from fields.
     operator QVariant() const;
 
+    /**
+     * Set the editor widget setup for the field.
+     *
+     * @param v  The value to set
+     */
+    void setEditorWidgetSetup( const QgsEditorWidgetSetup& v );
+
+    /**
+     * Get the editor widget setup for the field.
+     *
+     * @return the value
+     */
+    const QgsEditorWidgetSetup& editorWidgetSetup() const;
 }; // class QgsField
 
 
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetautoconf.sip b/python/gui/editorwidgets/core/qgseditorwidgetautoconf.sip
new file mode 100644
index 00000000000..ce64ec137f0
--- /dev/null
+++ b/python/gui/editorwidgets/core/qgseditorwidgetautoconf.sip
@@ -0,0 +1,41 @@
+/***************************************************************************
+    qgseditorwidgetautoconf.sip
+    ---------------------
+    begin                : July 2016
+    copyright            : (C) 2016 by Patrick Valsecchi
+    email                : patrick.valsecchi at camptocamp.com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/**
+ * Base class for plugins allowing to pick automatically a widget type for editing fields.
+ *
+ * @note added in QGIS 3.0
+ */
+class QgsEditorWidgetAutoConfPlugin
+{
+  %TypeHeaderCode
+  #include <qgseditorwidgetautoconf.h>
+  %End
+
+  public:
+    /**
+     * Typical scores are:
+     *   * 0: no matching type found.
+     *   * 10: a widget has been guessed from the type of field.
+     *   * 20: a widget has been determined from an external configuration (for example a database table)
+     *
+     * @param vl        The vector layer for which this widget will be created
+     * @param fieldName The field name on the specified layer for which this widget will be created
+     * @param score     Where the score is returned (default to 0)
+     *
+     * @return and integer value rating how good is the setup provided by this plugin.
+     */
+    virtual QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName, int& score /Out/ ) const = 0;
+};
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip b/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
index 1dd137eb149..f261823b6dd 100644
--- a/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
+++ b/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
@@ -170,17 +170,23 @@ class QgsEditorWidgetFactory
      */
     virtual QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx );
 
-  private:
     /**
      * This method allows disabling this editor widget type for a certain field.
-     * By default, it returns true for all fields.
+     * By default, it returns 5 for every fields.
      * Reimplement this if you only support certain fields.
      *
+     * Typical return values are:
+     *   * 0: not supported
+     *   * 5: maybe support (for example, Datetime support strings depending on their content)
+     *   * 10: basic support (this is what returns TextEdit for example, since it supports everything in a crude way)
+     *   * 20: specialised support
+     *
      * @param vl
      * @param fieldIdx
-     * @return True if the field is supported.
+     * @return 0 if the field is not supported or a bigger number if it can (the widget with the biggest number will be
+     *      taken by default). The default implementation returns 5..
      *
      * @see supportsField( QgsVectorLayer* vl, fieldIdx )
      */
-    virtual bool isFieldSupported( QgsVectorLayer* vl, int fieldIdx );
+    virtual unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const;
 };
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip b/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
index 38ba6a75afa..1d9e5089d43 100644
--- a/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
+++ b/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
+
 /**
  * This class manages all known edit widget factories
  */
@@ -43,6 +44,17 @@ class QgsEditorWidgetRegistry : QObject
      */
     static void initEditors( QgsMapCanvas* mapCanvas = 0, QgsMessageBar* messageBar = 0 );
 
+    /**
+     * Find the best editor widget and its configuration for a given field.
+     *
+     * @param vl        The vector layer for which this widget will be created
+     * @param fieldIdx  The field index on the specified layer for which this widget will be created
+     *
+     * @return The id of the widget type to use and its config
+     */
+    QgsEditorWidgetSetup findBest( const QgsVectorLayer* vl, const QString& fieldName ) const;
+
+
     /**
      * Create an attribute editor widget wrapper of a given type for a given field.
      * The editor may be NULL if you want the widget wrapper to create a default widget.
@@ -116,4 +128,11 @@ class QgsEditorWidgetRegistry : QObject
      * @return true, if successful, false, if the widgetId is already in use or widgetFactory is NULL
      */
     bool registerWidget( const QString& widgetId, QgsEditorWidgetFactory* widgetFactory /Transfer/ );
+
+     /**
+     * Register a new auto-conf plugin.
+     *
+     * @param plugin The plugin (ownership is transfered)
+     */
+    void registerAutoConfPlugin( QgsEditorWidgetAutoConfPlugin* plugin );
 };
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
index 5cd321ddcff..b710a7bdd5c 100644
--- a/python/gui/gui.sip
+++ b/python/gui/gui.sip
@@ -260,6 +260,7 @@
 %Include effects/qgspainteffectwidget.sip
 
 %Include editorwidgets/core/qgseditorconfigwidget.sip
+%Include editorwidgets/core/qgseditorwidgetautoconf.sip
 %Include editorwidgets/core/qgseditorwidgetfactory.sip
 %Include editorwidgets/core/qgseditorwidgetregistry.sip
 %Include editorwidgets/core/qgseditorwidgetwrapper.sip
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
index 063e1a80710..ba4a00ecc29 100644
--- a/src/app/ogr/qgsvectorlayersaveasdialog.cpp
+++ b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -249,8 +249,9 @@ void QgsVectorLayerSaveAsDialog::on_mFormatComboBox_currentIndexChanged( int idx
     bool foundFieldThatCanBeExportedAsDisplayedValue = false;
     for ( int i = 0; i < mLayer->fields().size(); ++i )
     {
-      if ( mLayer->editFormConfig().widgetType( i ) != "TextEdit" &&
-           QgsEditorWidgetRegistry::instance()->factory( mLayer->editFormConfig().widgetType( i ) ) )
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, mLayer->fields()[i].name() );
+      if ( setup.type() != "TextEdit" &&
+           QgsEditorWidgetRegistry::instance()->factory( setup.type() ) )
       {
         foundFieldThatCanBeExportedAsDisplayedValue = true;
         break;
@@ -285,10 +286,11 @@ void QgsVectorLayerSaveAsDialog::on_mFormatComboBox_currentIndexChanged( int idx
 
       if ( foundFieldThatCanBeExportedAsDisplayedValue )
       {
+        const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, mLayer->fields()[i].name() );
         QgsEditorWidgetFactory *factory = nullptr;
         if ( flags == Qt::ItemIsEnabled &&
-             mLayer->editFormConfig().widgetType( i ) != "TextEdit" &&
-             ( factory = QgsEditorWidgetRegistry::instance()->factory( mLayer->editFormConfig().widgetType( i ) ) ) )
+             setup.type() != "TextEdit" &&
+             ( factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() ) ) )
         {
           item = new QTableWidgetItem( tr( "Use %1" ).arg( factory->name() ) );
           item->setFlags(( selectAllFields ) ? ( Qt::ItemIsEnabled | Qt::ItemIsUserCheckable ) : Qt::ItemIsUserCheckable );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 45d9b8f1835..675d1739391 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -6149,11 +6149,11 @@ QVariant QgisAppFieldValueConverter::convert( int idx, const QVariant& value )
   {
     return value;
   }
-  QgsEditorWidgetFactory *factory = QgsEditorWidgetRegistry::instance()->factory( mLayer->editFormConfig().widgetType( idx ) );
+  const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, mLayer->fields().field( idx ).name() );
+  QgsEditorWidgetFactory *factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
   if ( factory )
   {
-    QgsEditorWidgetConfig cfg( mLayer->editFormConfig().widgetConfig( idx ) );
-    return QVariant( factory->representValue( mLayer, idx, cfg, QVariant(), value ) );
+    return QVariant( factory->representValue( mLayer, idx, setup.config(), QVariant(), value ) );
   }
   return value;
 }
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
index 5f4a642d24b..a321a14d891 100644
--- a/src/app/qgsattributetabledialog.cpp
+++ b/src/app/qgsattributetabledialog.cpp
@@ -391,7 +391,7 @@ void QgsAttributeTableDialog::columnBoxInit()
     if ( idx < 0 )
       continue;
 
-    if ( mLayer->editFormConfig().widgetType( idx ) != "Hidden" )
+    if ( QgsEditorWidgetRegistry::instance()->findBest( mLayer, field.name() ).type() != "Hidden" )
     {
       QIcon icon = mLayer->fields().iconForField( idx );
       QString alias = mLayer->attributeDisplayName( idx );
@@ -527,10 +527,9 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )
   int fldIdx = mLayer->fieldNameIndex( fieldName );
   if ( fldIdx < 0 )
     return;
-  const QString widgetType = mLayer->editFormConfig().widgetType( fldIdx );
-  const QgsEditorWidgetConfig widgetConfig = mLayer->editFormConfig().widgetConfig( fldIdx );
+  const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, fieldName );
   mCurrentSearchWidgetWrapper = QgsEditorWidgetRegistry::instance()->
-                                createSearchWidget( widgetType, mLayer, fldIdx, widgetConfig, mFilterContainer, mEditorContext );
+                                createSearchWidget( setup.type(), mLayer, fldIdx, setup.config(), mFilterContainer, mEditorContext );
   if ( mCurrentSearchWidgetWrapper->applyDirectly() )
   {
     connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged( QString ) ), SLOT( filterQueryChanged( QString ) ) );
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
index 8fa5a0aa142..c38d70e350a 100644
--- a/src/app/qgsfieldsproperties.cpp
+++ b/src/app/qgsfieldsproperties.cpp
@@ -392,9 +392,9 @@ void QgsFieldsProperties::loadRelations()
       if ( nmrel.fieldPairs().at( 0 ).referencingField() != relation.fieldPairs().at( 0 ).referencingField() )
         nmCombo->addItem( QString( "%1 (%2)" ).arg( nmrel.referencedLayer()->name(), nmrel.fieldPairs().at( 0 ).referencedField() ), nmrel.id() );
 
-      QgsEditorWidgetConfig cfg = mLayer->editFormConfig().widgetConfig( relation.id() );
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, relation.id() );
 
-      QVariant nmrelcfg = cfg.value( "nm-rel" );
+      const QVariant nmrelcfg = setup.config().value( "nm-rel" );
 
       int idx =  nmCombo->findData( nmrelcfg.toString() );
 
@@ -1028,8 +1028,9 @@ QgsFieldsProperties::FieldConfig::FieldConfig( QgsVectorLayer* layer, int idx )
   mNotNull = layer->editFormConfig().notNull( idx );
   mConstraint = layer->editFormConfig().expression( idx );
   mConstraintDescription = layer->editFormConfig().expressionDescription( idx );
-  mEditorWidgetType = layer->editFormConfig().widgetType( idx );
-  mEditorWidgetConfig = layer->editFormConfig().widgetConfig( idx );
+  const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( layer, layer->fields().field( idx ).name() );
+  mEditorWidgetType = setup.type();
+  mEditorWidgetConfig = setup.config();
 }
 
 /*
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
index 518370bf463..82a0a6160a0 100644
--- a/src/app/qgsidentifyresultsdialog.cpp
+++ b/src/app/qgsidentifyresultsdialog.cpp
@@ -479,7 +479,8 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
     if ( i >= fields.count() )
       break;
 
-    if ( vlayer->editFormConfig().widgetType( i ) == "Hidden" )
+    const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( vlayer, fields[i].name() );
+    if ( setup.type() == "Hidden" )
     {
       continue;
     }
@@ -498,7 +499,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
 
     attrItem->setData( 1, Qt::UserRole, value );
 
-    value = representValue( vlayer, fields.at( i ).name(), attrs.at( i ) );
+    value = representValue( vlayer, setup, fields.at( i ).name(), attrs.at( i ) );
     attrItem->setSortData( 1, value );
     bool foundLinks = false;
     QString links = QgsStringUtils::insertLinks( value, &foundLinks );
@@ -543,7 +544,8 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
       continue;
 
     QString value = fields.at( i ).displayString( attrs.at( i ) );
-    QString value2 = representValue( vlayer, fields.at( i ).name(), value );
+    const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( vlayer, fields.at( i ).name() );
+    QString value2 = representValue( vlayer, setup, fields.at( i ).name(), value );
 
     tblResults->setRowCount( j + 1 );
 
@@ -664,13 +666,12 @@ QgsIdentifyPlotCurve::~QgsIdentifyPlotCurve()
   }
 }
 
-QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer* vlayer, const QString& fieldName, const QVariant& value )
+QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer* vlayer, const QgsEditorWidgetSetup& setup, const QString& fieldName, const QVariant& value )
 {
   QVariant cache;
   QMap<QString, QVariant>& layerCaches = mWidgetCaches[vlayer->id()];
 
-  QString widgetType = vlayer->editFormConfig().widgetType( fieldName );
-  QgsEditorWidgetFactory* factory = QgsEditorWidgetRegistry::instance()->factory( widgetType );
+  QgsEditorWidgetFactory* factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
 
   int idx = vlayer->fieldNameIndex( fieldName );
 
@@ -683,11 +684,11 @@ QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer* vlayer, const
   }
   else
   {
-    cache = factory->createCache( vlayer, idx, vlayer->editFormConfig().widgetConfig( fieldName ) );
+    cache = factory->createCache( vlayer, idx, setup.config() );
     layerCaches.insert( fieldName, cache );
   }
 
-  return factory->representValue( vlayer, idx, vlayer->editFormConfig().widgetConfig( fieldName ), cache, value );
+  return factory->representValue( vlayer, idx, setup.config(), cache, value );
 }
 
 void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
@@ -1502,7 +1503,8 @@ void QgsIdentifyResultsDialog::attributeValueChanged( QgsFeatureId fid, int idx,
 
         if ( item->data( 0, Qt::UserRole + 1 ).toInt() == idx )
         {
-          value = representValue( vlayer, fld.name(), val );
+          const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( vlayer, fld.name() );
+          value = representValue( vlayer, setup, fld.name(), val );
 
           QgsTreeWidgetItem* treeItem = static_cast< QgsTreeWidgetItem* >( item );
           treeItem->setSortData( 1, value );
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
index 06829054655..5a6baff09a2 100644
--- a/src/app/qgsidentifyresultsdialog.h
+++ b/src/app/qgsidentifyresultsdialog.h
@@ -41,6 +41,7 @@ class QgsHighlight;
 class QgsMapCanvas;
 class QgsDockWidget;
 class QgsMapLayerAction;
+class QgsEditorWidgetSetup;
 
 class QwtPlotCurve;
 
@@ -217,7 +218,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti
     void mapLayerActionDestroyed();
 
   private:
-    QString representValue( QgsVectorLayer* vlayer, const QString& fieldName, const QVariant& value );
+    QString representValue( QgsVectorLayer* vlayer, const QgsEditorWidgetSetup& setup, const QString& fieldName, const QVariant& value );
 
     enum ItemDataRole
     {
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
index c655e8f3dec..edddb2934e3 100644
--- a/src/app/qgsmergeattributesdialog.cpp
+++ b/src/app/qgsmergeattributesdialog.cpp
@@ -27,6 +27,7 @@
 #include "qgsvectordataprovider.h"
 #include "qgsattributeeditor.h"
 #include "qgsstatisticalsummary.h"
+#include "qgseditorwidgetregistry.h"
 
 #include <limits>
 #include <QComboBox>
@@ -116,8 +117,8 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
   mHiddenAttributes.clear();
   for ( int idx = 0; idx < mFields.count(); ++idx )
   {
-    if ( mVectorLayer->editFormConfig().widgetType( idx ) == "Hidden" ||
-         mVectorLayer->editFormConfig().widgetType( idx ) == "Immutable" )
+    const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mVectorLayer, mFields.at( idx ).name() );
+    if ( setup.type() == "Hidden" || setup.type() == "Immutable" )
     {
       mHiddenAttributes.insert( idx );
       continue;
@@ -125,7 +126,7 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
 
     mTableWidget->setColumnCount( col + 1 );
 
-    QComboBox *cb = createMergeComboBox( mFields.at( idx ) .type() );
+    QComboBox *cb = createMergeComboBox( mFields.at( idx ).type() );
     if ( pkAttrList.contains( idx ) )
     {
       cb->setCurrentIndex( cb->findData( "skip" ) );
diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp
index 889a30b1f9b..911e8854408 100644
--- a/src/core/qgseditformconfig.cpp
+++ b/src/core/qgseditformconfig.cpp
@@ -16,6 +16,7 @@
 #include "qgseditformconfig.h"
 #include "qgsproject.h"
 #include "qgsrelationmanager.h"
+//#include "qgseditorwidgetregistry.h"
 
 QgsAttributeEditorContainer::~QgsAttributeEditorContainer()
 {
@@ -27,30 +28,14 @@ QgsEditFormConfig::QgsEditFormConfig()
 {
 }
 
-QString QgsEditFormConfig::widgetType( int fieldIdx ) const
-{
-  if ( fieldIdx < 0 || fieldIdx >= d->mFields.count() )
-    return "TextEdit";
-
-  return d->mEditorWidgetTypes.value( d->mFields.at( fieldIdx ).name(), "TextEdit" );
-}
-
 QString QgsEditFormConfig::widgetType( const QString& fieldName ) const
 {
-  return d->mEditorWidgetTypes.value( fieldName, "TextEdit" );
+  return d->mEditorWidgetTypes.value( fieldName );
 }
 
-QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( int fieldIdx ) const
+QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( const QString& fieldName ) const
 {
-  if ( fieldIdx < 0 || fieldIdx >= d->mFields.count() )
-    return QgsEditorWidgetConfig();
-
-  return d->mWidgetConfigs.value( d->mFields.at( fieldIdx ).name() );
-}
-
-QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( const QString& widgetName ) const
-{
-  return d->mWidgetConfigs.value( widgetName );
+  return d->mWidgetConfigs.value( fieldName );
 }
 
 void QgsEditFormConfig::setFields( const QgsFields& fields, const QMap<QString, QString>& attributeAliasMap )
@@ -443,38 +428,40 @@ void QgsEditFormConfig::readXml( const QDomNode& node )
   }
 
 
-  //// TODO: MAKE THIS MORE GENERIC, SO INDIVIDUALL WIDGETS CAN NOT ONLY SAVE STRINGS
-  /// SEE QgsEditorWidgetFactory::writeConfig
-
   QDomElement widgetsElem = node.namedItem( "widgets" ).toElement();
 
   QDomNodeList widgetConfigsElems = widgetsElem.childNodes();
 
   for ( int i = 0; i < widgetConfigsElems.size(); ++i )
   {
-    QgsEditorWidgetConfig cfg;
+    const QDomElement wdgElem = widgetConfigsElems.at( i ).toElement();
+    const QDomElement cfgElem = wdgElem.namedItem( "config" ).toElement();
+    const QgsEditorWidgetConfig widgetConfig = parseEditorWidgetConfig( cfgElem );
+    setWidgetConfig( wdgElem.attribute( "name" ), widgetConfig );
+  }
+}
 
-    QDomElement wdgElem = widgetConfigsElems.at( i ).toElement();
+QgsEditorWidgetConfig QgsEditFormConfig::parseEditorWidgetConfig( const QDomElement& cfgElem )
+{
+  QgsEditorWidgetConfig cfg;
+  //// TODO: MAKE THIS MORE GENERIC, SO INDIVIDUALL WIDGETS CAN NOT ONLY SAVE STRINGS
+  /// SEE QgsEditorWidgetFactory::writeConfig
+  for ( int j = 0; j < cfgElem.attributes().size(); ++j )
+  {
+    const QDomAttr attr = cfgElem.attributes().item( j ).toAttr();
+    cfg.insert( attr.name(), attr.value() );
+  }
 
-    QDomElement cfgElem = wdgElem.namedItem( "config" ).toElement();
-
-    for ( int j = 0; j < cfgElem.attributes().size(); ++j )
-    {
-      QDomAttr attr = cfgElem.attributes().item( j ).toAttr();
-      cfg.insert( attr.name(), attr.value() );
-    }
-
-    QDomNodeList optionElements = cfgElem.elementsByTagName( "option" );
-    for ( int j = 0; j < optionElements.size(); ++j )
-    {
-      QString key = optionElements.at( j ).toElement().attribute( "key" );
-      QString value = optionElements.at( j ).toElement().attribute( "value" );
-      cfg.insert( key, value );
-    }
-
-    setWidgetConfig( wdgElem.attribute( "name" ), cfg );
+  const QDomNodeList optionElements = cfgElem.elementsByTagName( "option" );
+  for ( int j = 0; j < optionElements.size(); ++j )
+  {
+    const QDomElement option = optionElements.at( j ).toElement();
+    const QString key = option.attribute( "key" );
+    const QString value = option.attribute( "value" );
+    cfg.insert( key, value );
   }
   //// END TODO
+  return cfg;
 }
 
 void QgsEditFormConfig::writeXml( QDomNode& node ) const
diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h
index 13809a482ca..a169d29afcf 100644
--- a/src/core/qgseditformconfig.h
+++ b/src/core/qgseditformconfig.h
@@ -177,15 +177,7 @@ class CORE_EXPORT QgsEditFormConfig
 
     /**
      * Get the id for the editor widget used to represent the field at the given index
-     *
-     * @param fieldIdx  The index of the field
-     *
-     * @return The id for the editor widget or a NULL string if not applicable
-     */
-    QString widgetType( int fieldIdx ) const;
-
-    /**
-     * Get the id for the editor widget used to represent the field at the given index
+     * Don't use this directly. Prefere the use of QgsEditorWidgetRegistry::instance()->findBestType.
      *
      * @param fieldName  The name of the field
      *
@@ -218,32 +210,24 @@ class CORE_EXPORT QgsEditFormConfig
      *   layer.setWidgetConfig( 'relation_id', { 'nm-rel': 'other_relation' } )
      * \endcode
      *
-     * @param widgetName  The name of the widget or field to configure
+     * @param fieldName  The name of the field to configure
      * @param config      The config to set for this field
      *
      * @see setWidgetType() for a list of widgets and choose the widget to see the available options.
      *
      * @note not available in python bindings
      */
-    void setWidgetConfig( const QString& widgetName, const QgsEditorWidgetConfig& config );
-
-    /**
-     * Get the configuration for the editor widget used to represent the field at the given index
-     *
-     * @param fieldIdx  The index of the field
-     *
-     * @return The configuration for the editor widget or an empty config if the field does not exist
-     */
-    QgsEditorWidgetConfig widgetConfig( int fieldIdx ) const;
+    void setWidgetConfig( const QString& fieldName, const QgsEditorWidgetConfig& config );
 
     /**
      * Get the configuration for the editor widget used to represent the field with the given name
+     * Don't use this directly. Prefere the use of QgsEditorWidgetRegistry::instance()->findBestConfig.
      *
-     * @param widgetName The name of the widget. This can be a field name or the name of an additional widget.
+     * @param fieldName The name of the field.
      *
      * @return The configuration for the editor widget or an empty config if the field does not exist
      */
-    QgsEditorWidgetConfig widgetConfig( const QString& widgetName ) const;
+    QgsEditorWidgetConfig widgetConfig( const QString& fieldName ) const;
 
     /**
      * Remove the configuration for the editor widget used to represent the field at the given index
@@ -257,11 +241,11 @@ class CORE_EXPORT QgsEditFormConfig
     /**
      * Remove the configuration for the editor widget used to represent the field with the given name
      *
-     * @param widgetName The name of the widget. This can be a field name or the name of an additional widget.
+     * @param fieldName The name of the widget.
      *
      * @return true if successful, false if the field does not exist
      */
-    bool removeWidgetConfig( const QString& widgetName );
+    bool removeWidgetConfig( const QString& fieldName );
 
     /**
      * This returns true if the field is manually set to read only or if the field
@@ -411,6 +395,11 @@ class CORE_EXPORT QgsEditFormConfig
      */
     explicit QgsEditFormConfig();
 
+    /**
+     * Parse the XML for the config of one editor widget.
+     */
+    static QgsEditorWidgetConfig parseEditorWidgetConfig( const QDomElement& cfgElem );
+
   private:
 
     /**
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
index ab010360255..2b24fc7b823 100644
--- a/src/core/qgsfield.cpp
+++ b/src/core/qgsfield.cpp
@@ -238,6 +238,16 @@ bool QgsField::convertCompatible( QVariant& v ) const
   return true;
 }
 
+void QgsField::setEditorWidgetSetup( const QgsEditorWidgetSetup& v )
+{
+  d->editorWidgetSetup = v;
+}
+
+const QgsEditorWidgetSetup& QgsField::editorWidgetSetup() const
+{
+  return d->editorWidgetSetup;
+}
+
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests in testqgsfield.cpp.
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
index 618901076b0..b28b762aecf 100644
--- a/src/core/qgsfield.h
+++ b/src/core/qgsfield.h
@@ -33,6 +33,42 @@ class QgsFieldsPrivate;
  * See details in QEP #17
  ****************************************************************************/
 
+#include "qgseditorwidgetconfig.h"
+
+/** \ingroup core
+ * Holder for the widget type and its configuration for a field.
+ *
+ * @note added in QGIS 3.0
+ */
+class GUI_EXPORT QgsEditorWidgetSetup
+{
+  public:
+    /**
+     * Constructor
+     */
+    QgsEditorWidgetSetup( const QString& type, const QgsEditorWidgetConfig& config ) : mType( type ), mConfig( config ) {}
+    QgsEditorWidgetSetup() {}
+
+    /**
+     * @return the widget type to use
+     */
+    QString type() const { return mType; }
+
+    /**
+     * @return the widget configuration to used
+     */
+    QgsEditorWidgetConfig config() const { return mConfig; }
+
+    /**
+     * @return true if there is no widget configured.
+     */
+    bool isNull() const { return mType.isEmpty(); }
+  private:
+    QString mType;
+    QgsEditorWidgetConfig mConfig;
+};
+
+
 /** \class QgsField
   * \ingroup core
   * Encapsulate a field in an attribute table or data source.
@@ -175,6 +211,20 @@ class CORE_EXPORT QgsField
       return QVariant::fromValue( *this );
     }
 
+    /**
+     * Set the editor widget setup for the field.
+     *
+     * @param v  The value to set
+     */
+    void setEditorWidgetSetup( const QgsEditorWidgetSetup& v );
+
+    /**
+     * Get the editor widget setup for the field.
+     *
+     * @return the value
+     */
+    const QgsEditorWidgetSetup& editorWidgetSetup() const;
+
   private:
 
     QSharedDataPointer<QgsFieldPrivate> d;
diff --git a/src/core/qgsfield_p.h b/src/core/qgsfield_p.h
index 626417b86ec..d09138117ed 100644
--- a/src/core/qgsfield_p.h
+++ b/src/core/qgsfield_p.h
@@ -93,6 +93,8 @@ class QgsFieldPrivate : public QSharedData
 
     //! Comment
     QString comment;
+
+    QgsEditorWidgetSetup editorWidgetSetup;
 };
 
 
diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp
index 01744291ebd..d144f1a9583 100644
--- a/src/core/qgsvectorlayerundocommand.cpp
+++ b/src/core/qgsvectorlayerundocommand.cpp
@@ -344,7 +344,7 @@ QgsVectorLayerUndoCommandDeleteAttribute::QgsVectorLayerUndoCommandDeleteAttribu
   QgsFields::FieldOrigin origin = fields.fieldOrigin( mFieldIndex );
   mOriginIndex = fields.fieldOriginIndex( mFieldIndex );
   mProviderField = ( origin == QgsFields::OriginProvider );
-  mOldEditorWidgetConfig = mBuffer->L->editFormConfig().widgetConfig( mFieldIndex );
+  mOldEditorWidgetConfig = mBuffer->L->editFormConfig().widgetConfig( fields.field( mFieldIndex ).name() );
 
   if ( !mProviderField )
   {
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index fc1951e1c7d..fed3bd45623 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -84,6 +84,7 @@ SET(QGIS_GUI_SRCS
   auth/qgsauthtrustedcasdialog.cpp
 
   editorwidgets/core/qgseditorconfigwidget.cpp
+  editorwidgets/core/qgseditorwidgetautoconf.cpp
   editorwidgets/core/qgseditorwidgetfactory.cpp
   editorwidgets/core/qgseditorwidgetregistry.cpp
   editorwidgets/core/qgseditorwidgetwrapper.cpp
diff --git a/src/gui/attributetable/qgsattributetabledelegate.cpp b/src/gui/attributetable/qgsattributetabledelegate.cpp
index 34233d140d7..f87b81596d1 100644
--- a/src/gui/attributetable/qgsattributetabledelegate.cpp
+++ b/src/gui/attributetable/qgsattributetabledelegate.cpp
@@ -67,10 +67,8 @@ QWidget* QgsAttributeTableDelegate::createEditor( QWidget *parent, const QStyleO
 
   int fieldIdx = index.model()->data( index, QgsAttributeTableModel::FieldIndexRole ).toInt();
 
-  QString widgetType = vl->editFormConfig().widgetType( fieldIdx );
-  QgsEditorWidgetConfig cfg = vl->editFormConfig().widgetConfig( fieldIdx );
   QgsAttributeEditorContext context( masterModel( index.model() )->editorContext(), QgsAttributeEditorContext::Popup );
-  QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, vl, fieldIdx, cfg, nullptr, parent, context );
+  QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( vl, fieldIdx, nullptr, parent, context );
   QWidget* w = eww->widget();
 
   w->setAutoFillBackground( true );
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
index 052fbae8159..02f6e7afb31 100644
--- a/src/gui/attributetable/qgsattributetablemodel.cpp
+++ b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -339,13 +339,13 @@ void QgsAttributeTableModel::loadAttributes()
 
   for ( int idx = 0; idx < fields.count(); ++idx )
   {
-    const QString widgetType = layer()->editFormConfig().widgetType( idx );
-    QgsEditorWidgetFactory* widgetFactory = QgsEditorWidgetRegistry::instance()->factory( widgetType );
+    const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( layer(), fields[idx].name() );
+    QgsEditorWidgetFactory* widgetFactory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
     if ( widgetFactory )
     {
       mWidgetFactories.append( widgetFactory );
-      mWidgetConfigs.append( layer()->editFormConfig().widgetConfig( idx ) );
-      mAttributeWidgetCaches.append( widgetFactory->createCache( layer(), idx, mWidgetConfigs.last() ) );
+      mWidgetConfigs.append( setup.config() );
+      mAttributeWidgetCaches.append( widgetFactory->createCache( layer(), idx, setup.config() ) );
 
       attributes << idx;
     }
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
index 9e41a3855b5..cec4d35c72e 100644
--- a/src/gui/attributetable/qgsdualview.cpp
+++ b/src/gui/attributetable/qgsdualview.cpp
@@ -26,6 +26,7 @@
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayercache.h"
 #include "qgsorganizetablecolumnsdialog.h"
+#include "qgseditorwidgetregistry.h"
 
 #include <QClipboard>
 #include <QDialog>
@@ -141,7 +142,7 @@ void QgsDualView::columnBoxInit()
     if ( fieldIndex == -1 )
       continue;
 
-    if ( mLayerCache->layer()->editFormConfig().widgetType( fieldIndex ) != "Hidden" )
+    if ( QgsEditorWidgetRegistry::instance()->findBest( mLayerCache->layer(), field.name() ).type() != "Hidden" )
     {
       QIcon icon = mLayerCache->layer()->fields().iconForField( fieldIndex );
       QString text = field.name();
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp
new file mode 100644
index 00000000000..e0ef2e3027b
--- /dev/null
+++ b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp
@@ -0,0 +1,112 @@
+/***************************************************************************
+    qgseditorwidgetautoconf.cpp
+    ---------------------
+    begin                : July 2016
+    copyright            : (C) 2016 by Patrick Valsecchi
+    email                : patrick.valsecchi at camptocamp.com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "qgseditorwidgetautoconf.h"
+#include "qgseditorwidgetregistry.h"
+
+/** \ingroup gui
+ * Widget auto conf plugin that guesses what widget type to use in function of what the widgets support.
+ *
+ * @note not available in Python bindings
+ * @note added in QGIS 3.0
+ */
+class FromFactoriesPlugin: public QgsEditorWidgetAutoConfPlugin
+{
+  public:
+    virtual QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName, int& score ) const override
+    {
+      int bestScore = 0;
+      QString bestType;
+      const QMap<QString, QgsEditorWidgetFactory*> factories = QgsEditorWidgetRegistry::instance()->factories();
+      for ( QMap<QString, QgsEditorWidgetFactory*>::const_iterator i = factories.begin(); i != factories.end(); ++i )
+      {
+        const int index = vl->fieldNameIndex( fieldName );
+        if ( index >= 0 )
+        {
+          const int score = i.value()->fieldScore( vl, index );
+          if ( score > bestScore )
+          {
+            bestType = i.key();
+            bestScore = score;
+          }
+        }
+      }
+      if ( bestScore > 0 )
+      {
+        score = 10;
+        return QgsEditorWidgetSetup( bestType, QgsEditorWidgetConfig() );
+      }
+      return QgsEditorWidgetSetup();
+    }
+};
+
+
+/** \ingroup gui
+ * Widget auto conf plugin that reads the widget setup to use from what the data provider says.
+ *
+ * @note not available in Python bindings
+ * @note added in QGIS 3.0
+ */
+class FromDbTablePlugin: public QgsEditorWidgetAutoConfPlugin
+{
+  public:
+    virtual QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName, int& score ) const override
+    {
+      QgsField field = vl->fields().field( fieldName );
+      if ( !field.editorWidgetSetup().isNull() )
+      {
+        score = 20;
+        return field.editorWidgetSetup();
+      }
+      else
+      {
+        return QgsEditorWidgetSetup();
+      }
+    }
+};
+
+///@cond PRIVATE
+QgsEditorWidgetAutoConf::QgsEditorWidgetAutoConf()
+{
+  registerPlugin( new FromFactoriesPlugin() );
+  registerPlugin( new FromDbTablePlugin() );
+}
+
+QgsEditorWidgetSetup QgsEditorWidgetAutoConf::editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName ) const
+{
+  QgsEditorWidgetSetup result( "TextEdit", QgsEditorWidgetConfig() );
+
+  if ( vl->fields().indexFromName( fieldName ) >= 0 )
+  {
+    int bestScore = 0;
+    Q_FOREACH ( QSharedPointer<QgsEditorWidgetAutoConfPlugin> cur, plugins )
+    {
+      int score = 0;
+      const QgsEditorWidgetSetup curResult = cur->editorWidgetSetup( vl, fieldName, score );
+      if ( score > bestScore )
+      {
+        result = curResult;
+        bestScore = score;
+      }
+    }
+  }
+
+  return result;
+}
+
+void QgsEditorWidgetAutoConf::registerPlugin( QgsEditorWidgetAutoConfPlugin* plugin )
+{
+  plugins.append( QSharedPointer<QgsEditorWidgetAutoConfPlugin>( plugin ) );
+}
+///@endcond
\ No newline at end of file
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h
new file mode 100644
index 00000000000..c0ec973cec9
--- /dev/null
+++ b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h
@@ -0,0 +1,88 @@
+/***************************************************************************
+    qgseditorwidgetautoconf.h
+    ---------------------
+    begin                : July 2016
+    copyright            : (C) 2016 by Patrick Valsecchi
+    email                : patrick.valsecchi at camptocamp.com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSEDITORWIDGETAUTOCONF_H
+#define QGSEDITORWIDGETAUTOCONF_H
+
+#include <QList>
+#include <QSharedPointer>
+
+class QgsVectorLayer;
+class QgsEditorWidgetSetup;
+
+/** \ingroup gui
+ * Base class for plugins allowing to pick automatically a widget type for editing fields.
+ *
+ * @note added in QGIS 3.0
+ */
+class GUI_EXPORT QgsEditorWidgetAutoConfPlugin
+{
+  public:
+    /**
+     * Typical scores are:
+     *   * 0: no matching type found.
+     *   * 10: a widget has been guessed from the type of field.
+     *   * 20: a widget has been determined from an external configuration (for example a database table)
+     *
+     * @param vl        The vector layer for which this widget will be created
+     * @param fieldName The field name on the specified layer for which this widget will be created
+     * @param score     Where the score is returned (default to 0)
+     *
+     * @return and integer value rating how good is the setup provided by this plugin.
+     */
+    virtual QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName, int& score ) const = 0;
+
+};
+
+
+///@cond PRIVATE
+/** \ingroup gui
+ * Class that allows to register plugins to pick automatically a widget type for editing fields.
+ * This class has only one instance, owned by the QgsEditorWidgetRegistry singleton
+ *
+ * The plugins are instances of QgsEditorWidgetAutoConfPlugin.
+ * @note added in QGIS 3.0
+ * @note not available in Python bindings
+ */
+class GUI_EXPORT QgsEditorWidgetAutoConf
+{
+  public:
+    /**
+     * Register the default plugins.
+     */
+    QgsEditorWidgetAutoConf();
+
+    /**
+     * Iterate over the plugins and return the setup of the plugin returning the highest score.
+     *
+     * @param vl        The vector layer for which this widget will be created
+     * @param fieldName The field name on the specified layer for which this widget will be created
+     *
+     * @return The best widget setup that was found
+     */
+    QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName ) const;
+
+    /**
+     * Register a new plugin.
+     *
+     * @param plugin The plugin (ownership is transfered)
+     */
+    void registerPlugin( QgsEditorWidgetAutoConfPlugin* plugin );
+
+  private:
+    QList<QSharedPointer<QgsEditorWidgetAutoConfPlugin> > plugins;
+};
+///@endcond
+
+#endif // QGSEDITORWIDGETAUTOCONF_H
\ No newline at end of file
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp
index 977873a0f90..0abafe644bb 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp
+++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp
@@ -116,10 +116,10 @@ QgsEditorWidgetConfig QgsEditorWidgetFactory::readConfig( const QDomElement& con
   return QgsEditorWidgetConfig();
 }
 
-bool QgsEditorWidgetFactory::isFieldSupported( QgsVectorLayer* vl, int fieldIdx )
+unsigned int QgsEditorWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
 {
   Q_UNUSED( vl )
   Q_UNUSED( fieldIdx )
-  return true;
+  return 5;
 }
 
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h
index 4b248408902..050d36dfb7c 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h
+++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h
@@ -113,9 +113,9 @@ class GUI_EXPORT QgsEditorWidgetFactory
      * @param fieldIdx  The field index
      * @return          True if the type is supported for this field
      *
-     * @see isFieldSupported( QgsVectorLayer* vl, ind fieldIdx )
+     * @see fieldScore( const QgsVectorLayer* vl, ind fieldIdx )
      */
-    inline bool supportsField( QgsVectorLayer* vl, int fieldIdx ) { return isFieldSupported( vl, fieldIdx ); }
+    inline bool supportsField( const QgsVectorLayer* vl, int fieldIdx ) { return fieldScore( vl, fieldIdx ) > 0; }
 
     /**
      * Returns a list of widget types which this editor widget supports.
@@ -187,19 +187,25 @@ class GUI_EXPORT QgsEditorWidgetFactory
      */
     virtual QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx );
 
-  private:
     /**
      * This method allows disabling this editor widget type for a certain field.
-     * By default, it returns true for all fields.
+     * By default, it returns 5 for every fields.
      * Reimplement this if you only support certain fields.
      *
+     * Typical return values are:
+     *   * 0: not supported
+     *   * 5: maybe support (for example, Datetime support strings depending on their content)
+     *   * 10: basic support (this is what returns TextEdit for example, since it supports everything in a crude way)
+     *   * 20: specialised support
+     *
      * @param vl
      * @param fieldIdx
-     * @return True if the field is supported.
+     * @return 0 if the field is not supported or a bigger number if it can (the widget with the biggest number will be
+     *      taken by default). The default implementation returns 5..
      *
      * @see supportsField( QgsVectorLayer* vl, fieldIdx )
      */
-    virtual bool isFieldSupported( QgsVectorLayer* vl, int fieldIdx );
+    virtual unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const;
 
   private:
     QString mName;
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
index 79a69f37d9b..73c3659bc37 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
+++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -54,6 +54,7 @@ QgsEditorWidgetRegistry* QgsEditorWidgetRegistry::instance()
 void QgsEditorWidgetRegistry::initEditors( QgsMapCanvas *mapCanvas, QgsMessageBar *messageBar )
 {
   QgsEditorWidgetRegistry *reg = instance();
+  reg->registerWidget( "TextEdit", new QgsTextEditWidgetFactory( tr( "Text Edit" ) ) );
   reg->registerWidget( "Classification", new QgsClassificationWidgetWrapperFactory( tr( "Classification" ) ) );
   reg->registerWidget( "Range", new QgsRangeWidgetFactory( tr( "Range" ) ) );
   reg->registerWidget( "UniqueValues", new QgsUniqueValueWidgetFactory( tr( "Unique Values" ) ) );
@@ -62,7 +63,6 @@ void QgsEditorWidgetRegistry::initEditors( QgsMapCanvas *mapCanvas, QgsMessageBa
   reg->registerWidget( "Enumeration", new QgsEnumerationWidgetFactory( tr( "Enumeration" ) ) );
   reg->registerWidget( "Hidden", new QgsHiddenWidgetFactory( tr( "Hidden" ) ) );
   reg->registerWidget( "CheckBox", new QgsCheckboxWidgetFactory( tr( "Check Box" ) ) );
-  reg->registerWidget( "TextEdit", new QgsTextEditWidgetFactory( tr( "Text Edit" ) ) );
   reg->registerWidget( "ValueRelation", new QgsValueRelationWidgetFactory( tr( "Value Relation" ) ) );
   reg->registerWidget( "UuidGenerator", new QgsUuidWidgetFactory( tr( "Uuid Generator" ) ) );
   reg->registerWidget( "Photo", new QgsPhotoWidgetFactory( tr( "Photo" ) ) );
@@ -89,6 +89,23 @@ QgsEditorWidgetRegistry::~QgsEditorWidgetRegistry()
   qDeleteAll( mWidgetFactories );
 }
 
+QgsEditorWidgetSetup QgsEditorWidgetRegistry::findBest( const QgsVectorLayer* vl, const QString& fieldName ) const
+{
+  const QString fromConfig = vl->editFormConfig().widgetType( fieldName );
+  if ( !fromConfig.isNull() )
+  {
+    return QgsEditorWidgetSetup( fromConfig, vl->editFormConfig().widgetConfig( fieldName ) );
+  }
+  return autoConf.editorWidgetSetup( vl, fieldName );
+}
+
+QgsEditorWidgetWrapper* QgsEditorWidgetRegistry::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent, const QgsAttributeEditorContext &context )
+{
+  const QString fieldName = vl->fields().field( fieldIdx ).name();
+  const QgsEditorWidgetSetup setup = findBest( vl, fieldName );
+  return create( setup.type(), vl, fieldIdx, setup.config(), editor, parent, context );
+}
+
 QgsEditorWidgetWrapper* QgsEditorWidgetRegistry::create( const QString& widgetId, QgsVectorLayer* vl, int fieldIdx, const QgsEditorWidgetConfig& config, QWidget* editor, QWidget* parent, const QgsAttributeEditorContext &context )
 {
   if ( mWidgetFactories.contains( widgetId ) )
@@ -271,8 +288,13 @@ void QgsEditorWidgetRegistry::writeMapLayer( QgsMapLayer* mapLayer, QDomElement&
   QgsFields fields = vectorLayer->fields();
   for ( int idx = 0; idx < fields.count(); ++idx )
   {
-    QgsField field = fields.at( idx );
-    const QString& widgetType = vectorLayer->editFormConfig().widgetType( idx );
+    const QgsField field = fields.at( idx );
+    const QString& widgetType = vectorLayer->editFormConfig().widgetType( field.name() );
+    if ( widgetType.isNull() )
+    {
+      // Don't save widget config if it is not manually edited
+      continue;
+    }
     if ( !mWidgetFactories.contains( widgetType ) )
     {
       QgsMessageLog::logMessage( tr( "Could not save unknown editor widget type '%1'." ).arg( widgetType ) );
@@ -293,7 +315,7 @@ void QgsEditorWidgetRegistry::writeMapLayer( QgsMapLayer* mapLayer, QDomElement&
       ewv2CfgElem.setAttribute( "constraint", vectorLayer->editFormConfig().expression( idx ) );
       ewv2CfgElem.setAttribute( "constraintDescription", vectorLayer->editFormConfig().expressionDescription( idx ) );
 
-      mWidgetFactories[widgetType]->writeConfig( vectorLayer->editFormConfig().widgetConfig( idx ), ewv2CfgElem, doc, vectorLayer, idx );
+      mWidgetFactories[widgetType]->writeConfig( vectorLayer->editFormConfig().widgetConfig( field.name() ), ewv2CfgElem, doc, vectorLayer, idx );
 
       editTypeElement.appendChild( ewv2CfgElem );
     }
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
index bf22d8c117e..637ea48fe95 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
+++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
@@ -21,6 +21,7 @@
 #include "qgseditorwidgetconfig.h"
 #include "qgseditorwidgetfactory.h"
 #include "qgsattributeeditorcontext.h"
+#include "qgseditorwidgetautoconf.h"
 
 class QgsMapLayer;
 class QDomNode;
@@ -67,6 +68,16 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
      */
     ~QgsEditorWidgetRegistry();
 
+    /**
+     * Find the best editor widget and its configuration for a given field.
+     *
+     * @param vl        The vector layer for which this widget will be created
+     * @param fieldName The field name on the specified layer for which this widget will be created
+     *
+     * @return The id of the widget type to use and its config
+     */
+    QgsEditorWidgetSetup findBest( const QgsVectorLayer* vl, const QString& fieldName ) const;
+
     /**
      * Create an attribute editor widget wrapper of a given type for a given field.
      * The editor may be NULL if you want the widget wrapper to create a default widget.
@@ -89,6 +100,24 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
                                     QWidget* parent,
                                     const QgsAttributeEditorContext& context = QgsAttributeEditorContext() );
 
+    /**
+     * Create an attribute editor widget wrapper of the best type for a given field.
+     * The editor may be NULL if you want the widget wrapper to create a default widget.
+     *
+     * @param vl        The vector layer for which this widget will be created
+     * @param fieldIdx  The field index on the specified layer for which this widget will be created
+     * @param editor    An editor widget which will be used instead of an autocreated widget
+     * @param parent    The parent which will be used for the created wrapper and the created widget
+     * @param context   The editor context (not available in python bindings)
+     *
+     * @return A new widget wrapper
+     */
+    QgsEditorWidgetWrapper* create( QgsVectorLayer* vl,
+                                    int fieldIdx,
+                                    QWidget* editor,
+                                    QWidget* parent,
+                                    const QgsAttributeEditorContext& context = QgsAttributeEditorContext() );
+
     QgsSearchWidgetWrapper* createSearchWidget( const QString& widgetId,
         QgsVectorLayer* vl,
         int fieldIdx,
@@ -141,6 +170,13 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
      */
     bool registerWidget( const QString& widgetId, QgsEditorWidgetFactory* widgetFactory );
 
+    /**
+     * Register a new auto-conf plugin.
+     *
+     * @param plugin The plugin (ownership is transfered)
+     */
+    void registerAutoConfPlugin( QgsEditorWidgetAutoConfPlugin* plugin ) { autoConf.registerPlugin( plugin ); }
+
   protected:
     QgsEditorWidgetRegistry();
 
@@ -199,6 +235,7 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
 
     QMap<QString, QgsEditorWidgetFactory*> mWidgetFactories;
     QMap<const char*, QPair<int, QString> > mFactoriesByType;
+    QgsEditorWidgetAutoConf autoConf;
 };
 
 #endif // QGSEDITORWIDGETREGISTRY_H
diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
index 6f171dbfdc5..89ea28e7a27 100644
--- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
@@ -68,3 +68,9 @@ QMap<const char*, int> QgsCheckboxWidgetFactory::supportedWidgetTypes()
   map.insert( QGroupBox::staticMetaObject.className(), 10 );
   return map;
 }
+
+unsigned int QgsCheckboxWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
+{
+  const QVariant::Type type = vl->fields().field( fieldIdx ).type();
+  return type == QVariant::Bool ? 20 : 5;
+}
diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.h b/src/gui/editorwidgets/qgscheckboxwidgetfactory.h
index 1a322275ff9..be3db128550 100644
--- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.h
+++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.h
@@ -36,6 +36,7 @@ class GUI_EXPORT QgsCheckboxWidgetFactory : public QgsEditorWidgetFactory
     QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override;
     void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override;
     QMap<const char*, int> supportedWidgetTypes() override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 };
 
 #endif // QGSCHECKBOXWIDGETFACTORY_H
diff --git a/src/gui/editorwidgets/qgscolorwidgetfactory.cpp b/src/gui/editorwidgets/qgscolorwidgetfactory.cpp
index 2af11f73694..c0476c1d7c8 100644
--- a/src/gui/editorwidgets/qgscolorwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgscolorwidgetfactory.cpp
@@ -33,3 +33,17 @@ QgsEditorConfigWidget* QgsColorWidgetFactory::configWidget( QgsVectorLayer* vl,
 {
   return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "Field contains a color." ) );
 }
+
+unsigned int QgsColorWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
+{
+  const QgsField field = vl->fields().field( fieldIdx );
+  const QVariant::Type type = field.type();
+  if ( type == QVariant::Color )
+  {
+    return 20;
+  }
+  else
+  {
+    return 5;
+  }
+}
\ No newline at end of file
diff --git a/src/gui/editorwidgets/qgscolorwidgetfactory.h b/src/gui/editorwidgets/qgscolorwidgetfactory.h
index 13d46a87171..4f1d0b7b534 100644
--- a/src/gui/editorwidgets/qgscolorwidgetfactory.h
+++ b/src/gui/editorwidgets/qgscolorwidgetfactory.h
@@ -32,6 +32,7 @@ class GUI_EXPORT QgsColorWidgetFactory : public QgsEditorWidgetFactory
   public:
     QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override;
     QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 };
 
 #endif // QGSCOLORWIDGETFACTORY_H
diff --git a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
index f71d46d2367..376bb9f3dca 100644
--- a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
+++ b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
@@ -114,3 +114,18 @@ QMap<const char*, int> QgsDateTimeEditFactory::supportedWidgetTypes()
   map.insert( QgsDateTimeEdit::staticMetaObject.className(), 10 );
   return map;
 }
+
+unsigned int QgsDateTimeEditFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
+{
+  const QgsField field = vl->fields().field( fieldIdx );
+  const QVariant::Type type = field.type();
+  const QgsEditorWidgetConfig config = vl->editFormConfig().widgetConfig( field.name() );
+  if ( type == QVariant::DateTime || config.contains( "field_format" ) )
+  {
+    return 20;
+  }
+  else
+  {
+    return 5;
+  }
+}
\ No newline at end of file
diff --git a/src/gui/editorwidgets/qgsdatetimeeditfactory.h b/src/gui/editorwidgets/qgsdatetimeeditfactory.h
index efbb0de812b..b74c900b6f4 100644
--- a/src/gui/editorwidgets/qgsdatetimeeditfactory.h
+++ b/src/gui/editorwidgets/qgsdatetimeeditfactory.h
@@ -42,6 +42,7 @@ class GUI_EXPORT QgsDateTimeEditFactory : public QgsEditorWidgetFactory
     QString representValue( QgsVectorLayer* vl, int fieldIdx, const QgsEditorWidgetConfig& config, const QVariant& cache, const QVariant& value ) const override;
     Qt::AlignmentFlag alignmentFlag( QgsVectorLayer *vl, int fieldIdx, const QgsEditorWidgetConfig &config ) const override;
     virtual QMap<const char*, int> supportedWidgetTypes() override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 };
 
 #endif // QGSDATETIMEEDITFACTORY_H
diff --git a/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp b/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp
index c70329356e7..c1a2b3f975b 100644
--- a/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp
@@ -36,12 +36,12 @@ QgsEditorConfigWidget* QgsEnumerationWidgetFactory::configWidget( QgsVectorLayer
 }
 
 
-bool QgsEnumerationWidgetFactory::isFieldSupported( QgsVectorLayer* vl, int fieldIdx )
+unsigned int QgsEnumerationWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
 {
   QStringList list;
   vl->dataProvider()->enumValues( fieldIdx, list );
   if ( !list.isEmpty() )
-    return true;
+    return 20;
   else
-    return false;
+    return 0;
 }
diff --git a/src/gui/editorwidgets/qgsenumerationwidgetfactory.h b/src/gui/editorwidgets/qgsenumerationwidgetfactory.h
index 66bb4b3dce7..cf158b4025e 100644
--- a/src/gui/editorwidgets/qgsenumerationwidgetfactory.h
+++ b/src/gui/editorwidgets/qgsenumerationwidgetfactory.h
@@ -33,8 +33,7 @@ class GUI_EXPORT QgsEnumerationWidgetFactory : public QgsEditorWidgetFactory
     QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override;
     QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
 
-  private:
-    bool isFieldSupported( QgsVectorLayer* vl, int fieldIdx ) override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 };
 
 #endif // QGSENUMERATIONWIDGETFACTORY_H
diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp
index 993a66b2e36..e6de559ab49 100644
--- a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp
@@ -119,10 +119,10 @@ QgsEditorWidgetConfig QgsExternalResourceWidgetFactory::readConfig( const QDomEl
   return cfg;
 }
 
-bool QgsExternalResourceWidgetFactory::isFieldSupported( QgsVectorLayer* vl, int fieldIdx )
+unsigned int QgsExternalResourceWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
 {
   if ( vl->fields().at( fieldIdx ).type() == QVariant::String )
-    return true;
+    return 5;
 
-  return false;
+  return 0;
 }
diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h
index b5221c9c30c..d9d0a5f7894 100644
--- a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h
+++ b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h
@@ -35,13 +35,11 @@ class GUI_EXPORT QgsExternalResourceWidgetFactory : public QgsEditorWidgetFactor
     QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override;
     QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
 
-    // QgsEditorWidgetFactory interface
-  public:
     void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 
   private:
     QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override;
-    bool isFieldSupported( QgsVectorLayer* vl, int fieldIdx ) override;
 };
 
 #endif // QGSEXTERNALRESOURCEWIDGETFACTORY_H
diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp
index d197b73a44f..aa6f850bb3e 100644
--- a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp
@@ -71,18 +71,9 @@ void QgsRangeWidgetFactory::writeConfig( const QgsEditorWidgetConfig& config, QD
   }
 }
 
-bool QgsRangeWidgetFactory::isFieldSupported( QgsVectorLayer* vl, int fieldIdx )
+unsigned int QgsRangeWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
 {
-  switch ( vl->fields().at( fieldIdx ).type() )
-  {
-    case QVariant::LongLong:
-    case QVariant::Double:
-    case QVariant::Int:
-      return true;
-
-    default:
-      return false;
-  }
+  return vl->fields().at( fieldIdx ).isNumeric() ? 20 : 0;
 }
 
 QMap<const char*, int> QgsRangeWidgetFactory::supportedWidgetTypes()
diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.h b/src/gui/editorwidgets/qgsrangewidgetfactory.h
index f7ece7e1daf..e3e1242539a 100644
--- a/src/gui/editorwidgets/qgsrangewidgetfactory.h
+++ b/src/gui/editorwidgets/qgsrangewidgetfactory.h
@@ -37,7 +37,7 @@ class GUI_EXPORT QgsRangeWidgetFactory : public QgsEditorWidgetFactory
     virtual QMap<const char*, int> supportedWidgetTypes() override;
 
   private:
-    virtual bool isFieldSupported( QgsVectorLayer *vl, int fieldIdx ) override;
+    virtual unsigned int fieldScore( const QgsVectorLayer *vl, int fieldIdx ) const override;
 };
 
 #endif // QGSRANGEWIDGETFACTORY_H
diff --git a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp
index 27f9e4b31fd..f0286f447d4 100644
--- a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp
@@ -62,3 +62,10 @@ QgsEditorWidgetConfig QgsTextEditWidgetFactory::readConfig( const QDomElement& c
 
   return cfg;
 }
+
+unsigned int QgsTextEditWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
+{
+  Q_UNUSED( vl )
+  Q_UNUSED( fieldIdx )
+  return 10;
+}
\ No newline at end of file
diff --git a/src/gui/editorwidgets/qgstexteditwidgetfactory.h b/src/gui/editorwidgets/qgstexteditwidgetfactory.h
index 9e67b39be3d..8297babe476 100644
--- a/src/gui/editorwidgets/qgstexteditwidgetfactory.h
+++ b/src/gui/editorwidgets/qgstexteditwidgetfactory.h
@@ -34,9 +34,8 @@ class GUI_EXPORT QgsTextEditWidgetFactory : public QgsEditorWidgetFactory
     QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
     QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
 
-    // QgsEditorWidgetFactory interface
-  public:
     void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 
   private:
     QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override;
diff --git a/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp b/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp
index cb60235702c..3cb6833fc37 100644
--- a/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp
@@ -33,3 +33,9 @@ QgsEditorConfigWidget* QgsUuidWidgetFactory::configWidget( QgsVectorLayer* vl, i
 {
   return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "Read-only field that generates a UUID if empty." ) );
 }
+
+unsigned int QgsUuidWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const
+{
+  const QVariant::Type type = vl->fields().field( fieldIdx ).type();
+  return type == QVariant::String ? 5 : 0;
+}
\ No newline at end of file
diff --git a/src/gui/editorwidgets/qgsuuidwidgetfactory.h b/src/gui/editorwidgets/qgsuuidwidgetfactory.h
index c74c610f685..14724d71b40 100644
--- a/src/gui/editorwidgets/qgsuuidwidgetfactory.h
+++ b/src/gui/editorwidgets/qgsuuidwidgetfactory.h
@@ -32,6 +32,7 @@ class GUI_EXPORT QgsUuidWidgetFactory : public QgsEditorWidgetFactory
   public:
     QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override;
     QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override;
+    unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override;
 };
 
 #endif // QGSUUIDWIDGETFACTORY_H
diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
index 550f530cef7..c14661d2571 100644
--- a/src/gui/qgsattributeeditor.cpp
+++ b/src/gui/qgsattributeeditor.cpp
@@ -43,10 +43,7 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
 
 QWidget* QgsAttributeEditor::createAttributeEditor( QWidget* parent, QWidget* editor, QgsVectorLayer* vl, int idx, const QVariant& value, QgsAttributeEditorContext& context )
 {
-  QString widgetType = vl->editFormConfig().widgetType( idx );
-  QgsEditorWidgetConfig cfg = vl->editFormConfig().widgetConfig( idx );
-
-  QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, vl, idx, cfg, editor, parent, context );
+  QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( vl, idx, editor, parent, context );
 
   if ( eww )
   {
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
index 11501f1bad4..ed28e2d488c 100644
--- a/src/gui/qgsattributeform.cpp
+++ b/src/gui/qgsattributeform.cpp
@@ -1216,17 +1216,16 @@ void QgsAttributeForm::init()
       //show attribute alias if available
       QString fieldName = mLayer->attributeDisplayName( idx );
 
-      const QString widgetType = mLayer->editFormConfig().widgetType( idx );
+      const QgsEditorWidgetSetup widgetSetup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, field.name() );
 
-      if ( widgetType == "Hidden" )
+      if ( widgetSetup.type() == "Hidden" )
         continue;
 
-      const QgsEditorWidgetConfig widgetConfig = mLayer->editFormConfig().widgetConfig( idx );
       bool labelOnTop = mLayer->editFormConfig().labelOnTop( idx );
 
       // This will also create the widget
       QLabel *l = new QLabel( fieldName );
-      QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, mLayer, idx, widgetConfig, nullptr, this, mContext );
+      QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetSetup.type(), mLayer, idx, widgetSetup.config(), nullptr, this, mContext );
 
       QWidget* w = nullptr;
       if ( eww )
@@ -1234,13 +1233,13 @@ void QgsAttributeForm::init()
         QgsAttributeFormEditorWidget* formWidget = new QgsAttributeFormEditorWidget( eww, this );
         w = formWidget;
         mFormEditorWidgets.insert( idx, formWidget );
-        formWidget->createSearchWidgetWrappers( widgetType, idx, widgetConfig, mContext );
+        formWidget->createSearchWidgetWrappers( widgetSetup.type(), idx, widgetSetup.config(), mContext );
 
         l->setBuddy( eww->widget() );
       }
       else
       {
-        w = new QLabel( QString( "<p style=\"color: red; font-style: italic;\">Failed to create widget with type '%1'</p>" ).arg( widgetType ) );
+        w = new QLabel( QString( "<p style=\"color: red; font-style: italic;\">Failed to create widget with type '%1'</p>" ).arg( widgetSetup.type() ) );
       }
 
 
@@ -1265,8 +1264,8 @@ void QgsAttributeForm::init()
     Q_FOREACH ( const QgsRelation& rel, QgsProject::instance()->relationManager()->referencedRelations( mLayer ) )
     {
       QgsRelationWidgetWrapper* rww = new QgsRelationWidgetWrapper( mLayer, rel, nullptr, this );
-      QgsEditorWidgetConfig cfg = mLayer->editFormConfig().widgetConfig( rel.id() );
-      rww->setConfig( cfg );
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, rel.id() );
+      rww->setConfig( setup.config() );
       rww->setContext( mContext );
       gridLayout->addWidget( rww->widget(), row++, 0, 1, 2 );
       mWidgets.append( rww );
@@ -1506,14 +1505,13 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
       int fldIdx = vl->fieldNameIndex( fieldDef->name() );
       if ( fldIdx < vl->fields().count() && fldIdx >= 0 )
       {
-        const QString widgetType = mLayer->editFormConfig().widgetType( fldIdx );
-        const QgsEditorWidgetConfig widgetConfig = mLayer->editFormConfig().widgetConfig( fldIdx );
+        const QgsEditorWidgetSetup widgetSetup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, fieldDef->name() );
 
-        QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, mLayer, fldIdx, widgetConfig, nullptr, this, mContext );
+        QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetSetup.type(), mLayer, fldIdx, widgetSetup.config(), nullptr, this, mContext );
         QgsAttributeFormEditorWidget* w = new QgsAttributeFormEditorWidget( eww, this );
         mFormEditorWidgets.insert( fldIdx, w );
 
-        w->createSearchWidgetWrappers( widgetType, fldIdx, widgetConfig, mContext );
+        w->createSearchWidgetWrappers( widgetSetup.type(), fldIdx, widgetSetup.config(), mContext );
 
         newWidgetInfo.widget = w;
         addWidgetWrapper( eww );
@@ -1533,8 +1531,8 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
       const QgsAttributeEditorRelation* relDef = dynamic_cast<const QgsAttributeEditorRelation*>( widgetDef );
 
       QgsRelationWidgetWrapper* rww = new QgsRelationWidgetWrapper( mLayer, relDef->relation(), nullptr, this );
-      QgsEditorWidgetConfig cfg = mLayer->editFormConfig().widgetConfig( relDef->relation().id() );
-      rww->setConfig( cfg );
+      const QgsEditorWidgetSetup widgetSetup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, relDef->relation().id() );
+      rww->setConfig( widgetSetup.config() );
       rww->setContext( context );
       newWidgetInfo.widget = rww->widget();
       rww->setShowLabel( relDef->showLabel() );
@@ -1688,7 +1686,8 @@ void QgsAttributeForm::createWrappers()
       if ( relation.isValid() )
       {
         QgsRelationWidgetWrapper* rww = new QgsRelationWidgetWrapper( mLayer, relation, myWidget, this );
-        rww->setConfig( mLayer->editFormConfig().widgetConfig( relation.id() ) );
+        const QgsEditorWidgetSetup widgetSetup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, relation.id() );
+        rww->setConfig( widgetSetup.config() );
         rww->setContext( mContext );
         rww->widget(); // Will initialize the widget
         mWidgets.append( rww );
@@ -1700,11 +1699,9 @@ void QgsAttributeForm::createWrappers()
       {
         if ( field.name() == myWidget->objectName() )
         {
-          const QString widgetType = mLayer->editFormConfig().widgetType( field.name() );
-          const QgsEditorWidgetConfig widgetConfig = mLayer->editFormConfig().widgetConfig( field.name() );
           int idx = mLayer->fieldNameIndex( field.name() );
 
-          QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, mLayer, idx, widgetConfig, myWidget, this, mContext );
+          QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( mLayer, idx, myWidget, this, mContext );
           addWidgetWrapper( eww );
         }
       }
diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt
index 56e6767afe9..24f1ddc8972 100644
--- a/src/providers/postgres/CMakeLists.txt
+++ b/src/providers/postgres/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 ########################################################
 # Files
 
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
index 39a1cedd0e5..48ab52c4e97 100644
--- a/src/providers/postgres/qgspostgresconn.cpp
+++ b/src/providers/postgres/qgspostgresconn.cpp
@@ -1287,6 +1287,7 @@ QString QgsPostgresConn::fieldExpression( const QgsField &fld, QString expr )
   }
   else if ( type.startsWith( '_' ) )
   {
+    //TODO: add native support for arrays
     return QString( "array_out(%1)::text" ).arg( expr );
   }
   else if ( type == "bool" )
@@ -1303,6 +1304,7 @@ QString QgsPostgresConn::fieldExpression( const QgsField &fld, QString expr )
   {
     return QString( "st_astext(%1)" ).arg( expr );
   }
+  //TODO: add support for hstore
   else
   {
     return expr + "::text";
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
index d020d5b2e21..8301c0aaf1b 100644
--- a/src/providers/postgres/qgspostgresprovider.cpp
+++ b/src/providers/postgres/qgspostgresprovider.cpp
@@ -23,6 +23,7 @@
 #include <qgsmessagelog.h>
 #include <qgsrectangle.h>
 #include <qgscoordinatereferencesystem.h>
+#include <qgseditformconfig.h>
 
 #include <QMessageBox>
 
@@ -38,6 +39,7 @@
 
 const QString POSTGRES_KEY = "postgres";
 const QString POSTGRES_DESCRIPTION = "PostgreSQL/PostGIS data provider";
+static const QString EDITOR_WIDGET_STYLES_TABLE = "qgis_editor_widget_styles";
 
 inline qint64 PKINT2FID( qint32 x )
 {
@@ -49,6 +51,12 @@ inline qint32 FID2PKINT( qint64 x )
   return QgsPostgresUtils::fid_to_int32pk( x );
 }
 
+static bool tableExists( QgsPostgresConn& conn, const QString& name )
+{
+  QgsPostgresResult res( conn.PQexec( "SELECT COUNT(*) FROM information_schema.tables WHERE table_name=" + QgsPostgresConn::quotedValue( name ) ) );
+  return res.PQgetvalue( 0, 0 ).toInt() > 0;
+}
+
 QgsPostgresPrimaryKeyType
 QgsPostgresProvider::pkType( const QgsField& f ) const
 {
@@ -1053,9 +1061,48 @@ bool QgsPostgresProvider::loadFields()
     mAttributeFields.append( QgsField( fieldName, fieldType, fieldTypeName, fieldSize, fieldPrec, fieldComment ) );
   }
 
+  setEditorWidgets();
+
   return true;
 }
 
+void QgsPostgresProvider::setEditorWidgets()
+{
+  if ( tableExists( *connectionRO(), EDITOR_WIDGET_STYLES_TABLE ) )
+  {
+    for ( int i = 0; i < mAttributeFields.count(); ++i )
+    {
+      // CREATE TABLE qgis_editor_widget_styles (schema_name TEXT NOT NULL, table_name TEXT NOT NULL, field_name TEXT NOT NULL,
+      //                                         type TEXT NOT NULL, config TEXT,
+      //                                         PRIMARY KEY(schema_name, table_name, field_name));
+      QgsField& field = mAttributeFields[i];
+      const QString sql = QString( "SELECT type, config FROM %1 WHERE schema_name = %2 and table_name = %3 and field_name = %4 LIMIT 1" ).
+                          arg( EDITOR_WIDGET_STYLES_TABLE, quotedValue( mSchemaName ), quotedValue( mTableName ), quotedValue( field.name() ) );
+      QgsPostgresResult result( connectionRO()->PQexec( sql ) );
+      for ( int i = 0; i < result.PQntuples(); ++i )
+      {
+        const QString type = result.PQgetvalue( i, 0 );
+        QgsEditorWidgetConfig config;
+        if ( !result.PQgetisnull( i, 1 ) ) // Can be null and it's OK
+        {
+          const QString configTxt = result.PQgetvalue( i, 1 );
+          QDomDocument doc;
+          if ( doc.setContent( configTxt ) )
+          {
+            config = QgsEditFormConfig::parseEditorWidgetConfig( doc.documentElement() );
+          }
+          else
+          {
+            QgsMessageLog::logMessage( tr( "Cannot parse widget configuration for field %1.%2.%3\n" ).arg( mSchemaName, mTableName, field.name() ), tr( "PostGIS" ) );
+          }
+        }
+
+        field.setEditorWidgetSetup( QgsEditorWidgetSetup( type, config ) );
+      }
+    }
+  }
+}
+
 bool QgsPostgresProvider::hasSufficientPermsAndCapabilities()
 {
   QgsDebugMsg( "Checking for permissions on the relation" );
@@ -1937,6 +1984,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )
                     .arg( delim,
                           quotedValue( v.toString() ) );
         }
+        //TODO: convert arrays and hstore to native types
         else
         {
           values += delim + quotedValue( v );
@@ -3965,24 +4013,23 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS
     return false;
   }
 
-  QgsPostgresResult res( conn->PQexec( "SELECT COUNT(*) FROM information_schema.tables WHERE table_name='layer_styles'" ) );
-  if ( res.PQgetvalue( 0, 0 ).toInt() == 0 )
+  if ( !tableExists( *conn, "layer_styles" ) )
   {
-    res = conn->PQexec( "CREATE TABLE layer_styles("
-                        "id SERIAL PRIMARY KEY"
-                        ",f_table_catalog varchar"
-                        ",f_table_schema varchar"
-                        ",f_table_name varchar"
-                        ",f_geometry_column varchar"
-                        ",styleName varchar(30)"
-                        ",styleQML xml"
-                        ",styleSLD xml"
-                        ",useAsDefault boolean"
-                        ",description text"
-                        ",owner varchar(30)"
-                        ",ui xml"
-                        ",update_time timestamp DEFAULT CURRENT_TIMESTAMP"
-                        ")" );
+    QgsPostgresResult res( conn->PQexec( "CREATE TABLE layer_styles("
+                                         "id SERIAL PRIMARY KEY"
+                                         ",f_table_catalog varchar"
+                                         ",f_table_schema varchar"
+                                         ",f_table_name varchar"
+                                         ",f_geometry_column varchar"
+                                         ",styleName varchar(30)"
+                                         ",styleQML xml"
+                                         ",styleSLD xml"
+                                         ",useAsDefault boolean"
+                                         ",description text"
+                                         ",owner varchar(30)"
+                                         ",ui xml"
+                                         ",update_time timestamp DEFAULT CURRENT_TIMESTAMP"
+                                         ")" ) );
     if ( res.PQresultStatus() != PGRES_COMMAND_OK )
     {
       errCause = QObject::tr( "Unable to save layer style. It's not possible to create the destination table on the database. Maybe this is due to table permissions (user=%1). Please contact your database admin" ).arg( dsUri.username() );
@@ -4036,7 +4083,7 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS
                        .arg( QgsPostgresConn::quotedValue( dsUri.geometryColumn() ) )
                        .arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) );
 
-  res = conn->PQexec( checkQuery );
+  QgsPostgresResult res( conn->PQexec( checkQuery ) );
   if ( res.PQntuples() > 0 )
   {
     if ( QMessageBox::question( nullptr, QObject::tr( "Save style in database" ),
@@ -4111,8 +4158,7 @@ QGISEXTERN QString loadStyle( const QString& uri, QString& errCause )
     return "";
   }
 
-  QgsPostgresResult result( conn->PQexec( "SELECT COUNT(*) FROM information_schema.tables WHERE table_name='layer_styles'" ) );
-  if ( result.PQgetvalue( 0, 0 ).toInt() == 0 )
+  if ( !tableExists( *conn, "layer_styles" ) )
   {
     return "";
   }
@@ -4130,7 +4176,7 @@ QGISEXTERN QString loadStyle( const QString& uri, QString& errCause )
                            .arg( QgsPostgresConn::quotedValue( dsUri.table() ) )
                            .arg( QgsPostgresConn::quotedValue( dsUri.geometryColumn() ) );
 
-  result = conn->PQexec( selectQmlQuery );
+  QgsPostgresResult result( conn->PQexec( selectQmlQuery ) );
 
   QString style = result.PQntuples() == 1 ? result.PQgetvalue( 0, 0 ) : "";
   conn->unref();
diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
index 0c8ec10a536..ef696a3f51f 100644
--- a/src/providers/postgres/qgspostgresprovider.h
+++ b/src/providers/postgres/qgspostgresprovider.h
@@ -300,6 +300,10 @@ class QgsPostgresProvider : public QgsVectorDataProvider
      */
     bool loadFields();
 
+    /** Set the default widget type for the fields
+     */
+    void setEditorWidgets();
+
     /** Convert a QgsField to work with PG */
     static bool convertField( QgsField &field, const QMap<QString, QVariant> *options = nullptr );
 
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
index 276ac207da1..a535206a9af 100644
--- a/src/server/qgsserverprojectparser.cpp
+++ b/src/server/qgsserverprojectparser.cpp
@@ -811,7 +811,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement& layerElem, QD
       }
 
       //edit type to text
-      attributeElem.setAttribute( "editType", vLayer->editFormConfig().widgetType( idx ) );
+      attributeElem.setAttribute( "editType", vLayer->editFormConfig().widgetType( field.name() ) );
       attributeElem.setAttribute( "comment", field.comment() );
       attributeElem.setAttribute( "length", field.length() );
       attributeElem.setAttribute( "precision", field.precision() );
@@ -1555,10 +1555,11 @@ void QgsServerProjectParser::addValueRelationLayersForLayer( const QgsVectorLaye
 
   for ( int idx = 0; idx < vl->pendingFields().size(); idx++ )
   {
-    if ( vl->editFormConfig().widgetType( idx ) != "ValueRelation" )
+    const QString name = vl->pendingFields().field( idx ).name();
+    if ( vl->editFormConfig().widgetType( name ) != "ValueRelation" )
       continue;
 
-    QgsEditorWidgetConfig cfg( vl->editFormConfig().widgetConfig( idx ) );
+    QgsEditorWidgetConfig cfg( vl->editFormConfig().widgetConfig( name ) );
     if ( !cfg.contains( "Layer" ) )
       continue;
 
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
index 462ce13fddf..e4b7a1c900b 100644
--- a/src/server/qgswmsserver.cpp
+++ b/src/server/qgswmsserver.cpp
@@ -3334,11 +3334,11 @@ QDomElement QgsWmsServer::createFeatureGML(
 
 QString QgsWmsServer::replaceValueMapAndRelation( QgsVectorLayer* vl, int idx, const QString& attributeVal )
 {
-  if ( QgsEditorWidgetFactory *factory = QgsEditorWidgetRegistry::instance()->factory( vl->editFormConfig().widgetType( idx ) ) )
+  const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( vl, vl->fields().field( idx ).name() );
+  if ( QgsEditorWidgetFactory *factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() ) )
   {
-    QgsEditorWidgetConfig cfg( vl->editFormConfig().widgetConfig( idx ) );
-    QString value( factory->representValue( vl, idx, cfg, QVariant(), attributeVal ) );
-    if ( cfg.value( "AllowMulti" ).toBool() && value.startsWith( "{" ) && value.endsWith( "}" ) )
+    QString value( factory->representValue( vl, idx, setup.config(), QVariant(), attributeVal ) );
+    if ( setup.config().value( "AllowMulti" ).toBool() && value.startsWith( "{" ) && value.endsWith( "}" ) )
     {
       value = value.mid( 1, value.size() - 2 );
     }
diff --git a/tests/src/core/testqgsfield.cpp b/tests/src/core/testqgsfield.cpp
index 9f4919d60d0..c2da6689aa2 100644
--- a/tests/src/core/testqgsfield.cpp
+++ b/tests/src/core/testqgsfield.cpp
@@ -40,6 +40,7 @@ class TestQgsField: public QObject
     void displayString();
     void convertCompatible();
     void dataStream();
+    void editorWidgetSetup();
 
   private:
 };
@@ -372,5 +373,17 @@ void TestQgsField::dataStream()
   QCOMPARE( result.comment(), original.comment() ); //comment is NOT required for equality
 }
 
+void TestQgsField::editorWidgetSetup()
+{
+  QgsField field;
+  QgsEditorWidgetConfig config;
+  config.insert( "a", "value_a" );
+  const QgsEditorWidgetSetup setup( "test", config );
+  field.setEditorWidgetSetup( setup );
+
+  QCOMPARE( field.editorWidgetSetup().type(), setup.type() );
+  QCOMPARE( field.editorWidgetSetup().config(), setup.config() );
+}
+
 QTEST_MAIN( TestQgsField )
 #include "testqgsfield.moc"
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
index 7f7c92f356c..d0e9756b136 100644
--- a/tests/src/gui/CMakeLists.txt
+++ b/tests/src/gui/CMakeLists.txt
@@ -140,4 +140,5 @@ ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp)
 ADD_QGIS_TEST(scalecombobox testqgsscalecombobox.cpp)
 ADD_QGIS_TEST(spinbox testqgsspinbox.cpp)
 ADD_QGIS_TEST(sqlcomposerdialog testqgssqlcomposerdialog.cpp)
+ADD_QGIS_TEST(editorwidgetregistrytest testqgseditorwidgetregistry.cpp)
 
diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp
index f396eef7814..a7734a6c8e0 100644
--- a/tests/src/gui/testqgsattributeform.cpp
+++ b/tests/src/gui/testqgsattributeform.cpp
@@ -67,6 +67,7 @@ void TestQgsAttributeForm::testFieldConstraint()
   // make a temporary vector layer
   QString def = "Point?field=col0:integer";
   QgsVectorLayer* layer = new QgsVectorLayer( def, "test", "memory" );
+  layer->editFormConfig().setWidgetType( 0, "TextEdit" );
 
   // add a feature to the vector layer
   QgsFeature ft( layer->dataProvider()->fields(), 1 );
diff --git a/tests/src/gui/testqgseditorwidgetregistry.cpp b/tests/src/gui/testqgseditorwidgetregistry.cpp
new file mode 100644
index 00000000000..662192ce19d
--- /dev/null
+++ b/tests/src/gui/testqgseditorwidgetregistry.cpp
@@ -0,0 +1,119 @@
+/***************************************************************************
+    testqgseditorwidgetregistry.cpp
+    ---------------------
+    begin                : July 2016
+    copyright            : (C) 2016 by Patrick Valsecchi
+    email                : patrick.valsecchi at camptocamp.com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include <QtTest/QtTest>
+
+#include "qgseditorwidgetregistry.h"
+#include "qgseditorwidgetautoconf.h"
+
+
+class TestQgsEditorWidgetRegistry: public QObject
+{
+    Q_OBJECT
+
+    class DummyPlugin: public QgsEditorWidgetAutoConfPlugin
+    {
+      public:
+        QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer* vl, const QString& fieldName, int& score ) const override
+        {
+          Q_UNUSED( vl )
+          if ( fieldName == "special" )
+          {
+            score = 100;
+            return QgsEditorWidgetSetup( "Special", QgsEditorWidgetConfig() );
+          }
+          score = 0;
+          return QgsEditorWidgetSetup();
+        }
+    };
+
+
+  private slots:
+    void initTestCase()
+    {
+      QgsApplication::init();
+      QgsApplication::initQgis();
+      QgsEditorWidgetRegistry::initEditors();
+      QgsEditorWidgetRegistry::instance()->registerAutoConfPlugin( new DummyPlugin() );
+    }
+
+    void cleanupTestCase()
+    {
+      QgsApplication::exitQgis();
+    }
+
+    void stringType()
+    {
+      checkSimple( "string", "TextEdit" );
+    }
+
+    void datetimeType()
+    {
+      checkSimple( "datetime", "DateTime" );
+    }
+
+    void integerType()
+    {
+      checkSimple( "integer", "Range" );
+    }
+
+    void doubleType()
+    {
+      checkSimple( "double", "Range" );
+    }
+
+    void configuredType()
+    {
+      QgsVectorLayer vl( "LineString?crs=epsg:3111&field=pk:int&field=col1:string", "vl", "memory" );
+      QgsEditFormConfig formConfig = vl.editFormConfig();
+      formConfig.setWidgetType( vl.fieldNameIndex( "col1" ), "FooEdit" );
+      QgsEditorWidgetConfig config;
+      config["a"] = QVariant( 12 );
+      config["b"] = QVariant( "bar" );
+      formConfig.setWidgetConfig( "col1", config );
+      vl.setEditFormConfig( formConfig );
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( &vl, "col1" );
+      QCOMPARE( setup.type(), QString( "FooEdit" ) );
+      QCOMPARE( setup.config(), config );
+    }
+
+    void wrongFieldName()
+    {
+      const QgsVectorLayer vl( "LineString?crs=epsg:3111&field=pk:int&field=col1:string", "vl", "memory" );
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( &vl, "col2" );
+      // an unknown fields leads to a default setup with a TextEdit
+      QCOMPARE( setup.type(), QString( "TextEdit" ) );
+      QCOMPARE( setup.config().count(), 0 );
+    }
+
+    void typeFromPlugin()
+    {
+      const QgsVectorLayer vl( "LineString?crs=epsg:3111&field=pk:int&field=special:string", "vl", "memory" );
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( &vl, "special" );
+      QCOMPARE( setup.type(), QString( "Special" ) );
+    }
+
+  private:
+
+    static void checkSimple( const QString& dataType, const QString& widgetType )
+    {
+      const QgsVectorLayer vl( "LineString?crs=epsg:3111&field=pk:int&field=col1:" + dataType, "vl", "memory" );
+      const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( &vl, "col1" );
+      QCOMPARE( setup.type(), widgetType );
+      QCOMPARE( setup.config().count(), 0 );
+    }
+};
+
+QTEST_MAIN( TestQgsEditorWidgetRegistry )
+#include "testqgseditorwidgetregistry.moc"
diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
index 12d706c6321..e5fa309f946 100644
--- a/tests/src/python/test_provider_postgres.py
+++ b/tests/src/python/test_provider_postgres.py
@@ -24,6 +24,7 @@ from qgis.core import (
     QgsTransactionGroup,
     NULL
 )
+from qgis.gui import QgsEditorWidgetRegistry
 from qgis.PyQt.QtCore import QSettings, QDate, QTime, QDateTime, QVariant
 from qgis.testing import start_app, unittest
 from utilities import unitTestDataPath
@@ -48,6 +49,7 @@ class TestPyQgsPostgresProvider(unittest.TestCase, ProviderTestCase):
         cls.poly_vl = QgsVectorLayer(cls.dbconn + ' sslmode=disable key=\'pk\' srid=4326 type=POLYGON table="qgis_test"."some_poly_data" (geom) sql=', 'test', 'postgres')
         assert cls.poly_vl.isValid()
         cls.poly_provider = cls.poly_vl.dataProvider()
+        QgsEditorWidgetRegistry.instance().initEditors()
 
     @classmethod
     def tearDownClass(cls):
@@ -312,6 +314,27 @@ class TestPyQgsPostgresProvider(unittest.TestCase, ProviderTestCase):
         self.assertEqual(fet.fields()[1].name(), 'newname2')
         self.assertEqual(fet.fields()[2].name(), 'another')
 
+    def testEditorWidgetTypes(self):
+        """Test that editor widget types can be fetched from the qgis_editor_widget_styles table"""
+
+        vl = QgsVectorLayer('%s table="qgis_test"."widget_styles" sql=' % (self.dbconn), "widget_styles", "postgres")
+        self.assertTrue(vl.isValid())
+        fields = vl.dataProvider().fields()
+
+        setup1 = fields.field("fld1").editorWidgetSetup()
+        self.assertFalse(setup1.isNull())
+        self.assertEqual(setup1.type(), "FooEdit")
+        self.assertEqual(setup1.config(), {"param1": "value1", "param2": "2"})
+
+        best1 = QgsEditorWidgetRegistry.instance().findBest(vl, "fld1")
+        self.assertEqual(best1.type(), "FooEdit")
+        self.assertEqual(best1.config(), setup1.config())
+
+        self.assertTrue(fields.field("fld2").editorWidgetSetup().isNull())
+
+        best2 = QgsEditorWidgetRegistry.instance().findBest(vl, "fld2")
+        self.assertEqual(best2.type(), "TextEdit")
+
 
 class TestPyQgsPostgresProviderCompoundKey(unittest.TestCase, ProviderTestCase):
 
diff --git a/tests/testdata/provider/testdata_pg.sh b/tests/testdata/provider/testdata_pg.sh
index 610215c385c..da665a73e25 100755
--- a/tests/testdata/provider/testdata_pg.sh
+++ b/tests/testdata/provider/testdata_pg.sh
@@ -6,6 +6,7 @@ SCRIPTS="
   tests/testdata/provider/testdata_pg_vectorjoin.sql
 "
 
+dropdb qgis_test 2> /dev/null || true
 createdb qgis_test || exit 1
 for f in ${SCRIPTS}; do
   psql -f $f qgis_test --set ON_ERROR_STOP=1 || exit 1
diff --git a/tests/testdata/provider/testdata_pg.sql b/tests/testdata/provider/testdata_pg.sql
index cd72168a729..4c9e10b6286 100644
--- a/tests/testdata/provider/testdata_pg.sql
+++ b/tests/testdata/provider/testdata_pg.sql
@@ -434,3 +434,27 @@ CREATE TABLE qgis_test.rename_table
 );
 
 INSERT INTO qgis_test.rename_table (field1,field2) VALUES ('a','b');
+
+
+--------------------------------------
+-- Table for editor widget types
+--
+
+CREATE TABLE qgis_editor_widget_styles
+(
+  schema_name TEXT NOT NULL,
+  table_name TEXT NOT NULL,
+  field_name TEXT NOT NULL,
+  type TEXT NOT NULL,
+  config TEXT,
+  PRIMARY KEY(table_name, field_name)
+);
+
+CREATE TABLE qgis_test.widget_styles(
+       id int PRIMARY KEY,
+       fld1 TEXT,
+       fld2 TEXT
+);
+
+INSERT INTO qgis_editor_widget_styles VALUES
+('qgis_test', 'widget_styles', 'fld1', 'FooEdit', '<config><option key="param1" value="value1"/><option key="param2" value="2"/></config>');