diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 12:45:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 12:45:42 +0000 |
| commit | 6e68e61e16ea981cfdf08d853d37435b66954c12 (patch) | |
| tree | 87a12ae1cd5e0cef1d601c8a0c3a4182552029b4 /padmin/source/fontentry.cxx | |
| parent | INTEGRATION: CWS vcl20 (1.78.24); FILE MERGED (diff) | |
| download | core-6e68e61e16ea981cfdf08d853d37435b66954c12.tar.gz core-6e68e61e16ea981cfdf08d853d37435b66954c12.zip | |
INTEGRATION: CWS vcl20 (1.10.82); FILE MERGED
2004/02/20 14:57:25 pl 1.10.82.1: #i20934# search in subdirectories for fonts, too
Diffstat (limited to 'padmin/source/fontentry.cxx')
| -rw-r--r-- | padmin/source/fontentry.cxx | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx index 980dc86cf6e7..c607a986f133 100644 --- a/padmin/source/fontentry.cxx +++ b/padmin/source/fontentry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fontentry.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2004-03-17 10:44:23 $ + * last change: $Author: rt $ $Date: 2004-03-30 13:45:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -478,6 +478,8 @@ FontImportDialog::FontImportDialog( Window* pParent ) : m_aFromFL( this, PaResId( RID_FIMP_FL_FROM ) ), m_aFromDirEdt( this, PaResId( RID_FIMP_EDT_FROM ) ), m_aFromBtn( this, PaResId( RID_FIMP_BTN_FROM ) ), + m_aSubDirsBox( this, PaResId( RID_FIMP_BOX_SUBDIRS ) ), + m_aTargetOptFL( this, PaResId( RID_FIMP_FL_TARGETOPTS ) ), m_aLinkOnlyBox( this, PaResId( RID_FIMP_BOX_LINKONLY ) ), m_aFixedText( this, PaResId( RID_FIMP_TXT_HELP ) ), m_bOverwriteAll( false ), @@ -505,6 +507,8 @@ FontImportDialog::FontImportDialog( Window* pParent ) : m_aRefreshTimer.SetTimeoutHdl( LINK( this, FontImportDialog, RefreshTimeoutHdl ) ); m_aRefreshTimer.SetTimeout( 2000 ); m_aLinkOnlyBox.Check( FALSE ); + m_aSubDirsBox.Check( TRUE ); + m_aSubDirsBox.SetToggleHdl( LINK( this, FontImportDialog, ToggleHdl ) ); Config& rPadminRC( getPadminRC() ); rPadminRC.SetGroup( "FontImport" ); @@ -604,10 +608,10 @@ IMPL_LINK( FontImportDialog, ModifyHdl, Edit*,pEdit ) IMPL_LINK( FontImportDialog, RefreshTimeoutHdl, void*, pDummy ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - ::std::list< String > aFiles; + std::list< String > aFiles; m_aNewFonts.clear(); OUString aDirectory( m_aFromDirEdt.GetText() ); - FindFiles( aDirectory, aFiles, String( RTL_CONSTASCII_USTRINGPARAM( "PFA;PFB;TTF;TTC" ) ) ); + FindFiles( aDirectory, aFiles, String( RTL_CONSTASCII_USTRINGPARAM( "PFA;PFB;TTF;TTC" ) ), m_aSubDirsBox.IsChecked() ); OString aDir( OUStringToOString( aDirectory, aEncoding ) ); aDir += "/"; while( aFiles.begin() != aFiles.end() ) @@ -708,3 +712,13 @@ IMPL_LINK( FontImportDialog, ClickBtnHdl, Button*, pButton ) } return 0; } + +IMPL_LINK( FontImportDialog, ToggleHdl, CheckBox*, pBox ) +{ + if( pBox == &m_aSubDirsBox ) + { + RefreshTimeoutHdl( NULL ); + } + + return 0; +} |