[Libreoffice-commits] core.git: officecfg/registry
Seth Chaiklin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Feb 28 19:08:31 UTC 2021
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit cbb467e2570715fadf08fe4ac964bdfe6397f535
Author: Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Fri Feb 26 16:13:56 2021 +0100
Commit: Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Sun Feb 28 20:07:50 2021 +0100
tdf#134432 refine the labelling appearance for .uno:CharBackColor
Writer uses .uno:BackColor and .uno:CharBackColor. The first
for highlighting text in the canvas; the second for highlighting
text in text boxes and shapes. Calc, Draw, and Impress only have
.uno:CharBackColor. The same icon and popup menu is used for both
.unos in all modules. The intent is to make the tooltip be identical
as "Character Highlighting Color" - for the icon and menu label. But
there needs to be a way to differentiate between the two .unos
in the Customize dialog (for Writer only).
.uno:CharBackColor uses "Label" for what is presented as a tooltip
in the toolbar. So use "Label" in GenericCommands.xcu to present
the tooltip in the UI, and use its "TooltipLabel" as a way to
differentiate between the two Character Highlighting Color commands
in the Customize dialog for Writer. It will give a little extra
information in the Calc, Draw, Impress Customize dialog, which was
usually implicit, but should not cause confusion.
Thanks to Maxim Monastirsky for essential insights about how
.uno:CharBackColor is handled in svx/source/tbxctrls/tbcontrl.cxx
Change-Id: Ifb5d258ebfeac6a070e5d285fc7c022a2dc071c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111590
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 756bdd288b91..36388e2c100b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3302,13 +3302,10 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
</node>
<node oor:name=".uno:CharBackColor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Character Highlighting Color (in Text Box and Shapes)</value>
- </prop>
- <prop oor:name="ContextLabel" oor:type="xs:string" oor:localized="true">
<value xml:lang="en-US">Character Highlighting Color</value>
</prop>
- <prop oor:name="TooltipLabel" oor:type="xs:string" oor:localized="true">
- <value xml:lang="en-US">Character Highlighting Color</value>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Character Highlighting Color (in Text Box and Shapes)</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
More information about the Libreoffice-commits
mailing list