summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2020-02-06 14:54:19 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2020-02-06 23:11:39 +0100
commit87a8b2c0d1002bff4f6268ac8673dd32fc7762b9 (patch)
tree1fdbef6ba9f2b9e8dabee2b305c2595b5c547eba /officecfg
parentf3f5e11682b0392b4e750ec014c399051a5fe27c (diff)
GenericCommands: fix Fontwork tooltips
These were terribly confusing. .uno:Fontwork does NOT insert fontwork text, despite the tooltip name. It opens up the old fontwork dialog that modifies contour properties so that the text can flow along the contour. The UIname is Fontwork, so lets have an automatic tooltip for that. .uno:FontworkGalleryFloater has a UIname of "Fontwork Style", but the auto-generated tooltip was "Fontwork". (Notice that this conflicts with the UIname of the other one. So when you add "Fontwork" to your toolbar, and chose the icon with the tooltip "Fontwork" you get a different item.) Since this one actually inserts text, and doesn't actually modify any existing style (that's the function of Fontwork Shape), lets give this one the tooltip "Insert Fontwork Text". Therefore, this patch effectively switches the two tooltip names around, which much better matches their function, and their UIname. I expect that this was the original 2016 intention anyway... At the end, I decided to also change the UIname to "Insert Fontwork", since the gallery is normally added to insert menus... The unit test I had to modify just looked like a functionality test and had nothing to do specifically with the label's string. (It was last changed for tdf#91781 which made no specific reference to fontwork.) This might help documentation bug tdf#118336 a bit too. Change-Id: I152596781def2d8dba47f53e345976543e3131bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88101 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu8
1 files changed, 4 insertions, 4 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 87bd85857eaf..c266d12afbfe 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -72,11 +72,14 @@
</node>
<node oor:name=".uno:FontworkGalleryFloater" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fontwork Style</value>
+ <value xml:lang="en-US">Insert Fontwork</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Fontwork...</value>
</prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Fontwork Text</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
</prop>
@@ -3848,9 +3851,6 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">F~ontwork</value>
</prop>
- <prop oor:name="TooltipLabel" oor:type="xs:string">
- <value xml:lang="en-US">Insert Fontwork Text</value>
- </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>