[Libreoffice-commits] online.git: 3 commits - cypress_test/integration_tests loleaflet/images loleaflet/src
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Mon Feb 24 10:38:24 UTC 2020
cypress_test/integration_tests/mobile/impress/impress_focus_spec.js | 22 ++
loleaflet/images/lc_changesmenu.svg | 1
loleaflet/images/lc_datamenu.svg | 1
loleaflet/images/lc_downloadas.svg | 1
loleaflet/images/lc_editmenu.svg | 1
loleaflet/images/lc_file.svg | 1
loleaflet/images/lc_formattingmark.svg | 3
loleaflet/images/lc_insertfield.svg | 1
loleaflet/images/lc_insertheaderfooter.svg | 1
loleaflet/images/lc_insertnonbreakingspace.svg | 3
loleaflet/images/lc_insertpagefooter.svg | 8
loleaflet/images/lc_insertpageheader.svg | 8
loleaflet/images/lc_pagesetup.svg | 1
loleaflet/images/lc_sheetmenu.svg | 1
loleaflet/images/lc_slidemenu.svg | 1
loleaflet/images/lc_tablemenu.svg | 1
loleaflet/images/lc_view.svg | 88 ----------
loleaflet/src/control/Control.Menubar.js | 30 +--
18 files changed, 34 insertions(+), 139 deletions(-)
New commits:
commit 75c58a60145ab957802ed4bb0e2199bbe2ada2e6
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Feb 24 11:37:54 2020 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Feb 24 11:37:54 2020 +0100
Revert "Mobile: Insert: Add missing icons, add missing ids, create missing icons, also add sub level icns for footerandheader and formattingmark"
This reverts commit 9364ccfe885460a254365008c64f20ab878e4ce0.
diff --git a/loleaflet/images/lc_formattingmark.svg b/loleaflet/images/lc_formattingmark.svg
deleted file mode 100644
index 2c8bbb6da..000000000
--- a/loleaflet/images/lc_formattingmark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 9.5h3v4h14v-4h2.9998" fill="none" stroke="#4d82b8" stroke-width="2"/>
-</svg>
diff --git a/loleaflet/images/lc_insertfield.svg b/loleaflet/images/lc_insertfield.svg
deleted file mode 100644
index a2d6d0003..000000000
--- a/loleaflet/images/lc_insertfield.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 4v17h6.283203c-.175464-.296519-.283203-.636031-.283203-1 0-1.090703.909297-2 2-2v-1c-1.090703 0-2-.909297-2-2s.909297-2 2-2c0-1.090703.909297-2 2-2s2 .909297 2 2h1c0-.726734.407943-1.366449 1-1.716797v-3.5546874l-4-3.7285156zm12 13v1h1v-1z" fill="#fff"/><path d="m5 3c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h8c-.726734 0-1.366449-.407943-1.716797-1h-6.283203v-17h9v4c0 .554.446 1 1 1h4v2.283203c.296519-.175464.636031-.283203 1-.283203v-2.75-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m15 12c-.554 0-1 .446-1 1v1h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v3h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v1c0 .554.446 1 1 1s1-.446 1-1v-1h3v1c0 .554.446 1 1 1s1-.446 1-1v-1h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-3h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-1c0-.554-.446-1-
1-1s-1 .446-1 1v1h-3v-1c0-.554-.446-1-1-1zm1 4h3v3h-3z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertheaderfooter.svg b/loleaflet/images/lc_insertheaderfooter.svg
deleted file mode 100644
index 4c03f51d4..000000000
--- a/loleaflet/images/lc_insertheaderfooter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><g fill="#eac282"><path d="m6 4h7v3h-7z"/><path d="m6 17h11v3h-11z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertnonbreakingspace.svg b/loleaflet/images/lc_insertnonbreakingspace.svg
deleted file mode 100644
index 2c8bbb6da..000000000
--- a/loleaflet/images/lc_insertnonbreakingspace.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 9.5h3v4h14v-4h2.9998" fill="none" stroke="#4d82b8" stroke-width="2"/>
-</svg>
diff --git a/loleaflet/images/lc_insertpagefooter.svg b/loleaflet/images/lc_insertpagefooter.svg
deleted file mode 100644
index 7e49b478e..000000000
--- a/loleaflet/images/lc_insertpagefooter.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3v18h14v-14.271l-4-3.7294z" fill="#fff"/>
- <path d="m5 2c-0.554 0-1 0.446-1 1v18c0 0.554 0.446 1 1 1h14c0.554 0 1-0.446 1-1v-13.959c0-0.45068 0.09887-0.4266-0.60464-1.0676l-3.3074-3.237c-0.70952-0.73686-0.71122-0.73686-1.0948-0.73686h-0.99317zm0 1h9v4c0 0.554 0.446 1 1 1h4v13h-14z" fill="#808080"/>
- <path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <g fill="#eac282">
- <path d="m6 17h11v3h-11z"/>
- </g>
-</svg>
diff --git a/loleaflet/images/lc_insertpageheader.svg b/loleaflet/images/lc_insertpageheader.svg
deleted file mode 100644
index bd6820b27..000000000
--- a/loleaflet/images/lc_insertpageheader.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3v18h14v-14.271l-4-3.7294z" fill="#fff"/>
- <path d="m5 2c-0.554 0-1 0.446-1 1v18c0 0.554 0.446 1 1 1h14c0.554 0 1-0.446 1-1v-13.959c0-0.45068 0.09887-0.4266-0.60464-1.0676l-3.3074-3.237c-0.70952-0.73686-0.71122-0.73686-1.0948-0.73686h-0.99317zm0 1h9v4c0 0.554 0.446 1 1 1h4v13h-14z" fill="#808080"/>
- <path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <g fill="#eac282">
- <path d="m6 4h7v3h-7z"/>
- </g>
-</svg>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index d5f27b537..8f2d230ad 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -622,9 +622,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Local Image...'), id: 'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertGraphic', 'text'), id: 'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'text'), id: 'insertcomment', type: 'action'},
- {name: _UNO('.uno:TableMenu'), id: 'inserttable_mono', type: 'action'},
+ {name: _UNO('.uno:TableMenu'), id: 'inserttable', type: 'action'},
{type: 'separator'},
- {name: _UNO('.uno:InsertField', 'text'), id: 'insertfield', type: 'menu', menu: [
+ {name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertPageNumberField'},
{uno: '.uno:InsertPageCountField'},
{uno: '.uno:InsertDateField'},
@@ -633,10 +633,10 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertAuthorField'},
{uno: '.uno:InsertTopicField'}
]},
- {name: _UNO('.uno:InsertHeaderFooterMenu', 'text'), id: 'insertheaderfooter', type: 'menu', menu: [
- {name: _UNO('.uno:InsertPageHeader', 'text'), id: 'insertpageheader', type: 'menu', menu: [
+ {name: _UNO('.uno:InsertHeaderFooterMenu', 'text'), type: 'menu', menu: [
+ {name: _UNO('.uno:InsertPageHeader', 'text'), type: 'menu', menu: [
{name: _('All'), disabled: true, id: 'insertheader', tag: '_ALL_', uno: '.uno:InsertPageHeader?On:bool=true'}]},
- {name: _UNO('.uno:InsertPageFooter', 'text'), id: 'insertpagefooter', type: 'menu', menu: [
+ {name: _UNO('.uno:InsertPageFooter', 'text'), type: 'menu', menu: [
{name: _('All'), disabled: true, id: 'insertfooter', tag: '_ALL_', uno: '.uno:InsertPageFooter?On:bool=true'}]}
]},
{uno: '.uno:InsertFootnote'},
@@ -647,8 +647,8 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
{name: _UNO('.uno:ShapesMenu'), id: 'insertshape', type: 'action'},
- {name: _UNO('.uno:FormattingMarkMenu', 'text'), id: 'formattingmark', type: 'menu', menu: [
- {name: _UNO('.uno:InsertNonBreakingSpace'), id: 'insertnonbreakingspace', type: 'action'},
+ {name: _UNO('.uno:FormattingMarkMenu', 'text'), type: 'menu', menu: [
+ {uno: '.uno:InsertNonBreakingSpace'},
{uno: '.uno:InsertHardHyphen'},
{uno: '.uno:InsertSoftHyphen'},
{uno: '.uno:InsertZWSP'},
@@ -679,7 +679,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
{name: _UNO('.uno:ShapesMenu'), id: 'insertshape', type: 'action'},
{uno: '.uno:Text'},
- {name: _UNO('.uno:InsertField', 'text'), id: 'insertfield', type: 'menu', menu: [
+ {name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertDateFieldFix'},
{uno: '.uno:InsertDateFieldVar'},
{uno: '.uno:InsertTimeFieldFix'},
commit 08fc4c51cca4644a636c5a6bf47ccc7f333473af
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Feb 24 11:37:40 2020 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Feb 24 11:37:40 2020 +0100
Revert "Mobile: Top menu (hamburger): add missing icons, add missing ids, add new view more icon"
This reverts commit 40418c0cbffec3664eaedc62ed2ecb9d12eb3a85.
diff --git a/loleaflet/images/lc_changesmenu.svg b/loleaflet/images/lc_changesmenu.svg
deleted file mode 100644
index 088300cc5..000000000
--- a/loleaflet/images/lc_changesmenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h6.267578c-.795872-1.135833-1.267578-2.513707-1.267578-4 0-3.854149 3.145851-7 7-7 .694626 0 1.365658.106777 2 .296875v-3.5683594l-4-3.7285156z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h7.115234c-.312835-.305717-.595999-.640846-.847656-1h-6.267578v-18h9v4c0 .554.446 1 1 1h4v2.296875c.346387.103805.678167.236716 1 .390625v-3.4375-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><rect fill="#808080" height="1" ry=".5" width="5" x="7" y="5"/><rect fill="#808080" height="1" ry=".5" width="3" x="7" y="9"/><rect fill="#d65532" height="1" ry=".5" width="5" x="12" y="9"/><path d="m7.5 12c-.277 0-.5.223-.5.5s.223.5.5.5h3.767578c.251657-.359154.534821-.694283.847656-1z" fill="#d65532"/><path d="m7.5 15c-.277 0-.5.223-.5.5s.223.5
.5.5h2.580078c.049324-.341059.119834-.676443.216797-1z" fill="#808080"/><path d="m12.474609 15c-.262915 0-.474609.211694-.474609.474609v.05078c0 .262917.211694.474611.474609.474611h1.050782c.06573 0 .128731-.01316.185547-.03711.000848-.000358.0011-.0016.002-.002l.248047-.248047c.000362-.000847.0016-.0011.002-.002.023857-.056721.037015-.119724.037015-.185452v-.05078c0-.262917-.211694-.474611-.474609-.474611z" fill="#808080"/><rect fill="#d65532" height="1" ry=".474576" width="2" x="7" y="18"/><path d="m17 11a6 6 0 0 0 -6 6 6 6 0 0 0 6 6 6 6 0 0 0 6-6 6 6 0 0 0 -6-6zm0 1a5 5 0 0 1 5 5 5 5 0 0 1 -5 5 5 5 0 0 1 -5-5 5 5 0 0 1 5-5z" fill="#808080"/><circle cx="17" cy="17" fill="#fff" r="5"/><circle cx="17" cy="17" fill="#d65532" r="2"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_datamenu.svg b/loleaflet/images/lc_datamenu.svg
deleted file mode 100644
index 06251b16f..000000000
--- a/loleaflet/images/lc_datamenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4.71875 2.5058594-1.2128906 1.1855468v1.1875.3613282l5.9941406 8.3828126v4.310547.046875l2.878906 2.02539 1.003906-2.005859h-.382812a1.0001 1.0001 0 0 1 -.78125-1.625l2.964844-3.699219 5.310547-7.4355466v-1.5488282l-1.212891-1.1855468z" fill="#fff"/><path d="m17.004237 12h5.995763l-4 4h2l-9 7 3-6h-2z" fill="#eac282" fill-rule="evenodd"/><path d="m4.71875 2a.50535904.50535904 0 0 0 -.3535156.1445312l-1.2128906 1.1855469a.50535904.50535904 0 0 0 -.1523438.3613281v1.1875.3613282a.50535904.50535904 0 0 0 .09375.2949218l5.9003906 8.2499998v4.148438.046875a.50535904.50535904 0 0 0 .2148438.414062l2.9414066 2.070313.457031-.916016-2.601563-1.830078v-4.095703a.50535904.50535904 0 0 0 -.0957028-.294922l-5.9003906-8.25v-.1992188-.9746093l.9160156-.8945313h14.1484378l.916015.8945313v1.1738281l-5.894531 8.25a.50535904.50535904 0 0 0 -.095703.294922v.529297l2.224609-2.777344a1.0001 1.0001 0 0 1 .777344-.375l3.904297-5.4648438a
.50535904.50535904 0 0 0 .09375-.2949218v-1.5488282a.50535904.50535904 0 0 0 -.152344-.3613281l-1.21289-1.1855469a.50535904.50535904 0 0 0 -.353516-.1445312zm10.292969 17.212891-.146485.292968.146485-.113281z" fill="#808080"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas.svg b/loleaflet/images/lc_downloadas.svg
deleted file mode 100644
index 462f994fe..000000000
--- a/loleaflet/images/lc_downloadas.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 4v17h12.076172c.08822-.229036.224537-.442298.402344-.601562l.40625-.408204h-6.363282c-.420168.005943-.867654-.182805-1.138672-.484375-.271015-.30157-.382812-.666177-.382812-1.015625 0-.349447.111796-.714055.382812-1.015625.271018-.30157.718504-.490275 1.138672-.484375h6.351563l-.421875-.421875c-.452852-.438274-.556085-1.125408-.347656-1.640625.207997-.514149.758145-.9356 1.386718-.9375h.001954c.175227-.000445.345797.035698.507812.09375v-6.3554684l-4-3.7285156z" fill="#fff"/><path d="m5 3c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h12.060547c-.047908-.135592-.083757-.278117-.089844-.435547-.007198-.186166.034536-.380297.105469-.564453h-12.076172v-17h9v4c0 .554.446 1 1 1h4v5.083984c.211956.075948.408045.193521.568359.357422l.431641.431641v-6.623047-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z" fill="#808080"/><g fill-rule=
"evenodd"><path d="m15 8h4l-4-4z" fill="#fff"/><path d="m18.494141 14.990234a.50005.50005 0 0 0 -.347657.859375l2.144532 2.140625h-8.783204a.50005.50005 0 1 0 0 1h8.78711l-2.148438 2.152344a.50005.50005 0 1 0 .707032.705078l2.957031-2.960937a.50005.50005 0 0 0 -.003906-.796875l-2.953125-2.949219a.50005.50005 0 0 0 -.359375-.150391z" fill="#4d82b8"/></g></svg>
diff --git a/loleaflet/images/lc_editmenu.svg b/loleaflet/images/lc_editmenu.svg
deleted file mode 100644
index cf0c07abc..000000000
--- a/loleaflet/images/lc_editmenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h5.462891l.517578-2.103516c.04344-.177395.134629-.339507.263672-.46875l5.529297-5.523437.0078-.0078.738281-.720703 1.480481-1.476575v-3.9707034l-4-3.7285156zm14 16.1875-1.802734 1.8125h1.802734z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h5.216797l.246094-1h-5.462891v-18h9v4c0 .554.446 1 1 1h4v2.699219l.189453-.189453c.10637-.106241.227363-.190073.353516-.263672.022042-.012592.043911-.023576.066406-.035156.123752-.06524.251663-.116414.384766-.150391.00198-.000505.003877-.001455.005859-.001953v-2.808594-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109zm15 16.179688-1 1.005859v.001953 1.8125h-1.802734l-.992188 1h2.794922c.554 0 1-.446 1-1z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><g fill="#eac282" transform="translate(-1 -1)"><path d="m18.480469 14.611328-5.529297
5.523438-.951172 3.865234 3.806641-1.011719 5.509765-5.544922z"/><path d="m21.419922 12c-.189562 0-.378184.07172-.523438.216797l-1.673828 1.669922 2.847656 2.849609 1.710938-1.638672c.290506-.290127.290506-.756747 0-1.046875l-1.835938-1.833984c-.145254-.145064-.335828-.216797-.52539-.216797z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_file.svg b/loleaflet/images/lc_file.svg
deleted file mode 100644
index 4c10f58bf..000000000
--- a/loleaflet/images/lc_file.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/></svg>
diff --git a/loleaflet/images/lc_pagesetup.svg b/loleaflet/images/lc_pagesetup.svg
deleted file mode 100644
index e0d41c5d6..000000000
--- a/loleaflet/images/lc_pagesetup.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9 4.9980469v3.0019531c0 .554-.446 1-1 1h-4.9980469v9.998047h14.2714849l3.728515-4v-10.0000001z" fill="#fff"/><path d="m9 3.9980469v1h12.001953v9.0000001h-4c-.554 0-1 .446-1 1v4h-12.9999999v-9.998047h-1v9.998047c0 .554.446 1 1 1h10.1093749 3.642578.207032c.450679 0 .427365.098038 1.068359-.605469l3.236328-3.30664c.736858-.709525.736328-.712123.736328-1.095704v-.330078-.662109-9.0000001c0-.554-.446-1-1-1z" fill="#808080"/><path d="m17.00238 14.99762v4l4-4z" fill="#fff" fill-rule="evenodd"/><g fill="#eac282"><rect height="1" ry=".5" width="6" x="1" y="1"/><rect height="6" ry=".5" width="1" x="1" y="1"/><path d="m2.4999352 7.4999941 5.0000589-5.0000589v5.0000589z" fill-rule="evenodd" stroke="#eac282" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.000012"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_sheetmenu.svg b/loleaflet/images/lc_sheetmenu.svg
deleted file mode 100644
index f19ef8747..000000000
--- a/loleaflet/images/lc_sheetmenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3h18v18h-18z" fill="#fff"/><path d="m3 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h18c.554 0 1-.446 1-1v-18c0-.554-.446-1-1-1zm0 1h5v6h-5zm6 0h6v6h-6zm7 0h5v6h-5zm-13 7h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5zm-13 4h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5zm-13 4h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5z" fill="#808080"/><path d="m2 2h20v4h-20z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_slidemenu.svg b/loleaflet/images/lc_slidemenu.svg
deleted file mode 100644
index 03c7196fb..000000000
--- a/loleaflet/images/lc_slidemenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 7h18v13h-18z" fill="#fff"/><path d="m2 6v15h1 8.585938 9.414062 1v-10.414062-3.585938-1zm1 1h18v4.585938 8.414062h-8.414062-9.585938z" fill="#808080"/><path d="m1 3h22v2h-22z" fill="#4d82b8"/><path d="m5 9h14v2h-14z" fill="#eac282"/><g fill="#808080"><path d="m5 12h6v1h-6z"/><path d="m5 16h6v1h-6z"/><path d="m5 14h6v1h-6z"/><path d="m5 18h6v1h-6z"/><path d="m13 12h6v1h-6z"/><path d="m13 16h6v1h-6z"/><path d="m13 14h6v1h-6z"/><path d="m13 18h6v1h-6z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_tablemenu.svg b/loleaflet/images/lc_tablemenu.svg
deleted file mode 100644
index f19ef8747..000000000
--- a/loleaflet/images/lc_tablemenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3h18v18h-18z" fill="#fff"/><path d="m3 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h18c.554 0 1-.446 1-1v-18c0-.554-.446-1-1-1zm0 1h5v6h-5zm6 0h6v6h-6zm7 0h5v6h-5zm-13 7h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5zm-13 4h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5zm-13 4h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5z" fill="#808080"/><path d="m2 2h20v4h-20z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_view.svg b/loleaflet/images/lc_view.svg
deleted file mode 100644
index 69e710261..000000000
--- a/loleaflet/images/lc_view.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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="svg16"
- sodipodi:docname="lc_morecontrols.svg"
- inkscape:version="0.92.4 (unknown)">
- <metadata
- id="metadata22">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs20" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1017"
- id="namedview18"
- showgrid="false"
- inkscape:zoom="11.313708"
- inkscape:cx="13.521499"
- inkscape:cy="7.2888914"
- inkscape:window-x="0"
- inkscape:window-y="30"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg16" />
- <path
- d="M 21,6 H 3 v 15 h 18"
- id="path2"
- inkscape:connector-curvature="0"
- style="fill:#fcfcfc"
- sodipodi:nodetypes="cccc" />
- <g
- id="g12"
- style="fill:#808080">
- <path
- d="M 22,3 C 22,2.446 21.554,2 21,2 H 3 C 2.446,2 2,2.446 2,3 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 z M 21,21 H 3 V 6 h 18 z"
- id="path4"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssccccccccc" />
- <path
- d="m 5,8 v 4 H 9 V 8 Z m 1,1 h 2 v 2 H 6 Z"
- id="path6"
- inkscape:connector-curvature="0" />
- <path
- d="m 5,14 v 4 h 4 v -4 z m 1,1 h 2 v 2 H 6 Z"
- id="path8"
- inkscape:connector-curvature="0" />
- <path
- d="m 11,9 h 7 v 1 h -7 z"
- id="path10"
- inkscape:connector-curvature="0" />
- </g>
- <ellipse
- cy="18.325001"
- cx="17.704151"
- id="circle833"
- style="fill:#fcfcfc;fill-opacity:1;stroke:#4d82b8;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill"
- rx="5"
- ry="3.5" />
- <circle
- style="fill:#4d82b8;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill"
- id="path831"
- cx="17.704151"
- cy="18.325001"
- r="2" />
-</svg>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 7db7c12fc..d5f27b537 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -477,7 +477,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
{name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}
]},
- {name: _UNO('.uno:EditMenu', 'text'), id: 'editmenu', type: 'menu', menu: [
+ {name: _UNO('.uno:EditMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:Undo'},
{uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
@@ -523,7 +523,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
{name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'},
]},
- {name: _UNO('.uno:EditMenu', 'presentation'), id: 'editmenu', type: 'menu', menu: [
+ {name: _UNO('.uno:EditMenu', 'presentation'), type: 'menu', menu: [
{uno: '.uno:Undo'},
{uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
@@ -533,7 +533,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
- {name: _UNO('.uno:TableMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), id: 'tablemenu', type: 'menu', menu: [
+ {name: _UNO('.uno:TableMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
{uno: '.uno:InsertRowsAfter'},
{type: 'separator'},
@@ -543,7 +543,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:DeleteColumns'},
{uno: '.uno:MergeCells'}]
},
- {name: _UNO('.uno:SlideMenu', 'presentation'), id: 'slidemenu', type: 'menu', menu: [
+ {name: _UNO('.uno:SlideMenu', 'presentation'), type: 'menu', menu: [
{name: _UNO('.uno:InsertSlide', 'presentation'), id: 'insertpage', type: 'action'},
{name: _UNO('.uno:DuplicateSlide', 'presentation'), id: 'duplicatepage', type: 'action'},
{name: _UNO('.uno:DeleteSlide', 'presentation'), id: 'deletepage', type: 'action'}]
@@ -568,7 +568,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
{name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}
]},
- {name: _UNO('.uno:EditMenu', 'spreadsheet'), id: 'editmenu', type: 'menu', menu: [
+ {name: _UNO('.uno:EditMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:Undo'},
{uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
@@ -578,7 +578,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
- {name: _UNO('.uno:SheetMenu', 'spreadsheet'), id: 'sheetmenu', type: 'menu', menu: [
+ {name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
{uno: '.uno:InsertRowsAfter'}]},
@@ -595,7 +595,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:DeleteRowbreak'},
{uno: '.uno:DeleteColumnbreak'}]}
]},
- {name: _UNO('.uno:DataMenu', 'spreadsheet'), id: 'datamenu', type: 'menu', menu: [
+ {name: _UNO('.uno:DataMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:DataSort'},
{uno: '.uno:SortAscending'},
{uno: '.uno:SortDescending'},
commit c692487accb3f64a9af4528d1efb5ba9d51358b9
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Feb 24 11:22:33 2020 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Feb 24 11:36:43 2020 +0100
cypress: mobile: split this test case.
So it might be more stable.
Change-Id: Ie8b8a13ebfe9b681a8e9a456f24f6322ce9cc8a6
diff --git a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
index 96eb334d7..5d52067ab 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
@@ -11,7 +11,7 @@ describe('Impress focus tests', function() {
helper.afterAll();
});
- it('Basic document focus.', function() {
+ it('Single tap on a text shape.', function() {
// Click on edit button
cy.get('#mobile-edit-button').click();
@@ -33,14 +33,30 @@ describe('Impress focus tests', function() {
// No focus
cy.document().its('activeElement.tagName')
.should('be.eq', 'BODY');
+ });
+
+ it('Double tap on a text shape.', function() {
+ // Click on edit button
+ cy.get('#mobile-edit-button').click();
+
+ cy.get('#tb_actionbar_item_mobile_wizard')
+ .should('not.have.class', 'disabled');
+
+ // Body has the focus -> can't type in the document
+ cy.document().its('activeElement.tagName')
+ .should('be.eq', 'BODY');
// Double tap on a text shape gives the focus to the document
cy.get('#document-container')
.dblclick();
+ // Shape selection
+ cy.get('.leaflet-pane.leaflet-overlay-pane svg g')
+ .should('exist');
+
// Document has the focus
// TODO: Focus is inconsistent here.
- //cy.document().its('activeElement.className')
- // .should('be.eq', 'clipboard');
+ cy.document().its('activeElement.className')
+ .should('be.eq', 'clipboard');
});
});
More information about the Libreoffice-commits
mailing list