From: nri <nri@opencascade.com>
Date: Fri, 23 May 2003 09:34:04 +0000 (+0000)
Subject: NRI : getComponentUserName( "KERNEL") instead of "Salome".
X-Git-Tag: V1_4_0~99
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3123281d4f1002ca08ed5ad8bd8dca822cb3376f;p=modules%2Fkernel.git

NRI : getComponentUserName( "KERNEL") instead of "Salome".
---

diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 5baa010df..049b5882d 100644
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -2647,7 +2647,8 @@ void QAD_Desktop::onComboActiveComponent( const QString & component, bool isLoad
       if (!myXmlHandler->myIdList.IsEmpty()) clearMenus();
       if ( myCombo->currentText() != component )
 	myCombo->setCurrentText( component );
-      if (component.compare(QString("Salome"))!= 0) {
+      //NRI if (component.compare(QString("Salome"))!= 0) {
+      if (component.compare( getComponentUserName( "KERNEL" ) )!= 0) {
 //	QApplication::setOverrideCursor( Qt::waitCursor );
 	myActiveComp = component;
 
@@ -2691,7 +2692,8 @@ void QAD_Desktop::onComboActiveComponent( const QString & component, bool isLoad
 
       } else {  // component == "Salome"
 	myActiveComp = "";
-	myActiveStudy->Selection( "Salome" );
+	//NRI	myActiveStudy->Selection( "Salome" );
+	myActiveStudy->Selection( getComponentUserName( "KERNEL" ) );
 	SALOME_Selection* Sel = SALOME_Selection::Selection( myActiveStudy->getSelection() );
 	Sel->ClearIObjects();
 	for ( QToolButton* aButton=myComponentButton.first(); aButton; aButton=myComponentButton.next() ) {
@@ -3283,7 +3285,7 @@ void QAD_Desktop::helpSearch()
 void QAD_Desktop::helpContents()
 {
   if (myActiveComp == "")
-    myActiveComp = "Salome";
+    myActiveComp = getComponentUserName( "KERNEL" ); //NRI "Salome";
 
   QCString dir;
   QString root;
diff --git a/src/SALOMEGUI/QAD_Study.cxx b/src/SALOMEGUI/QAD_Study.cxx
index 113237997..9862b252b 100644
--- a/src/SALOMEGUI/QAD_Study.cxx
+++ b/src/SALOMEGUI/QAD_Study.cxx
@@ -77,7 +77,8 @@ myPath( path )
     SCRUTE(_interp);
 
     /* create default selection */
-    Selection( "Salome" );
+    //NRI    Selection( "Salome" );
+    Selection( QAD_Application::getDesktop()->getComponentUserName( "KERNEL" ) );
 
     /* create study frame */
     myResult = true;