diff options
author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-16 21:43:56 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:22:56 +0200 |
commit | b9d712d90aa408c41584601e97b3b4dd43a69681 (patch) | |
tree | 176c76b49cdb50969e2f0c80fec98a40d7a259aa /cui | |
parent | 7475ef2bca781e1b7b0e53805eb94377fe485a32 (diff) |
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 <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/srchxtra.cxx | 3 | ||||
-rw-r--r-- | cui/source/inc/backgrnd.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/cuires.hrc | 1 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 5 | ||||
-rw-r--r-- | cui/source/tabpages/strings.src | 4 | ||||
-rw-r--r-- | cui/uiconfig/ui/backgroundpage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/optfltrembedpage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/searchformatdialog.ui | 2 |
8 files changed, 17 insertions, 3 deletions
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 44976012dad2..db419525e4e4 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 633e4e6c1e9e..c08b8a1308b8 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 3214b5100439..87eb8022a688 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 9ba70fa9758f..14c90e94ccb4 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 da547d479992..e380d5af415c 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 cf6f20d9fa51..bba87786b87e 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 2b0cb04a5d78..4e882419054c 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 6038e87c5753..4a95988a97c9 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> |