Tag: cws_src680_hsqlcsv User: fs Date: 2006/10/19 03:17:18 Modified: dba/dbaccess/source/ui/dlg/generalpage.cxx dba/dbaccess/source/ui/dlg/generalpage.hxx
Log: moved DialogController to svtools during #i69526# 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.49&r2=1.49.16.1 Delta lines: +19 -15 --------------------- --- generalpage.cxx 17 Sep 2006 07:10:11 -0000 1.49 +++ generalpage.cxx 19 Oct 2006 10:17:15 -0000 1.49.16.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.49.16.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:10:11 $ + * last change: $Author: fs $ $Date: 2006/10/19 10:17:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -93,9 +93,6 @@ #ifndef DBAUI_DRIVERSETTINGS_HXX #include "DriverSettings.hxx" #endif -#ifndef DBACCESS_SOURCE_UI_INC_DIALOGCONTROLLING_HXX -#include "dialogcontrolling.hxx" -#endif //......................................................................... namespace dbaui @@ -355,15 +352,22 @@ 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 ); + m_aControlDepdencies.clear(); + bool bDisableAll = !bValid || bReadonly; + if ( bDisableAll ) + { + m_aDatasourceTypeLabel.Disable(); + m_pDatasourceType->Disable(); + m_aFTDataSourceAppendix.Disable(); + m_aPB_OpenDocument.Disable(); + m_aFT_DocListLabel.Disable(); + m_pLB_DocumentList->Disable(); + } + else + { + m_aControlDepdencies.enableOnRadioCheck( m_aRB_GetExistingDatabase, m_aDatasourceTypeLabel, *m_pDatasourceType, m_aFTDataSourceAppendix ); + m_aControlDepdencies.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.17&r2=1.17.60.1 Delta lines: +9 -9 ------------------- --- generalpage.hxx 20 Jun 2006 03:08:05 -0000 1.17 +++ generalpage.hxx 19 Oct 2006 10:17:15 -0000 1.17.60.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.60.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:08:05 $ + * last change: $Author: fs $ $Date: 2006/10/19 10:17:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,10 @@ #ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> #endif +#ifndef SVTOOLS_DIALOGCONTROLLING_HXX +#include <svtools/dialogcontrolling.hxx> +#endif + #include <memory> //......................................................................... @@ -58,7 +62,6 @@ { //......................................................................... class IAdminHelper; - class RadioDependentEnabler; //========================================================================= //= OGeneralPage //========================================================================= @@ -105,11 +108,8 @@ CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; - ::std::auto_ptr< RadioDependentEnabler > - m_pSelectTypeController; - ::std::auto_ptr< RadioDependentEnabler > - m_pOpenDocController; - + ::svt::ControlDependencyManager + m_aControlDepdencies; ODsnTypeCollection* m_pCollection; /// the DSN type collection instance DECLARE_STL_MAP(DATASOURCE_TYPE, String, ::std::less< DATASOURCE_TYPE >, SelectionHistory); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
