diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 18:50:01 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 18:50:01 +0200 |
| commit | 3588a04f438b001cb64aa1fd86b28869f2c4e70b (patch) | |
| tree | 841202b71953905130d499354b2b97cd9de577fe /cui | |
| parent | 63ca46a0dc064de0bba52224449effeec3e90efc (diff) | |
tdf#89830: Ambiguous naming of character background
Use 'Highlighting' also on Character Dialog.
Change-Id: Ie81d25651e5998a35b4e2646089b8f2c590cfb98
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/backgrnd.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 7 | ||||
| -rw-r--r-- | cui/uiconfig/ui/backgroundpage.ui | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index a0441bf3a9c9..c12a33b2253a 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -80,6 +80,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/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 733dcaffc8e0..bc4b6c6bbfec 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -357,6 +357,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"); @@ -1707,7 +1708,13 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet) if ( nFlags & SvxBackgroundTabFlags::SHOW_PARACTL ) ShowParaControl(); if ( nFlags & SvxBackgroundTabFlags::SHOW_SELECTOR ) + { ShowSelector(); + } + if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING ) + { + m_pBackGroundColorLabelFT->SetText("Highlighting Color"); + } } } diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 6076bab0d644..91c5cb8420cd 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -221,7 +221,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> |