loleaflet/dist/toolbar.css | 1 +
loleaflet/dist/toolbar/toolbar.js | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit e48a02a46ae4da696caf054610c3d5c247b29d6b
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon May 23 09:57:39 2016 +0200
loleaflet: Added Comment button to toolbar
This reverts commit 269e2230914df55c5019d4f20bad1957e7a0823b.
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index b16f3ae..0af793c 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -206,6 +206,7 @@ button.leaflet-control-search-next
.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/lc_autosum.png')
no-repeat center !important; }
.w2ui-icon.backcolor{ background:
url('/loleaflet/dist/images/lc_backcolor.png') no-repeat center !important; }
.w2ui-icon.bold{ background: url('/loleaflet/dist/images/lc_bold.png')
no-repeat center !important; }
+.w2ui-icon.annotation{ background:
url('/loleaflet/dist/images/lc_showannotations.png') no-repeat center
!important; }
.w2ui-icon.bullet{ background:
url('/loleaflet/dist/images/lc_defaultbullet.png') no-repeat center !important;
}
.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/lc_cancel.png')
no-repeat center !important; }
.w2ui-icon.color{ background: url('/loleaflet/dist/images/lc_color.png')
no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 550e055..8aa22a7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -77,6 +77,7 @@ $(function () {
{ type: 'button', id: 'incrementindent', img:
'incrementindent', hint: _("Increase Indent"), uno: 'IncrementIndent' },
{ type: 'button', id: 'decrementindent', img:
'decrementindent', hint: _("Decrease Indent"), uno: 'DecrementIndent' },
{ type: 'break', id: 'incdecindent' },
+ { type: 'button', id: 'annotation', img: 'annotation',
hint: _("Insert Comment"), uno: 'InsertAnnotation' },
{ type: 'button', id: 'insertgraphic', img:
'insertgraphic', hint: _("Insert Graphic") },
{ type: 'break' },
{ type: 'button', id: 'help', img: 'help', hint:
_("Help") },
@@ -182,7 +183,7 @@ $(function () {
});
var formatButtons = ['undo', 'redo', 'save',
- 'bold', 'italic', 'underline', 'strikeout',
+ 'bold', 'italic', 'underline', 'strikeout', 'annotation',
'fontcolor', 'backcolor', 'bullet', 'numbering',
'alignleft', 'alignhorizontal', 'alignright', 'alignblock',
'incrementindent', 'decrementindent', 'insertgraphic'];
@@ -571,6 +572,7 @@ map.on('updatepermission', function (e) {
toolbar.hide('writer:menu:file');
if (docType === 'presentation') {
toolbar.show('impress:menu:file');
+ toolbar.hide('annotation');
toolbar = w2ui['presentation-toolbar'];
toolbar.show('presentation');
@@ -581,12 +583,14 @@ map.on('updatepermission', function (e) {
}
else if (docType === 'drawing') {
toolbar.show('impress:menu:file');
+ toolbar.hide('annotation');
}
else if (docType === 'spreadsheet') {
toolbar.show('calc:menu:file');
}
else {
toolbar.show('other:menu:file');
+ toolbar.hide('annotation');
}
}
});
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
