loleaflet/dist/images/lc_accepttrackedchanges.svg | 123 ------------------
loleaflet/dist/images/lc_showtrackedchanges.svg | 144 ----------------------
loleaflet/dist/images/lc_trackchanges.svg | 125 -------------------
loleaflet/dist/toolbar.css | 3
loleaflet/dist/toolbar/toolbar.js | 3
5 files changed, 1 insertion(+), 397 deletions(-)
New commits:
commit a65cf94b6580442a14479f7d6304f541d4614491
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Apr 4 23:00:44 2017 +0530
Revert "Add change tracking toolbar buttons"
This reverts commit 0c5efd80ad2e90772fac149398a01345ed8fd074.
Change tracking options are already available in the menubar, lets bin
them from the toolbar
Change-Id: Ie340957eb1e615429a54be9cb0639db146e6d7a1
(cherry picked from commit f90ad6e74329367581da8c5461e25d2edc48b652)
diff --git a/loleaflet/dist/images/lc_accepttrackedchanges.svg
b/loleaflet/dist/images/lc_accepttrackedchanges.svg
index 09d56877..a70905a5 100644
--- a/loleaflet/dist/images/lc_accepttrackedchanges.svg
+++ b/loleaflet/dist/images/lc_accepttrackedchanges.svg
@@ -1,122 +1 @@
-<?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>
+<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
diff --git a/loleaflet/dist/images/lc_showtrackedchanges.svg
b/loleaflet/dist/images/lc_showtrackedchanges.svg
deleted file mode 100644
index c8e94479..00000000
--- a/loleaflet/dist/images/lc_showtrackedchanges.svg
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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
deleted file mode 100644
index 3c7aa80e..00000000
--- a/loleaflet/dist/images/lc_trackchanges.svg
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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 220f4f94..e6cc5dc8 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -254,9 +254,6 @@ 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 4954e918..0650ec16 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -505,9 +505,6 @@ $(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: 'showtrackedchanges', img:
'showtrackedchanges', hint: _('Show Changes'), uno: 'ShowTrackedChanges'},
{type: 'html', id: 'right'},
{type: 'button', id: 'more', img: 'more', hint:
_('More')},
{type: 'html', id: 'rightmenupadding'},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
