Skip to content
Permalink
Browse files

Fix widget registry (SIP), few fixes for relation reference widget

  • Loading branch information
3nids committed Sep 16, 2014
1 parent dce206e commit d05d83ed79eaa2ee613943b7fbc824aa87c02fa7
@@ -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/;

/**
@@ -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();
}

0 comments on commit d05d83e

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