User: ihi Date: 2007-11-21 15:57:55+0000 Modified: dba/dbaccess/source/ui/dlg/generalpage.cxx
Log: INTEGRATION: CWS dba24c (1.51.40); FILE MERGED 2007/10/29 22:44:08 fs 1.51.40.2: merging changes from CWS dba24b herein, to not wait for later resync 2007/09/19 08:51:32 fs 1.51.40.1: dialogcontrolling.hxx is dead, has been re-incarnated as svtools/dialogcontrolling a while ago File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.52&r2=1.53 Delta lines: +14 -12 --------------------- --- generalpage.cxx 2007-11-01 15:13:21+0000 1.52 +++ generalpage.cxx 2007-11-21 15:57:53+0000 1.53 @@ -90,9 +90,6 @@ #ifndef DBAUI_DRIVERSETTINGS_HXX #include "DriverSettings.hxx" #endif -#ifndef DBACCESS_SOURCE_UI_INC_DIALOGCONTROLLING_HXX -#include "dialogcontrolling.hxx" -#endif //......................................................................... namespace dbaui @@ -337,15 +334,20 @@ m_pDatasourceType->SetPosPixel( MovePoint( m_aRB_GetExistingDatabase.GetPosPixel(), INDENT_BELOW_RADIO, 14 ) ); - m_pSelectTypeController.reset( new RadioDependentEnabler( m_aRB_GetExistingDatabase, !bValid || bReadonly ) ); - m_pSelectTypeController->addDependentWindow( m_aDatasourceTypeLabel ); - m_pSelectTypeController->addDependentWindow( *m_pDatasourceType ); - m_pSelectTypeController->addDependentWindow( m_aFTDataSourceAppendix ); - - m_pOpenDocController.reset( new RadioDependentEnabler( m_aRB_OpenDocument, !bValid || bReadonly ) ); - m_pOpenDocController->addDependentWindow( m_aPB_OpenDocument ); - m_pOpenDocController->addDependentWindow( m_aFT_DocListLabel ); - m_pOpenDocController->addDependentWindow( *m_pLB_DocumentList ); + if ( !bValid || bReadonly ) + { + m_aDatasourceTypeLabel.Enable( false ); + m_pDatasourceType->Enable( false ); + m_aFTDataSourceAppendix.Enable( false ); + m_aPB_OpenDocument.Enable( false ); + m_aFT_DocListLabel.Enable( false ); + m_pLB_DocumentList->Enable( false ); + } + else + { + m_aControlDependencies.enableOnRadioCheck( m_aRB_GetExistingDatabase, m_aDatasourceTypeLabel, *m_pDatasourceType, m_aFTDataSourceAppendix ); + m_aControlDependencies.enableOnRadioCheck( m_aRB_OpenDocument, m_aPB_OpenDocument, m_aFT_DocListLabel, *m_pLB_DocumentList ); + } m_pLB_DocumentList->SetDropDownLineCount( 20 ); if ( m_pLB_DocumentList->GetEntryCount() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
