loleaflet/images/lc_submenu_bringtofront.svg | 1 loleaflet/images/lc_submenu_rotateright.svg | 1 loleaflet/images/lc_submenu_setanchoratchar.svg | 53 +++++++++++++++++++++++ loleaflet/images/lc_submenu_wrapoff.svg | 12 +++++ loleaflet/src/control/Control.JSDialogBuilder.js | 6 +- 5 files changed, 71 insertions(+), 2 deletions(-)
New commits: commit 3dd1cefde8dc81b57465c292d409f1673b980c32 Author: Pedro Pinto Silva <pedro.si...@collabora.com> AuthorDate: Thu Mar 19 15:35:24 2020 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Thu Mar 19 16:27:37 2020 +0100 Mobile: mobile wizard: improve aditional ids by making them dependent of their respective children uno commands and add icons Change-Id: Iae1fb597272a684539700ed0732cfd19d43724f6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90755 Tested-by: Tamás Zolnai <tamas.zol...@collabora.com> Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com> diff --git a/loleaflet/images/lc_submenu_bringtofront.svg b/loleaflet/images/lc_submenu_bringtofront.svg new file mode 100644 index 000000000..7caa5b828 --- /dev/null +++ b/loleaflet/images/lc_submenu_bringtofront.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.9492188 14c-.5263 0-.9492188.422919-.9492188.949219v6.101562c0 .5263.4229188.949219.9492188.949219h8.1015622c.5263 0 .949219-.422919.949219-.949219v-2.050781h-1v2h-8v-6h1v-1z" fill="#808080"/><path d="m3 15v6h8v-2h-6c-.554 0-1-.446-1-1v-3z" fill="#fff"/><path d="m12.949219 2c-.5263 0-.949219.4229187-.949219.9492188v2.0507812h1v-2h8v6h-1v1h1.050781c.5263 0 .949219-.4229188.949219-.9492188v-6.1015624c0-.5263-.422919-.9492188-.949219-.9492188z" fill="#808080"/><path d="m13 3v2h6c.554 0 1 .446 1 1v3h1v-6z" fill="#fff"/><rect fill="#eac282" height="12" ry="1.254237" width="14" x="5" y="6"/></svg> \ No newline at end of file diff --git a/loleaflet/images/lc_submenu_rotateright.svg b/loleaflet/images/lc_submenu_rotateright.svg new file mode 100644 index 000000000..40e86d9b3 --- /dev/null +++ b/loleaflet/images/lc_submenu_rotateright.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(-1 0 0 1 23.999864 0)"><path d="m1.499971 21.5h7.000029v-15.0000002z" fill="#4d82b8" fill-rule="evenodd" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round"/><path d="m10.5 14.5v7.000008h11.999999z" fill="#fff" fill-rule="evenodd" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(0 -1 -1 0 30.992857 27)"><path d="m21.5 16.5-2.995 2.992879-3.005-2.992879" fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round"/><path d="m13.5 11.007943c-.276142 0-.5.223858-.5.5s.223858.5.5.5h2c1.380712 0 2.5 1.119287 2.5 2.5h.0059v.423829 4.068228h1v-4.068228-.5c-.0059-2.154663-1.88341-3.373799-3.5059-3.423829z" fill="#4d82b8" fill-rule="evenodd"/></g></g></svg> \ No newline at end of file diff --git a/loleaflet/images/lc_submenu_setanchoratchar.svg b/loleaflet/images/lc_submenu_setanchoratchar.svg new file mode 100644 index 000000000..94262ca3d --- /dev/null +++ b/loleaflet/images/lc_submenu_setanchoratchar.svg @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + viewBox="0 0 24 24" + version="1.1" + id="svg4" + sodipodi:docname="lc_submenu_setanchoratchar.svg" + inkscape:version="0.92.4 (unknown)"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="748" + inkscape:window-height="480" + id="namedview6" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="30" + inkscape:window-maximized="0" + inkscape:current-layer="svg4" /> + <path + d="m12 2a3 3 0 0 0 -3 3 3 3 0 0 0 2 2.8261719v1.1738281h-2c-.554 0-1 .446-1 1s .446 1 1 1h2v8.929688c-1.7029249-.217027-3.2936626-.97202-4.5332031-2.164063l1.0625-.744141a.9842562 1.0907768 0 0 0 -.5195313-2.021484.9842562 1.0907768 0 0 0 -.53125.177734l-3.9980468 2.792969a.9842562 1.0907768 0 1 0 1.0507812 1.845703l1.2773438-.892578c1.8749123 1.949387 4.4631707 3.074058 7.1914062 3.076172 2.728857-.001543 5.317991-1.126379 7.193359-3.076172l1.275391.892578a.98425669 1.0907768 0 1 0 1.050781-1.845703l-3.998047-2.792969a.98425669 1.0907768 0 0 0 -.53125-.177734.98425669 1.0907768 0 0 0 -.519531 2.021484l1.068359.748047c-1.24124 1.192002-2.8347 1.946875-4.539062 2.16211v-8.931641h2c .554 0 1-.446 1-1s-.446-1-1-1h-2v-1.1757812a3 3 0 0 0 2-2.8242188 3 3 0 0 0 -3-3zm0 2a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z" + fill="#4d82b8" + id="path2" /> +</svg> diff --git a/loleaflet/images/lc_submenu_wrapoff.svg b/loleaflet/images/lc_submenu_wrapoff.svg new file mode 100644 index 000000000..b34b507e0 --- /dev/null +++ b/loleaflet/images/lc_submenu_wrapoff.svg @@ -0,0 +1,12 @@ +<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> + <rect x="2" y="3" width="20" height="1" ry=".44607" fill="#808080"/> + <g fill="#808080"> + <rect x="2" y="6" width="20" height="1" ry=".44607"/> + <rect x="2" y="21" width="20" height="1" ry=".44607"/> + <rect x="2" y="12" width="20" height="1" ry=".44607"/> + <rect x="2" y="18" width="20" height="1" ry=".44607"/> + <rect x="2" y="9" width="20" height="1" ry=".44607"/> + <rect x="2" y="15" width="20" height="1" ry=".44607"/> + </g> + <rect x="7" y="8" width="10" height="9" ry="1" fill="#4d82b8"/> +</svg> diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index f9f536a8e..125dbae90 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -1660,8 +1660,10 @@ L.Control.JSDialogBuilder = L.Control.extend({ L.Control.JSDialogBuilder.generateIDForSubMenu = function(menuStructure) { for (var child = 0; child < menuStructure['children'].length; ++child) { - if (menuStructure['children'][child]['command'] === '.uno:SetAnchorAtChar') { - menuStructure['id'] = 'submenu_anchor'; + if (menuStructure['children'][child]['command'] === '.uno:SetAnchorAtChar' || menuStructure['children'][child]['command'] === '.uno:WrapOff' || menuStructure['children'][child]['command'] === '.uno:BringToFront' || menuStructure['children'][child]['command'] === '.uno:RotateRight') { + var tempstring = menuStructure['children'][child]['command']; + tempstring = tempstring.substring(5); + menuStructure['id'] = 'submenu_' + tempstring.toLowerCase(); break; } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits