cui/source/dialogs/srchxtra.cxx | 3 +++ cui/source/inc/backgrnd.hxx | 1 + cui/source/inc/cuires.hrc | 1 + cui/source/tabpages/backgrnd.cxx | 5 +++++ cui/source/tabpages/strings.src | 4 ++++ cui/uiconfig/ui/backgroundpage.ui | 2 +- cui/uiconfig/ui/optfltrembedpage.ui | 2 +- cui/uiconfig/ui/searchformatdialog.ui | 2 +- include/svx/flagsdef.hxx | 1 + reportdesign/source/ui/dlg/dlgpage.cxx | 12 +++++++++++- reportdesign/source/ui/inc/dlgpage.hxx | 3 +++ reportdesign/uiconfig/dbreport/ui/chardialog.ui | 2 +- sw/source/ui/chrdlg/chardlg.cxx | 5 +++++ sw/source/ui/fmtui/tmpdlg.cxx | 2 ++ sw/uiconfig/swriter/ui/characterproperties.ui | 2 +- sw/uiconfig/swriter/ui/templatedialog1.ui | 2 +- 16 files changed, 42 insertions(+), 7 deletions(-)
New commits: commit 94e9ad75943c39af548fc4b094c1e67df900e8a1 Author: Zolnai Tamás <[email protected]> Date: Tue Jun 16 21:43:56 2015 +0200 tdf#89830: Ambiguous naming of character background Use 'Highlighting' also on Character Dialog. (cherry picked from commit 3588a04f438b001cb64aa1fd86b28869f2c4e70b) Options: Background -> Highlighting (cherry picked from commit b47151f5d1e287425511b45c5474e10eb0ba3a9d) Search By Format: Background -> Highlighting (cherry picked from commit 16d202f29cafbdc8d0648b830d2209f5c61c878f) Make this string localizable (cherry picked from commit a676ad5ec8348a6c8074e3a8d42590e8fd189cf5) Change-Id: Ifa48799bb9e415d17f4e323008fac57270bae34b Reviewed-on: https://gerrit.libreoffice.org/16322 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 4497601..db41952 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -114,6 +114,9 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) else if (nId == m_nBackPageId) { static_cast<SvxBackgroundTabPage&>(rPage).ShowParaControl(true); + SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); + rPage.PageCreated(aSet); } } diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 633e4e6..c08b8a1 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -81,6 +81,7 @@ private: VclPtr<ListBox> m_pTblLBox; VclPtr<ListBox> m_pParaLBox; + VclPtr<FixedText> m_pBackGroundColorLabelFT; VclPtr<VclFrame> m_pBackGroundColorFrame; VclPtr<SvxColorValueSet> m_pBackgroundColorSet; VclPtr<BackgroundPreviewImpl> m_pPreviewWin1; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 3214b51..87eb802 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -93,6 +93,7 @@ #define RID_SVXSTR_CHARNAME_FONT (RID_SVX_START + 241) #define RID_SVXSTR_CHARNAME_STYLE (RID_SVX_START + 242) #define RID_SVXSTR_CHARNAME_TYPEFACE (RID_SVX_START + 243) +#define RID_SVXSTR_CHARNAME_HIGHLIGHTING (RID_SVX_START + 244) // options #define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 9ba70fa..14c90e9 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -370,6 +370,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe get(m_pTblLBox, "tablelb"); get(m_pParaLBox, "paralb"); + get(m_pBackGroundColorLabelFT, "background_label"); get(m_pBackGroundColorFrame, "backgroundcolorframe"); get(m_pBackgroundColorSet, "backgroundcolorset"); get(m_pPreviewWin1, "preview1"); @@ -1785,6 +1786,10 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet) ShowSelector(); if ( nFlags & SvxBackgroundTabFlags::ENABLE_TRANSPARENCY ) EnableTransparency(true, true); + if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING ) + { + m_pBackGroundColorLabelFT->SetText(CUI_RES(RID_SVXSTR_CHARNAME_HIGHLIGHTING)); + } } } diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index da547d4..e380d5a 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -103,6 +103,10 @@ String RID_SVXSTR_CHARNAME_TYPEFACE { Text [ en-US ] = "Typeface"; }; +String RID_SVXSTR_CHARNAME_HIGHLIGHTING +{ + Text [ en-US ] = "Highlighting Color"; +}; String RID_SVXSTR_USE_REPLACE { Text [ en-US ] = "Use replacement table" ; diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index cf6f20d..bba8778 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -256,7 +256,7 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="background_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Background Color</property> diff --git a/cui/uiconfig/ui/optfltrembedpage.ui b/cui/uiconfig/ui/optfltrembedpage.ui index 2b0cb04..4e88241 100644 --- a/cui/uiconfig/ui/optfltrembedpage.ui +++ b/cui/uiconfig/ui/optfltrembedpage.ui @@ -172,7 +172,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Character Background</property> + <property name="label" translatable="yes">Character Highlighting</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/cui/uiconfig/ui/searchformatdialog.ui b/cui/uiconfig/ui/searchformatdialog.ui index 6038e87..4a95988 100644 --- a/cui/uiconfig/ui/searchformatdialog.ui +++ b/cui/uiconfig/ui/searchformatdialog.ui @@ -210,7 +210,7 @@ <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes">Highlighting</property> </object> <packing> <property name="position">8</property> diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index 4a12a87..248deb2 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -45,6 +45,7 @@ enum class SvxBackgroundTabFlags SHOW_PARACTL = 0x02, ENABLE_TRANSPARENCY = 0x04, SHOW_TBLCTL = 0x08, + SHOW_HIGHLIGHTING = 0x10, }; namespace o3tl { diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index e4e7628..3e8ff66 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -60,7 +60,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); } else @@ -71,6 +71,16 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c RemoveTabPage("asianlayout"); } +void ORptPageDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +{ + SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); + if (nId == m_nCharBgdId) + { + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); + rPage.PageCreated(aSet); + } +} + } // namespace rptui diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 5085aab..1b577a4 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -33,9 +33,12 @@ class ORptPageDialog : public SfxTabDialog private: ORptPageDialog(const ORptPageDialog&) SAL_DELETED_FUNCTION; void operator =(const ORptPageDialog&) SAL_DELETED_FUNCTION; + + sal_uInt16 m_nCharBgdId; public: ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; }; } // namespace rptui diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index a9a8b5e..47491da 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -151,7 +151,7 @@ <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes">Highlighting</property> </object> <packing> <property name="position">4</property> diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index b20dfdc2..d856ff7 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -131,6 +131,11 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER)); rPage.PageCreated(aSet); } + else if (nId == m_nCharBgdId) + { + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); + rPage.PageCreated(aSet); + } } SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 0f33817..f0ad083 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -486,6 +486,8 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR; if( SFX_STYLE_FAMILY_FRAME == nType ) nFlagType |= SvxBackgroundTabFlags::ENABLE_TRANSPARENCY; + if( SFX_STYLE_FAMILY_CHAR == nType ) + nFlagType |= SvxBackgroundTabFlags::SHOW_HIGHLIGHTING; aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(nFlagType))); rPage.PageCreated(aSet); } diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui index e8c7490..0efad8c 100644 --- a/sw/uiconfig/swriter/ui/characterproperties.ui +++ b/sw/uiconfig/swriter/ui/characterproperties.ui @@ -166,7 +166,7 @@ <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes">Highlighting</property> </object> <packing> <property name="position">5</property> diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui index 6436282..9b3da41 100644 --- a/sw/uiconfig/swriter/ui/templatedialog1.ui +++ b/sw/uiconfig/swriter/ui/templatedialog1.ui @@ -196,7 +196,7 @@ <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes">Highlighting</property> </object> <packing> <property name="position">5</property>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
