loleaflet/css/toolbar.css | 1
loleaflet/images/lc_insertcomment.svg | 66 ++++++++++++++++++++++++++++
loleaflet/src/control/Control.Toolbar.js | 5 +-
loleaflet/src/layer/tile/CalcTileLayer.js | 1
loleaflet/src/layer/tile/WriterTileLayer.js | 1
5 files changed, 73 insertions(+), 1 deletion(-)
New commits:
commit 60d31ea5b9ec145677ee46837fcb4b30cc208d06
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Oct 7 16:19:27 2019 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Oct 7 16:27:10 2019 +0200
Mobile: Add a comment insertion button to the top toolbar
Change-Id: I4637aad1430d14febb77247ef905ad79f5238d4a
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 166ba3ba9..f48094231 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -661,6 +661,7 @@ button.leaflet-control-search-next
.w2ui-icon.sidebar_modify_page{ background:
url('images/lc_formproperties.svg') no-repeat center !important; }
.w2ui-icon.mobile_wizard{ background: url('images/lc_mobile_wizard.svg')
no-repeat center !important; }
.w2ui-icon.insertion_mobile_wizard{ background:
url('images/lc_insertion_mobile_wizard.svg') no-repeat center !important; }
+.w2ui-icon.insertcomment{ background: url('images/lc_insertcomment.svg')
no-repeat center !important; }
.w2ui-icon.vereign{ background: url('images/vereign.png') no-repeat center
!important; }
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 965fc9c56..c70e94d68 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -200,6 +200,9 @@ function onClick(e, id, item, subItem) {
else if (id === 'insertannotation') {
map.insertComment();
}
+ else if (id === 'insertcomment') {
+ map.insertComment();
+ }
else if (id === 'insertpage') {
map.insertPage();
}
@@ -2036,7 +2039,7 @@ function onUpdatePermission(e) {
var spreadsheetButtons = ['insertsheet'];
var formulaBarButtons = ['functiondialog', 'sum', 'function'];
var presentationButtons = ['insertpage', 'duplicatepage', 'deletepage'];
- var toolbarDownButtons = ['next', 'prev', 'mobile_wizard',
'insertion_mobile_wizard'];
+ var toolbarDownButtons = ['next', 'prev', 'mobile_wizard',
'insertion_mobile_wizard', 'insertcomment'];
if (e.perm === 'edit') {
// Enable list boxes
$('.styles-select').prop('disabled', false);
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 84545599a..7181e32c3 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -112,6 +112,7 @@ L.CalcTileLayer = L.TileLayer.extend({
{type: 'button', id: 'redo', img: 'redo',
hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true},
{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: 'button', id: 'fullscreen', img:
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
{type: 'drop', id: 'userlist', img: 'users',
html: '<div id="userlist_container"><table
id="userlist_table"><tbody></tbody></table>' +
'<hr><table class="loleaflet-font"
id="editor-btn">' +
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js
b/loleaflet/src/layer/tile/WriterTileLayer.js
index 3737747e2..7923eb32a 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -103,6 +103,7 @@ L.WriterTileLayer = L.TileLayer.extend({
{type: 'button', id: 'redo', img: 'redo',
hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true},
{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: 'button', id: 'fullscreen', img:
'fullscreen', hint: _UNO('.uno:FullScreen', 'text')},
{type: 'drop', id: 'userlist', img: 'users',
html: '<div id="userlist_container"><table
id="userlist_table"><tbody></tbody></table>' +
'<hr><table class="loleaflet-font"
id="editor-btn">' +
commit 53555525faa9db7773012a6f5a547a1ed094c678
Author: Pedro <pedro.si...@collabora.com>
AuthorDate: Mon Oct 7 16:18:36 2019 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Oct 7 16:27:10 2019 +0200
Add icon for insert comment toolbar button
Change-Id: I2268752e4a8cf68d1a71b5c64f8fcf1d90f30d01
diff --git a/loleaflet/images/lc_insertcomment.svg
b/loleaflet/images/lc_insertcomment.svg
new file mode 100644
index 000000000..ac434b08d
--- /dev/null
+++ b/loleaflet/images/lc_insertcomment.svg
@@ -0,0 +1,66 @@
+<?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";
+ id="svg4"
+ version="1.1"
+ viewBox="0 0 24 24"
+ sodipodi:docname="lc_showannotations_AMX_mobile.svg"
+ inkscape:version="0.92.4 (unknown)">
+ <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="namedview6"
+ showgrid="false"
+ inkscape:snap-bbox="true"
+ inkscape:snap-nodes="false"
+ inkscape:bbox-paths="true"
+ inkscape:bbox-nodes="true"
+ inkscape:snap-bbox-edge-midpoints="true"
+ inkscape:zoom="9.8333333"
+ inkscape:cx="6.2773823"
+ inkscape:cy="11.108882"
+ inkscape:window-x="0"
+ inkscape:window-y="30"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg4" />
+ <metadata
+ id="metadata10">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs8" />
+ <g
+ style="stroke-width:0.99999994"
+ id="g1615"
+
inkscape:export-filename="/home/pedrosilva/Documents/Projects/Collabora/amx/amx-mobile/amx-mobile-ux-milestone/screenshots-with-icons.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <path
+ style="fill:#555555;fill-opacity:1;stroke-width:0.99999994"
+ inkscape:connector-curvature="0"
+ d="M 21.99,4 C 21.99,2.9 21.1,2 20,2 H 4 C 2.9,2 2,2.9 2,4 v 12 c 0,1.1
0.9,2 2,2 h 14 l 4,4 z M 17,11 h -4 v 4 H 11 V 11 H 7 V 9 h 4 V 5 h 2 v 4 h 4 z"
+ id="path1613" />
+ </g>
+</svg>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
