sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

do not raise canvas but window (fix hiding message bar)

Browse Source
This commit is contained in:
Denis Rouzaud 2014-09-17 17:18:41 +02:00
parent 9ebb69e70b
commit f8228a2b2f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,7 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
QgsRelationReferenceWidget::~QgsRelationReferenceWidget()
{
deleteHighlight();
unsetMapTool();
delete mMapTool;
}
@ -517,9 +518,8 @@ void QgsRelationReferenceWidget::mapIdentification()
mCanvas->setMapTool( mMapTool );
mWindowWidget = window();
connect( mWindowWidget, SIGNAL( destroyed() ), this, SLOT( unsetMapTool() ) );
mCanvas->raise();
mCanvas->window()->raise();
mCanvas->activateWindow();
connect( mMapTool, SIGNAL( featureIdentified( QgsFeature ) ), this, SLOT( featureIdentified( const QgsFeature ) ) );
@ -529,7 +529,7 @@ void QgsRelationReferenceWidget::mapIdentification()
{
QString title = QString( "Relation %1 for %2." ).arg( mRelationName ).arg( mReferencingLayer->name() );
QString msg = tr( "Identify a feature of %1 to be associated. Press <ESC> to cancel." ).arg( mReferencedLayer->name() );
mMessageBarItem = QgsMessageBar::createMessage( title, msg );
mMessageBarItem = QgsMessageBar::createMessage( title, msg, this );
mMessageBar->pushItem( mMessageBarItem );
}
}