[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
Faisal M. Al-Otaibi
fmalotaibi at kacst.edu.sa
Fri Jun 7 00:51:10 PDT 2013
cui/AllLangResTarget_cui.mk | 1
cui/UIConfig_cui.mk | 1
cui/source/inc/helpid.hrc | 1
cui/source/options/optjsearch.cxx | 275 ++++++++++++-------------
cui/source/options/optjsearch.hrc | 43 ---
cui/source/options/optjsearch.hxx | 41 +--
cui/source/options/optjsearch.src | 181 ----------------
cui/uiconfig/ui/optjsearchpage.ui | 418 ++++++++++++++++++++++++++++++++++++++
8 files changed, 575 insertions(+), 386 deletions(-)
New commits:
commit 1543e30a33832e882b973f0ae8722e6c88a46963
Author: Faisal M. Al-Otaibi <fmalotaibi at kacst.edu.sa>
Date: Thu Jun 6 17:04:41 2013 +0200
Convert Search in Japanese page to .ui format
Change-Id: I1874f36d3e69b39fcb456de85b28c7a09f7bdbf2
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 518444f..163ce00 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/opthtml.src \
cui/source/options/optinet2.src \
cui/source/options/optjava.src \
- cui/source/options/optjsearch.src \
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/optsave.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8cb1c66..4bd60b4 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
+ cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
cui/uiconfig/ui/optonlineupdatepage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index bbae785..1fc1141 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -38,7 +38,6 @@
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
-#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 86770d5..fa183e7 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -23,38 +23,35 @@
#include <cuires.hrc>
#include <dialmgr.hxx>
#include <optjsearch.hxx>
-#include "optjsearch.hrc"
using namespace com::sun::star::i18n;
//////////////////////////////////////////////////////////////////////
SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
-
- aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
- aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ),
- aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
- aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
- aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
- aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
- aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
- aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
- aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
- aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
- aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
- aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
- aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
- aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
- aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ),
- aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ),
- aMatchProlongedSoundMark ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
- aIgnore ( this, CUI_RES( FL_IGNORE ) ),
- aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
- aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
- aIgnoreMiddleDot ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
+ SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", rSet )
{
- FreeResource();
+ get( m_pMatchCase, "matchcase");
+ get( m_pMatchFullHalfWidth, "matchfullhalfwidth");
+ get( m_pMatchHiraganaKatakana, "matchhiraganakatakana");
+ get( m_pMatchContractions, "matchcontractions");
+ get( m_pMatchMinusDashChoon, "matchminusdashchoon");
+ get( m_pMatchRepeatCharMarks, "matchrepeatcharmarks");
+ get( m_pMatchVariantFormKanji, "matchvariantformkanji");
+ get( m_pMatchOldKanaForms, "matcholdkanaforms");
+ get( m_pMatchDiziDuzu, "matchdiziduzu");
+ get( m_pMatchBavaHafa, "matchbavahafa");
+ get( m_pMatchTsithichiDhizi, "matchtsithichidhizi");
+ get( m_pMatchHyuiyuByuvyu, "matchhyuiyubyuvyu");
+ get( m_pMatchSesheZeje, "matchseshezeje");
+ get( m_pMatchIaiya, "matchiaiya");
+ get( m_pMatchKiku, "matchkiku");
+ get( m_pMatchProlongedSoundMark, "matchprolongedsoundmark");
+
+ get( m_pIgnorePunctuation, "ignorepunctuation");
+ get( m_pIgnoreWhitespace, "ignorewhitespace");
+ get( m_pIgnoreMiddleDot, "ignoremiddledot");
+
bSaveOptions = sal_True;
nTransliterationFlags = 0x00000000;
}
@@ -74,43 +71,43 @@ SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet& r
void SvxJSearchOptionsPage::SetTransliterationFlags( sal_Int32 nSettings )
{
sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
- aMatchCase .Check( bVal ); //! treat as equal uppercase/lowercase
+ m_pMatchCase ->Check( bVal ); //! treat as equal uppercase/lowercase
bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH);
- aMatchFullHalfWidth .Check( bVal );
+ m_pMatchFullHalfWidth ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_IGNORE_KANA);
- aMatchHiraganaKatakana .Check( bVal );
+ m_pMatchHiraganaKatakana ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreSize_ja_JP);
- aMatchContractions .Check( bVal );
+ m_pMatchContractions ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreMinusSign_ja_JP);
- aMatchMinusDashChoon .Check( bVal );
+ m_pMatchMinusDashChoon ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreIterationMark_ja_JP);
- aMatchRepeatCharMarks .Check( bVal );
+ m_pMatchRepeatCharMarks ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreTraditionalKanji_ja_JP);
- aMatchVariantFormKanji .Check( bVal );
+ m_pMatchVariantFormKanji ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreTraditionalKana_ja_JP);
- aMatchOldKanaForms .Check( bVal );
+ m_pMatchOldKanaForms ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreZiZu_ja_JP);
- aMatchDiziDuzu .Check( bVal );
+ m_pMatchDiziDuzu ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreBaFa_ja_JP);
- aMatchBavaHafa .Check( bVal );
+ m_pMatchBavaHafa ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreTiJi_ja_JP);
- aMatchTsithichiDhizi .Check( bVal );
+ m_pMatchTsithichiDhizi ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreHyuByu_ja_JP);
- aMatchHyuiyuByuvyu .Check( bVal );
+ m_pMatchHyuiyuByuvyu ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreSeZe_ja_JP);
- aMatchSesheZeje .Check( bVal );
+ m_pMatchSesheZeje ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreIandEfollowedByYa_ja_JP);
- aMatchIaiya .Check( bVal );
+ m_pMatchIaiya ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreKiKuFollowedBySa_ja_JP);
- aMatchKiku .Check( bVal );
+ m_pMatchKiku ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreSeparator_ja_JP);
- aIgnorePunctuation .Check( bVal );
+ m_pIgnorePunctuation ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreSpace_ja_JP);
- aIgnoreWhitespace .Check( bVal );
+ m_pIgnoreWhitespace ->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreProlongedSoundMark_ja_JP);
- aMatchProlongedSoundMark.Check( bVal );
+ m_pMatchProlongedSoundMark->Check( bVal );
bVal = 0 != (nSettings & TransliterationModules_ignoreMiddleDot_ja_JP);
- aIgnoreMiddleDot .Check( bVal );
+ m_pIgnoreMiddleDot ->Check( bVal );
nTransliterationFlags = nSettings;
}
@@ -119,43 +116,43 @@ void SvxJSearchOptionsPage::SetTransliterationFlags( sal_Int32 nSettings )
sal_Int32 SvxJSearchOptionsPage::GetTransliterationFlags_Impl()
{
sal_Int32 nTmp = 0;
- if (aMatchCase.IsChecked()) //! treat as equal uppercase/lowercase
+ if (m_pMatchCase->IsChecked()) //! treat as equal uppercase/lowercase
nTmp |= TransliterationModules_IGNORE_CASE;
- if (aMatchFullHalfWidth.IsChecked())
+ if (m_pMatchFullHalfWidth->IsChecked())
nTmp |= TransliterationModules_IGNORE_WIDTH;
- if (aMatchHiraganaKatakana.IsChecked())
+ if (m_pMatchHiraganaKatakana->IsChecked())
nTmp |= TransliterationModules_IGNORE_KANA;
- if (aMatchContractions.IsChecked())
+ if (m_pMatchContractions->IsChecked())
nTmp |= TransliterationModules_ignoreSize_ja_JP;
- if (aMatchMinusDashChoon.IsChecked())
+ if (m_pMatchMinusDashChoon->IsChecked())
nTmp |= TransliterationModules_ignoreMinusSign_ja_JP;
- if (aMatchRepeatCharMarks.IsChecked())
+ if (m_pMatchRepeatCharMarks->IsChecked())
nTmp |= TransliterationModules_ignoreIterationMark_ja_JP;
- if (aMatchVariantFormKanji.IsChecked())
+ if (m_pMatchVariantFormKanji->IsChecked())
nTmp |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
- if (aMatchOldKanaForms.IsChecked())
+ if (m_pMatchOldKanaForms->IsChecked())
nTmp |= TransliterationModules_ignoreTraditionalKana_ja_JP;
- if (aMatchDiziDuzu.IsChecked())
+ if (m_pMatchDiziDuzu->IsChecked())
nTmp |= TransliterationModules_ignoreZiZu_ja_JP;
- if (aMatchBavaHafa.IsChecked())
+ if (m_pMatchBavaHafa->IsChecked())
nTmp |= TransliterationModules_ignoreBaFa_ja_JP;
- if (aMatchTsithichiDhizi.IsChecked())
+ if (m_pMatchTsithichiDhizi->IsChecked())
nTmp |= TransliterationModules_ignoreTiJi_ja_JP;
- if (aMatchHyuiyuByuvyu.IsChecked())
+ if (m_pMatchHyuiyuByuvyu->IsChecked())
nTmp |= TransliterationModules_ignoreHyuByu_ja_JP;
- if (aMatchSesheZeje.IsChecked())
+ if (m_pMatchSesheZeje->IsChecked())
nTmp |= TransliterationModules_ignoreSeZe_ja_JP;
- if (aMatchIaiya.IsChecked())
+ if (m_pMatchIaiya->IsChecked())
nTmp |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
- if (aMatchKiku.IsChecked())
+ if (m_pMatchKiku->IsChecked())
nTmp |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
- if (aIgnorePunctuation.IsChecked())
+ if (m_pIgnorePunctuation->IsChecked())
nTmp |= TransliterationModules_ignoreSeparator_ja_JP;
- if (aIgnoreWhitespace.IsChecked())
+ if (m_pIgnoreWhitespace->IsChecked())
nTmp |= TransliterationModules_ignoreSpace_ja_JP;
- if (aMatchProlongedSoundMark.IsChecked())
+ if (m_pMatchProlongedSoundMark->IsChecked())
nTmp |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
- if (aIgnoreMiddleDot.IsChecked())
+ if (m_pIgnoreMiddleDot->IsChecked())
nTmp |= TransliterationModules_ignoreMiddleDot_ja_JP;
nTransliterationFlags = nTmp;
@@ -168,49 +165,49 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
SvtSearchOptions aOpt;
// read settings from configuration
- aMatchCase .Check(!aOpt.IsMatchCase() ); //! treat as equal uppercase/lowercase
- aMatchFullHalfWidth .Check( aOpt.IsMatchFullHalfWidthForms() );
- aMatchHiraganaKatakana .Check( aOpt.IsMatchHiraganaKatakana() );
- aMatchContractions .Check( aOpt.IsMatchContractions() );
- aMatchMinusDashChoon .Check( aOpt.IsMatchMinusDashChoon() );
- aMatchRepeatCharMarks .Check( aOpt.IsMatchRepeatCharMarks() );
- aMatchVariantFormKanji .Check( aOpt.IsMatchVariantFormKanji() );
- aMatchOldKanaForms .Check( aOpt.IsMatchOldKanaForms() );
- aMatchDiziDuzu .Check( aOpt.IsMatchDiziDuzu() );
- aMatchBavaHafa .Check( aOpt.IsMatchBavaHafa() );
- aMatchTsithichiDhizi .Check( aOpt.IsMatchTsithichiDhizi() );
- aMatchHyuiyuByuvyu .Check( aOpt.IsMatchHyuiyuByuvyu() );
- aMatchSesheZeje .Check( aOpt.IsMatchSesheZeje() );
- aMatchIaiya .Check( aOpt.IsMatchIaiya() );
- aMatchKiku .Check( aOpt.IsMatchKiku() );
- aIgnorePunctuation .Check( aOpt.IsIgnorePunctuation() );
- aIgnoreWhitespace .Check( aOpt.IsIgnoreWhitespace() );
- aMatchProlongedSoundMark .Check( aOpt.IsIgnoreProlongedSoundMark() );
- aIgnoreMiddleDot .Check( aOpt.IsIgnoreMiddleDot() );
+ m_pMatchCase ->Check(!aOpt.IsMatchCase() ); //! treat as equal uppercase/lowercase
+ m_pMatchFullHalfWidth ->Check( aOpt.IsMatchFullHalfWidthForms() );
+ m_pMatchHiraganaKatakana ->Check( aOpt.IsMatchHiraganaKatakana() );
+ m_pMatchContractions ->Check( aOpt.IsMatchContractions() );
+ m_pMatchMinusDashChoon ->Check( aOpt.IsMatchMinusDashChoon() );
+ m_pMatchRepeatCharMarks ->Check( aOpt.IsMatchRepeatCharMarks() );
+ m_pMatchVariantFormKanji ->Check( aOpt.IsMatchVariantFormKanji() );
+ m_pMatchOldKanaForms ->Check( aOpt.IsMatchOldKanaForms() );
+ m_pMatchDiziDuzu ->Check( aOpt.IsMatchDiziDuzu() );
+ m_pMatchBavaHafa ->Check( aOpt.IsMatchBavaHafa() );
+ m_pMatchTsithichiDhizi ->Check( aOpt.IsMatchTsithichiDhizi() );
+ m_pMatchHyuiyuByuvyu ->Check( aOpt.IsMatchHyuiyuByuvyu() );
+ m_pMatchSesheZeje ->Check( aOpt.IsMatchSesheZeje() );
+ m_pMatchIaiya ->Check( aOpt.IsMatchIaiya() );
+ m_pMatchKiku ->Check( aOpt.IsMatchKiku() );
+ m_pIgnorePunctuation ->Check( aOpt.IsIgnorePunctuation() );
+ m_pIgnoreWhitespace ->Check( aOpt.IsIgnoreWhitespace() );
+ m_pMatchProlongedSoundMark ->Check( aOpt.IsIgnoreProlongedSoundMark() );
+ m_pIgnoreMiddleDot ->Check( aOpt.IsIgnoreMiddleDot() );
nTransliterationFlags = GetTransliterationFlags_Impl();
DBG_ASSERT( nTransliterationFlags == aOpt.GetTransliterationFlags(),
"Transliteration settings different" );
- aMatchCase .SaveValue();
- aMatchFullHalfWidth .SaveValue();
- aMatchHiraganaKatakana .SaveValue();
- aMatchContractions .SaveValue();
- aMatchMinusDashChoon .SaveValue();
- aMatchRepeatCharMarks .SaveValue();
- aMatchVariantFormKanji .SaveValue();
- aMatchOldKanaForms .SaveValue();
- aMatchDiziDuzu .SaveValue();
- aMatchBavaHafa .SaveValue();
- aMatchTsithichiDhizi .SaveValue();
- aMatchHyuiyuByuvyu .SaveValue();
- aMatchSesheZeje .SaveValue();
- aMatchIaiya .SaveValue();
- aMatchKiku .SaveValue();
- aIgnorePunctuation .SaveValue();
- aIgnoreWhitespace .SaveValue();
- aMatchProlongedSoundMark .SaveValue();
- aIgnoreMiddleDot .SaveValue();
+ m_pMatchCase ->SaveValue();
+ m_pMatchFullHalfWidth ->SaveValue();
+ m_pMatchHiraganaKatakana ->SaveValue();
+ m_pMatchContractions ->SaveValue();
+ m_pMatchMinusDashChoon ->SaveValue();
+ m_pMatchRepeatCharMarks ->SaveValue();
+ m_pMatchVariantFormKanji ->SaveValue();
+ m_pMatchOldKanaForms ->SaveValue();
+ m_pMatchDiziDuzu ->SaveValue();
+ m_pMatchBavaHafa ->SaveValue();
+ m_pMatchTsithichiDhizi ->SaveValue();
+ m_pMatchHyuiyuByuvyu ->SaveValue();
+ m_pMatchSesheZeje ->SaveValue();
+ m_pMatchIaiya ->SaveValue();
+ m_pMatchKiku ->SaveValue();
+ m_pIgnorePunctuation ->SaveValue();
+ m_pIgnoreWhitespace ->SaveValue();
+ m_pMatchProlongedSoundMark ->SaveValue();
+ m_pIgnoreMiddleDot ->SaveValue();
}
@@ -227,134 +224,134 @@ sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
SvtSearchOptions aOpt;
sal_Bool bNewVal, bChanged;
- bNewVal = aMatchCase.IsChecked(); //! treat as equal uppercase/lowercase
- bChanged = bNewVal != aMatchCase.GetSavedValue();
+ bNewVal = m_pMatchCase->IsChecked(); //! treat as equal uppercase/lowercase
+ bChanged = bNewVal != m_pMatchCase->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchCase(!bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchFullHalfWidth.IsChecked();
- bChanged = bNewVal != aMatchFullHalfWidth.GetSavedValue();
+ bNewVal = m_pMatchFullHalfWidth->IsChecked();
+ bChanged = bNewVal != m_pMatchFullHalfWidth->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchFullHalfWidthForms( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchHiraganaKatakana.IsChecked();
- bChanged = bNewVal != aMatchHiraganaKatakana.GetSavedValue();
+ bNewVal = m_pMatchHiraganaKatakana->IsChecked();
+ bChanged = bNewVal != m_pMatchHiraganaKatakana->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchHiraganaKatakana( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchContractions.IsChecked();
- bChanged = bNewVal != aMatchContractions.GetSavedValue();
+ bNewVal = m_pMatchContractions->IsChecked();
+ bChanged = bNewVal != m_pMatchContractions->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchContractions( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchMinusDashChoon.IsChecked();
- bChanged = bNewVal != aMatchMinusDashChoon.GetSavedValue();
+ bNewVal = m_pMatchMinusDashChoon->IsChecked();
+ bChanged = bNewVal != m_pMatchMinusDashChoon->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchMinusDashChoon( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchRepeatCharMarks.IsChecked();
- bChanged = bNewVal != aMatchRepeatCharMarks.GetSavedValue();
+ bNewVal = m_pMatchRepeatCharMarks->IsChecked();
+ bChanged = bNewVal != m_pMatchRepeatCharMarks->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchRepeatCharMarks( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchVariantFormKanji.IsChecked();
- bChanged = bNewVal != aMatchVariantFormKanji.GetSavedValue();
+ bNewVal = m_pMatchVariantFormKanji->IsChecked();
+ bChanged = bNewVal != m_pMatchVariantFormKanji->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchVariantFormKanji( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchOldKanaForms.IsChecked();
- bChanged = bNewVal != aMatchOldKanaForms.GetSavedValue();
+ bNewVal = m_pMatchOldKanaForms->IsChecked();
+ bChanged = bNewVal != m_pMatchOldKanaForms->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchOldKanaForms( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchDiziDuzu.IsChecked();
- bChanged = bNewVal != aMatchDiziDuzu.GetSavedValue();
+ bNewVal = m_pMatchDiziDuzu->IsChecked();
+ bChanged = bNewVal != m_pMatchDiziDuzu->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchDiziDuzu( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchBavaHafa.IsChecked();
- bChanged = bNewVal != aMatchBavaHafa.GetSavedValue();
+ bNewVal = m_pMatchBavaHafa->IsChecked();
+ bChanged = bNewVal != m_pMatchBavaHafa->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchBavaHafa( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchTsithichiDhizi.IsChecked();
- bChanged = bNewVal != aMatchTsithichiDhizi.GetSavedValue();
+ bNewVal = m_pMatchTsithichiDhizi->IsChecked();
+ bChanged = bNewVal != m_pMatchTsithichiDhizi->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchTsithichiDhizi( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchHyuiyuByuvyu.IsChecked();
- bChanged = bNewVal != aMatchHyuiyuByuvyu.GetSavedValue();
+ bNewVal = m_pMatchHyuiyuByuvyu->IsChecked();
+ bChanged = bNewVal != m_pMatchHyuiyuByuvyu->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchHyuiyuByuvyu( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchSesheZeje.IsChecked();
- bChanged = bNewVal != aMatchSesheZeje.GetSavedValue();
+ bNewVal = m_pMatchSesheZeje->IsChecked();
+ bChanged = bNewVal != m_pMatchSesheZeje->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchSesheZeje( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchIaiya.IsChecked();
- bChanged = bNewVal != aMatchIaiya.GetSavedValue();
+ bNewVal = m_pMatchIaiya->IsChecked();
+ bChanged = bNewVal != m_pMatchIaiya->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchIaiya( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchKiku.IsChecked();
- bChanged = bNewVal != aMatchKiku.GetSavedValue();
+ bNewVal = m_pMatchKiku->IsChecked();
+ bChanged = bNewVal != m_pMatchKiku->GetSavedValue();
if (bChanged)
{
aOpt.SetMatchKiku( bNewVal );
bModified = sal_True;
}
- bNewVal = aIgnorePunctuation.IsChecked();
- bChanged = bNewVal != aIgnorePunctuation.GetSavedValue();
+ bNewVal = m_pIgnorePunctuation->IsChecked();
+ bChanged = bNewVal != m_pIgnorePunctuation->GetSavedValue();
if (bChanged)
{
aOpt.SetIgnorePunctuation( bNewVal );
bModified = sal_True;
}
- bNewVal = aIgnoreWhitespace.IsChecked();
- bChanged = bNewVal != aIgnoreWhitespace.GetSavedValue();
+ bNewVal = m_pIgnoreWhitespace->IsChecked();
+ bChanged = bNewVal != m_pIgnoreWhitespace->GetSavedValue();
if (bChanged)
{
aOpt.SetIgnoreWhitespace( bNewVal );
bModified = sal_True;
}
- bNewVal = aMatchProlongedSoundMark.IsChecked();
- bChanged = bNewVal != aMatchProlongedSoundMark.GetSavedValue();
+ bNewVal = m_pMatchProlongedSoundMark->IsChecked();
+ bChanged = bNewVal != m_pMatchProlongedSoundMark->GetSavedValue();
if (bChanged)
{
aOpt.SetIgnoreProlongedSoundMark( bNewVal );
bModified = sal_True;
}
- bNewVal = aIgnoreMiddleDot.IsChecked();
- bChanged = bNewVal != aIgnoreMiddleDot.GetSavedValue();
+ bNewVal = m_pIgnoreMiddleDot->IsChecked();
+ bChanged = bNewVal != m_pIgnoreMiddleDot->GetSavedValue();
if (bChanged)
{
aOpt.SetIgnoreMiddleDot( bNewVal );
diff --git a/cui/source/options/optjsearch.hrc b/cui/source/options/optjsearch.hrc
deleted file mode 100644
index f494751..0000000
--- a/cui/source/options/optjsearch.hrc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FL_TREAT_AS_EQUAL 100
-#define CB_MATCH_CASE 101
-#define CB_MATCH_FULL_HALF_WIDTH 102
-#define CB_MATCH_HIRAGANA_KATAKANA 103
-#define CB_MATCH_CONTRACTIONS 104
-#define CB_MATCH_MINUS_DASH_CHOON 105
-#define CB_MATCH_REPEAT_CHAR_MARKS 106
-#define CB_MATCH_VARIANT_FORM_KANJI 107
-#define CB_MATCH_OLD_KANA_FORMS 108
-#define CB_MATCH_DIZI_DUZU 109
-#define CB_MATCH_BAVA_HAFA 110
-#define CB_MATCH_TSITHICHI_DHIZI 111
-#define CB_MATCH_HYUFYU_BYUVYU 112
-#define CB_MATCH_SESHE_ZEJE 113
-#define CB_MATCH_IAIYA 114
-#define CB_MATCH_KIKU 115
-
-#define FL_IGNORE 200
-#define CB_IGNORE_PUNCTUATION 201
-#define CB_IGNORE_WHITESPACES 202
-#define CB_MATCH_PROLONGED_SOUNDMARK 203
-#define CB_IGNORE_MIDDLE_DOT 204
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 0daa6a2..7679cfb 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -32,27 +32,26 @@ class SfxItemSet;
class SvxJSearchOptionsPage : public SfxTabPage
{
private:
- FixedLine aTreatAsEqual;
- CheckBox aMatchCase;
- CheckBox aMatchFullHalfWidth;
- CheckBox aMatchHiraganaKatakana;
- CheckBox aMatchContractions;
- CheckBox aMatchMinusDashChoon;
- CheckBox aMatchRepeatCharMarks;
- CheckBox aMatchVariantFormKanji;
- CheckBox aMatchOldKanaForms;
- CheckBox aMatchDiziDuzu;
- CheckBox aMatchBavaHafa;
- CheckBox aMatchTsithichiDhizi;
- CheckBox aMatchHyuiyuByuvyu;
- CheckBox aMatchSesheZeje;
- CheckBox aMatchIaiya;
- CheckBox aMatchKiku;
- CheckBox aMatchProlongedSoundMark;
- FixedLine aIgnore;
- CheckBox aIgnorePunctuation;
- CheckBox aIgnoreWhitespace;
- CheckBox aIgnoreMiddleDot;
+ CheckBox* m_pMatchCase;
+ CheckBox* m_pMatchFullHalfWidth;
+ CheckBox* m_pMatchHiraganaKatakana;
+ CheckBox* m_pMatchContractions;
+ CheckBox* m_pMatchMinusDashChoon;
+ CheckBox* m_pMatchRepeatCharMarks;
+ CheckBox* m_pMatchVariantFormKanji;
+ CheckBox* m_pMatchOldKanaForms;
+ CheckBox* m_pMatchDiziDuzu;
+ CheckBox* m_pMatchBavaHafa;
+ CheckBox* m_pMatchTsithichiDhizi;
+ CheckBox* m_pMatchHyuiyuByuvyu;
+ CheckBox* m_pMatchSesheZeje;
+ CheckBox* m_pMatchIaiya;
+ CheckBox* m_pMatchKiku;
+ CheckBox* m_pMatchProlongedSoundMark;
+
+ CheckBox* m_pIgnorePunctuation;
+ CheckBox* m_pIgnoreWhitespace;
+ CheckBox* m_pIgnoreMiddleDot;
sal_Int32 nTransliterationFlags;
sal_Bool bSaveOptions;
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
deleted file mode 100644
index 10e91da..0000000
--- a/cui/source/options/optjsearch.src
+++ /dev/null
@@ -1,181 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <helpid.hrc>
-#include <cuires.hrc>
-
-#include "optjsearch.hrc"
-
-
-TabPage RID_SVXPAGE_JSEARCH_OPTIONS
-{
- HelpId = HID_SVXPAGE_JSEARCH_OPTIONS ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedLine FL_TREAT_AS_EQUAL
- {
- Pos = MAP_APPFONT( 6, 3 );
- Size = MAP_APPFONT( 248, 8 );
- Text [ en-US ] = "Treat as equal";
- };
- CheckBox CB_MATCH_CASE
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~uppercase/lowercase";
- };
- CheckBox CB_MATCH_FULL_HALF_WIDTH
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH";
- Pos = MAP_APPFONT ( 12 , 28 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~full-width/half-width forms";
- };
- CheckBox CB_MATCH_HIRAGANA_KATAKANA
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA";
- Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~hiragana/katakana";
- };
- CheckBox CB_MATCH_CONTRACTIONS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS";
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~contractions (yo-on, sokuon)";
- };
- CheckBox CB_MATCH_MINUS_DASH_CHOON
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON";
- Pos = MAP_APPFONT ( 12 , 70 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~minus/dash/cho-on";
- };
- CheckBox CB_MATCH_REPEAT_CHAR_MARKS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS";
- Pos = MAP_APPFONT ( 12 , 84 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "'re~peat character' marks";
- };
- CheckBox CB_MATCH_VARIANT_FORM_KANJI
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI";
- Pos = MAP_APPFONT ( 12 , 98 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~variant-form kanji (itaiji)";
- };
- CheckBox CB_MATCH_OLD_KANA_FORMS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS";
- Pos = MAP_APPFONT ( 12 , 112) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~old Kana forms";
- };
- CheckBox CB_MATCH_DIZI_DUZU
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU";
- Pos = MAP_APPFONT ( 136 , 14 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~di/zi, du/zu";
- };
- CheckBox CB_MATCH_BAVA_HAFA
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA";
- Pos = MAP_APPFONT ( 136 , 28 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~ba/va, ha/fa";
- };
- CheckBox CB_MATCH_TSITHICHI_DHIZI
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI";
- Pos = MAP_APPFONT ( 136 , 42 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~tsi/thi/chi, dhi/zi";
- };
- CheckBox CB_MATCH_HYUFYU_BYUVYU
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU";
- Pos = MAP_APPFONT ( 136 , 56 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "h~yu/fyu, byu/vyu";
- };
- CheckBox CB_MATCH_SESHE_ZEJE
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE";
- Pos = MAP_APPFONT ( 136 , 70 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~se/she, ze/je";
- };
- CheckBox CB_MATCH_IAIYA
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA";
- Pos = MAP_APPFONT ( 136 , 84 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~ia/iya (piano/piyano)";
- };
- CheckBox CB_MATCH_KIKU
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU";
- Pos = MAP_APPFONT ( 136 , 98 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~ki/ku (tekisuto/tekusuto)";
- };
- CheckBox CB_MATCH_PROLONGED_SOUNDMARK
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK";
- Pos = MAP_APPFONT ( 136 , 112 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "Prolon~ged vowels (ka-/kaa)";
- };
- FixedLine FL_IGNORE
- {
- Pos = MAP_APPFONT( 6, 128 );
- Size = MAP_APPFONT( 248, 8 );
- Text [ en-US ] = "Ignore";
- };
- CheckBox CB_IGNORE_PUNCTUATION
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION";
- Pos = MAP_APPFONT ( 12 , 139 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "Pu~nctuation characters";
- };
- CheckBox CB_IGNORE_WHITESPACES
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES";
- Pos = MAP_APPFONT ( 12 , 153 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "~Whitespace characters";
- };
- CheckBox CB_IGNORE_MIDDLE_DOT
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT";
- Pos = MAP_APPFONT ( 136 , 139 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text [ en-US ] = "Midd~le dots";
- };
- Text [ en-US ] = "Searching in Japanese";
-};
-// end TabPage
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optjsearchpage.ui b/cui/uiconfig/ui/optjsearchpage.ui
new file mode 100644
index 0000000..5b432df
--- /dev/null
+++ b/cui/uiconfig/ui/optjsearchpage.ui
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="OptJSearchPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkCheckButton" id="matchcase">
+ <property name="label" translatable="yes">_uppercase/lowercase</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchfullhalfwidth">
+ <property name="label" translatable="yes">_full-width/half-width forms</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchhiraganakatakana">
+ <property name="label" translatable="yes">_hiragana/katakana</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchcontractions">
+ <property name="label" translatable="yes">_contractions (yo-on, sokuon)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchminusdashchoon">
+ <property name="label" translatable="yes">_minus/dash/cho-on</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchrepeatcharmarks">
+ <property name="label" translatable="yes">'re_peat character' marks</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchvariantformkanji">
+ <property name="label" translatable="yes">_variant-form kanji (itaiji)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matcholdkanaforms">
+ <property name="label" translatable="yes">_old Kana forms</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchdiziduzu">
+ <property name="label" translatable="yes">_di/zi, du/zu</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchbavahafa">
+ <property name="label" translatable="yes">_ba/va, ha/fa</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchtsithichidhizi">
+ <property name="label" translatable="yes">_tsi/thi/chi, dhi/zi</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchhyuiyubyuvyu">
+ <property name="label" translatable="yes">h_yu/fyu, byu/vyu</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchseshezeje">
+ <property name="label" translatable="yes">_se/she, ze/je</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchiaiya">
+ <property name="label" translatable="yes">_ia/iya (piano/piyano)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchkiku">
+ <property name="label" translatable="yes">_ki/ku (tekisuto/tekusuto)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="matchprolongedsoundmark">
+ <property name="label" translatable="yes">Prolon_ged vowels (ka-/kaa)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Treat as equal</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkCheckButton" id="ignorepunctuation">
+ <property name="label" translatable="yes">Pu_nctuation characters</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="ignorewhitespace">
+ <property name="label" translatable="yes">_Whitespace characters</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="ignoremiddledot">
+ <property name="label" translatable="yes">Midd_le dots</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Ignore</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list