sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Denis Rouzaud 2014-09-16 13:31:30 +02:00
parent dce206e374
commit d05d83ed79
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
View File

@ -49,7 +49,8 @@ class QgsEditorWidgetRegistry : QObject
QgsVectorLayer* vl, QgsVectorLayer* vl,
int fieldIdx, int fieldIdx,
const QgsEditorWidgetConfig& config, const QgsEditorWidgetConfig& config,
QWidget* editor, QWidget* parent, QWidget* editor,
QWidget* parent /TransferThis/,
const QgsAttributeEditorContext context = QgsAttributeEditorContext() ) /Factory/; const QgsAttributeEditorContext context = QgsAttributeEditorContext() ) /Factory/;
/** /**

12
src/gui/editorwidgets/qgsrelationreferencewidget.cpp
View File

@ -275,7 +275,7 @@ void QgsRelationReferenceWidget::mapToolDeactivated()
{ {
if ( mWindowWidget ) if ( mWindowWidget )
{ {
mWindowWidget->show(); mWindowWidget->raise();
} }
if ( mMessageBar && mMessageBarItem ) if ( mMessageBar && mMessageBarItem )
@ -352,9 +352,9 @@ void QgsRelationReferenceWidget::setAllowMapIdentification( bool allowMapIdentif
mAllowMapIdentification = allowMapIdentification; mAllowMapIdentification = allowMapIdentification;
} }
void QgsRelationReferenceWidget::setOpenFormButtonVisible(bool openFormButtonVisible) void QgsRelationReferenceWidget::setOpenFormButtonVisible( bool openFormButtonVisible )
{ {
mOpenFormButton->setVisible(openFormButtonVisible); mOpenFormButton->setVisible( openFormButtonVisible );
mOpenFormButtonVisible = openFormButtonVisible; mOpenFormButtonVisible = openFormButtonVisible;
} }
@ -518,9 +518,11 @@ void QgsRelationReferenceWidget::mapIdentification()
return; return;
mMapTool = new QgsMapToolIdentifyFeature( mCanvas, mReferencedLayer ); mMapTool = new QgsMapToolIdentifyFeature( mCanvas, mReferencedLayer );
mMapTool->setAction( mMapIdentificationAction );
mCanvas->setMapTool( mMapTool ); mCanvas->setMapTool( mMapTool );
mWindowWidget = window(); mWindowWidget = window();
mWindowWidget->hide(); mCanvas->raise();
connect( mMapTool, SIGNAL( featureIdentified( QgsFeature ) ), this, SLOT( featureIdentified( const QgsFeature ) ) ); connect( mMapTool, SIGNAL( featureIdentified( QgsFeature ) ), this, SLOT( featureIdentified( const QgsFeature ) ) );
connect( mMapTool, SIGNAL( deactivated() ), this, SLOT( mapToolDeactivated() ) ); connect( mMapTool, SIGNAL( deactivated() ), this, SLOT( mapToolDeactivated() ) );
@ -580,5 +582,5 @@ void QgsRelationReferenceWidget::featureIdentified( const QgsFeature& feature )
} }
if ( mWindowWidget ) if ( mWindowWidget )
mWindowWidget->show(); mWindowWidget->raise();
} }