diff options
| -rw-r--r-- | svx/inc/srchdlg.hxx | 34 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 127 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.hrc | 6 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.src | 6 | ||||
| -rw-r--r-- | svx/source/options/optjsearch.src | 39 |
5 files changed, 111 insertions, 101 deletions
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx index 247078a8c439..ecf7d4ad5948 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/srchdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: srchdlg.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2001-02-19 11:16:57 $ + * last change: $Author: tl $ $Date: 2001-02-21 13:23:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,22 +101,10 @@ #include <svtools/svmedit.hxx> #endif -// defines --------------------------------------------------------------- - -#define SEARCH_OPTIONS_SEARCH ((USHORT)0x0001) -#define SEARCH_OPTIONS_SEARCH_ALL ((USHORT)0x0002) -#define SEARCH_OPTIONS_REPLACE ((USHORT)0x0004) -#define SEARCH_OPTIONS_REPLACE_ALL ((USHORT)0x0008) -#define SEARCH_OPTIONS_WHOLE_WORDS ((USHORT)0x0010) -#define SEARCH_OPTIONS_BACKWARDS ((USHORT)0x0020) -#define SEARCH_OPTIONS_REG_EXP ((USHORT)0x0040) -#define SEARCH_OPTIONS_EXACT ((USHORT)0x0080) -#define SEARCH_OPTIONS_SELECTION ((USHORT)0x0100) -#define SEARCH_OPTIONS_FAMILIES ((USHORT)0x0200) -#define SEARCH_OPTIONS_FORMAT ((USHORT)0x0400) -#define SEARCH_OPTIONS_MORE ((USHORT)0x0800) -#define SEARCH_OPTIONS_SIMILARITY ((USHORT)0x1000) -#define SEARCH_OPTIONS_CONTENT ((USHORT)0x2000) +#ifndef _SFX_SRCHDEFS_HXX_ +#include <sfx2/srchdefs.hxx> +#endif + // forward --------------------------------------------------------------- @@ -213,7 +201,7 @@ public: PushButton& GetReplaceBtn() { return aReplaceBtn; } - INT32 GetTransliterationSettings() const; + INT32 GetTransliterationFlags() const; private: FixedText aSearchText; @@ -242,7 +230,7 @@ private: MoreButton* pMoreBtn; CheckBox aWordBtn; - CheckBox aExactBtn; + CheckBox aMatchCaseCB; CheckBox aBackwardsBtn; CheckBox aSelectionBtn; CheckBox aRegExpBtn; @@ -251,7 +239,7 @@ private: CheckBox aSimilarityBox; PushButton aSimilarityBtn; CheckBox aJapMatchFullHalfWidthCB; - CheckBox aJapSoundsLikeCB; + CheckBox aJapOptionsCB; PushButton aJapOptionsBtn; GroupBox aOptionsBox; @@ -295,7 +283,7 @@ private: SvxSearchController* pSearchSetController; SvxSearchController* pReplaceSetController; - INT32 nTransliterationSettings; + INT32 nTransliterationFlags; #ifdef _SVX_SRCHDLG_CXX DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit ); @@ -325,7 +313,7 @@ private: void SetModifyFlag_Impl( const Control* pCtrl ); void SaveToModule_Impl(); - void ApplyTransliterationSettings_Impl( INT32 nSettings ); + void ApplyTransliterationFlags_Impl( INT32 nSettings ); #endif }; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index c244deff2dd6..b3ffbec480cf 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srchdlg.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2001-02-20 09:04:27 $ + * last change: $Author: tl $ $Date: 2001-02-21 13:27:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -342,7 +342,7 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxBindings& rBind ) : pMoreBtn ( new MoreButton( this, ResId( BTN_MORE ) ) ), aWordBtn ( this, ResId( BTN_CELLS ) ), - aExactBtn ( this, ResId( BTN_EXACT ) ), + aMatchCaseCB ( this, ResId( CB_MATCH_CASE ) ), aBackwardsBtn ( this, ResId( BTN_BACKWARDS ) ), aSelectionBtn ( this, ResId( BTN_SELECTIONS ) ), aRegExpBtn ( this, ResId( BTN_REGEXP ) ), @@ -350,7 +350,7 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxBindings& rBind ) : aSimilarityBox ( this, ResId( CB_SIMILARITY) ), aSimilarityBtn ( this, ResId( PB_SIMILARITY) ), aJapMatchFullHalfWidthCB( this, ResId( CB_JAP_MATCH_FULL_HALF_WIDTH ) ), - aJapSoundsLikeCB( this, ResId( CB_JAP_SOUNDS_LIKE ) ), + aJapOptionsCB ( this, ResId( CB_JAP_SOUNDS_LIKE ) ), aJapOptionsBtn ( this, ResId( PB_JAP_OPTIONS ) ), aOptionsBox ( this, ResId( GB_OPTIONS ) ), @@ -388,7 +388,7 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxBindings& rBind ) : pFamilyController ( NULL ), pSearchSetController ( NULL ), pReplaceSetController ( NULL ), - nTransliterationSettings( 0x00000000 ) + nTransliterationFlags ( 0x00000000 ) { Wallpaper aBackground = GetBackground(); @@ -494,14 +494,14 @@ BOOL SvxSearchDialog::Close() // save settings to configuration SvtSearchOptions aOpt; - aOpt.SetWholeWordsOnly ( aWordBtn .IsChecked() ); - aOpt.SetBackwards ( aBackwardsBtn .IsChecked() ); - aOpt.SetUseRegularExpression( aRegExpBtn .IsChecked() ); - aOpt.SetMatchCase ( aExactBtn .IsChecked() ); - aOpt.SetSearchForStyles ( aLayoutBtn .IsChecked() ); - aOpt.SetSimilaritySearch ( aSimilarityBox .IsChecked() ); - aOpt.SetMatchFullHalfWidth ( aJapMatchFullHalfWidthCB.IsChecked() ); - aOpt.SetSoundsLikeEnabled ( aJapSoundsLikeCB .IsChecked() ); + aOpt.SetWholeWordsOnly ( aWordBtn .IsChecked() ); + aOpt.SetBackwards ( aBackwardsBtn .IsChecked() ); + aOpt.SetUseRegularExpression ( aRegExpBtn .IsChecked() ); + //aOpt.SetMatchCase ( aMatchCaseCB .IsChecked() ); + aOpt.SetSearchForStyles ( aLayoutBtn .IsChecked() ); + aOpt.SetSimilaritySearch ( aSimilarityBox .IsChecked() ); + //aOpt.SetMatchFullHalfWidthForms ( aJapMatchFullHalfWidthCB.IsChecked() ); + aOpt.SetUseAsianOptions ( aJapOptionsCB .IsChecked() ); NotifyApp( FID_SEARCH_OFF ); NotifyApp( SID_SEARCH_DLG ); @@ -510,20 +510,29 @@ BOOL SvxSearchDialog::Close() // ----------------------------------------------------------------------- -INT32 SvxSearchDialog::GetTransliterationSettings() const +INT32 SvxSearchDialog::GetTransliterationFlags() const { - return nTransliterationSettings; + INT32 &rFlags = (INT32) nTransliterationFlags; + if (!aMatchCaseCB.IsChecked()) + rFlags |= TransliterationModules_IGNORE_CASE; + else + rFlags &= ~TransliterationModules_IGNORE_CASE; + if (!aJapMatchFullHalfWidthCB.IsChecked()) + rFlags |= TransliterationModules_IGNORE_WIDTH; + else + rFlags &= ~TransliterationModules_IGNORE_WIDTH; + return nTransliterationFlags; } // ----------------------------------------------------------------------- -void SvxSearchDialog::ApplyTransliterationSettings_Impl( INT32 nSettings ) +void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings ) { - nTransliterationSettings = nSettings; + nTransliterationFlags = nSettings; BOOL bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); - aExactBtn .Check( bVal ); + aMatchCaseCB .Check( !bVal ); bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH); - aJapMatchFullHalfWidthCB.Check( bVal ); + aJapMatchFullHalfWidthCB.Check( !bVal ); } // ----------------------------------------------------------------------- @@ -566,11 +575,11 @@ void SvxSearchDialog::InitControls_Impl() aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); aWordBtn.SetClickHdl( aLink ); aSelectionBtn.SetClickHdl( aLink ); - aExactBtn.SetClickHdl( aLink ); + aMatchCaseCB.SetClickHdl( aLink ); aRegExpBtn.SetClickHdl( aLink ); aBackwardsBtn.SetClickHdl( aLink ); aSimilarityBox.SetClickHdl( aLink ); - aJapSoundsLikeCB.SetClickHdl( aLink ); + aJapOptionsCB.SetClickHdl( aLink ); aJapMatchFullHalfWidthCB.SetClickHdl( aLink ); aLayoutBtn.SetClickHdl( LINK( this, SvxSearchDialog, TemplateHdl_Impl ) ); @@ -579,19 +588,6 @@ void SvxSearchDialog::InitControls_Impl() LINK( this, SvxSearchDialog, NoFormatHdl_Impl ) ); aAttributeBtn.SetClickHdl( LINK( this, SvxSearchDialog, AttributeHdl_Impl ) ); - - // apply settings from configuration - SvtSearchOptions aOpt; - aWordBtn .Check( aOpt.IsWholeWordsOnly() ); - aBackwardsBtn .Check( aOpt.IsBackwards() ); - aRegExpBtn .Check( aOpt.IsUseRegularExpression() ); - aExactBtn .Check( aOpt.IsMatchCase() ); - aLayoutBtn .Check( aOpt.IsSearchForStyles() ); - aSimilarityBox .Check( aOpt.IsSimilaritySearch() ); - aJapMatchFullHalfWidthCB.Check( aOpt.IsMatchFullHalfWidth() ); - aJapSoundsLikeCB .Check( aOpt.IsSoundsLikeEnabled() ); - ApplyTransliterationSettings_Impl( aOpt.GetTransliterationSettings() ); - FlagHdl_Impl( &aJapSoundsLikeCB ); } // ----------------------------------------------------------------------- @@ -636,7 +632,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) if ( ( nModifyFlag & MODIFY_WORD ) == 0 ) aWordBtn.Check( pSearchItem->GetWordOnly() ); if ( ( nModifyFlag & MODIFY_EXACT ) == 0 ) - aExactBtn.Check( pSearchItem->GetExact() ); + aMatchCaseCB.Check( pSearchItem->GetExact() ); if ( ( nModifyFlag & MODIFY_BACKWARDS ) == 0 ) aBackwardsBtn.Check( pSearchItem->GetBackward() ); if ( ( nModifyFlag & MODIFY_SELECTION ) == 0 ) @@ -645,6 +641,11 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aRegExpBtn.Check( pSearchItem->GetRegExp() ); if ( ( nModifyFlag & MODIFY_LAYOUT ) == 0 ) aLayoutBtn.Check( pSearchItem->GetPattern() ); + aSimilarityBox .Check( pSearchItem->IsLevenshtein() ); + aJapMatchFullHalfWidthCB.Check( pSearchItem->IsMatchFullHalfWidthForms() ); + aJapOptionsCB .Check( pSearchItem->IsUseAsianOptions() ); + ApplyTransliterationFlags_Impl( pSearchItem->GetTransliterationFlags() ); + FASTBOOL bDraw = FALSE; if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC ) @@ -754,9 +755,12 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 ) aSimilarityBox.Check( pSearchItem->IsLevenshtein() ); bSet = TRUE; + pImpl->bSaveToModule = FALSE; FlagHdl_Impl( &aSimilarityBox ); + FlagHdl_Impl( &aJapOptionsCB ); pImpl->bSaveToModule = TRUE; + FASTBOOL bDisableSearch = FALSE; SfxViewShell* pViewShell = SfxViewShell::Current(); @@ -810,7 +814,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aWordBtn.Disable(); aRegExpBtn.Disable(); - aExactBtn.Disable(); + aMatchCaseCB.Disable(); bDisableSearch = !aSearchTmplLB.GetEntryCount(); } @@ -848,7 +852,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aReplaceTmplLB.Hide(); EnableControl_Impl( &aRegExpBtn ); - EnableControl_Impl( &aExactBtn ); + EnableControl_Impl( &aMatchCaseCB ); if ( aRegExpBtn.IsChecked() ) aWordBtn.Disable(); @@ -989,7 +993,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pButton ) if ( aLayoutBtn.IsChecked() ) { - EnableControl_Impl( &aExactBtn ); + EnableControl_Impl( &aMatchCaseCB ); aLayoutBtn.Check( FALSE ); } aRegExpBtn.Disable(); @@ -1016,8 +1020,8 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pButton ) aWordBtn.Disable(); aRegExpBtn.Check( FALSE ); aRegExpBtn.Disable(); - aExactBtn.Check( FALSE ); - aExactBtn.Disable(); + aMatchCaseCB.Check( FALSE ); + aMatchCaseCB.Disable(); if ( aSearchTmplLB.GetEntryCount() ) { @@ -1030,7 +1034,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pButton ) else { EnableControl_Impl( &aRegExpBtn ); - EnableControl_Impl( &aExactBtn ); + EnableControl_Impl( &aMatchCaseCB ); if ( aRegExpBtn.IsChecked() ) { @@ -1062,11 +1066,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pButton ) } } - if ( &aJapSoundsLikeCB == pButton ) + if ( &aJapOptionsCB == pButton ) { - BOOL bEnableJapOpt = aJapSoundsLikeCB.IsChecked(); - aExactBtn .Enable( !bEnableJapOpt ); - aJapMatchFullHalfWidthCB.Enable( !bEnableJapOpt ); + BOOL bEnableJapOpt = aJapOptionsCB.IsChecked(); + aMatchCaseCB .Enable(!bEnableJapOpt ); + aJapMatchFullHalfWidthCB.Enable(!bEnableJapOpt ); aJapOptionsBtn .Enable( bEnableJapOpt ); } @@ -1108,11 +1112,16 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) } pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) ); + pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); pSearchItem->SetPattern( GetCheckBoxValue( aLayoutBtn ) ); pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) ); - pSearchItem->SetExact( GetCheckBoxValue( aExactBtn ) ); pSearchItem->SetRegExp( GetCheckBoxValue( aRegExpBtn ) ); - pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); + pSearchItem->SetLevenshtein( GetCheckBoxValue( aSimilarityBox )); + pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) ); + //! and even if checkboxes are disabled... + pSearchItem->SetExact( aMatchCaseCB.IsChecked() ); + pSearchItem->SetMatchFullHalfWidthForms( aJapMatchFullHalfWidthCB.IsChecked() ); + pSearchItem->SetTransliterationFlags( GetTransliterationFlags() ); if ( !bWriter ) { @@ -1191,9 +1200,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) SvxJSearchOptionsPage::Create( &aDlg, aSet ); aDlg.SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! pPage->EnableSaveOptions( FALSE ); - pPage->SetTransliterationSettings( GetTransliterationSettings() ); + pPage->SetTransliterationFlags( GetTransliterationFlags() ); aDlg.Execute(); - ApplyTransliterationSettings_Impl( pPage->GetTransliterationSettings() ); + ApplyTransliterationFlags_Impl( pPage->GetTransliterationFlags() ); } return 0; @@ -1490,9 +1499,9 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags ) else aRegExpBtn.Disable(); if ( ( SEARCH_OPTIONS_EXACT & nOptions ) != 0 ) - aExactBtn.Enable(); + aMatchCaseCB.Enable(); else - aExactBtn.Disable(); + aMatchCaseCB.Disable(); if ( ( SEARCH_OPTIONS_SELECTION & nOptions ) != 0 ) aSelectionBtn.Enable(); else @@ -1579,9 +1588,10 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) aRegExpBtn.Enable(); return; } - if ( &aExactBtn == pCtrl && ( SEARCH_OPTIONS_EXACT & nOptions ) != 0 ) + if ( &aMatchCaseCB == pCtrl && ( SEARCH_OPTIONS_EXACT & nOptions ) != 0 ) { - aExactBtn.Enable(); + if (!aJapOptionsCB.IsChecked()) + aMatchCaseCB.Enable(); return; } if ( &aSelectionBtn == pCtrl && ( SEARCH_OPTIONS_SELECTION & nOptions ) != 0 ) @@ -1975,7 +1985,7 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) nModifyFlag |= MODIFY_REPLACE; else if ( &aWordBtn == (CheckBox*)pCtrl ) nModifyFlag |= MODIFY_WORD; - else if ( &aExactBtn == (CheckBox*)pCtrl ) + else if ( &aMatchCaseCB == (CheckBox*)pCtrl ) nModifyFlag |= MODIFY_EXACT; else if ( &aBackwardsBtn == (CheckBox*)pCtrl ) nModifyFlag |= MODIFY_BACKWARDS; @@ -2021,11 +2031,16 @@ void SvxSearchDialog::SaveToModule_Impl() } pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) ); + pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); pSearchItem->SetPattern( GetCheckBoxValue( aLayoutBtn ) ); pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) ); - pSearchItem->SetExact( GetCheckBoxValue( aExactBtn ) ); pSearchItem->SetRegExp( GetCheckBoxValue( aRegExpBtn ) ); - pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); + pSearchItem->SetLevenshtein( GetCheckBoxValue( aSimilarityBox )); + pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) ); + //! and even if checkboxes are disabled... + pSearchItem->SetExact( aMatchCaseCB.IsChecked() ); + pSearchItem->SetMatchFullHalfWidthForms( aJapMatchFullHalfWidthCB.IsChecked() ); + pSearchItem->SetTransliterationFlags( GetTransliterationFlags() ); if ( !bWriter ) { diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc index 5b6014eb6b50..c46d7adaaed4 100644 --- a/svx/source/dialog/srchdlg.hrc +++ b/svx/source/dialog/srchdlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: srchdlg.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2001-02-19 11:17:30 $ + * last change: $Author: tl $ $Date: 2001-02-21 13:27:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ #define BTN_CELLS 20 #define BTN_LAYOUTS 21 #define BTN_SELECTIONS 22 -#define BTN_EXACT 23 +#define CB_MATCH_CASE 23 #define BTN_REGEXP 24 #define BTN_BACKWARDS 25 #define GB_OPTIONS 26 diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index fa01bdb4ff6c..9f6fd0bf6a5a 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: srchdlg.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: tl $ $Date: 2001-02-19 11:18:17 $ + * last change: $Author: tl $ $Date: 2001-02-21 13:28:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -337,7 +337,7 @@ ModelessDialog RID_SVXDLG_SEARCH Text[ turkish ] = "Yalnzca tam s~zck"; Text[ language_user1 ] = " "; }; - CheckBox BTN_EXACT + CheckBox CB_MATCH_CASE { Pos = MAP_APPFONT ( 102 , 103 ) ; Size = MAP_APPFONT ( 87 , 10 ) ; diff --git a/svx/source/options/optjsearch.src b/svx/source/options/optjsearch.src index 4d0e040ee9c5..6fa0b8a07e6f 100644 --- a/svx/source/options/optjsearch.src +++ b/svx/source/options/optjsearch.src @@ -2,9 +2,9 @@ * * $RCSfile: optjsearch.src,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: tl $ $Date: 2001-02-19 11:21:36 $ + * last change: $Author: tl $ $Date: 2001-02-21 13:25:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,58 +134,51 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS Text = "Alte Kana-Formen" ; Text [ ENGLISH ] = "Match old kana forms" ; }; - CheckBox CB_MATCH_CHOON_USED_FOR_VOWELS - { - Pos = MAP_APPFONT ( 136 , 14 ) ; - Size = MAP_APPFONT ( 118 , 10 ) ; - Text = "Cho-on bei Vokalen" ; - Text [ ENGLISH ] = "Match cho-on used for vowels" ; - }; CheckBox CB_MATCH_DIZI_DUZU { - Pos = MAP_APPFONT ( 136 , 28 ) ; + Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Di/zi, du/zu" ; Text [ ENGLISH ] = "Match di/zi, du/zu" ; }; CheckBox CB_MATCH_BAVA_HAFA { - Pos = MAP_APPFONT ( 136 , 42 ) ; + Pos = MAP_APPFONT ( 136 , 28 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Ba/va, ha/fa" ; Text [ ENGLISH ] = "Match ba/va, ha/fa" ; }; CheckBox CB_MATCH_TSITHICHI_DHIZI { - Pos = MAP_APPFONT ( 136 , 56 ) ; + Pos = MAP_APPFONT ( 136 , 42 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Tsi/thi/chi, dhi/zi" ; Text [ ENGLISH ] = "Match tsi/thi/chi, dhi/zi" ; }; CheckBox CB_MATCH_HYUIYU_BYUVYU { - Pos = MAP_APPFONT ( 136 , 70 ) ; + Pos = MAP_APPFONT ( 136 , 56 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Hyu/iyu, byu/vyu" ; Text [ ENGLISH ] = "Match hyu/iyu, byu/vyu" ; }; CheckBox CB_MATCH_SESHE_ZEJE { - Pos = MAP_APPFONT ( 136 , 84 ) ; + Pos = MAP_APPFONT ( 136 , 70 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Se/she, ze/je" ; Text [ ENGLISH ] = "Match se/she, ze/je" ; }; CheckBox CB_MATCH_IAIYA { - Pos = MAP_APPFONT ( 136 , 98 ) ; + Pos = MAP_APPFONT ( 136 , 84 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Ia/iya (piano/piyano)" ; Text [ ENGLISH ] = "Match ia/iya (piano/piyano)" ; }; CheckBox CB_MATCH_KIKU { - Pos = MAP_APPFONT ( 136 , 112 ) ; + Pos = MAP_APPFONT ( 136 , 98 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text = "Ki/ku (tekisuto/tekusuto)" ; Text [ ENGLISH ] = "Match ki/ku (tekisuto/tekusuto)" ; @@ -211,6 +204,20 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS Text = "Leerraumzeichen" ; Text [ ENGLISH ] = "Whitespace characters" ; }; + CheckBox CB_IGNORE_PROLONGED_SOUNDMARK + { + Pos = MAP_APPFONT ( 6 , 150 ) ; + Size = MAP_APPFONT ( 118 , 10 ) ; + Text = "Verlngerte Vokale (cho-on)" ; + Text [ ENGLISH ] = "Prolonged soundmarks (cho-on)" ; + }; + CheckBox CB_IGNORE_MIDDLE_DOT + { + Pos = MAP_APPFONT ( 136 , 150 ) ; + Size = MAP_APPFONT ( 118 , 10 ) ; + Text = "Mittiger Punkt" ; + Text [ ENGLISH ] = "Middle dots" ; + }; }; // end TabPage |