2) required disk space for sources and intermediate files will be shown in the "Space for temporary files" field, if user selected "install sources and build" type and checked "remove sources after compilation";
3) skip checking the available disk space for temporary files, because all files are unpucked into installation directory;
4) fix some bugs.
tempLayout->addMultiCellWidget( tempLab, 0, 0, 0, 1 );
tempLayout->addWidget ( tempFolder, 1, 0 );
tempLayout->addWidget ( tempBtn, 1, 1 );
tempLayout->addMultiCellWidget( tempLab, 0, 0, 0, 1 );
tempLayout->addWidget ( tempFolder, 1, 0 );
tempLayout->addWidget ( tempBtn, 1, 1 );
+ // AKL: 13/08/07 - disable temporary directory setting in GUI ==>
+ tempLab->hide();
+ tempFolder->hide();
+ tempBtn->hide();
+ // AKL: 13/08/07 - disable temporary directory setting in GUI <==
// layout widgets
pageLayout->addItem ( spacer1, 0, 0 );
pageLayout->addLayout( targetLayout, 1, 0 );
// layout widgets
pageLayout->addItem ( spacer1, 0, 0 );
pageLayout->addLayout( targetLayout, 1, 0 );
connect( tempBtn, SIGNAL( clicked() ), this, SLOT( browseDirectory() ) );
// adding page
connect( tempBtn, SIGNAL( clicked() ), this, SLOT( browseDirectory() ) );
// adding page
- addPage( dirPage, tr( "Installation directories" ) );
+ addPage( dirPage, tr( "Installation directory" ) );
}
// ================================================================
/*!
}
// ================================================================
/*!
// ########## check if any products are selected to be installed
long totSize, tempSize;
bool anySelected = checkSize( &totSize, &tempSize );
// ########## check if any products are selected to be installed
long totSize, tempSize;
bool anySelected = checkSize( &totSize, &tempSize );
+ if ( installType == Compile && removeSrcBtn->state() == QButton::On ) {
+ totSize += tempSize;
+ }
if ( !anySelected ) {
QMessageBox::warning( this,
tr( "Warning" ),
if ( !anySelected ) {
QMessageBox::warning( this,
tr( "Warning" ),
QMessageBox::NoButton );
return false;
}
QMessageBox::NoButton );
return false;
}
+ // AKL: 13/08/07 - skip tmp disk space checking (all files are unpucked into installation directory) ==>
+ /*
// run script that check available disk space for temporary files
// returns 1 in case of error
QFileInfo fit( QDir::cleanDirPath( tempFolder->text().stripWhiteSpace() ) );
// run script that check available disk space for temporary files
// returns 1 in case of error
QFileInfo fit( QDir::cleanDirPath( tempFolder->text().stripWhiteSpace() ) );
QMessageBox::NoButton,
QMessageBox::NoButton );
return false;
QMessageBox::NoButton,
QMessageBox::NoButton );
return false;
+ }
+ */
+ // AKL: 13/08/07 - skip tmp disk space checking (all files are unpucked into installation directory) <==
+
// ########## check installation scripts
QCheckListItem* item;
ProductsView* prodsView = modulesView;
// ########## check installation scripts
QCheckListItem* item;
ProductsView* prodsView = modulesView;
if ( totSize )
if ( installType == Compile && removeSrcBtn->state() == QButton::On )
if ( totSize )
if ( installType == Compile && removeSrcBtn->state() == QButton::On )
*totSize = tots;
if ( tempSize )
*tempSize = temps;
*totSize = tots;
if ( tempSize )
*tempSize = temps;
void SALOME_InstallWizard::onSelectionChanged()
{
const QObject* snd = sender();
void SALOME_InstallWizard::onSelectionChanged()
{
const QObject* snd = sender();
QListViewItem* item = modulesView->selectedItem();
if ( snd == prereqsView )
item = prereqsView->selectedItem();
QListViewItem* item = modulesView->selectedItem();
if ( snd == prereqsView )
item = prereqsView->selectedItem();
+ else if ( snd != modulesView )
+ return;
+ productInfo->clear();
if ( !item )
return;
QCheckListItem* anItem = (QCheckListItem*)item;
if ( !item )
return;
QCheckListItem* anItem = (QCheckListItem*)item;