Salome HOME
projects
/
tools
/
install.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fixes
[tools/install.git]
/
src
/
SALOME_InstallWizard.hxx
diff --git
a/src/SALOME_InstallWizard.hxx
b/src/SALOME_InstallWizard.hxx
index 3d18fac874912424587fe1e09d9e27b45fb1b5b8..94a6c9345aefd25b90363d255211b61fe9d92eed 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
// Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
// Project : SALOME
// Module : Installation Wizard
-// Copyright : 2002-200
8
CEA
+// Copyright : 2002-200
9
CEA
#ifndef __SALOME_InstallWizard
#define __SALOME_InstallWizard
#ifndef __SALOME_InstallWizard
#define __SALOME_InstallWizard
@@
-172,6
+172,8
@@
class SALOME_InstallWizard: public InstallWizard
QString getBasePlatform();
// get current platform
static QStringList currentPlatform();
QString getBasePlatform();
// get current platform
static QStringList currentPlatform();
+ // get application root dir
+ static QString rootDirPath();
// get binaries path
QString getBinPath() const { return binPath; }
// get binaries path
QString getBinPath() const { return binPath; }
@@
-191,6
+193,10
@@
class SALOME_InstallWizard: public InstallWizard
// set dependancies
void setDependancies( QCheckListItem* item, Dependancies dep);
// set dependancies
void setDependancies( QCheckListItem* item, Dependancies dep);
+ // executes some actions after finish of installation process (successful or not)
+ void doPostActions( const QString& btnText,
+ const QString& btnAboutInfo );
+
// add button for the <Finish> page
void addFinishButton( const QString& label,
const QString& tooltip,
// add button for the <Finish> page
void addFinishButton( const QString& label,
const QString& tooltip,
@@
-205,6
+211,8
@@
class SALOME_InstallWizard: public InstallWizard
void setCopyright( const QString& copyright ) { myCopyright = copyright; }
// set license
void setLicense( const QString& license ) { myLicense = license; }
void setCopyright( const QString& copyright ) { myCopyright = copyright; }
// set license
void setLicense( const QString& license ) { myLicense = license; }
+ // set list of optional libraries
+ void setOptionalLibs( const QString& optlibs ) { myOptLibs = QStringList::split( ",", optlibs ); }
// get version
QString getVersion() { return myVersion; }
// get version
QString getVersion() { return myVersion; }
@@
-214,6
+222,8
@@
class SALOME_InstallWizard: public InstallWizard
QString getCopyright() { return myCopyright; }
// get license
QString getLicense() { return myLicense; }
QString getCopyright() { return myCopyright; }
// get license
QString getLicense() { return myLicense; }
+ // get list of optional libraries
+ QStringList getOptionalLibs() { return myOptLibs; }
// get platform
QString getPlatform() { return !refPlatform.isEmpty() ? refPlatform : curPlatform; }
// get corresponding XML file
// get platform
QString getPlatform() { return !refPlatform.isEmpty() ? refPlatform : curPlatform; }
// get corresponding XML file
@@
-342,6
+352,8
@@
class SALOME_InstallWizard: public InstallWizard
void readFromStdout();
// -->something was written to stderr
void readFromStderr();
void readFromStdout();
// -->something was written to stderr
void readFromStderr();
+ // -->stop installation process if there is an error in stderr
+ void manageInstProc();
private:
QString myIWName; // Installation Wizard's name
private:
QString myIWName; // Installation Wizard's name
@@
-351,6
+363,7
@@
class SALOME_InstallWizard: public InstallWizard
QString myLicense; // license info
QString myTargetPath; // target directory path
QString myTmpPath; // temporary directory path
QString myLicense; // license info
QString myTargetPath; // target directory path
QString myTmpPath; // temporary directory path
+ QStringList myOptLibs; // list of optional libraries
HelpWindow* helpWindow; // help window
QProcess* shellProcess; // shell process (install script)
HelpWindow* helpWindow; // help window
QProcess* shellProcess; // shell process (install script)
@@
-431,6
+444,7
@@
class SALOME_InstallWizard: public InstallWizard
QLineEdit* passedParams; // user can pass data to running script
QTextEdit* installProgress;// contains information about progress of installing selected products
ProgressView* progressView; // displays information about progress of installing selected products
QLineEdit* passedParams; // user can pass data to running script
QTextEdit* installProgress;// contains information about progress of installing selected products
ProgressView* progressView; // displays information about progress of installing selected products
+ QCheckBox* ignoreErrCBox; // checkbox to ignore installation errors
QLabel* statusLab; // displays currently performed action
// --> finish page
QWidget* readmePage; // page itself
QLabel* statusLab; // displays currently performed action
// --> finish page
QWidget* readmePage; // page itself