From 75c58a60145ab957802ed4bb0e2199bbe2ada2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= Date: Mon, 24 Feb 2020 11:37:54 +0100 Subject: [PATCH] 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. --- 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/src/control/Control.Menubar.js | 16 ++++++++-------- 7 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 loleaflet/images/lc_formattingmark.svg delete mode 100644 loleaflet/images/lc_insertfield.svg delete mode 100644 loleaflet/images/lc_insertheaderfooter.svg delete mode 100644 loleaflet/images/lc_insertnonbreakingspace.svg delete mode 100644 loleaflet/images/lc_insertpagefooter.svg delete mode 100644 loleaflet/images/lc_insertpageheader.svg 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 @@ - - - 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 @@ - \ 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 @@ - \ 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 @@ - - - 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 @@ - - - - - - - - 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 @@ - - - - - - - - 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'},