loleaflet/src/control/Control.Menubar.js | 6 ++++--
loleaflet/src/layer/tile/ImpressTileLayer.js | 3 +++
loleaflet/src/map/Map.js | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit f4f40944d8a16194e06798154a361efafd13ad3f
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Oct 7 16:52:38 2019 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Oct 7 17:13:13 2019 +0200
Enable mobile wizard for impress too
Add menu items and also add the new top toolbar buttons.
Change-Id: I460d03149df99ea0dfe44f1b64ed463a6a4ebd54
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 9f26fe60b..7c5184aab 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -286,9 +286,11 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator', mobileapp: false},
{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'}]
+ {name: _('Reset zoom'), id: 'zoomreset', type:
'action'},
+ {uno: '.uno:Sidebar'},
+ {id: 'mobile-wizard', type: 'action', name:
_('Mobile Wizard'), mobile: true, desktop: false}]
},
- {name: _UNO('.uno:InsertMenu', 'presentation'), 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'},
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 34f073ae5..e0938732c 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -134,6 +134,9 @@ L.ImpressTileLayer = L.TileLayer.extend({
{type: 'button', id: 'undo', img: 'undo',
hint: _UNO('.uno:Undo'), uno: 'Undo', disabled: true},
{type: 'button', id: 'redo', img: 'redo',
hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true},
{type: 'button', id: 'fullscreen', img:
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
+ {type: 'button', id: 'mobile_wizard', img:
'mobile_wizard', disabled: true},
+ {type: 'button', id:
'insertion_mobile_wizard', img: 'insertion_mobile_wizard', disabled: true},
+ {type: 'button', id: 'insertcomment', img:
'insertcomment', disabled: true},
{type: 'drop', id: 'userlist', img: 'users',
hidden: true, html: '<div id="userlist_container"><table
id="userlist_table"><tbody></tbody></table>' +
'<hr><table class="loleaflet-font"
id="editor-btn">' +
'<tr>' +
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f201ed847..0dfd40bc3 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -269,7 +269,7 @@ L.Map = L.Evented.extend({
// Show sidebar.
if (this._docLayer && !this._docLoadedOnce &&
- (this._docLayer._docType === 'spreadsheet' ||
this._docLayer._docType === 'text')) {
+ (this._docLayer._docType === 'spreadsheet' ||
this._docLayer._docType === 'text' || this._docLayer._docType ===
'presentation')) {
// Let the first page finish loading then load
the sidebar.
var map = this;
setTimeout(function () {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
