strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GenericCommands: fix Fontwork tooltips

Browse source 
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>
This commit is contained in:
Justin Luth 2020-02-06 14:54:19 +03:00 committed by Maxim Monastirsky
parent f3f5e11682
commit 87a8b2c0d1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configmgr/qa/unit/test.cxx
View file

@ -272,7 +272,7 @@ void Test::testSetSetMemberName()
".uno:FontworkShapeType",
"Label") >>=
s);
CPPUNIT_ASSERT_EQUAL( OUString("Fontwork Style"), s );
CPPUNIT_ASSERT_EQUAL( OUString("Insert Fontwork"), s );
}
void Test::testInsertSetMember() {

8
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
View file

@ -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>