[QGIS Commit] r11583 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-09-07 16:42:36 -0400 (Mon, 07 Sep 2009)
New Revision: 11583

Modified:
   trunk/qgis/src/app/qgsmaptoolidentify.cpp
   trunk/qgis/src/app/qgsmaptoolidentify.h
Log:
multilayer identify: also report layer name

Modified: trunk/qgis/src/app/qgsmaptoolidentify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolidentify.cpp	2009-09-07 15:49:04 UTC (rev 11582)
+++ trunk/qgis/src/app/qgsmaptoolidentify.cpp	2009-09-07 20:42:36 UTC (rev 11583)
@@ -100,6 +100,7 @@
   else
   {
     connect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
+    connect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
 
     QApplication::setOverrideCursor( Qt::WaitCursor );
 
@@ -110,6 +111,7 @@
       QgsMapLayer *layer = mCanvas->layer( i );
 
       emit identifyProgress( i, mCanvas->layerCount() );
+      emit identifyMessage( tr("Identifying on %1...").arg( layer->name() ) );
 
       if ( noIdentifyLayerIdList.contains( layer->getLayerID() ) )
         continue;
@@ -123,8 +125,10 @@
     }
 
     emit identifyProgress( mCanvas->layerCount(), mCanvas->layerCount() );
+    emit identifyMessage( tr("Identifying done.") );
 
     disconnect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
+    disconnect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
 
     QApplication::restoreOverrideCursor();
   }

Modified: trunk/qgis/src/app/qgsmaptoolidentify.h
===================================================================
--- trunk/qgis/src/app/qgsmaptoolidentify.h	2009-09-07 15:49:04 UTC (rev 11582)
+++ trunk/qgis/src/app/qgsmaptoolidentify.h	2009-09-07 20:42:36 UTC (rev 11583)
@@ -63,6 +63,7 @@
 
   signals:
     void identifyProgress( int, int );
+    void identifyMessage( QString );
 
   private:
     bool identifyLayer( QgsMapLayer *layer, int x, int y );