cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js |
12 +++++-----
loleaflet/images/lc_inserthardhyphen.svg |
5 ++++
loleaflet/images/lc_insertlrm.svg |
5 ++++
loleaflet/images/lc_insertrlm.svg |
5 ++++
loleaflet/images/lc_insertsofthyphen.svg |
5 ++++
loleaflet/images/lc_insertzwnbsp.svg |
5 ++++
loleaflet/images/lc_insertzwsp.svg |
7 +++++
loleaflet/src/core/LOUtil.js |
6 -----
8 files changed, 38 insertions(+), 12 deletions(-)
New commits:
commit a28a759212d6b0274e33023e863fd99339595e31
Author: Pedro Pinto Silva <pedro.si...@collabora.com>
AuthorDate: Tue Mar 17 17:10:31 2020 +0100
Commit: Pedro Pinto da Silva <pedro.si...@collabora.com>
CommitDate: Wed Mar 18 15:35:48 2020 +0100
Mobile: Writer: Insert: Add missing icons to Formatting marks submenu
Change-Id: Ieadca0bdb5668d0bdc8ee9356879b652b540ab3c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90659
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Tested-by: Pedro Pinto da Silva <pedro.si...@collabora.com>
Reviewed-by: Pedro Pinto da Silva <pedro.si...@collabora.com>
diff --git
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
index 1133eb2cd..4d8fcc9ee 100644
---
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
+++
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
@@ -46,7 +46,7 @@ describe('Insert formatting mark via insertion wizard.',
function() {
});
it('Insert non-breaking hyphen.', function() {
- cy.get('.menu-entry-no-icon')
+ cy.get('.menu-entry-with-icon')
.contains('Non-breaking hyphen')
.click();
@@ -60,7 +60,7 @@ describe('Insert formatting mark via insertion wizard.',
function() {
});
it('Insert soft hyphen.', function() {
- cy.get('.menu-entry-no-icon')
+ cy.get('.menu-entry-with-icon')
.contains('Soft hyphen')
.click();
@@ -74,7 +74,7 @@ describe('Insert formatting mark via insertion wizard.',
function() {
});
it('Insert no-width optional break.', function() {
- cy.get('.menu-entry-no-icon')
+ cy.get('.menu-entry-with-icon')
.contains('No-width optional break')
.click();
@@ -88,7 +88,7 @@ describe('Insert formatting mark via insertion wizard.',
function() {
});
it('Insert no-width no break.', function() {
- cy.get('.menu-entry-no-icon')
+ cy.get('.menu-entry-with-icon')
.contains('No-width no break')
.click();
@@ -102,7 +102,7 @@ describe('Insert formatting mark via insertion wizard.',
function() {
});
it('Insert left-to-right mark.', function() {
- cy.get('.menu-entry-no-icon')
+ cy.get('.menu-entry-with-icon')
.contains('Left-to-right mark')
.click();
@@ -116,7 +116,7 @@ describe('Insert formatting mark via insertion wizard.',
function() {
});
it('Insert right-to-left mark.', function() {
- cy.get('.menu-entry-no-icon')
+ cy.get('.menu-entry-with-icon')
.contains('Right-to-left mark')
.click();
diff --git a/loleaflet/images/lc_inserthardhyphen.svg
b/loleaflet/images/lc_inserthardhyphen.svg
new file mode 100644
index 000000000..76ccba0f6
--- /dev/null
+++ b/loleaflet/images/lc_inserthardhyphen.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m8.4998 10.5h7.0001v-2h-7.0001z" color="#000000"
color-rendering="auto" dominant-baseline="auto" fill="#4d4d4d"
image-rendering="auto" shape-rendering="auto" solid-color="#000000"
style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ <rect x="2" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5"
style="paint-order:stroke markers fill"/>
+ <rect x="19" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5"
style="paint-order:stroke markers fill"/>
+</svg>
diff --git a/loleaflet/images/lc_insertlrm.svg
b/loleaflet/images/lc_insertlrm.svg
new file mode 100644
index 000000000..65d8188f3
--- /dev/null
+++ b/loleaflet/images/lc_insertlrm.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";>
+ <g transform="matrix(0 1.996 1.996 0 -13.94 -25.91)">
+ <path transform="rotate(-90,15.75,8.75)" d="m9.9785 9.873a0.50005 0.50005 0
0 0-0.33984 0.16211l-1.957 2.084-0.00391 0.0039a0.50005 0.50005 0 0 0 0.025391
0.78516l1.9355 2.0566a0.50085 0.50085 0 1 0 0.72852-0.6875l-1.2012-1.2734
5.834-0.009765a0.50005 0.50005 0 0 0 0.50781-0.50781 0.50005 0.50005 0 0
0-0.50781-0.49219l-5.8379 0.0098 1.2051-1.2832a0.50005 0.50005 0 0 0
0.14062-0.36332 0.50005 0.50005 0 0 0-0.5293-0.48438z" color="#000000"
color-rendering="auto" dominant-baseline="auto" fill="#4d82b8"
image-rendering="auto" shape-rendering="auto" solid-color="#000000"
style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ </g>
+</svg>
diff --git a/loleaflet/images/lc_insertrlm.svg
b/loleaflet/images/lc_insertrlm.svg
new file mode 100644
index 000000000..b6428f09e
--- /dev/null
+++ b/loleaflet/images/lc_insertrlm.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";>
+ <g transform="matrix(0 1.996 -1.996 0 37.94 -25.91)">
+ <path transform="rotate(-90,15.75,8.75)" d="m9.9785 9.873a0.50005 0.50005 0
0 0-0.33984 0.16211l-1.957 2.084-0.00391 0.0039a0.50005 0.50005 0 0 0 0.025391
0.78516l1.9355 2.0566a0.50085 0.50085 0 1 0 0.72852-0.6875l-1.2012-1.2734
5.834-0.009765a0.50005 0.50005 0 0 0 0.50781-0.50781 0.50005 0.50005 0 0
0-0.50781-0.49219l-5.8379 0.0098 1.2051-1.2832a0.50005 0.50005 0 0 0
0.14062-0.36332 0.50005 0.50005 0 0 0-0.5293-0.48438z" color="#000000"
color-rendering="auto" dominant-baseline="auto" fill="#4d82b8"
image-rendering="auto" shape-rendering="auto" solid-color="#000000"
style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ </g>
+</svg>
diff --git a/loleaflet/images/lc_insertsofthyphen.svg
b/loleaflet/images/lc_insertsofthyphen.svg
new file mode 100644
index 000000000..198b96da3
--- /dev/null
+++ b/loleaflet/images/lc_insertsofthyphen.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m8.4998 10.5h7.0001v-2h-7.0001z" color="#000000"
color-rendering="auto" dominant-baseline="auto" fill="#4d4d4d"
image-rendering="auto" shape-rendering="auto" solid-color="#000000"
style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ <path d="m4.0632 9.1003q0 1.8803 0.4486 3.7129 0.45815 1.823 1.279 3.417
0.10499 0.20044 0.12408 0.34361 0.019089 0.15272-0.028634 0.26725-0.038179
0.11454-0.12408 0.1909-0.085903 0.0859-0.18135 0.15272l-1.0786
0.64904q-0.68722-1.0499-1.174-2.1094-0.47724-1.0595-0.78267-2.1476t-0.4486-2.1953q-0.13363-1.1167-0.13363-2.2812t0.13363-2.2812q0.14317-1.1167
0.4486-2.1953 0.30543-1.0881 0.78267-2.1476 0.48678-1.0595 1.174-2.1094l1.0786
0.64904q0.095447 0.066813 0.18135 0.15272 0.085903 0.076358 0.12408 0.19089
0.047724 0.11454 0.028634 0.26725-0.01909 0.14317-0.12408 0.34361-0.82085
1.594-1.279 3.4266-0.4486 1.823-0.4486 3.7034z" fill="#4d82b8"
stroke-width=".48869"/>
+ <path d="m19.945 9.1003q0 1.8803-0.4486 3.7129-0.45815 1.823-1.279
3.417-0.10499 0.20044-0.12408 0.34361-0.01909 0.15272 0.02863 0.26725 0.03818
0.11454 0.12408 0.1909 0.0859 0.0859 0.18135 0.15272l1.0786
0.64904q0.68722-1.0499 1.174-2.1094 0.47724-1.0595
0.78267-2.1476t0.4486-2.1953q0.13363-1.1167
0.13363-2.2812t-0.13363-2.2812q-0.14317-1.1167-0.4486-2.1953-0.30543-1.0881-0.78267-2.1476-0.48678-1.0595-1.174-2.1094l-1.0786
0.64904q-0.09545 0.066813-0.18135 0.15272-0.0859 0.076358-0.12408
0.19089-0.04772 0.11454-0.02863 0.26725 0.01909 0.14317 0.12408 0.34361 0.82085
1.594 1.279 3.4266 0.4486 1.823 0.4486 3.7034z" fill="#4d82b8"
stroke-width=".48869"/>
+</svg>
diff --git a/loleaflet/images/lc_insertzwnbsp.svg
b/loleaflet/images/lc_insertzwnbsp.svg
new file mode 100644
index 000000000..a0879e27f
--- /dev/null
+++ b/loleaflet/images/lc_insertzwnbsp.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";>
+ <rect x="8" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5"
style="paint-order:stroke markers fill"/>
+ <rect x="13" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5"
style="paint-order:stroke markers fill"/>
+ <path d="m11 2.2119h2v13.576h-2z" fill="#e68497" style="paint-order:stroke
markers fill"/>
+</svg>
diff --git a/loleaflet/images/lc_insertzwsp.svg
b/loleaflet/images/lc_insertzwsp.svg
new file mode 100644
index 000000000..3e732e8e4
--- /dev/null
+++ b/loleaflet/images/lc_insertzwsp.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";>
+ <rect x="8" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5"
style="paint-order:stroke markers fill"/>
+ <rect x="13" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5"
style="paint-order:stroke markers fill"/>
+ <path d="m11 2.2119h2v13.576h-2z" fill="#e68497" style="paint-order:stroke
markers fill"/>
+ <path d="m4.0591 9.1006q0 1.8803 0.4486 3.7129 0.45815 1.823 1.279 3.417
0.10499 0.20044 0.12408 0.34361 0.01909 0.15272-0.02863 0.26725-0.03818
0.11454-0.12408 0.1909-0.0859 0.0859-0.18135 0.15272l-1.0786
0.64904q-0.68722-1.0499-1.174-2.1094-0.47724-1.0595-0.78267-2.1476t-0.4486-2.1953q-0.13363-1.1167-0.13363-2.2812t0.13363-2.2812q0.14317-1.1167
0.4486-2.1953 0.30543-1.0881 0.78267-2.1476 0.48678-1.0595 1.174-2.1094l1.0786
0.64904q0.09545 0.066813 0.18135 0.15272 0.0859 0.076358 0.12408 0.19089
0.04772 0.11454 0.02863 0.26725-0.01909 0.14317-0.12408 0.34361-0.82085
1.594-1.279 3.4266-0.4486 1.823-0.4486 3.7034z" fill="#4d82b8"
stroke-width=".48869"/>
+ <path d="m19.941 9.1006q0 1.8803-0.4486 3.7129-0.45815 1.823-1.279
3.417-0.10499 0.20044-0.12408 0.34361-0.01909 0.15272 0.02863 0.26725 0.03818
0.11454 0.12408 0.1909 0.0859 0.0859 0.18135 0.15272l1.0786
0.64904q0.68722-1.0499 1.174-2.1094 0.47724-1.0595
0.78267-2.1476t0.4486-2.1953q0.13363-1.1167
0.13363-2.2812t-0.13363-2.2812q-0.14317-1.1167-0.4486-2.1953-0.30543-1.0881-0.78267-2.1476-0.48678-1.0595-1.174-2.1094l-1.0786
0.64904q-0.09545 0.066813-0.18135 0.15272-0.0859 0.076358-0.12408
0.19089-0.04772 0.11454-0.02863 0.26725 0.01909 0.14317 0.12408 0.34361 0.82085
1.594 1.279 3.4266 0.4486 1.823 0.4486 3.7034z" fill="#4d82b8"
stroke-width=".48869"/>
+</svg>
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index 7ff1a5272..d9cf252c9 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -92,12 +92,6 @@ L.LOUtil = {
commandWithoutIcon: [
'InsertPageHeader',
'InsertPageFooter',
- 'InsertHardHyphen',
- 'InsertSoftHyphen',
- 'InsertZWSP',
- 'InsertZWNBSP',
- 'InsertLRM',
- 'InsertRLM',
'None'
],
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
