Changin for Salome 6.1.0

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index 0329cc08b6d393c43be7cca71b9eced86fff6e22..a8f4303327afd419f63e36a770676902ccf1f280 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ

diff --git a/doc/readme.html b/doc/readme.html
index a048036306c5a61004b3274345a52e2b92317dfb..b3394e5f45b13b4692c7d07e36c218d7d18cc86f 100755 (executable)
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -36,7 +36,7 @@ Wizard Help</font></font></h3>
 </table>
 </center>
 <div align="right"><b><font color="#000099">updated for the version </font><font
- color="#ff0000">5.1.3</font></b></div>
+ color="#ff0000">6.1.0</font></b></div>
 <hr>
 <ul>
   <li> <a href="#install_from_wizard">Installing products with the

diff --git a/src/Makefile b/src/Makefile
index abf01f1217a45f92ef5edebdf51d3b970acc155e..82a200cbca470c07da4d07a170d9957f55f862c5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ../bin/SALOME_InstallWizard
-# Generated by qmake (1.07a) (Qt 3.3.8) on: Fri Nov  7 17:35:06 2008
+# Generated by qmake (1.07a) (Qt 3.3.8) on: Fri May 28 14:01:16 2010
 # Project:  SALOME_INSTALL.pro
 # Template: app
 # Command: $(QMAKE) -o Makefile SALOME_INSTALL.pro

diff --git a/src/SALOME_HelpWindow.cxx b/src/SALOME_HelpWindow.cxx
index 5989eed5bb913b5c4ee3fea4d4b14acd797025a9..3593a61c2e2ce24a7f8811d1d21978c2a7f29ad0 100644 (file)
--- a/src/SALOME_HelpWindow.cxx
+++ b/src/SALOME_HelpWindow.cxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #include "SALOME_HelpWindow.hxx"
 #include "SALOME_InstallWizard.hxx"

diff --git a/src/SALOME_HelpWindow.hxx b/src/SALOME_HelpWindow.hxx
index 34d93bba66363250a20aa6e098a5b51a06735c83..a365d9bc67e65ff6df2f7bf09390b2f1f0992395 100644 (file)
--- a/src/SALOME_HelpWindow.hxx
+++ b/src/SALOME_HelpWindow.hxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #ifndef __SALOME_HelpWindow
 #define __SALOME_HelpWindow

diff --git a/src/SALOME_INSTALL.pro b/src/SALOME_INSTALL.pro
index e0ec9057584344edf91a008eb6a7d072c8d9be73..808f8321b0dd1c1004dabb0319ccf3c6f01a55af 100644 (file)
--- a/src/SALOME_INSTALL.pro
+++ b/src/SALOME_INSTALL.pro
@@ -3,7 +3,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2009 CEA
+#  Copyright : 2002-2010 CEA
 
 TEMPLATE       =  app
 CONFIG         += qt warn_on release thread

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index c160149d686e3a26db0398a225eb22bb906e7be0..4d85f745bec50e4c2da65405bafd427f7a7211d6 100644 (file)
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #include "globals.h"
 
@@ -465,7 +465,7 @@ public:
                      .arg( __IW_VERSION_MINOR__ ) \
                      .arg( __IW_VERSION_PATCH__ ) );
     QLabel* copyright = new QLabel( this, "copyright" );
-    copyright->setText( "<b>Copyright</b> &copy; 2007-2009 CEA/DEN" );
+    copyright->setText( "<b>Copyright</b> &copy; 2007-2010 CEA/DEN" );
     QFont font = title->font();
     font.setPointSize( (int)( font.pointSize() * 1.8 ) );
     title->setFont( font );
@@ -559,9 +559,9 @@ SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName,
   addLogo( pixmap( pxLogo ) );
 
   // set defaults
-  setVersion( "5.1.3" );
+  setVersion( "6.1.0" );
   setCaption( tr( "SALOME %1" ).arg( myVersion ) );
