From 92df39a06314044acf5f62e87fcf4057c64a9c2d Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 10 Apr 2012 15:33:48 +0000 Subject: [PATCH] Update copyright --- src/SALOME_HelpWindow.cxx | 2 +- src/SALOME_HelpWindow.hxx | 2 +- src/SALOME_INSTALL.pro | 2 +- src/SALOME_InstallWizard.cxx | 12 +++++++----- src/SALOME_InstallWizard.hxx | 2 +- src/SALOME_ProductsView.cxx | 2 +- src/SALOME_ProductsView.hxx | 2 +- src/SALOME_ProgressView.cxx | 2 +- src/SALOME_ProgressView.hxx | 2 +- src/SALOME_XmlHandler.cxx | 2 +- src/SALOME_XmlHandler.hxx | 2 +- src/globals.h | 6 +++--- src/icons.h | 2 +- src/main.cxx | 4 ++-- 14 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/SALOME_HelpWindow.cxx b/src/SALOME_HelpWindow.cxx index 3593a61..23397f2 100644 --- 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 a365d9b..2a18425 100644 --- 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 808f832..f5caee7 100644 --- 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 ba1c90a..c1de103 100644 --- 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( "Copyright © 2007-2011 CEA/DEN" ); + copyright->setText( "Copyright © 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( "
Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
" + setCopyright( tr( "
Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
" "
Copyright © 2003-2007 OPEN CASCADE,
EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D,
LEG, PRINCIPIA R&D, BUREAU VERITAS
" )); setLicense( tr( "
GNU LGPL
" ) ); @@ -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 9b5e116..2d3ff6c 100644 --- 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 87aa0f1..0f3c4a0 100644 --- 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 diff --git a/src/SALOME_ProductsView.hxx b/src/SALOME_ProductsView.hxx index a3002d5..7533a30 100644 --- 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 5f992fb..2450248 100644 --- 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 5c99f63..2377576 100644 --- 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 c90dc1d..fadc86f 100644 --- 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 a58b9aa..bee7131 100644 --- 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 2db8a2a..2add028 100644 --- 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 #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 4ea8fa3..164f1e0 100644 --- 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 61516a6..3f4b16d 100644 --- 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" ) { -- 2.39.2