Tag: cws_src680_dba24c User: fs Date: 2007-09-19 08:51:35+0000 Modified: dba/dbaccess/source/ui/dlg/generalpage.cxx dba/dbaccess/source/ui/dlg/generalpage.hxx
Log: 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.51&r2=1.51.40.1 Delta lines: +17 -15 --------------------- --- generalpage.cxx 2007-07-06 08:17:12+0000 1.51 +++ generalpage.cxx 2007-09-19 08:51:32+0000 1.51.40.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.51.40.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:17:12 $ + * last change: $Author: fs $ $Date: 2007/09/19 08:51:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ -352,15 +349,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() ) File [changed]: generalpage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.hxx?r1=1.18&r2=1.18.58.1 Delta lines: +6 -8 ------------------- --- generalpage.hxx 2007-05-10 10:26:00+0000 1.18 +++ generalpage.hxx 2007-09-19 08:51:33+0000 1.18.58.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.58.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:26:00 $ + * last change: $Author: fs $ $Date: 2007/09/19 08:51:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,7 @@ #ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> #endif +#include <svtools/dialogcontrolling.hxx> #include <memory> //......................................................................... @@ -58,7 +59,6 @@ { //......................................................................... class IDatabaseSettingsDialog; - class RadioDependentEnabler; //========================================================================= //= OGeneralPage //========================================================================= @@ -105,10 +105,8 @@ CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; - ::std::auto_ptr< RadioDependentEnabler > - m_pSelectTypeController; - ::std::auto_ptr< RadioDependentEnabler > - m_pOpenDocController; + ::svt::ControlDependencyManager + m_aControlDependencies; ODsnTypeCollection* m_pCollection; /// the DSN type collection instance --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
