don't show layer popup selection if there is only one item

qgis · Jun 1, 2014 · 08ed60f · 08ed60f
1 parent 272ac2e
commit 08ed60f
Showing 1 changed file with 49 additions and 45 deletions.
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -115,66 +115,70 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsMapToolIdentify::identify( int x, i
       }
     }
 
-    //fill selection menu with entries from mmLayerIdResults
-    QMenu layerSelectionMenu;
-    QMap< QgsMapLayer*, QList<IdentifyResult> >::const_iterator resultIt = mLayerIdResults.constBegin();
-    for ( ; resultIt != mLayerIdResults.constEnd(); ++resultIt )
+    if ( mLayerIdResults.size() > 1 )
     {
-      QAction* action = new QAction( QString( "%1 (%2)" ).arg( resultIt.key()->name() ).arg( resultIt.value().size() ), 0 );
-      action->setData( resultIt.key()->id() );
-      //add point/line/polygon icon
-      QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( resultIt.key() );
-      if ( vl )
+      //fill selection menu with entries from mmLayerIdResults
+      QMenu layerSelectionMenu;
+      QMap< QgsMapLayer*, QList<IdentifyResult> >::const_iterator resultIt = mLayerIdResults.constBegin();
+      for ( ; resultIt != mLayerIdResults.constEnd(); ++resultIt )
       {
-        switch ( vl->geometryType() )
+        QAction* action = new QAction( QString( "%1 (%2)" ).arg( resultIt.key()->name() ).arg( resultIt.value().size() ), 0 );
+        action->setData( resultIt.key()->id() );
+        //add point/line/polygon icon
+        QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( resultIt.key() );
+        if ( vl )
         {
-          case QGis::Point:
-            action->setIcon( QgsApplication::getThemeIcon( "/mIconPointLayer.png" ) );
-            break;
-          case QGis::Line:
-            action->setIcon( QgsApplication::getThemeIcon( "/mIconLineLayer.png" ) );
-            break;
-          case QGis::Polygon:
-            action->setIcon( QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" ) );
-            break;
-          default:
-            break;
+          switch ( vl->geometryType() )
+          {
+            case QGis::Point:
+              action->setIcon( QgsApplication::getThemeIcon( "/mIconPointLayer.png" ) );
+              break;
+            case QGis::Line:
+              action->setIcon( QgsApplication::getThemeIcon( "/mIconLineLayer.png" ) );
+              break;
+            case QGis::Polygon:
+              action->setIcon( QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" ) );
+              break;
+            default:
+              break;
+          }
         }
+        else if ( resultIt.key()->type() == QgsMapLayer::RasterLayer )
+        {
+          action->setIcon( QgsApplication::getThemeIcon( "/mIconRaster.png" ) );
+        }
+        connect( action, SIGNAL( hovered() ), this, SLOT( handleMenuHover() ) );
+        layerSelectionMenu.addAction( action );
       }
-      else if ( resultIt.key()->type() == QgsMapLayer::RasterLayer )
-      {
-        action->setIcon( QgsApplication::getThemeIcon( "/mIconRaster.png" ) );
-      }
-      connect( action, SIGNAL( hovered() ), this, SLOT( handleMenuHover() ) );
-      layerSelectionMenu.addAction( action );
-    }
 
-    if ( mLayerIdResults.size() > 1 )
-    {
       QAction *action = new QAction( tr( "All (%1)" ).arg( idResult.size() ), 0 );
       connect( action, SIGNAL( hovered() ), this, SLOT( handleMenuHover() ) );
       layerSelectionMenu.addAction( action );
-    }
 
-    // exec layer selection menu
-    QPoint globalPos = mCanvas->mapToGlobal( QPoint( x + 5, y + 5 ) );
-    QAction* selectedAction = layerSelectionMenu.exec( globalPos );
-    if ( selectedAction )
-    {
-      if ( selectedAction->data().toString().isEmpty() )
-      {
-        results = idResult;
-      }
-      else
+      // exec layer selection menu
+      QPoint globalPos = mCanvas->mapToGlobal( QPoint( x + 5, y + 5 ) );
+      QAction* selectedAction = layerSelectionMenu.exec( globalPos );
+      if ( selectedAction )
       {
-        QgsMapLayer* selectedLayer = QgsMapLayerRegistry::instance()->mapLayer( selectedAction->data().toString() );
-        QMap< QgsMapLayer*, QList<IdentifyResult> >::const_iterator sIt = mLayerIdResults.find( selectedLayer );
-        if ( sIt != mLayerIdResults.constEnd() )
+        if ( selectedAction->data().toString().isEmpty() )
+        {
+          results = idResult;
+        }
+        else
         {
-          results = sIt.value();
+          QgsMapLayer* selectedLayer = QgsMapLayerRegistry::instance()->mapLayer( selectedAction->data().toString() );
+          QMap< QgsMapLayer*, QList<IdentifyResult> >::const_iterator sIt = mLayerIdResults.find( selectedLayer );
+          if ( sIt != mLayerIdResults.constEnd() )
+          {
+            results = sIt.value();
+          }
         }
       }
     }
+    else if ( mLayerIdResults.size() == 1 )
+    {
+      results = idResult;
+    }
 
     deleteRubberBands();
   }