diff --git a/src/customwidgets/qgiscustomwidgets.cpp b/src/customwidgets/qgiscustomwidgets.cpp index be15bbf43117..c5d2e750e172 100644 --- a/src/customwidgets/qgiscustomwidgets.cpp +++ b/src/customwidgets/qgiscustomwidgets.cpp @@ -19,10 +19,12 @@ #include "qgscollapsiblegroupboxplugin.h" #include "qgscolorbuttonplugin.h" +#include "qgscolorbuttonv2plugin.h" #include "qgsdatadefinedbuttonplugin.h" #include "qgsfieldcomboboxplugin.h" #include "qgsfieldexpressionwidgetplugin.h" #include "qgsmaplayercomboboxplugin.h" +#include "qgsrelationreferencewidgetplugin.h" #include "qgsscalerangewidgetplugin.h" @@ -31,10 +33,12 @@ QgisCustomWidgets::QgisCustomWidgets( QObject *parent ) { mWidgets.append( new QgsCollapsibleGroupBoxPlugin ); mWidgets.append( new QgsColorButtonPlugin ); + mWidgets.append( new QgsColorButtonV2Plugin ); mWidgets.append( new QgsDataDefinedButtonPlugin ); mWidgets.append( new QgsFieldComboBoxPlugin ); mWidgets.append( new QgsFieldExpressionWidgetPlugin ); mWidgets.append( new QgsMapLayerComboBoxPlugin ); + mWidgets.append( new QgsRelationReferenceWidgetPlugin ); mWidgets.append( new QgsScaleRangeWidgetPlugin ); } diff --git a/src/customwidgets/qgsrelationreferencewidgetplugin.cpp b/src/customwidgets/qgsrelationreferencewidgetplugin.cpp index 4a1a9265d22e..9f0d6348a9a2 100644 --- a/src/customwidgets/qgsrelationreferencewidgetplugin.cpp +++ b/src/customwidgets/qgsrelationreferencewidgetplugin.cpp @@ -71,7 +71,7 @@ void QgsRelationReferenceWidgetPlugin::initialize( QDesignerFormEditorInterface QString QgsRelationReferenceWidgetPlugin::toolTip() const { - return "Select color"; + return "Relation reference"; } QString QgsRelationReferenceWidgetPlugin::whatsThis() const @@ -82,7 +82,7 @@ QString QgsRelationReferenceWidgetPlugin::whatsThis() const QString QgsRelationReferenceWidgetPlugin::domXml() const { return QString( "\n" - " \n" + " \n" " \n" " \n" " 0\n"