From: vsr <vsr@opencascade.com>
Date: Tue, 13 Dec 2005 14:46:55 +0000 (+0000)
Subject: PAL10853
X-Git-Tag: V_3_1_0b1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d4a64634ccca77773ff0b808c44c78891a76ca71;p=tools%2Finstall.git

PAL10853
---

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index 389af2e..08dae42 100755
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ
diff --git a/config.xml b/config.xml
index c797737..2b7f353 100644
--- a/config.xml
+++ b/config.xml
@@ -540,6 +540,7 @@
 	   script="LIGHT_BIN.sh"/>
   <product name="SAMPLES"
            version="3.1.0b1" 
+           context="salome sources,salome binaries" 
            description="SALOME samples files"
            install="install sources"
 	   supported="install sources"
diff --git a/config_Mandrake_10.1.xml b/config_Mandrake_10.1.xml
index f705c45..3b583fe 100755
--- a/config_Mandrake_10.1.xml
+++ b/config_Mandrake_10.1.xml
@@ -540,6 +540,7 @@
 	   script="LIGHT_BIN.sh"/>
   <product name="SAMPLES"
            version="3.1.0b1" 
+           context="salome sources,salome binaries" 
            description="SALOME samples files"
            install="install sources"
 	   supported="install sources"
diff --git a/config_RedHat_8.0.xml b/config_RedHat_8.0.xml
index 468d20b..f70cb8a 100755
--- a/config_RedHat_8.0.xml
+++ b/config_RedHat_8.0.xml
@@ -540,6 +540,7 @@
 	   script="LIGHT_BIN.sh"/>
   <product name="SAMPLES"
            version="3.1.0b1" 
+           context="salome sources,salome binaries" 
            description="SALOME samples files"
            install="install sources"
 	   supported="install sources"
diff --git a/config_RedHat_9.xml b/config_RedHat_9.xml
index 12bd3f9..9d85751 100755
--- a/config_RedHat_9.xml
+++ b/config_RedHat_9.xml
@@ -540,6 +540,7 @@
 	   script="LIGHT_BIN.sh"/>
   <product name="SAMPLES"
            version="3.1.0b1" 
+           context="salome sources,salome binaries" 
            description="SALOME samples files"
            install="install sources"
 	   supported="install sources"
diff --git a/config_Scientific_3.0.5.xml b/config_Scientific_3.0.5.xml
index ac36e86..7670638 100755
--- a/config_Scientific_3.0.5.xml
+++ b/config_Scientific_3.0.5.xml
@@ -540,6 +540,7 @@
 	   script="LIGHT_BIN.sh"/>
   <product name="SAMPLES"
            version="3.1.0b1" 
+           context="salome sources,salome binaries" 
            description="SALOME samples files"
            install="install sources"
 	   supported="install sources"
diff --git a/doc/readme.html b/doc/readme.html
index c21dd8e..ec9f11e 100755
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -163,10 +163,13 @@ have
 installed.
 Therefore all these products will be marked when you check on <b><i>PyQt</i></b>.
 This feature can be switched off by clicking <i>"Auto set
-prerequisites products"</i> checkbox. <br>
+prerequisites products"</i> checkbox. Turn on this checkbox if you
+want all pre-requisite products to be automatically checked when you
+select some product to be installed. Turn off this checkbox if you
+want to disable this feature.<br><br>
 Special button in the right part of the page - <i>"Unselect All" </i>-
 allows to reset quickly all products to the <i>"not install"</i>
-state. <br>
+state. <br><br>
 If you want to use native products (like <span
  style="font-weight: bold;">gcc</span>, <span
  style="font-weight: bold;">tcl</span>, etc.), select <i>"use native" </i>option.
diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index a51e1ea..f85b34b 100644
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -1182,15 +1182,19 @@ void SALOME_InstallWizard::checkProductPage()
   int totBin = 0, selBin = 0;
   MapProducts::Iterator itProd;
   for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
-    if ( itProd.data().getContext() == "salome sources" ) {
-      totSrc++;
-      if ( productsView->isSources( itProd.key() ) )
-	selSrc++;
-    }
-    if ( itProd.data().getContext() == "salome binaries" ) {
-      totBin++;
-      if ( productsView->isBinaries( itProd.key() ) )
-	selBin++;
+    bool srcctx = itProd.data().hasContext( "salome sources" );
+    bool binctx = itProd.data().hasContext( "salome binaries" );
+    if ( srcctx ) totSrc++;
+    if ( binctx ) totBin++;
+    if ( srcctx && !binctx && productsView->isSources( itProd.key() ) )
+      selSrc++;
+    if ( !srcctx && binctx && productsView->isBinaries( itProd.key() ) )
+      selBin++;
+    if ( srcctx && binctx && 
+	 ( productsView->isSources( itProd.key() ) || 
+	   productsView->isBinaries( itProd.key() ) ) ) {
+      selSrc++;
+      selBin++;
     }
   }
   selectSrcBtn->blockSignals( true );
@@ -1889,11 +1893,14 @@ void SALOME_InstallWizard::onProdBtn()
       checkBox->setState( QButton::On );
     MapProducts::Iterator itProd;
     for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
-      if ( itProd.data().getContext() == "salome sources" ) {
+      if ( itProd.data().hasContext( "salome sources" ) ) {
 	if ( checkBox->state() == QButton::Off )
 	  productsView->setNone( itProd.key() );
-	else
+	else {
 	  productsView->setSources( itProd.key() );
+	  if ( prerequisites->isChecked() )
+	    setPrerequisites( itProd.key() );
+	}
       }
     }
   }
@@ -1903,11 +1910,14 @@ void SALOME_InstallWizard::onProdBtn()
       checkBox->setState( QButton::On );
     MapProducts::Iterator itProd;
     for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
-      if ( itProd.data().getContext() == "salome binaries" ) {
+      if ( itProd.data().hasContext( "salome binaries" ) ) {
 	if ( checkBox->state() == QButton::Off )
 	  productsView->setNone( itProd.key() );
-	else
+	else {
 	  productsView->setBinaries( itProd.key() );
+	  if ( prerequisites->isChecked() )
+	    setPrerequisites( itProd.key() );
+	}
       }
     }
   }
diff --git a/src/SALOME_InstallWizard.hxx b/src/SALOME_InstallWizard.hxx
index 551e43c..dd9e4d7 100644
--- a/src/SALOME_InstallWizard.hxx
+++ b/src/SALOME_InstallWizard.hxx
@@ -53,13 +53,22 @@ class Dependancies
   // gets dependancies
   QStringList getDependancies() const { return dependsOn; }
   // gets disk space required
-  long        getSize(bool sources = false) const { return ( sources ? sizeSourcesTotal : sizeBinaryTotal ); }
+  long        getSize(bool sources = false) const 
+  { 
+    return ( sources ? sizeSourcesTotal : sizeBinaryTotal ); 
+  }
   // gets temporary disk space required
   long        getTempSize() const     { return sizeTemp;   }
   // gets product's description
   QString     getDescription() const  { return description; }
   // gets product's context
   QString     getContext() const      { return context; }
+  // returns true if product supports given context
+  bool        hasContext( const QString& ctx ) const
+  {
+    QStringList cl = QStringList::split(",",context);
+    return cl.find( ctx ) != cl.end();
+  }
   // gets default mode
   QString     getDefault() const      { return defaultMode; }
   // returns true if this product needs to pick-up environment