Tag: cws_src680_wizopendb User: fs Date: 05/06/14 07:58:49 Modified: /dba/dbaccess/source/ui/dlg/ dbadmin.hrc, generalpage.cxx, generalpage.hxx
Log: #i42477# layout changes File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbadmin.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.hrc?r1=1.31.118.1&r2=1.31.118.2 Delta lines: +3 -2 ------------------- --- dbadmin.hrc 6 Jun 2005 10:40:40 -0000 1.31.118.1 +++ dbadmin.hrc 14 Jun 2005 14:58:45 -0000 1.31.118.2 @@ -2,9 +2,9 @@ * * $RCSfile: dbadmin.hrc,v $ * - * $Revision: 1.31.118.1 $ + * $Revision: 1.31.118.2 $ * - * last change: $Author: fs $ $Date: 2005/06/06 10:40:40 $ + * last change: $Author: fs $ $Date: 2005/06/14 14:58:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,7 @@ #define FT_GENERALHELPTEXT 42 #define FT_DATATYPEAPPENDIX 43 #define FT_DATASOURCEHEADER 44 +#define FT_DOCLISTLABEL 45 #define LB_DATATYPE 1 #define LB_DATASOURCES 2 File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.41.86.1&r2=1.41.86.2 Delta lines: +27 -25 --------------------- --- generalpage.cxx 6 Jun 2005 10:40:41 -0000 1.41.86.1 +++ generalpage.cxx 14 Jun 2005 14:58:46 -0000 1.41.86.2 @@ -2,9 +2,9 @@ * * $RCSfile: generalpage.cxx,v $ * - * $Revision: 1.41.86.1 $ + * $Revision: 1.41.86.2 $ * - * last change: $Author: fs $ $Date: 2005/06/06 10:40:41 $ + * last change: $Author: fs $ $Date: 2005/06/14 14:58:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,6 +148,7 @@ ,m_aFTHelpText (this, ResId(FT_GENERALHELPTEXT)) ,m_aFTDataSourceAppendix (this, ResId(FT_DATATYPEAPPENDIX)) ,m_pLB_DocumentList ( new OpenDocumentListBox( this, "com.sun.star.sdb.OfficeDatabaseDocument", ResId( LB_DOCUMENTLIST ) ) ) + ,m_aFT_DocListLabel (this, ResId(FT_DOCLISTLABEL)) ,m_aPB_OpenDocument (this, "com.sun.star.sdb.OfficeDatabaseDocument", ResId(PB_OPENDOCUMENT)) ,m_sMySQLEntry (ResId(STR_MYSQLENTRY)) ,m_pCollection (NULL) @@ -176,7 +177,6 @@ m_aRB_CreateDatabase.Check(); m_pLB_DocumentList->SetSelectHdl( LINK( this, OGeneralPage, OnDocumentSelected ) ); - m_pLB_DocumentList->SetDoubleClickHdl( LINK( this, OGeneralPage, OnEntryDoubleClicked ) ); m_aPB_OpenDocument.SetClickHdl( LINK( this, OGeneralPage, OnOpenDocument ) ); } @@ -345,20 +345,27 @@ m_aTypePreLabel.Hide(); m_aTypePostLabel.Hide(); m_aSpecialMessage.Hide(); - m_aDatasourceTypeLabel.SetPosPixel( MovePoint( m_aRB_GetExistingDatabase.GetPosPixel(), INDENT_BELOW_RADIO, 14 ) ); - m_aDatasourceType.SetPosPixel( MovePoint( m_aRB_GetExistingDatabase.GetPosPixel(), 90, 12) ); - m_aFTDataSourceAppendix.SetPosPixel( MovePoint(m_aRB_GetExistingDatabase.GetPosPixel(), 162, 14) ); SetControlFontWeight(&m_aFTHeaderText); SetText(String()); + m_aDatasourceType.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_aDatasourceType ); m_pSelectTypeController->addDependentWindow( m_aFTDataSourceAppendix ); m_pOpenDocController.reset( new RadioDependentEnabler( m_aRB_OpenDocument, !bValid || bReadonly ) ); - m_pOpenDocController->addDependentWindow( *m_pLB_DocumentList ); m_pOpenDocController->addDependentWindow( m_aPB_OpenDocument ); + m_pOpenDocController->addDependentWindow( m_aFT_DocListLabel ); + m_pOpenDocController->addDependentWindow( *m_pLB_DocumentList ); + + m_pLB_DocumentList->SetDropDownLineCount( 20 ); + if ( m_pLB_DocumentList->GetEntryCount() ) + m_pLB_DocumentList->SelectEntryPos( 0 ); + + m_aDatasourceTypeLabel.Hide(); + m_aFTDataSourceAppendix.Hide(); m_eOriginalCreationMode = GetDatabaseCreationMode(); } @@ -369,12 +376,14 @@ m_aRB_GetExistingDatabase.Hide(); m_aRB_OpenDocument.Hide(); m_aPB_OpenDocument.Hide(); + m_aFT_DocListLabel.Hide(); m_pLB_DocumentList->Hide(); m_aFTHeaderText.Hide(); m_aFTHelpText.Hide(); m_aTypePreLabel.Enable(bValid); m_aTypePostLabel.Enable(bValid); m_aDatasourceTypeLabel.Enable(bValid); + m_aFTDataSourceAppendix.Enable(bValid); m_aDatasourceType.Enable(bValid); } // if the selection is invalid, disable evrything @@ -419,7 +428,7 @@ } } if (m_aRB_CreateDatabase.IsChecked() && m_DBWizardMode) - sDisplayName = m_pCollection->getTypeDisplayName(DST_DBASE); + sDisplayName = m_pCollection->getTypeDisplayName(DST_JDBC); m_aDatasourceType.SelectEntry(sDisplayName); // notify our listener that our type selection has changed (if so) @@ -591,16 +600,16 @@ { // TODO: nearly all of this could be outsourced to a IWindowOperator, and // triggered via a DialogController, couldn't it? - String sDisplayName; - if (m_aRB_CreateDatabase.IsChecked()) - sDisplayName = m_pCollection->getTypeDisplayName(DST_DBASE); - else - sDisplayName = m_pCollection->getTypeDisplayName(m_eCurrentSelection); - USHORT n = m_aDatasourceType.GetEntryPos(sDisplayName); - if ((n < m_aDatasourceType.GetEntryCount()) && (n >= 0)) - m_aDatasourceType.SelectEntry(sDisplayName); - else - m_aDatasourceType.SelectEntry(m_sMySQLEntry); +// String sDisplayName; +// if (m_aRB_CreateDatabase.IsChecked()) +// sDisplayName = m_pCollection->getTypeDisplayName(DST_DBASE); +// else +// sDisplayName = m_pCollection->getTypeDisplayName(m_eCurrentSelection); +// USHORT n = m_aDatasourceType.GetEntryPos(sDisplayName); +// if ((n < m_aDatasourceType.GetEntryCount()) && (n >= 0)) +// m_aDatasourceType.SelectEntry(sDisplayName); +// else +// m_aDatasourceType.SelectEntry(m_sMySQLEntry); if ( m_aCreationModeHandler.IsSet() ) m_aCreationModeHandler.Call(this); return 1L; @@ -625,13 +634,6 @@ return 1L; } - return 0L; - } - - //------------------------------------------------------------------------- - IMPL_LINK(OGeneralPage, OnEntryDoubleClicked, ListBox*, _pBox) - { - m_aChooseDocumentHandler.Call( this ); return 0L; } File [changed]: generalpage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.hxx?r1=1.13.118.1&r2=1.13.118.2 Delta lines: +7 -7 ------------------- --- generalpage.hxx 6 Jun 2005 10:40:42 -0000 1.13.118.1 +++ generalpage.hxx 14 Jun 2005 14:58:46 -0000 1.13.118.2 @@ -2,9 +2,9 @@ * * $RCSfile: generalpage.hxx,v $ * - * $Revision: 1.13.118.1 $ + * $Revision: 1.13.118.2 $ * - * last change: $Author: fs $ $Date: 2005/06/06 10:40:42 $ + * last change: $Author: fs $ $Date: 2005/06/14 14:58:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,15 +113,16 @@ FixedText m_aFTHelpText; FixedText m_aFT_DatasourceTypeHeader; RadioButton m_aRB_CreateDatabase; - RadioButton m_aRB_GetExistingDatabase; RadioButton m_aRB_OpenDocument; + RadioButton m_aRB_GetExistingDatabase; + FixedText m_aFT_DocListLabel; + ::std::auto_ptr< OpenDocumentListBox > + m_pLB_DocumentList; + OpenDocumentButton m_aPB_OpenDocument; FixedText m_aTypePreLabel; FixedText m_aDatasourceTypeLabel; ListBox m_aDatasourceType; FixedText m_aFTDataSourceAppendix; - ::std::auto_ptr< OpenDocumentListBox > - m_pLB_DocumentList; - OpenDocumentButton m_aPB_OpenDocument; FixedText m_aTypePostLabel; FixedText m_aSpecialMessage; sal_Bool m_DBWizardMode; @@ -203,7 +204,6 @@ DECL_LINK(OnSetupModeSelected, RadioButton*); DECL_LINK(OnDocumentSelected, ListBox*); DECL_LINK(OnOpenDocument, PushButton*); - DECL_LINK(OnEntryDoubleClicked, ListBox*); }; //......................................................................... --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
