From 09ea96a022935cf592f020e4339c04c5851e2ba1 Mon Sep 17 00:00:00 2001 From: akl Date: Tue, 28 Aug 2007 13:51:41 +0000 Subject: [PATCH] 1) getSize() just returns required size that read from XML now; 2) introduce updateSizeColumn(); 3) Small corrections. --- src/SALOME_InstallWizard.hxx | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/SALOME_InstallWizard.hxx b/src/SALOME_InstallWizard.hxx index 901b46b..f3564b4 100644 --- a/src/SALOME_InstallWizard.hxx +++ b/src/SALOME_InstallWizard.hxx @@ -75,8 +75,9 @@ class Dependancies // gets disk space required long getSize( InstallationType instType ) const { - return ( instType == Binaries ? ( type == "component" ? sizeBinaryTotal + sizeSourcesTotal : sizeBinaryTotal ) : - ( instType == Sources ? sizeSourcesTotal : sizeSrcBuildTotal ) ); + return instType == Binaries ? sizeBinaryTotal : + instType == Sources ? sizeSourcesTotal : + sizeSrcBuildTotal; } // gets temporary disk space required long getTempSize( InstallationType instType ) const @@ -89,14 +90,6 @@ class Dependancies QString getDescription() const { return description; } // gets product's type QString getType() const { return type; } - // returns true if product supports given type - bool hasType( const QString& tp ) const - { - QStringList tl = QStringList::split(",",type); - return tl.find( tp ) != tl.end(); - } - // gets default mode - QString getDefault() const { return ""; } // returns true if this product needs to pick-up environment bool pickUpEnvironment() { return pickupEnv; } @@ -307,6 +300,8 @@ class SALOME_InstallWizard: public InstallWizard void updateAvailableSpace(); // Slot to take result of Fortran libraries checking void checkFLibResult(); + // Slot to update 'Size' column for modules and prerequisites + void updateSizeColumn(); // page buttons slot void onFinishButton(); @@ -352,6 +347,7 @@ class SALOME_InstallWizard: public InstallWizard QString tmpCreated; // created temporary directory bool stateChanged; // flag: whether installation type or platform was changed bool exitConfirmed; // flag: "Exit confirmed" + bool rmSrcPrevState; // flag: status of "Remove SRC & TMP files" is changed ? // Widgets // --> introduction page QWidget* introPage; // page itself @@ -366,7 +362,7 @@ class SALOME_InstallWizard: public InstallWizard QRadioButton* binBtn; // install binaries button QRadioButton* srcBtn; // install sources button QRadioButton* srcCompileBtn; // install sources and compile button - QMyCheckBox* removeSrcBtn; // checkbox + QCheckBox* removeSrcBtn; // checkbox // --> installation platform page QWidget* platformsPage; // page itself QButtonGroup* platBtnGrp; // group of platforms for selection -- 2.39.2