Update copyright

diff --git a/src/SALOME_HelpWindow.cxx b/src/SALOME_HelpWindow.cxx
index 3593a61c2e2ce24a7f8811d1d21978c2a7f29ad0..23397f2e33fde353c60d1364c003b05f752d8353 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #include "SALOME_HelpWindow.hxx"
 #include "SALOME_InstallWizard.hxx"

diff --git a/src/SALOME_HelpWindow.hxx b/src/SALOME_HelpWindow.hxx
index a365d9bc67e65ff6df2f7bf09390b2f1f0992395..2a18425a7e193de2fd6d4b3f38281092d02e70dc 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #ifndef __SALOME_HelpWindow
 #define __SALOME_HelpWindow

diff --git a/src/SALOME_INSTALL.pro b/src/SALOME_INSTALL.pro
index 808f8321b0dd1c1004dabb0319ccf3c6f01a55af..f5caee73b162b7d3beecee4940862efd2d9617c0 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-2010 CEA
+#  Copyright : 2002-2012 CEA
 
 TEMPLATE       =  app
 CONFIG         += qt warn_on release thread

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index ba1c90a10e1d84049901c33a371b4e92e1bb7309..c1de103d9199252ed323a1d9e0004c10ca574dd1 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #include "globals.h"
 
@@ -478,7 +478,7 @@ public:
                      .arg( __IW_VERSION_MINOR__ ) \
                      .arg( __IW_VERSION_PATCH__ ) );
     QLabel* copyright = new QLabel( this, "copyright" );
-    copyright->setText( "<b>Copyright</b> &copy; 2007-2011 CEA/DEN" );
+    copyright->setText( "<b>Copyright</b> &copy; 2002-2012 CEA" );
     QFont font = title->font();
     font.setPointSize( (int)( font.pointSize() * 1.8 ) );
     title->setFont( font );
@@ -572,9 +572,9 @@ SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName,
   addLogo( pixmap( pxLogo ) );
 
   // set defaults
-  setVersion( "6.4.0" );
+  setVersion( "6.5.0" );
   setCaption( tr( "SALOME %1" ).arg( myVersion ) );
-  setCopyright( tr( "<h5>Copyright &copy; 2007-2011 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br></h5>"
+  setCopyright( tr( "<h5>Copyright &copy; 2007-2012 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>" ) );
 
@@ -942,7 +942,7 @@ void SALOME_InstallWizard::setupIntroPage()
   // create logo picture
   logoLab = new QLabel( introPage );
   logoLab->setPixmap( pixmap( pxBigLogo ) );
-  logoLab->setScaledContents( false );
+  logoLab->setScaledContents( true );
   logoLab->setFrameStyle( QLabel::Plain | QLabel::NoFrame );
   logoLab->setAlignment( AlignCenter );
   // create version box
@@ -2285,7 +2285,9 @@ void SALOME_InstallWizard::launchScript()
     // run script
     if ( !shellProcess->start() ) {
       // error handling can be here
+      QStringList args = shellProcess->arguments();
       ___MESSAGE___( "error" );
+      ___MESSAGE___( "cmd: " << args.join(" ").latin1() );
     }
     return;
   }

diff --git a/src/SALOME_InstallWizard.hxx b/src/SALOME_InstallWizard.hxx
index 9b5e116b39bd5006f865be4c6adc66c866959c0e..2d3ff6c919660d0bc51c8272b0dd01480ce63f86 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #ifndef __SALOME_InstallWizard
 #define __SALOME_InstallWizard

diff --git a/src/SALOME_ProductsView.cxx b/src/SALOME_ProductsView.cxx
index 87aa0f15d4435626fbc3ac35ad7d667329fb52b5..0f3c4a0ad2e11903173ac1a4e9675d82b5161cc5 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #include "SALOME_ProductsView.hxx"
 #include <qstringlist.h>

diff --git a/src/SALOME_ProductsView.hxx b/src/SALOME_ProductsView.hxx
index a3002d516b2a37a25cbc4cdabc1095c100d99eb8..7533a30a2b16f1d505c8472b75b2f7f05e2630c1 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #ifndef __SALOME_ProductsView
 #define __SALOME_ProductsView

diff --git a/src/SALOME_ProgressView.cxx b/src/SALOME_ProgressView.cxx
index 5f992fb244373141e28b999fa0fae7788417d8b4..2450248ceb5c0f75166745f2f48ca554b5ec17ae 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #include "SALOME_ProgressView.hxx"
 

diff --git a/src/SALOME_ProgressView.hxx b/src/SALOME_ProgressView.hxx
index 5c99f63defb70e7689816afa46b74258d8140f20..2377576af747ffd4c1bb6fd4ba39ce33ca8c40cb 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #ifndef __SALOME_ProgressView
 #define __SALOME_ProgressView

diff --git a/src/SALOME_XmlHandler.cxx b/src/SALOME_XmlHandler.cxx
index c90dc1d835d5e12cb799a6ad818dd5485b2a1fa6..fadc86f5e8e1e078dd3d0e602c4da0c2c1e141bc 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #include "globals.h"
 

diff --git a/src/SALOME_XmlHandler.hxx b/src/SALOME_XmlHandler.hxx
index a58b9aac0853bdef8fb73cdd6c7fb32f859ea3e8..bee7131865ad97bcb5fa9fe0ef17811e6e274531 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #ifndef __SALOME_XmlHandler
 #define __SALOME_XmlHandler

diff --git a/src/globals.h b/src/globals.h
index 2db8a2aacd2a249af590bcdbfcbf4245047c89c6..2add028f836516c0d06cee84f6f306725dc132d5 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #if !defined( ___GLOBALS )
 #define ___GLOBALS
@@ -16,8 +16,8 @@
 #include <iostream>
 
 #define __IW_VERSION_MAJOR__ 1
-#define __IW_VERSION_MINOR__ 1
-#define __IW_VERSION_PATCH__ 7
+#define __IW_VERSION_MINOR__ 2
+#define __IW_VERSION_PATCH__ 0
 
 #define __IW_VERSION__ (__IW_VERSION_MAJOR__*10000 + \
                         __IW_VERSION_MINOR__*100   + \

diff --git a/src/icons.h b/src/icons.h
index 4ea8fa378f2a3340cc5fd9101986efea4fb4a197..164f1e08800faffe6c9eeb2f4db6c393e4f132de 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-2010 CEA
+//  Copyright : 2002-2012 CEA
 
 #ifndef ___ICONS_h
 #define ___ICONS_h

diff --git a/src/main.cxx b/src/main.cxx
index 61516a6e2b8935fed499c663844b11a2e10eb578..3f4b16d94ec69957722c800f3dd2cd7cba853e0e 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-2010 CEA
+//  Copyright : 2002-2012 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-2011 CEA\n");
+      printf("Copyright (C) 2002-2012 CEA\n");
       return 0;
     }
     else if ( a == "--target" || a == "-d" ) {