Update of copyrights

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index b5ec6711bab3c16f6b075b65f256bb2ac6e9662d..117c2533af38d922b29504aacee9aa30740cd5d6 100644 (file)
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -427,7 +427,8 @@ public:
                      .arg( __IW_VERSION_MINOR__ ) \
                      .arg( __IW_VERSION_PATCH__ ) );
     QLabel* copyright = new QLabel( this, "copyright" );
-    copyright->setText( "<b>Copyright</b> &copy; 2002-2008 CEA" );
+    copyright->setText( "<b>Copyright</b> &copy; 2007-2008 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br><br>"
+                       "<b>Copyright</b> &copy; 2003-2007 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,<br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS");
     QFont font = title->font();
     font.setPointSize( (int)( font.pointSize() * 1.8 ) );
     title->setFont( font );
@@ -454,7 +455,7 @@ public:
     QFontMetrics fm( title->font() );
     int width = (int)( fm.width( tlt ) * 1.5 );
     title->setMinimumWidth( width );
-    setMaximumSize( minimumSize() );
+//     setMaximumSize( minimumSize() );
   }
   void mousePressEvent( QMouseEvent* )
   {
@@ -520,10 +521,11 @@ SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName,
   addLogo( pixmap( pxLogo ) );
 
   // set defaults
-  setVersion( "4.1.3" );
+  setVersion( "4.1.4" );
   setCaption( tr( "SALOME %1" ).arg( myVersion ) );
-  setCopyright( tr( "Copyright (C) 2008 CEA" ) );
-  setLicense( tr( "All rights reserved." ) );
+  setCopyright( tr( "<h5>Copyright &copy; 2007-2008 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br></h5>"
+               "<h5>Copyright &copy; 2003-2007 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,<br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</h5>" ));
+  setLicense( tr( "<h5>GNU LGPL</h5>" ) );
 
   ___MESSAGE___( "Configuration file : " << xmlFileName.latin1() );
   ___MESSAGE___( "Target directory   : " << myTargetPath.latin1() );
@@ -1495,6 +1497,29 @@ bool SALOME_InstallWizard::acceptData( const QString& pageTitle )
                            QMessageBox::NoButton );
       return false;
     }
+    else if ( installType == Binaries ) {
+      QString aPlatform = platBtnGrp->selected()->name();
+      QFileInfo fib( getPlatformBinPath( aPlatform ) );
+      if ( !fib.isDir() ) {
+       QMessageBox::warning( this,
+                             tr( "Warning" ),
+                             tr( "The directory %1 doesn't exist.\n"
+                                 "This directory must contains binary archives.\n" ).arg( fib.absFilePath() ),
+                             QMessageBox::Ok,
+                             QMessageBox::NoButton, 
+                             QMessageBox::NoButton );
+       return false;
+      }
+      else if ( QDir( fib.filePath(), "*.tar.gz" ).count() == 0 ) {
+       QMessageBox::warning( this,
+                             tr( "Warning" ),
+                             tr( "The directory %1 doesn't contain binary archives.\n" ).arg( fib.absFilePath() ),
+                             QMessageBox::Ok,
+                             QMessageBox::NoButton, 
+                             QMessageBox::NoButton );
+       return false;
+      }
+    }
   }
 
   else if ( aPage == dirPage ) {
@@ -2472,14 +2497,10 @@ void SALOME_InstallWizard::pageChanged( const QString & mytitle)
        QRadioButton* rb = ( (QRadioButton*) platBtnGrp->child( plat ) );
        if ( installType == Binaries ) {
          QFileInfo fib( getPlatformBinPath( plat ) );
-         rb->setEnabled( fib.exists() );
+         rb->setEnabled( true/*fib.isDir()*/ );
          if ( platBtnGrp->id( platBtnGrp->selected() ) == -1 && plat == getBasePlatform() )
            rb->animateClick();
        }
-       else {
-         QFileInfo fis( QDir::cleanDirPath( getSrcPath() ) );
-         rb->setEnabled( fis.exists() );
-       }
 //     rb->setChecked( rb->isChecked() && rb->isEnabled() );
        if ( rb->isChecked() && rb->isEnabled() )
          rb->animateClick();
@@ -2601,8 +2622,8 @@ void SALOME_InstallWizard::onButtonGroup( int rbIndex )
   int prevType = installType;
   QString prevPlat = getPlatform();
   QWidget* aPage = InstallWizard::currentPage();
-  installType = InstallationType( rbIndex );
   if ( aPage == typePage ) {
+    installType = InstallationType( rbIndex );
     // management of the <Remove source and tmp files> check-box
     removeSrcBtn->setEnabled( installType == Compile );
     oneModDirBtn->setEnabled( installType == Binaries /*|| installType == Compile*/ );

diff --git a/src/globals.h b/src/globals.h
index 8ad9f9a0f2eb3f8fa05ea8f23f22357589134e8e..7d91670dcc9de9789d3c754f00ffd636ee69981f 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -17,7 +17,7 @@
 
 #define __IW_VERSION_MAJOR__ 1
 #define __IW_VERSION_MINOR__ 1
-#define __IW_VERSION_PATCH__ 5
+#define __IW_VERSION_PATCH__ 6
 
 #define __IW_VERSION__ (__IW_VERSION_MAJOR__*10000 + \
                         __IW_VERSION_MINOR__*100   + \