add new custom widgets to Qt Designer plugin

qgis · Aug 20, 2014 · eb678e4 · eb678e4
1 parent 68bb52f
commit eb678e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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( "<ui language=\"c++\">\n"
-                  " <widget class=\"%1\" name=\"mColorButton\">\n"
+                  " <widget class=\"%1\" name=\"mRelationReference\">\n"
                   "  <property name=\"geometry\">\n"
                   "   <rect>\n"
                   "    <x>0</x>\n"