[Libreoffice-commits] online.git: 11 commits - loleaflet/src
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 15 18:33:01 UTC 2019
loleaflet/src/control/Control.JSDialogBuilder.js | 3
loleaflet/src/control/Control.Menubar.js | 325 +++++++++++++++--------
loleaflet/src/control/Control.MobileWizard.js | 1
3 files changed, 228 insertions(+), 101 deletions(-)
New commits:
commit 976801f82cda8b651689534e70e537c62fc090e1
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 20:28:07 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Clicking on an item enabled insertion wizard.
Change-Id: I3152f6844a777209b8274a80bece51b8af09453d
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index a94fbc778..6715d7d4a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -610,7 +610,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
} else {
builder.map.sendUnoCommand(data.command)
}
- window.onClick(null, 'insertion_mobile_wizard');
+ if (window.insertionMobileWizard)
+ window.onClick(null, 'insertion_mobile_wizard');
});
} else {
console.debug('Builder used outside of mobile wizard: please implement the click handler');
commit 4839e55f23ee11700f29619b86b444f8308b626c
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 20:16:24 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Writer: Move 'Download as' menu upper with one level
To make the menu structure more shallow.
Change-Id: I1f64defe8103f3bb0d716bddcddb2b8a463b5585
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index b278c960e..40900d170 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -457,14 +457,15 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'text'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
- {name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
- {name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
- {name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}]},
{name: _('Sign document'), id: 'signdocument', type: 'action'}
]},
+ {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
+ {name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
+ {name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
+ {name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}
+ ]},
{name: _UNO('.uno:EditMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:Undo'},
{uno: '.uno:Redo'},
commit 6ca2f7f15224ffe843b79d4f916f4c3cf62b8e3f
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 20:12:43 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Simplify 'Download as' / 'Export as' menu creation
Change-Id: I9e7f094e9a04d96c5eeae3c9948ed0e856431cf3
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index cb0cf5245..b278c960e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -457,13 +457,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'text'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: _('Download as'), id: 'downloadas', type: 'menu', mobileapp: false, menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
- {name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
- {name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
- {name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}]},
- {name: _('Export as'), id: 'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
{name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
@@ -508,12 +502,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'presentation'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: _('Download as'), id: 'downloadas', type: 'menu', mobileapp: false, menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
- {name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
- {name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'}]},
- {name: _('Export as'), id: 'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
{name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
@@ -564,12 +553,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'spreadsheet'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: _('Download as'), id:'downloadas', type: 'menu', mobileapp: false, menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
- {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
- {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]},
- {name: _('Export as'), id:'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
{name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
commit ff60c8ee68bc81554287f95acf6c567c7454a9fc
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:53:23 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Writer: Move 'Track Changes' menu upper with one level
Change-Id: I68e5b9f757976c8cbe55c4512dad6a3037e292fe
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 8acecbff6..cb0cf5245 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -481,17 +481,16 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
{uno: '.uno:SelectAll'},
{type: 'separator'},
- {uno: '.uno:SearchDialog'},
+ {uno: '.uno:SearchDialog'}
+ ]},
+ {name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
+ {uno: '.uno:TrackChanges'},
+ {uno: '.uno:ShowTrackedChanges'},
{type: 'separator'},
- {name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
- {uno: '.uno:TrackChanges'},
- {uno: '.uno:ShowTrackedChanges'},
- {type: 'separator'},
- {uno: '.uno:AcceptAllTrackedChanges'},
- {uno: '.uno:RejectAllTrackedChanges'},
- {uno: '.uno:PreviousTrackedChange'},
- {uno: '.uno:NextTrackedChange'}
- ]},
+ {uno: '.uno:AcceptAllTrackedChanges'},
+ {uno: '.uno:RejectAllTrackedChanges'},
+ {uno: '.uno:PreviousTrackedChange'},
+ {uno: '.uno:NextTrackedChange'}
]},
{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
{name: _('Show Ruler'), id: 'showruler', type: 'action'},
commit 83f116987ca13e3099bc3b20200164bc8d36a55f
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:50:40 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Remove 'Close document' menu item
We have a button for this on the toolbar.
Change-Id: I87e844b6c4d0bfa1cb022c12a76e1b52fcb02164
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index d15a5e952..8acecbff6 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -469,9 +469,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
{name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
{name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}]},
- {name: _('Sign document'), id: 'signdocument', type: 'action'},
- {type: 'separator'},
- {name: _('Close document'), id: 'closedocument', type: 'action'}
+ {name: _('Sign document'), id: 'signdocument', type: 'action'}
]},
{name: _UNO('.uno:EditMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:Undo'},
@@ -521,8 +519,6 @@ L.Control.Menubar = L.Control.extend({
{name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
{name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
{name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'}]},
- {type: 'separator'},
- {name: _('Close document'), id: 'closedocument', type: 'action'}
]},
{name: _UNO('.uno:EditMenu', 'presentation'), type: 'menu', menu: [
{uno: '.uno:Undo'},
@@ -579,8 +575,6 @@ L.Control.Menubar = L.Control.extend({
{name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
{name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
{name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]},
- {type: 'separator'},
- {name: _('Close document'), id: 'closedocument', type: 'action'}
]},
{name: _UNO('.uno:EditMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:Undo'},
commit bba4f10138a4105c125000209632325b69d17673
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:46:12 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Remove some useless separator from View menu
Change-Id: I041836ca70d649eb1979cf7ef12750572be50779
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 7d2c5863e..d15a5e952 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -496,11 +496,9 @@ L.Control.Menubar = L.Control.extend({
]},
]},
{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
- {type: 'separator', mobileapp: false},
{name: _('Show Ruler'), id: 'showruler', type: 'action'},
{uno: '.uno:ControlCodes'},
{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
- {type: 'separator'},
]
},
{name: _('About'), id: 'about', type: 'action'},
@@ -598,7 +596,6 @@ L.Control.Menubar = L.Control.extend({
]},
{name: _UNO('.uno:ViewMenu', 'spreadsheet'), id: 'view', type: 'menu', menu: [
{name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action', mobileapp: false},
- {type: 'separator', mobileapp: false},
]},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
commit b63678ce275440032167837b434dfbfc38a0face
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:44:54 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Replace Help menu with it's only About item.
Change-Id: I3c82df0aa03b1790c23d87a86e6acf44bcf22ad3
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 60849d496..7d2c5863e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -503,9 +503,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
]
},
- {name: _UNO('.uno:HelpMenu', 'text'), id: 'help', type: 'menu', menu: [
- {name: _('About'), id: 'about', type: 'action'}]
- },
+ {name: _('About'), id: 'about', type: 'action'},
],
mobilepresentation: [
@@ -563,9 +561,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SlideShowMenu', 'presentation'), type: 'menu', menu: [
{name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}]
},
- {name: _UNO('.uno:HelpMenu', 'presentation'), id: 'help', type: 'menu', menu: [
- {name: _('About'), id: 'about', type: 'action'}]
- },
+ {name: _('About'), id: 'about', type: 'action'},
],
mobilespreadsheet: [
@@ -637,9 +633,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:HideDetail'},
{uno: '.uno:ShowDetail'}]}
]},
- {name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 'help', type: 'menu', menu: [
- {name: _('About'), id: 'about', type: 'action'}]
- },
+ {name: _('About'), id: 'about', type: 'action'},
],
commandStates: {},
commit d724b110c67896d8fe004be05a4381269b239586
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:43:10 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-menu: Remove Tools menu for Calc / Impress too
Writer does not show them either.
Change-Id: Iaed967e11270424731e245b289e20a212d4bcbd3
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index abd552416..60849d496 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -563,11 +563,6 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SlideShowMenu', 'presentation'), type: 'menu', menu: [
{name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}]
},
- {name: _UNO('.uno:ToolsMenu', 'presentation'), id: 'tools', type: 'menu', menu: [
- {uno: '.uno:SpellOnline'},
- {name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
- ]},
{name: _UNO('.uno:HelpMenu', 'presentation'), id: 'help', type: 'menu', menu: [
{name: _('About'), id: 'about', type: 'action'}]
},
@@ -642,11 +637,6 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:HideDetail'},
{uno: '.uno:ShowDetail'}]}
]},
- {name: _UNO('.uno:ToolsMenu', 'spreadsheet'), id: 'tools', type: 'menu', menu: [
- {uno: '.uno:SpellOnline'},
- {name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
- ]},
{name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 'help', type: 'menu', menu: [
{name: _('About'), id: 'about', type: 'action'}]
},
commit bce80fa5004834ba96ad5b70f07b6de61a30a4e6
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:40:27 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
menu-to-mobile-wizard: Create a separate menu structure for mobile
Instead of using mobile attribute. So we can customize mobile menu
freely.
Change-Id: I1d624dd54a6f0988a3ebeb4ef692a1ffd252a916
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 4e0a889d9..abd552416 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -21,13 +21,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'text'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: _('Download as'), id: 'downloadas', type: 'menu', mobileapp: false, menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
- {name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
- {name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
- {name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}]},
- {name: _('Export as'), id: 'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: _('Download as'), id: 'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
{name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
@@ -42,9 +36,9 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
{type: 'separator'},
- {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Cut'},
- {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Copy'},
- {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
+ {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action'},
+ {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action'},
+ {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action'},
{uno: '.uno:SelectAll'},
{type: 'separator'},
{uno: '.uno:SearchDialog'},
@@ -53,36 +47,36 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:TrackChanges'},
{uno: '.uno:ShowTrackedChanges'},
{type: 'separator'},
- {uno: '.uno:AcceptTrackedChanges', mobile: false},
+ {uno: '.uno:AcceptTrackedChanges'},
{uno: '.uno:AcceptAllTrackedChanges'},
{uno: '.uno:RejectAllTrackedChanges'},
{uno: '.uno:PreviousTrackedChange'},
{uno: '.uno:NextTrackedChange'}
]},
- {uno: '.uno:EditStyle', mobile: false}
+ {uno: '.uno:EditStyle'}
]},
{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
- {name: _UNO('.uno:FullScreen', 'text'), id: 'fullscreen', type: 'action', mobileapp: false, mobile: false},
- {type: 'separator', mobileapp: false},
- {name: _UNO('.uno:ZoomPlus', 'text'), id: 'zoomin', type: 'action', mobile: false},
- {name: _UNO('.uno:ZoomMinus', 'text'), id: 'zoomout', type: 'action', mobile: false},
- {name: _('Reset zoom'), id: 'zoomreset', type: 'action', mobile:false },
+ {name: _UNO('.uno:FullScreen', 'text'), id: 'fullscreen', type: 'action'},
+ {type: 'separator'},
+ {name: _UNO('.uno:ZoomPlus', 'text'), id: 'zoomin', type: 'action'},
+ {name: _UNO('.uno:ZoomMinus', 'text'), id: 'zoomout', type: 'action',},
+ {name: _('Reset zoom'), id: 'zoomreset', type: 'action'},
{name: _('Show Ruler'), id: 'showruler', type: 'action'},
- {type: 'separator', mobile: false},
+ {type: 'separator'},
{uno: '.uno:ControlCodes'},
- {type: 'separator', mobile: false},
+ {type: 'separator'},
{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
{type: 'separator'},
- {uno: '.uno:Sidebar', mobile: false},
+ {uno: '.uno:Sidebar'},
]
},
- {name: _UNO('.uno:InsertMenu', 'text'), id: 'insert', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:InsertMenu', 'text'), id: 'insert', type: 'menu', menu: [
{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'},
- {uno: '.uno:InsertObjectChart', mobile: false},
+ {uno: '.uno:InsertObjectChart'},
{type: 'separator'},
- {uno: '.uno:InsertSection', id: 'insertsection', mobile: false },
+ {uno: '.uno:InsertSection', id: 'insertsection'},
{name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertPageNumberField'},
{uno: '.uno:InsertPageCountField'},
@@ -105,8 +99,8 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertColumnBreak'},
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
- {name: _('Insert Shape'), id: 'insertshape', desktop: false, mobile: true, type: 'action' },
- {uno: '.uno:InsertSymbol', mobile: false},
+ {name: _('Insert Shape'), id: 'insertshape', desktop: false, type: 'action' },
+ {uno: '.uno:InsertSymbol'},
{name: _UNO('.uno:FormattingMarkMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertNonBreakingSpace'},
{uno: '.uno:InsertHardHyphen'},
@@ -115,12 +109,12 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertZWNBSP'},
{uno: '.uno:InsertLRM'},
{uno: '.uno:InsertRLM'}]},
- {name: _UNO('.uno:IndexesMenu', 'text'), type: 'menu', mobile: false, menu: [
+ {name: _UNO('.uno:IndexesMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertIndexesEntry'},
{uno: '.uno:InsertAuthoritiesEntry'},
{uno: '.uno:InsertMultiIndex'}]},
]},
- {name: _UNO('.uno:FormatMenu', 'text'), id: 'format', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:FormatMenu', 'text'), id: 'format', type: 'menu', menu: [
{name: _UNO('.uno:FormatTextMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:Bold'},
{uno: '.uno:Italic'},
@@ -205,7 +199,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{uno: '.uno:ResetAttributes'}
]},
- {name: _UNO('.uno:TableMenu', 'text'), mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:TableMenu', 'text'), type: 'menu', menu: [
{name: _UNO('.uno:TableInsertMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
{uno: '.uno:InsertRowsAfter'},
@@ -225,7 +219,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{uno: '.uno:TableDialog'}
]},
- {name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', type: 'menu', menu: [
{uno: '.uno:SpellingAndGrammarDialog'},
{uno: '.uno:SpellOnline'},
{uno: '.uno:ThesaurusDialog'},
@@ -243,10 +237,10 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:OnlineAutoFormat'}]}
]},
{name: _UNO('.uno:HelpMenu', 'text'), id: 'help', type: 'menu', menu: [
- {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action', mobile: false, mobileapp: false},
+ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
- {name: _('Last modification'), id: 'last-mod', type: 'action', mobile: false, tablet: false}
+ {name: _('Last modification'), id: 'last-mod', type: 'action', tablet: false}
],
presentation: [
@@ -256,12 +250,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'presentation'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: _('Download as'), id: 'downloadas', type: 'menu', mobileapp: false, menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
- {name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
- {name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'}]},
- {name: _('Export as'), id: 'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: _('Download as'), id: 'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
{name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
@@ -274,35 +263,35 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
{type: 'separator'},
- {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Cut'},
- {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Copy'},
- {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
+ {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action'},
+ {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action'},
+ {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action'},
{uno: '.uno:SelectAll'},
{type: 'separator'},
{uno: '.uno:SearchDialog'}
]},
{name: _UNO('.uno:ViewMenu', 'presentation'), id: 'view', type: 'menu', menu: [
- {name: _UNO('.uno:FullScreen', 'presentation'), id: 'fullscreen', type: 'action', mobileapp: false},
- {type: 'separator', mobileapp: false, mobile: false},
- {name: _UNO('.uno:ZoomPlus', 'presentation'), id: 'zoomin', type: 'action', mobile: false },
- {name: _UNO('.uno:ZoomMinus', 'presentation'), id: 'zoomout', type: 'action', mobile: false},
- {name: _('Reset zoom'), id: 'zoomreset', type: 'action', mobile: false},
- {uno: '.uno:Sidebar', mobile: false}
+ {name: _UNO('.uno:FullScreen', 'presentation'), id: 'fullscreen', type: 'action'},
+ {type: 'separator'},
+ {name: _UNO('.uno:ZoomPlus', 'presentation'), id: 'zoomin', type: 'action'},
+ {name: _UNO('.uno:ZoomMinus', 'presentation'), id: 'zoomout', type: 'action'},
+ {name: _('Reset zoom'), id: 'zoomreset', type: 'action'},
+ {uno: '.uno:Sidebar'}
]},
- {name: _UNO('.uno:InsertMenu', 'presentation'), id: 'insert', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:InsertMenu', 'presentation'), id: 'insert', type: 'menu', menu: [
{name: _('Local Image...'), id: 'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertGraphic', 'presentation'), id: 'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'presentation'), id: 'insertcomment', type: 'action'},
- {uno: '.uno:InsertObjectChart', mobile: false},
+ {uno: '.uno:InsertObjectChart'},
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
{type: 'separator'},
- {uno: '.uno:InsertSymbol', mobile: false},
+ {uno: '.uno:InsertSymbol'},
{type: 'separator'},
- {name: _('Insert Shape'), id: 'insertshape', desktop: false, mobile: true, type: 'action' },
- {uno: '.uno:HeaderAndFooter', mobile: false}]
+ {name: _('Insert Shape'), id: 'insertshape', desktop: false, type: 'action' },
+ {uno: '.uno:HeaderAndFooter'}]
},
- {name: _UNO('.uno:FormatMenu', 'presentation'), id: 'format', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:FormatMenu', 'presentation'), id: 'format', type: 'menu', menu: [
{uno: '.uno:FontDialog'},
{uno: '.uno:ParagraphDialog'},
{uno: '.uno:PageSetup'},
@@ -334,16 +323,16 @@ L.Control.Menubar = L.Control.extend({
{name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}]
},
{name: _UNO('.uno:ToolsMenu', 'presentation'), id: 'tools', type: 'menu', menu: [
- {uno: '.uno:SpellDialog', mobile: false},
+ {uno: '.uno:SpellDialog'},
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _UNO('.uno:HelpMenu', 'presentation'), id: 'help', type: 'menu', menu: [
- {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action', mobileapp: false, mobile: false},
+ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
- {name: _('Last modification'), id: 'last-mod', type: 'action', mobile: false, tablet: false}
+ {name: _('Last modification'), id: 'last-mod', type: 'action', tablet: false}
],
spreadsheet: [
@@ -353,12 +342,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Share...'), id:'shareas', type: 'action'},
{name: _UNO('.uno:Print', 'spreadsheet'), id: 'print', type: 'action'},
{name: _('See revision history'), id: 'rev-history', type: 'action'},
- {name: _('Download as'), id:'downloadas', type: 'menu', mobileapp: false, menu: [
- {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
- {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
- {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
- {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]},
- {name: _('Export as'), id:'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: _('Download as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
{name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
@@ -371,30 +355,30 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
{type: 'separator'},
- {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Cut'},
- {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Copy'},
- {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
+ {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action'},
+ {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action'},
+ {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action'},
{uno: '.uno:SelectAll'},
{type: 'separator'},
{uno: '.uno:SearchDialog'}
]},
{name: _UNO('.uno:ViewMenu', 'spreadsheet'), id: 'view', type: 'menu', menu: [
- {name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action', mobileapp: false},
- {type: 'separator', mobileapp: false},
- {uno: '.uno:Sidebar', mobile: false},
+ {name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action'},
+ {type: 'separator'},
+ {uno: '.uno:Sidebar'},
]},
- {name: _UNO('.uno:InsertMenu', 'spreadsheet'), id: 'insert', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:InsertMenu', 'spreadsheet'), id: 'insert', type: 'menu', menu: [
{name: _('Local Image...'), id: 'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertGraphic', 'spreadsheet'), id: 'insertgraphicremote', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
- {name: _('Insert Shape'), id: 'insertshape', desktop: false, mobile: true, type: 'action' },
- {uno: '.uno:InsertSymbol', mobile: false},
- {uno: '.uno:EditHeaderAndFooter', mobile: false}
+ {name: _('Insert Shape'), id: 'insertshape', desktop: false, type: 'action' },
+ {uno: '.uno:InsertSymbol'},
+ {uno: '.uno:EditHeaderAndFooter'}
]},
- {name: _UNO('.uno:FormatMenu', 'spreadsheet'), id: 'format', mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:FormatMenu', 'spreadsheet'), id: 'format', type: 'menu', menu: [
{uno: '.uno:ResetAttributes'},
{uno: '.uno:FormatCellDialog'},
{uno: '.uno:PageFormatDialog'},
@@ -433,10 +417,10 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:DataSort'},
{uno: '.uno:SortAscending'},
{uno: '.uno:SortDescending'},
- {uno: '.uno:Validation', mobile: false },
+ {uno: '.uno:Validation'},
{type: 'separator'},
{uno: '.uno:DataFilterAutoFilter'},
- {name: _UNO('.uno:FilterMenu', 'spreadsheet'), mobile: false, type: 'menu', menu: [
+ {name: _UNO('.uno:FilterMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:DataFilterStandardFilter'},
{uno: '.uno:DataFilterSpecialFilter'},
{type: 'separator'},
@@ -453,17 +437,219 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:ShowDetail'}]}
]},
{name: _UNO('.uno:ToolsMenu', 'spreadsheet'), id: 'tools', type: 'menu', menu: [
- {uno: '.uno:SpellDialog', mobile: false},
+ {uno: '.uno:SpellDialog'},
+ {uno: '.uno:SpellOnline'},
+ {name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
+ {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
+ {uno: '.uno:GoalSeekDialog'}
+ ]},
+ {name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 'help', type: 'menu', menu: [
+ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
+ {name: _('About'), id: 'about', type: 'action'}]
+ },
+ {name: _('Last modification'), id: 'last-mod', type: 'action', tablet: false}
+ ],
+
+ mobiletext: [
+ {name: _UNO('.uno:PickList', 'text'), id: 'file', type: 'menu', menu: [
+ {name: _UNO('.uno:Save', 'text'), id: 'save', type: 'action'},
+ {name: _UNO('.uno:SaveAs', 'text'), id: 'saveas', type: 'action'},
+ {name: _('Share...'), id:'shareas', type: 'action'},
+ {name: _UNO('.uno:Print', 'text'), id: 'print', type: 'action'},
+ {name: _('See revision history'), id: 'rev-history', type: 'action'},
+ {name: _('Download as'), id: 'downloadas', type: 'menu', mobileapp: false, menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
+ {name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
+ {name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
+ {name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}]},
+ {name: _('Export as'), id: 'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
+ {name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
+ {name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
+ {name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'}]},
+ {name: _('Sign document'), id: 'signdocument', type: 'action'},
+ {type: 'separator'},
+ {name: _('Close document'), id: 'closedocument', type: 'action'}
+ ]},
+ {name: _UNO('.uno:EditMenu', 'text'), type: 'menu', menu: [
+ {uno: '.uno:Undo'},
+ {uno: '.uno:Redo'},
+ {name: _('Repair'), id: 'repair', type: 'action'},
+ {type: 'separator'},
+ {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Cut'},
+ {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Copy'},
+ {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
+ {uno: '.uno:SelectAll'},
+ {type: 'separator'},
+ {uno: '.uno:SearchDialog'},
+ {type: 'separator'},
+ {name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
+ {uno: '.uno:TrackChanges'},
+ {uno: '.uno:ShowTrackedChanges'},
+ {type: 'separator'},
+ {uno: '.uno:AcceptAllTrackedChanges'},
+ {uno: '.uno:RejectAllTrackedChanges'},
+ {uno: '.uno:PreviousTrackedChange'},
+ {uno: '.uno:NextTrackedChange'}
+ ]},
+ ]},
+ {name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
+ {type: 'separator', mobileapp: false},
+ {name: _('Show Ruler'), id: 'showruler', type: 'action'},
+ {uno: '.uno:ControlCodes'},
+ {name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
+ {type: 'separator'},
+ ]
+ },
+ {name: _UNO('.uno:HelpMenu', 'text'), id: 'help', type: 'menu', menu: [
+ {name: _('About'), id: 'about', type: 'action'}]
+ },
+ ],
+
+ mobilepresentation: [
+ {name: _UNO('.uno:PickList', 'presentation'), id: 'file', type: 'menu', menu: [
+ {name: _UNO('.uno:Save', 'presentation'), id: 'save', type: 'action'},
+ {name: _UNO('.uno:SaveAs', 'presentation'), id: 'saveas', type: 'action'},
+ {name: _('Share...'), id:'shareas', type: 'action'},
+ {name: _UNO('.uno:Print', 'presentation'), id: 'print', type: 'action'},
+ {name: _('See revision history'), id: 'rev-history', type: 'action'},
+ {name: _('Download as'), id: 'downloadas', type: 'menu', mobileapp: false, menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
+ {name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
+ {name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'}]},
+ {name: _('Export as'), id: 'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
+ {name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
+ {name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'}]},
+ {type: 'separator'},
+ {name: _('Close document'), id: 'closedocument', type: 'action'}
+ ]},
+ {name: _UNO('.uno:EditMenu', 'presentation'), type: 'menu', menu: [
+ {uno: '.uno:Undo'},
+ {uno: '.uno:Redo'},
+ {name: _('Repair'), id: 'repair', type: 'action'},
+ {type: 'separator'},
+ {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Cut'},
+ {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Copy'},
+ {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
+ {uno: '.uno:SelectAll'},
+ {type: 'separator'},
+ {uno: '.uno:SearchDialog'}
+ ]},
+ {name: _UNO('.uno:ViewMenu', 'presentation'), id: 'view', type: 'menu', menu: [
+ {name: _UNO('.uno:FullScreen', 'presentation'), id: 'fullscreen', type: 'action', mobileapp: false}
+ ]},
+ {name: _UNO('.uno:TableMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
+ {name: _UNO('.uno:TableInsertMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
+ {uno: '.uno:InsertRowsBefore'},
+ {uno: '.uno:InsertRowsAfter'},
+ {type: 'separator'},
+ {uno: '.uno:InsertColumnsBefore'},
+ {uno: '.uno:InsertColumnsAfter'}]},
+ {name: _UNO('.uno:TableDeleteMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
+ {uno: '.uno:DeleteRows'},
+ {uno: '.uno:DeleteColumns'}]},
+ {uno: '.uno:MergeCells'}]
+ },
+ {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'} ]
+ },
+ {name: _UNO('.uno:SlideShowMenu', 'presentation'), type: 'menu', menu: [
+ {name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}]
+ },
+ {name: _UNO('.uno:ToolsMenu', 'presentation'), id: 'tools', type: 'menu', menu: [
+ {uno: '.uno:SpellOnline'},
+ {name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
+ {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
+ ]},
+ {name: _UNO('.uno:HelpMenu', 'presentation'), id: 'help', type: 'menu', menu: [
+ {name: _('About'), id: 'about', type: 'action'}]
+ },
+ ],
+
+ mobilespreadsheet: [
+ {name: _UNO('.uno:PickList', 'spreadsheet'), id: 'file', type: 'menu', menu: [
+ {name: _UNO('.uno:Save', 'spreadsheet'), id: 'save', type: 'action'},
+ {name: _UNO('.uno:SaveAs', 'spreadsheet'), id: 'saveas', type: 'action'},
+ {name: _('Share...'), id:'shareas', type: 'action'},
+ {name: _UNO('.uno:Print', 'spreadsheet'), id: 'print', type: 'action'},
+ {name: _('See revision history'), id: 'rev-history', type: 'action'},
+ {name: _('Download as'), id:'downloadas', type: 'menu', mobileapp: false, menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
+ {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
+ {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]},
+ {name: _('Export as'), id:'downloadas', type: 'menu', mobileapp: true, menu: [
+ {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
+ {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
+ {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]},
+ {type: 'separator'},
+ {name: _('Close document'), id: 'closedocument', type: 'action'}
+ ]},
+ {name: _UNO('.uno:EditMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:Undo'},
+ {uno: '.uno:Redo'},
+ {name: _('Repair'), id: 'repair', type: 'action'},
+ {type: 'separator'},
+ {name: _UNO('.uno:Cut'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Cut'},
+ {name: _UNO('.uno:Copy'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Copy'},
+ {name: _UNO('.uno:Paste'), id: 'warn-copy-paste', type: 'action', mobileappuno: '.uno:Paste'},
+ {uno: '.uno:SelectAll'},
+ {type: 'separator'},
+ {uno: '.uno:SearchDialog'}
+ ]},
+ {name: _UNO('.uno:ViewMenu', 'spreadsheet'), id: 'view', type: 'menu', menu: [
+ {name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action', mobileapp: false},
+ {type: 'separator', mobileapp: false},
+ ]},
+ {name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
+ {name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:InsertRowsBefore'},
+ {uno: '.uno:InsertRowsAfter'}]},
+ {name: _UNO('.uno:InsertColumnsMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:InsertColumnsBefore'},
+ {uno: '.uno:InsertColumnsAfter'}]},
+ {name: _UNO('.uno:InsertBreakMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:InsertRowBreak'},
+ {uno: '.uno:InsertColumnBreak'}]},
+ {type: 'separator'},
+ {uno: '.uno:DeleteRows'},
+ {uno: '.uno:DeleteColumns'},
+ {name: _UNO('.uno:DelBreakMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:DeleteRowbreak'},
+ {uno: '.uno:DeleteColumnbreak'}]}
+ ]},
+ {name: _UNO('.uno:DataMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:DataSort'},
+ {uno: '.uno:SortAscending'},
+ {uno: '.uno:SortDescending'},
+ {type: 'separator'},
+ {uno: '.uno:DataFilterAutoFilter'},
+ {type: 'separator'},
+ {name: _UNO('.uno:GroupOutlineMenu', 'spreadsheet'), type: 'menu', menu: [
+ {uno: '.uno:Group'},
+ {uno: '.uno:Ungroup'},
+ {type: 'separator'},
+ {uno: '.uno:ClearOutline'},
+ {type: 'separator'},
+ {uno: '.uno:HideDetail'},
+ {uno: '.uno:ShowDetail'}]}
+ ]},
+ {name: _UNO('.uno:ToolsMenu', 'spreadsheet'), id: 'tools', type: 'menu', menu: [
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
- {uno: '.uno:GoalSeekDialog', mobile: false}
]},
{name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 'help', type: 'menu', menu: [
- {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action', mobileapp: false, mobile: false},
{name: _('About'), id: 'about', type: 'action'}]
},
- {name: _('Last modification'), id: 'last-mod', type: 'action', mobile: false, tablet: false}
],
commandStates: {},
@@ -1094,15 +1280,6 @@ L.Control.Menubar = L.Control.extend({
}
if (menu[i].type === 'menu') {
- if (menu[i].mobileapp == false && window.ThisIsAMobileApp) {
- continue;
- }
- if (menu[i].mobileapp == true && !window.ThisIsAMobileApp) {
- continue;
- }
- if (menu[i].mobile === false && window.mode.isMobile())
- continue;
-
var ulItem = L.DomUtil.create('ul', '', liItem);
var subitemList = this._createMenu(menu[i].menu);
if (!subitemList.length) {
@@ -1120,9 +1297,6 @@ L.Control.Menubar = L.Control.extend({
} else if (menu[i].type === 'action') {
$(aItem).data('type', 'action');
$(aItem).data('id', menu[i].id);
- if (window.ThisIsAMobileApp && menu[i].mobileappuno) {
- $(aItem).data('mobileappuno', menu[i].mobileappuno);
- }
}
if (menu[i].desktop == false && window.mode.isDesktop()) {
@@ -1133,14 +1307,6 @@ L.Control.Menubar = L.Control.extend({
$(aItem).css('display', 'none');
}
- if (menu[i].mobile == false && window.mode.isMobile()) {
- $(aItem).css('display', 'none');
- }
-
- if (menu[i].mobileapp == false && window.ThisIsAMobileApp) {
- $(aItem).css('display', 'none');
- }
-
itemList.push(liItem);
}
@@ -1195,7 +1361,7 @@ L.Control.Menubar = L.Control.extend({
children : []
};
var docType = this._map.getDocType();
- var items = this.options[docType];
+ var items = this.options['mobile' + docType];
for (var i = 0; i < items.length; i++) {
if (items[i].mobile !== false && this._checkItemVisibility(items[i]) === true) {
commit 3f9cc7b5c98e3ea05ae0d4dc4a632a7d3b920a15
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 19:21:08 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
menu-to-mobile-wizard: Hide menus not allowed in read only mode.
Change-Id: I76b277ee68e0a94823615e65c335830c903e9edd
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index f36a489f5..4e0a889d9 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1198,7 +1198,7 @@ L.Control.Menubar = L.Control.extend({
var items = this.options[docType];
for (var i = 0; i < items.length; i++) {
- if (items[i].mobile !== false) {
+ if (items[i].mobile !== false && this._checkItemVisibility(items[i]) === true) {
topMenu.children.push(this._generateMenuStructure(items[i], docType, false));
}
}
commit ac31c8776ec5e84ac7428bacc02bcb9ebb786878
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Oct 15 16:32:21 2019 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Oct 15 20:32:06 2019 +0200
mobile-wizard: Fix mobile wizard position after using menu wizard
Change-Id: I861dd32922a037fe459d7e7e894ec1782921fa02
diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index ac27f778a..285bad6b3 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -162,6 +162,7 @@ L.Control.MobileWizard = L.Control.extend({
$('#mobile-wizard').css('top', $('#document-container').css('top'));
} else {
$('#mobile-wizard').height('45%');
+ $('#mobile-wizard').css('top', '');
}
}
},
More information about the Libreoffice-commits
mailing list