-  setCopyright( tr( "<h5>Copyright &copy; 2007-2009 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br></h5>"
+  setCopyright( tr( "<h5>Copyright &copy; 2007-2010 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>" ) );
 

diff --git a/src/SALOME_InstallWizard.hxx b/src/SALOME_InstallWizard.hxx
index 94a6c9345aefd25b90363d255211b61fe9d92eed..9b5e116b39bd5006f865be4c6adc66c866959c0e 100644 (file)
--- a/src/SALOME_InstallWizard.hxx
+++ b/src/SALOME_InstallWizard.hxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #ifndef __SALOME_InstallWizard
 #define __SALOME_InstallWizard

diff --git a/src/SALOME_ProductsView.cxx b/src/SALOME_ProductsView.cxx
index 64536d9764fc306fab4630bf7a506bf093d78344..87aa0f15d4435626fbc3ac35ad7d667329fb52b5 100644 (file)
--- a/src/SALOME_ProductsView.cxx
+++ b/src/SALOME_ProductsView.cxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #include "SALOME_ProductsView.hxx"
 #include <qstringlist.h>

diff --git a/src/SALOME_ProductsView.hxx b/src/SALOME_ProductsView.hxx
index 8c0a8310d23b2c9f72399683455690820fb788e6..a3002d516b2a37a25cbc4cdabc1095c100d99eb8 100644 (file)
--- a/src/SALOME_ProductsView.hxx
+++ b/src/SALOME_ProductsView.hxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #ifndef __SALOME_ProductsView
 #define __SALOME_ProductsView

diff --git a/src/SALOME_ProgressView.cxx b/src/SALOME_ProgressView.cxx
index 8dd317b22b69b1aee26b54ba768fe967a0b8d439..5f992fb244373141e28b999fa0fae7788417d8b4 100644 (file)
--- a/src/SALOME_ProgressView.cxx
+++ b/src/SALOME_ProgressView.cxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #include "SALOME_ProgressView.hxx"
 

diff --git a/src/SALOME_ProgressView.hxx b/src/SALOME_ProgressView.hxx
index 5985a2aa84ab5b091bdf9060a320a001da0ccfcf..5c99f63defb70e7689816afa46b74258d8140f20 100644 (file)
--- a/src/SALOME_ProgressView.hxx
+++ b/src/SALOME_ProgressView.hxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #ifndef __SALOME_ProgressView
 #define __SALOME_ProgressView

diff --git a/src/SALOME_XmlHandler.cxx b/src/SALOME_XmlHandler.cxx
index 3eca49f9f2034ff9f9b222bdf142eda268ee7bdd..c90dc1d835d5e12cb799a6ad818dd5485b2a1fa6 100644 (file)
--- a/src/SALOME_XmlHandler.cxx
+++ b/src/SALOME_XmlHandler.cxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #include "globals.h"
 

diff --git a/src/SALOME_XmlHandler.hxx b/src/SALOME_XmlHandler.hxx
index 6ed3937da9bf39e61c7bb9c4a020713df32bc55a..a58b9aac0853bdef8fb73cdd6c7fb32f859ea3e8 100644 (file)
--- a/src/SALOME_XmlHandler.hxx
+++ b/src/SALOME_XmlHandler.hxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #ifndef __SALOME_XmlHandler
 #define __SALOME_XmlHandler

diff --git a/src/globals.h b/src/globals.h
index 6d57705749f35480bfe3061deaaacde84614dd37..2db8a2aacd2a249af590bcdbfcbf4245047c89c6 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #if !defined( ___GLOBALS )
 #define ___GLOBALS

diff --git a/src/icons.h b/src/icons.h
index f6ce2d934f877bfe10d02b882286830efd243f06..4ea8fa378f2a3340cc5fd9101986efea4fb4a197 100644 (file)
--- a/src/icons.h
+++ b/src/icons.h
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #ifndef ___ICONS_h
 #define ___ICONS_h

diff --git a/src/main.cxx b/src/main.cxx
index 81ccd143aa0050d5b1694d0832ceb0d5863618cf..8e1ac010bdca5c764035f3c8e1c0b6d2707c0901 100644 (file)
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -3,7 +3,7 @@
 //  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2002-2009 CEA
+//  Copyright : 2002-2010 CEA
 
 #include "globals.h"
 
@@ -67,7 +67,7 @@ int main( int argc, char **argv )
             ( QT_VERSION >> 16 ) & 0xFF,
             ( QT_VERSION >> 8  ) & 0xFF,
             ( QT_VERSION       ) & 0xFF );
-      printf("Copyright (C) 2002-2009 CEA\n");
+      printf("Copyright (C) 2002-2010 CEA\n");
       return 0;
     }
     else if ( a == "--target" || a == "-d" ) {