[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loleaflet/src

Pranav Kant pranavk at collabora.co.uk
Wed Mar 8 12:36:39 UTC 2017


 loleaflet/dist/images/lc_accepttrackedchanges.svg  |  123 +++++++++++++
 loleaflet/dist/images/lc_commentchangetracking.svg |  185 +++++++++++++++++++++
 loleaflet/dist/images/lc_showtrackedchanges.svg    |  144 ++++++++++++++++
 loleaflet/dist/images/lc_trackchanges.svg          |  125 ++++++++++++++
 loleaflet/dist/toolbar.css                         |    3 
 loleaflet/dist/toolbar/toolbar.js                  |    4 
 loleaflet/src/layer/AnnotationManager.js           |   42 ++++
 loleaflet/src/layer/tile/TileLayer.js              |    1 
 loleaflet/src/layer/tile/WriterTileLayer.js        |    6 
 9 files changed, 630 insertions(+), 3 deletions(-)

New commits:
commit 728c0d320d4a213a6bfaa30ca169522a3ef811ee
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Mar 8 15:45:52 2017 +0530

    loleaflet: Change tracking comment can be changed now
    
    Change-Id: I92886afc5e4a9a1b03f148d11c54a9988261c2c4

diff --git a/loleaflet/src/layer/AnnotationManager.js b/loleaflet/src/layer/AnnotationManager.js
index 487bbe5..15cd8af 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -277,6 +277,19 @@ L.AnnotationManager = L.Class.extend({
 				}
 			};
 			this._map.sendUnoCommand('.uno:InsertAnnotation', comment);
+		}
+		else if (e.annotation._data.trackchange) {
+			comment = {
+				ChangeTrackingId: {
+					type: 'long',
+					value: e.annotation._data.index
+				},
+				Text: {
+					type: 'string',
+					value: e.annotation._data.text
+				}
+			};
+			this._map.sendUnoCommand('.uno:CommentChangeTracking', comment);
 		} else {
 			comment = {
 				Id: {
commit 66c51609e7ec4032f9b5fc7384da3b956616a22f
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Mar 8 15:20:23 2017 +0530

    loleaflet: Show change tracking comments in sidebar
    
    Change-Id: I89c095c388efffc4a96a3837a8b780d14931b33f

diff --git a/loleaflet/src/layer/AnnotationManager.js b/loleaflet/src/layer/AnnotationManager.js
index c07ab03..487bbe5 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -19,15 +19,28 @@ L.AnnotationManager = L.Class.extend({
 		this._map.on('AnnotationSave', this._onAnnotationSave, this);
 	},
 
+	// Remove only text comments from the document (excluding change tracking comments)
 	clear: function () {
 		for (var key in this._items) {
-			this._map.removeLayer(this._items[key]);
+			if (!this._items[key].trackchange) {
+				this._map.removeLayer(this._items[key]);
+			}
 		}
 		this._map.removeLayer(this._arrow);
 		this._items = [];
 		this._selected = {};
 	},
 
+	// Remove only change tracking comments from the document
+	clearChanges: function() {
+		for (var key in this._items) {
+			if (this._items[key].trackchange) {
+				this._map.removeLayer(this._items[key]);
+			}
+		}
+	},
+
+	// Fill normal comments in the documents
 	fill: function (comments) {
 		var comment;
 		this.clear();
@@ -37,11 +50,25 @@ L.AnnotationManager = L.Class.extend({
 				continue;
 			}
 			comment.anchorPos = L.LOUtil.stringToPoint(comment.anchorPos);
+			comment.trackchange = false;
 			this._items.push(L.annotation(this._map.options.maxBounds.getSouthEast(), comment).addTo(this._map));
 		}
 		this.layout();
 	},
 
+	fillChanges: function(redlines) {
+		var changecomment;
+		this.clearChanges();
+		for (var idx in redlines) {
+			changecomment = redlines[idx];
+			changecomment.anchorPos = L.LOUtil.stringToPoint(changecomment.textRange);
+			changecomment.trackchange = true;
+			changecomment.text = changecomment.comment;
+			this._items.push(L.annotation(this._map.options.maxBounds.getSouthEast(), changecomment).addTo(this._map));
+		}
+		this.layout();
+	},
+
 	getItem: function (id) {
 		for (var iterator in this._items) {
 			if (this._items[iterator]._data.id === id) {
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 6fb2f15..27b988c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -198,6 +198,7 @@ L.TileLayer = L.GridLayer.extend({
 				}
 			}
 		});
+		this._map._socket.sendMessage('commandvalues command=.uno:AcceptTrackedChanges');
 
 		map._fadeAnimated = false;
 		this._viewReset();
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js b/loleaflet/src/layer/tile/WriterTileLayer.js
index f198457..34f1de7 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -35,7 +35,11 @@ L.WriterTileLayer = L.TileLayer.extend({
 
 		if (values.comments) {
 			this._annotations.fill(values.comments);
-		} else {
+		}
+		else if (values.redlines) {
+			this._annotations.fillChanges(values.redlines);
+		}
+		else {
 			L.TileLayer.prototype._onCommandValuesMsg.call(this, textMsg);
 		}
 	},
commit 0c5efd80ad2e90772fac149398a01345ed8fd074
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Mar 6 19:49:03 2017 +0530

    Add change tracking toolbar buttons
    
    Change-Id: Ie2b77ce5828de1062d94d0fca35852f7f5e15dbc

diff --git a/loleaflet/dist/images/lc_accepttrackedchanges.svg b/loleaflet/dist/images/lc_accepttrackedchanges.svg
index a70905a..09d5687 100644
--- a/loleaflet/dist/images/lc_accepttrackedchanges.svg
+++ b/loleaflet/dist/images/lc_accepttrackedchanges.svg
@@ -1 +1,122 @@
-<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(1 -1029.3623)"><path d="m11 1033.3622c-4.432 0-8 3.568-8 8 0 4.432 3.568 8 8 8 4.432 0 8-3.568 8-8 0-4.432-3.568-8-8-8zm0 1c3.878 0 7 3.122 7 7 0 3.878-3.122 7-7 7-3.878 0-7-3.122-7-7 0-3.878 3.122-7 7-7z" fill="#4d4d4d"/><path d="m15.285715 1037.8623l-5.7142861 5.6-2.8571432-2.8-.7142857.7 2.8571427 2.7999.7142862.7001.7142861-.7001 5.714285-5.5998z" fill="#2ecc71"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 24 24"
+   sodipodi:docname="lc_accepttrackedchanges.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.788374"
+     inkscape:cx="12.426612"
+     inkscape:cy="12.841403"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4120"
+       originx="1px"
+       originy="1.0001047px" />
+    <sodipodi:guide
+       position="3,21.000122"
+       orientation="18,0"
+       id="guide4126" />
+    <sodipodi:guide
+       position="3,3.0001221"
+       orientation="0,18"
+       id="guide4128" />
+    <sodipodi:guide
+       position="21,3.0001221"
+       orientation="-18,0"
+       id="guide4130" />
+    <sodipodi:guide
+       position="21,21.000122"
+       orientation="0,-18"
+       id="guide4132" />
+    <sodipodi:guide
+       position="4,20.000122"
+       orientation="16,0"
+       id="guide4134" />
+    <sodipodi:guide
+       position="4,4.0001221"
+       orientation="0,16"
+       id="guide4136" />
+    <sodipodi:guide
+       position="20,4.0001221"
+       orientation="-16,0"
+       id="guide4138" />
+    <sodipodi:guide
+       position="20,20.000122"
+       orientation="0,-16"
+       id="guide4140" />
+    <sodipodi:guide
+       position="20,14.000122"
+       orientation="-6,0"
+       id="guide4199" />
+    <sodipodi:guide
+       position="20,20.000122"
+       orientation="0,-6.0000172"
+       id="guide4201" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(1,-1029.3623)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="m 11,1033.3622 c -4.432,0 -8,3.568 -8,8 0,4.432 3.568,8 8,8 4.432,0 8,-3.568 8,-8 0,-4.432 -3.568,-8 -8,-8 z m 0,1 c 3.878,0 7,3.122 7,7 0,3.878 -3.122,7 -7,7 -3.878,0 -7,-3.122 -7,-7 0,-3.878 3.122,-7 7,-7 z"
+       id="rect3356" />
+    <path
+       style="fill:#2ecc71;fill-opacity:1;stroke:none;stroke-opacity:1"
+       d="m 15.285715,1037.8623 -5.7142861,5.6 -2.8571432,-2.8 -0.7142857,0.7 2.8571427,2.7999 0.7142862,0.7001 0.7142861,-0.7001 5.714285,-5.5998 -0.714285,-0.7001 z"
+       id="rect4176"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/loleaflet/dist/images/lc_commentchangetracking.svg b/loleaflet/dist/images/lc_commentchangetracking.svg
new file mode 100644
index 0000000..4f40fec
--- /dev/null
+++ b/loleaflet/dist/images/lc_commentchangetracking.svg
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="24"
+   height="24"
+   id="svg3760"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="lc_commentchangetracking.svg">
+  <defs
+     id="defs3762" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.223826"
+     inkscape:cx="7.1623996"
+     inkscape:cy="14.426796"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <sodipodi:guide
+       position="1,23"
+       orientation="22,0"
+       id="guide4116" />
+    <sodipodi:guide
+       position="1,1"
+       orientation="0,22"
+       id="guide4118" />
+    <sodipodi:guide
+       position="23,1"
+       orientation="-22,0"
+       id="guide4120" />
+    <sodipodi:guide
+       position="23,23"
+       orientation="0,-22"
+       id="guide4122" />
+    <sodipodi:guide
+       position="3,21"
+       orientation="18,0"
+       id="guide4124" />
+    <sodipodi:guide
+       position="21,3"
+       orientation="-18,0"
+       id="guide4128" />
+    <sodipodi:guide
+       position="21,21"
+       orientation="0,-18"
+       id="guide4130" />
+    <sodipodi:guide
+       position="4,20"
+       orientation="16,0"
+       id="guide4132" />
+    <sodipodi:guide
+       position="4,4"
+       orientation="0,16"
+       id="guide4134" />
+    <sodipodi:guide
+       position="20,4"
+       orientation="-16,0"
+       id="guide4136" />
+    <sodipodi:guide
+       position="20,20"
+       orientation="0,-16"
+       id="guide4138" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid4140"
+       originx="0.99999582px"
+       originy="1.0000027px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3765">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-552.72253,-582.11926)">
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect4035"
+       width="0"
+       height="10.999983"
+       x="539.72247"
+       y="591.1192" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect4035-5"
+       width="0"
+       height="10.999983"
+       x="557.76324"
+       y="589.06787" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect4035-8"
+       width="0"
+       height="10.999983"
+       x="539.72247"
+       y="591.1192" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect4035-59"
+       width="0"
+       height="10.999983"
+       x="539.72247"
+       y="591.1192" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3781"
+       y="603.87646"
+       x="555.15845"
+       style="font-size:9px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         id="tspan3783"
+         sodipodi:role="line"
+         x="555.15845"
+         y="603.87646" /></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3781-8"
+       y="598.01312"
+       x="555.89514"
+       style="font-size:9px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         id="tspan3783-1"
+         sodipodi:role="line"
+         x="555.89514"
+         y="598.01312" /></text>
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#da4453;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3024"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="M 10,8 A 2,2 0 0 1 8,10 2,2 0 0 1 6,8 2,2 0 0 1 8,6 2,2 0 0 1 10,8 Z"
+       transform="translate(556.72253,583.11926)" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="m 556.72253,586.11926 0,10 3.00002,4 -2e-5,-3 2e-5,-1 12.99998,0 0,-10 z m 1,1 14.00002,0 0,8 -14,0 z"
+       id="path4147"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       d="m 569.72253,597.11926 0,2 -2,0 0,1 2,0 0,2 1,0 0,-2 2,0 0,-1 -2,0 0,-2 -1,0 z"
+       id="rect2992" />
+  </g>
+</svg>
diff --git a/loleaflet/dist/images/lc_showtrackedchanges.svg b/loleaflet/dist/images/lc_showtrackedchanges.svg
new file mode 100644
index 0000000..c8e9447
--- /dev/null
+++ b/loleaflet/dist/images/lc_showtrackedchanges.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   viewBox="0 0 24 24"
+   sodipodi:docname="lc_showtrackedchanges.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="35.576748"
+     inkscape:cx="15.447886"
+     inkscape:cy="12.487296"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     units="px"
+     inkscape:window-width="1868"
+     inkscape:window-height="1060"
+     inkscape:window-x="50"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     showguides="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4120"
+       originx="1px"
+       originy="1.0001047px" />
+    <sodipodi:guide
+       position="3,21.000122"
+       orientation="18,0"
+       id="guide4126" />
+    <sodipodi:guide
+       position="3,3.0001221"
+       orientation="0,18"
+       id="guide4128" />
+    <sodipodi:guide
+       position="21,3.0001221"
+       orientation="-18,0"
+       id="guide4130" />
+    <sodipodi:guide
+       position="21,21.000122"
+       orientation="0,-18"
+       id="guide4132" />
+    <sodipodi:guide
+       position="4,20.000122"
+       orientation="16,0"
+       id="guide4134" />
+    <sodipodi:guide
+       position="4,4.0001221"
+       orientation="0,16"
+       id="guide4136" />
+    <sodipodi:guide
+       position="20,4.0001221"
+       orientation="-16,0"
+       id="guide4138" />
+    <sodipodi:guide
+       position="20,20.000122"
+       orientation="0,-16"
+       id="guide4140" />
+    <sodipodi:guide
+       position="20,14.000122"
+       orientation="-6,0"
+       id="guide4199" />
+    <sodipodi:guide
+       position="20,20.000122"
+       orientation="0,-6.0000172"
+       id="guide4201" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(1,-1029.3623)">
+    <g
+       transform="translate(0,-4.4833253e-6)"
+       id="layer1-2"
+       inkscape:label="Capa 1">
+      <rect
+         y="1033.3622"
+         x="3"
+         height="14.000017"
+         width="14"
+         id="rect4146"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+      <rect
+         y="1048.3622"
+         x="3"
+         height="0.9999826"
+         width="16"
+         id="rect4148"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+      <rect
+         y="1033.3622"
+         x="18"
+         height="16.000017"
+         width="1"
+         id="rect4150"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+      <rect
+         y="1034.3622"
+         x="4"
+         height="12"
+         width="12"
+         id="rect4152"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/loleaflet/dist/images/lc_trackchanges.svg b/loleaflet/dist/images/lc_trackchanges.svg
new file mode 100644
index 0000000..3c7aa80
--- /dev/null
+++ b/loleaflet/dist/images/lc_trackchanges.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   viewBox="0 0 24 24"
+   sodipodi:docname="lc_trackchanges.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.788374"
+     inkscape:cx="13.587302"
+     inkscape:cy="12.176955"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     units="px"
+     inkscape:window-width="1868"
+     inkscape:window-height="1060"
+     inkscape:window-x="50"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     showguides="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4120"
+       originx="1px"
+       originy="0.99998262px" />
+    <sodipodi:guide
+       position="3,21"
+       orientation="18,0"
+       id="guide4126" />
+    <sodipodi:guide
+       position="3,3"
+       orientation="0,18"
+       id="guide4128" />
+    <sodipodi:guide
+       position="21,21"
+       orientation="0,-18"
+       id="guide4132" />
+    <sodipodi:guide
+       position="4,20"
+       orientation="16,0"
+       id="guide4134" />
+    <sodipodi:guide
+       position="4,4"
+       orientation="0,16"
+       id="guide4136" />
+    <sodipodi:guide
+       position="20,4"
+       orientation="-16,0"
+       id="guide4138" />
+    <sodipodi:guide
+       position="20,20"
+       orientation="0,-16"
+       id="guide4140" />
+    <sodipodi:guide
+       position="20,14"
+       orientation="-6,0"
+       id="guide4199" />
+    <sodipodi:guide
+       position="20,20"
+       orientation="0,-6.0000172"
+       id="guide4201" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(1,-1029.3622)">
+    <g
+       id="layer1-5"
+       inkscape:label="Capa 1">
+      <path
+         id="rect3356"
+         transform="translate(0,1030.3622)"
+         d="m 11,3 c -4.432,0 -8,3.568 -8,8 0,4.432 3.568,8 8,8 4.432,0 8,-3.568 8,-8 0,-4.432 -3.568,-8 -8,-8 z m 0,1 c 3.878,0 7,3.122 7,7 0,3.878 -3.122,7 -7,7 C 7.122,18 4,14.878 4,11 4,7.122 7.122,4 11,4 z"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <rect
+         ry="3"
+         y="1038.3622"
+         x="8"
+         height="6"
+         width="6"
+         id="rect3274"
+         style="fill:#da4453;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index a2b5c31..8e5f830 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -255,6 +255,9 @@ button.leaflet-control-search-next
 .w2ui-icon.selected{ background: url('../images/lc_ok.svg') no-repeat center !important; }
 .w2ui-icon.repair{ background: url('../images/lc_backward.svg') no-repeat center !important; }
 .w2ui-icon.specialcharacter{ background: url('../images/lc_insertsymbol.svg') no-repeat center !important; }
+.w2ui-icon.trackchanges{ background: url('../images/lc_trackchanges.svg') no-repeat center !important; }
+.w2ui-icon.commentchangetracking{ background: url('../images/lc_commentchangetracking.svg') no-repeat center !important; }
+.w2ui-icon.showtrackedchanges{ background: url('../images/lc_showtrackedchanges.svg') no-repeat center !important; }
 
 #inserttable-wrapper {
     position: relative;
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 6fe0696..5e010f7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -521,6 +521,10 @@ $(function () {
 			{type: 'button',  id: 'insertannotation', img: 'annotation', hint: _('Insert comment')},
 			{type: 'button',  id: 'insertgraphic',  img: 'insertgraphic', hint: _('Insert graphic')},
 			{type: 'button',  id: 'specialcharacter', img: 'specialcharacter', hint: _('Special Character')},
+			{type: 'break', id: 'reviewbreak'},
+			{type: 'button',  id: 'trackchanges',  img: 'trackchanges', hint: _('Record Changes'), uno: 'TrackChanges'},
+			{type: 'button',  id: 'commentchangetracking',  img: 'commentchangetracking', hint: _('Comment On Change'), uno: 'CommentChangeTracking'},
+			{type: 'button',  id: 'showtrackedchanges',  img: 'showtrackedchanges', hint: _('Show Changes'), uno: 'ShowTrackedChanges'},
 			{type: 'html', id: 'right'},
 			{type: 'button',  id: 'more', img: 'more', hint: _('More')},
 			{type: 'html', id: 'rightmenupadding'},


More information about the Libreoffice-commits mailing list