From d05d83ed79eaa2ee613943b7fbc824aa87c02fa7 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Tue, 16 Sep 2014 13:31:30 +0200
Subject: [PATCH] Fix widget registry (SIP), few fixes for relation reference
 widget

---
 .../editorwidgets/core/qgseditorwidgetregistry.sip   |  3 ++-
 src/gui/editorwidgets/qgsrelationreferencewidget.cpp | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip b/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
index eb3fbb59e07..9ba162f753f 100644
--- a/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
+++ b/python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
@@ -49,7 +49,8 @@ class QgsEditorWidgetRegistry : QObject
                                     QgsVectorLayer* vl,
                                     int fieldIdx,
                                     const QgsEditorWidgetConfig& config,
-                                    QWidget* editor, QWidget* parent,
+                                    QWidget* editor,
+                                    QWidget* parent /TransferThis/,
                                     const QgsAttributeEditorContext context = QgsAttributeEditorContext() ) /Factory/;
 
     /**
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
index 1e7abb4f3ec..8801e3ea209 100644
--- a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
+++ b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -275,7 +275,7 @@ void QgsRelationReferenceWidget::mapToolDeactivated()
 {
   if ( mWindowWidget )
   {
-    mWindowWidget->show();
+    mWindowWidget->raise();
   }
 
   if ( mMessageBar && mMessageBarItem )
@@ -352,9 +352,9 @@ void QgsRelationReferenceWidget::setAllowMapIdentification( bool allowMapIdentif
   mAllowMapIdentification = allowMapIdentification;
 }
 
-void QgsRelationReferenceWidget::setOpenFormButtonVisible(bool openFormButtonVisible)
+void QgsRelationReferenceWidget::setOpenFormButtonVisible( bool openFormButtonVisible )
 {
-  mOpenFormButton->setVisible(openFormButtonVisible);
+  mOpenFormButton->setVisible( openFormButtonVisible );
   mOpenFormButtonVisible = openFormButtonVisible;
 }
 
@@ -518,9 +518,11 @@ void QgsRelationReferenceWidget::mapIdentification()
     return;
 
   mMapTool = new QgsMapToolIdentifyFeature( mCanvas, mReferencedLayer );
+  mMapTool->setAction( mMapIdentificationAction );
   mCanvas->setMapTool( mMapTool );
   mWindowWidget = window();
-  mWindowWidget->hide();
+  mCanvas->raise();
+
   connect( mMapTool, SIGNAL( featureIdentified( QgsFeature ) ), this, SLOT( featureIdentified( const QgsFeature ) ) );
   connect( mMapTool, SIGNAL( deactivated() ), this, SLOT( mapToolDeactivated() ) );
 
@@ -580,5 +582,5 @@ void QgsRelationReferenceWidget::featureIdentified( const QgsFeature& feature )
   }
 
   if ( mWindowWidget )
-    mWindowWidget->show();
+    mWindowWidget->raise();
 }