From: maintenance team Date: Fri, 27 Apr 2007 08:15:04 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a77d84d6b6d2ae1a59906a1530bf2dfe32b0fb37;p=tools%2Finstall.git *** empty log message *** --- diff --git a/SALOME_4_0rc1.pdf b/SALOME_4_0rc1.pdf new file mode 100755 index 0000000..b3cf739 Binary files /dev/null and b/SALOME_4_0rc1.pdf differ diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard index 609fc03..c605690 100755 Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml index 7361383..d296cf0 100755 --- a/config_Mandriva_2006.0.xml +++ b/config_Mandriva_2006.0.xml @@ -454,6 +454,61 @@ installdiskspace="208" temporarydiskspace="0" script="GHS3DPLUGIN_BIN.sh"/> + + + + + ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <addWidget( requiredSize, 0, 1 ); sizeLayout->addWidget( reqLab2, 1, 0 ); sizeLayout->addWidget( requiredTemp, 1, 1 ); + // / box super-container :) + QVBox* moreLessBox = new QVBox( productsPage ); // // create mode widgets container // - moreBox = new QWidget( productsPage ); + moreBox = new QWidget( moreLessBox ); QGridLayout* moreBoxLayout = new QGridLayout( moreBox ); moreBoxLayout->setMargin( 0 ); moreBoxLayout->setSpacing( 6 ); // @@ -770,7 +772,7 @@ void SALOME_InstallWizard::setupProductsPage(const bool forceSrc) // // create mode widgets container // - lessBox = new QWidget( productsPage ); + lessBox = new QWidget( moreLessBox ); QGridLayout* lessBoxLayout = new QGridLayout( lessBox ); lessBoxLayout->setMargin( 0 ); lessBoxLayout->setSpacing( 6 ); // @@ -798,13 +800,10 @@ void SALOME_InstallWizard::setupProductsPage(const bool forceSrc) pageLayout->addMultiCellWidget( tempLab, 2, 2, 0, 1 ); pageLayout->addWidget ( tempFolder, 3, 0 ); pageLayout->addWidget ( tempBtn, 3, 1 ); - pageLayout->addMultiCellWidget( moreBox, 4, 4, 0, 1 ); - pageLayout->addMultiCellWidget( lessBox, 5, 5, 0, 1 ); - pageLayout->addMultiCellWidget( line, 6, 6, 0, 1 ); - pageLayout->addLayout ( sizeLayout, 7, 0 ); - pageLayout->addWidget ( moreBtn, 7, 1 ); - pageLayout->setRowStretch( 4, 5 ); - pageLayout->setRowStretch( 5, 5 ); + pageLayout->addMultiCellWidget( moreLessBox, 4, 4, 0, 1 ); + pageLayout->addMultiCellWidget( line, 5, 5, 0, 1 ); + pageLayout->addLayout ( sizeLayout, 6, 0 ); + pageLayout->addWidget ( moreBtn, 6, 1 ); // // xml reader // @@ -1836,7 +1835,7 @@ void SALOME_InstallWizard::reject() tr( "&Yes" ), tr( "&No" ), QString::null, - 0, + 1, 1 ) == 1 ) { return; } diff --git a/src/SALOME_ProductsView.cxx b/src/SALOME_ProductsView.cxx index 5268830..c68ae02 100644 --- a/src/SALOME_ProductsView.cxx +++ b/src/SALOME_ProductsView.cxx @@ -129,6 +129,8 @@ void ProductsView::itemActivated( QCheckListItem* item ) { // ================================================================ bool ProductsView::isBinaries( QCheckListItem* item ) const { + if ( !item ) + return false; if ( item->childCount() > 0 && item->isEnabled() ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -147,6 +149,8 @@ bool ProductsView::isBinaries( QCheckListItem* item ) const // ================================================================ bool ProductsView::isSources( QCheckListItem* item ) const { + if ( !item ) + return false; if ( item->childCount() > 0 && item->isEnabled() ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -168,6 +172,8 @@ bool ProductsView::isSources( QCheckListItem* item ) const // ================================================================ bool ProductsView::isNative( QCheckListItem* item ) const { + if ( !item ) + return false; if ( item->childCount() > 0 && item->isEnabled() ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -196,6 +202,8 @@ bool ProductsView::isNone( QCheckListItem* item ) const */ // ================================================================ void ProductsView::setBinaries( QCheckListItem* item ) { + if ( !item ) + return; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); QCheckListItem* srcItem = 0; @@ -228,6 +236,8 @@ void ProductsView::setBinaries( QCheckListItem* item ) { */ // ================================================================ void ProductsView::setSources( QCheckListItem* item ) { + if ( !item ) + return; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); QCheckListItem* binItem = 0; @@ -260,6 +270,8 @@ void ProductsView::setSources( QCheckListItem* item ) { */ // ================================================================ void ProductsView::setNative( QCheckListItem* item ) { + if ( !item ) + return; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); QCheckListItem* binItem = 0; @@ -291,6 +303,8 @@ void ProductsView::setNative( QCheckListItem* item ) { */ // ================================================================ void ProductsView::setNone( QCheckListItem* item ) { + if ( !item ) + return; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -314,6 +328,8 @@ void ProductsView::setNone( QCheckListItem* item ) { // ================================================================ bool ProductsView::hasBinaries( QCheckListItem* item ) const { + if ( !item ) + return false; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -333,6 +349,8 @@ bool ProductsView::hasBinaries( QCheckListItem* item ) const // ================================================================ bool ProductsView::hasSources( QCheckListItem* item ) const { + if ( !item ) + return false; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -352,6 +370,8 @@ bool ProductsView::hasSources( QCheckListItem* item ) const // ================================================================ bool ProductsView::hasNative( QCheckListItem* item ) const { + if ( !item ) + return false; if ( item->childCount() > 0 ) { QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() ); while( subItem ) { @@ -371,6 +391,8 @@ bool ProductsView::hasNative( QCheckListItem* item ) const // ================================================================ void ProductsView::setItemEnabled( QCheckListItem* item, const bool enable ) { + if ( !item ) + return; item->setEnabled( enable ); QListViewItem* subItem = item->firstChild(); while( subItem ) {