From: asl <asl@opencascade.com>
Date: Tue, 4 Oct 2005 05:33:39 +0000 (+0000)
Subject: PAL10133 - Two "display" in popup
X-Git-Tag: BR-D5-38-2003_D2005-12-19~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b88f9305213d0be49d576dccbb95cf7c5ed50a06;p=modules%2Fgui.git

PAL10133 - Two "display" in popup
---

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index 21da6e509..f289eef6d 100644
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -158,7 +158,8 @@ QtxPopupMgr* SalomeApp_Module::popupMgr()
     myPopupMgr->insert( dispOnly, -1, 0 );
     myPopupMgr->insert( separator(), -1, 0 );
 
-    QString uniform = "( count( $component ) = 1 ) and ( component != activeModule )";
+    QString uniform = "( count( $component ) = 1 ) and ( component != activeModule ) and ( activeModule = '%1' )";
+    uniform = uniform.arg( name() );
     myPopupMgr->setRule( disp, QString( "( not isVisible ) and " ) + uniform, true );
     myPopupMgr->setRule( erase, QString( "( isVisible ) and " ) + uniform, true );
     myPopupMgr->setRule( dispOnly, uniform, true );