diff options
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/inc/autocdlg.hxx | 14 | ||||
-rw-r--r-- | cui/source/inc/helpid.hrc | 1 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 68 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.src | 71 |
4 files changed, 39 insertions, 115 deletions
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 1190ffe6aa1e..91062f1f8f70 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -38,18 +38,18 @@ namespace editeng { class SortedAutoCompleteStrings; } class OfaAutoCorrDlg : public SfxTabDialog { - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; + VclContainer* m_pLanguageBox; + SvxLanguageBox* m_pLanguageLB; + + sal_uInt16 m_nReplacePageId; + sal_uInt16 m_nExceptionsPageId; DECL_LINK(SelectLanguageHdl, ListBox*); public: - OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet ); - - void EnableLanguage(sal_Bool bEnable) - { aLanguageFT.Enable(bEnable); - aLanguageLB.Enable(bEnable);} + OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet); + void EnableLanguage(bool bEnable); }; #ifdef _OFA_AUTOCDLG_CXX diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 0f4a5a1eec7a..5c6819282729 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -229,7 +229,6 @@ #define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY" #define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS" #define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB" -#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE" #define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB" #define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1" #define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2" diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 2f11b4c86164..75fa160df0e3 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -59,11 +59,12 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star; using namespace ::rtl; -OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : - SfxTabDialog( pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet ), - aLanguageFT ( this, CUI_RES( FT_LANG ) ), - aLanguageLB ( this, CUI_RES( LB_LANG ) ) +OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) + : SfxTabDialog(pParent, "AutoCorrectDialog", "cui/ui/autocorrectdialog.ui", _pSet) { + get(m_pLanguageBox, "langbox"); + get(m_pLanguageLB, "lang"); + sal_Bool bShowSWOptions = sal_False; sal_Bool bOpenSmartTagOptions = sal_False; @@ -78,21 +79,16 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : bOpenSmartTagOptions = sal_True; } - aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST); - aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND); - aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE); - FreeResource(); - - AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 0); - AddTabPage(RID_OFAPAGE_AUTOFMT_APPLY, OfaSwAutoFmtOptionsPage::Create, 0); - AddTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS, OfaAutoCompleteTabPage::Create, 0); - AddTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS, OfaSmartTagOptionsTabPage::Create, 0); + AddTabPage("options", OfaAutocorrOptionsPage::Create, 0); + AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, 0); + AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, 0); + AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, 0); if (!bShowSWOptions) { - RemoveTabPage(RID_OFAPAGE_AUTOFMT_APPLY); - RemoveTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS); - RemoveTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS); + RemoveTabPage("apply"); + RemoveTabPage("wordcompletion"); + RemoveTabPage("smarttags"); } else { @@ -100,14 +96,14 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() ) - RemoveTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS); + RemoveTabPage("smarttags"); - RemoveTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS); + RemoveTabPage("options"); } - AddTabPage(RID_OFAPAGE_AUTOCORR_REPLACE, OfaAutocorrReplacePage::Create, 0); - AddTabPage(RID_OFAPAGE_AUTOCORR_EXCEPT, OfaAutocorrExceptPage::Create, 0); - AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE, OfaQuoteTabPage::Create, 0); + m_nReplacePageId = AddTabPage("replace", OfaAutocorrReplacePage::Create, 0); + m_nExceptionsPageId = AddTabPage("exceptions", OfaAutocorrExceptPage::Create, 0); + AddTabPage("localized", OfaQuoteTabPage::Create, 0); // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType @@ -116,31 +112,31 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : if( SvtLanguageOptions().IsCTLFontEnabled() ) nLangList |= LANG_LIST_CTL; - aLanguageLB.SetLanguageList( nLangList, sal_True, sal_True ); - aLanguageLB.SelectLanguage( LANGUAGE_NONE ); - sal_uInt16 nPos = aLanguageLB.GetSelectEntryPos(); + m_pLanguageLB->SetLanguageList( nLangList, sal_True, sal_True ); + m_pLanguageLB->SelectLanguage( LANGUAGE_NONE ); + sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" ); - aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED ); + m_pLanguageLB->SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED ); // Initializing doesn't work for static on linux - therefore here if( LANGUAGE_SYSTEM == eLastDialogLanguage ) eLastDialogLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); LanguageType nSelectLang = LANGUAGE_UNDETERMINED; - nPos = aLanguageLB.GetEntryPos( (void*)(long) eLastDialogLanguage ); + nPos = m_pLanguageLB->GetEntryPos( (void*)(long) eLastDialogLanguage ); if (LISTBOX_ENTRY_NOTFOUND != nPos) nSelectLang = eLastDialogLanguage; - aLanguageLB.SelectLanguage( nSelectLang ); - - aLanguageLB.SetSelectHdl(LINK(this, OfaAutoCorrDlg, SelectLanguageHdl)); + m_pLanguageLB->SelectLanguage( nSelectLang ); - Size aMinSize(aLanguageFT.CalcMinimumSize()); - //reserve some extra space for CJK accelerators that are possible inserted - //later (like '(A)') - aLanguageFT.setPosSizePixel( 0, 0, aMinSize.Width() + 20, 0, WINDOW_POSSIZE_WIDTH ); + m_pLanguageLB->SetSelectHdl(LINK(this, OfaAutoCorrDlg, SelectLanguageHdl)); if ( bOpenSmartTagOptions ) - SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS ); + SetCurPageId("smarttags"); +} + +void OfaAutoCorrDlg::EnableLanguage(bool bEnable) +{ + m_pLanguageBox->Enable(bEnable); } static sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, @@ -171,9 +167,9 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) if(eNewLang != eLastDialogLanguage) { sal_uInt16 nPageId = GetCurPageId(); - if(RID_OFAPAGE_AUTOCORR_REPLACE == nPageId) + if (m_nReplacePageId == nPageId) ((OfaAutocorrReplacePage*)GetTabPage( nPageId ))->SetLanguage(eNewLang); - else if(RID_OFAPAGE_AUTOCORR_EXCEPT == nPageId) + else if (m_nExceptionsPageId == nPageId) ((OfaAutocorrExceptPage*)GetTabPage( nPageId ))->SetLanguage(eNewLang); } return 0; diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index cf48712d1d8a..b33cce728ef1 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -22,77 +22,6 @@ #include "helpid.hrc" #include <svx/svxids.hrc> // SID_AUTOFORMAT -/**************************************************************************/ -/* */ -/* TabDialog RID_OFA_AUTOCORR_DLG */ -/* */ -/**************************************************************************/ -TabDialog RID_OFA_AUTOCORR_DLG -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "AutoCorrect" ; - Moveable = TRUE ; - Closeable = TRUE ; - TabControl 1 - { - SVLook = TRUE ; - PageList = - { - PageItem - { - Identifier = RID_OFAPAGE_AUTOCORR_REPLACE ; - Text [ en-US ] = "Replace" ; - }; - PageItem - { - Identifier = RID_OFAPAGE_AUTOCORR_EXCEPT ; - Text [ en-US ] = "Exceptions" ; - }; - PageItem - { - Identifier = RID_OFAPAGE_AUTOCORR_OPTIONS ; - Text [ en-US ] = "Options" ; - }; - PageItem - { - Identifier = RID_OFAPAGE_AUTOFMT_APPLY ; - Text [ en-US ] = "Options" ; - }; - PageItem - { - Identifier = RID_OFAPAGE_AUTOCORR_QUOTE ; - Text [ en-US ] = "Localized Options" ; - }; - PageItem - { - Identifier = RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ; - Text [ en-US ] = "Word Completion"; - }; - PageItem - { - Identifier = RID_OFAPAGE_SMARTTAG_OPTIONS ; - Text [ en-US ] = "Smart Tags"; - }; - }; - }; - FixedText FT_LANG - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 140 , 8 ) ; - - Left = TRUE ; - Text [ en-US ] = "Replacements and exceptions for language:"; - }; - ListBox LB_LANG - { - Pos = MAP_APPFONT ( 150 , 3 ) ; - Size = MAP_APPFONT ( 80 , 100 ) ; - DropDown = TRUE; - TabStop = TRUE ; - Border = TRUE ; - }; -}; #define COMMON_CLB_ENTRIES \ String ST_USE_REPLACE \ { \ |