Merge pull request #304 from vkbo/ref_panel_update

Redesign of References Panel
This commit is contained in:
Veronica K. Berglyd Olsen
2020-06-09 23:47:13 +02:00
committed by GitHub
34 changed files with 857 additions and 221 deletions
@@ -0,0 +1,31 @@
<?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"
id="svg2608"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata2614">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2612" />
<path
style="stroke-width:1.05081;fill:#aeaeae;fill-opacity:1"
id="path2606"
d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z" />
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

+31
View File
@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg2608">
<metadata
id="metadata2614">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2612" />
<path
d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z"
id="path2606"
style="stroke-width:1.05081;fill:#000000;fill-opacity:0.78039217" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg5619">
<metadata
id="metadata5625">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5623" />
<path
d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z"
id="path5617"
style="stroke-width:1.17614;fill:#aeaeae;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

+31
View File
@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg5619">
<metadata
id="metadata5625">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5623" />
<path
d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z"
id="path5617"
style="stroke-width:1.17614;fill:#000000;fill-opacity:0.78039217" />
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg4924">
<metadata
id="metadata4930">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4928" />
<path
d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z"
id="path4922"
style="stroke-width:1.24817;fill:#aeaeab;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

+31
View File
@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg4924">
<metadata
id="metadata4930">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4928" />
<path
d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z"
id="path4922"
style="stroke-width:1.24817;fill:#000000;fill-opacity:0.78039217" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg2608">
<metadata
id="metadata2614">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2612" />
<path
d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z"
id="path2606"
style="stroke-width:1.05081;fill:#6699cc;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

@@ -49,3 +49,6 @@ edit = pencil.svg
check = tick.svg check = tick.svg
cross = times.svg cross = times.svg
hash = hash.svg hash = hash.svg
reference = bookmark.svg
sticky-on = pin.svg
sticky-off = pin-outline.svg
@@ -0,0 +1,31 @@
<?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"
id="svg5619"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata5625">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5623" />
<path
style="stroke-width:1.17614;fill:#6699cc;fill-opacity:1"
id="path5617"
d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z" />
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

@@ -0,0 +1,31 @@
<?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"
id="svg4924"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata4930">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4928" />
<path
style="stroke-width:1.24817;fill:#6699cc;fill-opacity:1"
id="path4922"
d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -0,0 +1,31 @@
<?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"
id="svg2608"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata2614">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2612" />
<path
style="stroke-width:1.05081;fill:#4271ae;fill-opacity:1"
id="path2606"
d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z" />
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

@@ -49,3 +49,6 @@ edit = pencil.svg
check = tick.svg check = tick.svg
cross = times.svg cross = times.svg
hash = hash.svg hash = hash.svg
reference = bookmark.svg
sticky-on = pin.svg
sticky-off = pin-outline.svg
@@ -0,0 +1,31 @@
<?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"
id="svg5619"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata5625">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5623" />
<path
style="stroke-width:1.17614;fill:#4271ae;fill-opacity:1"
id="path5617"
d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z" />
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

@@ -0,0 +1,31 @@
<?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"
id="svg4924"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata4930">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4928" />
<path
style="stroke-width:1.24817;fill:#4271ae;fill-opacity:1"
id="path4922"
d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -0,0 +1,31 @@
<?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"
id="svg2608"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata2614">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2612" />
<path
style="stroke-width:1.05081;fill:#aeaeae;fill-opacity:1"
id="path2606"
d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z" />
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

@@ -49,3 +49,6 @@ edit = pencil.svg
check = tick.svg check = tick.svg
cross = times.svg cross = times.svg
hash = hash.svg hash = hash.svg
reference = bookmark.svg
sticky-on = pin.svg
sticky-off = pin-outline.svg
@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg5619">
<metadata
id="metadata5625">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5623" />
<path
d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z"
id="path5617"
style="stroke-width:1.17614;fill:#aeaeae;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg4924">
<metadata
id="metadata4930">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4928" />
<path
d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z"
id="path4922"
style="stroke-width:1.24817;fill:#aeaeab;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -0,0 +1,31 @@
<?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"
id="svg2608"
viewBox="0 0 24 24"
height="24"
width="24"
version="1.2">
<metadata
id="metadata2614">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2612" />
<path
style="stroke-width:1.05081;fill:#000000;fill-opacity:0.78039217"
id="path2606"
d="M 16.203226,2 H 7.796774 C 6.05874,2 4.6443545,3.4143855 4.6443545,5.1524195 V 19.86371 c 0,0.540115 0.1092839,0.994063 0.3236484,1.350287 0.5926549,0.982504 1.9072138,1.059213 2.9559187,0.0084 L 11.25708,17.889239 c 0.394052,-0.393002 1.091787,-0.393002 1.485841,0 l 3.333158,3.333158 C 16.592024,21.738349 17.128987,22 17.673304,22 c 0.837492,0 1.682342,-0.660957 1.682342,-2.13629 V 5.1524195 C 19.355646,3.4143855 17.941259,2 16.203226,2 Z M 7.796774,4.101613 h 8.406452 c 0.578994,0 1.050806,0.4718121 1.050806,1.0508065 V 15.560658 l -2.575527,-2.361162 c -1.477434,-1.35449 -3.880628,-1.353439 -5.3580615,0 l -2.574476,2.361162 V 5.1524195 c 0,-0.5789944 0.4718121,-1.0508065 1.0508065,-1.0508065 z m 6.431987,12.301792 C 13.635055,15.809699 12.843798,15.482898 12,15.482898 c -0.843797,0 -1.635054,0.327852 -2.2287605,0.920507 l -3.025272,3.025272 v -2.442075 l 3.2848215,-3.011611 c 1.085483,-0.995114 2.851889,-0.995114 3.937372,0 l 3.285871,3.011611 v 2.442075 z" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -49,3 +49,6 @@ edit = pencil.svg
check = tick.svg check = tick.svg
cross = times.svg cross = times.svg
hash = hash.svg hash = hash.svg
reference = bookmark.svg
sticky-on = pin.svg
sticky-off = pin-outline.svg
@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg5619">
<metadata
id="metadata5625">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5623" />
<path
d="M 21.321794,7.3993841 16.619582,2.6712968 C 15.735124,1.7821341 14.193203,1.772725 13.291103,2.6642399 13.060579,2.8947636 12.879453,3.1770375 12.799476,3.4040327 12.031456,5.0059369 11.206981,6.0091853 10.148454,6.6113695 L 9.8932312,6.7348644 c -1.138504,0.5704284 -2.687482,1.1514421 -5.5502098,1.1514421 -0.3128535,0 -0.6127695,0.061159 -0.9009241,0.1787735 -0.5692523,0.2375805 -1.033828,0.6998039 -1.2725846,1.2749371 -0.2340521,0.569252 -0.2340521,1.2243629 0,1.7936149 0.1223186,0.292859 0.2940352,0.553963 0.5116213,0.765668 L 6.4859506,15.704116 1.9907392,22 l 6.294707,-4.495212 3.7954078,3.795408 c 0.218762,0.222291 0.477513,0.398712 0.771548,0.518678 C 13.142909,21.940017 13.444001,22 13.753326,22 c 0.309325,0 0.610418,-0.06116 0.899748,-0.181126 0.585719,-0.241109 1.038533,-0.696275 1.270233,-1.26788 0.121142,-0.284626 0.182302,-0.596304 0.182302,-0.903276 0,-2.86508 0.581013,-4.412882 1.150266,-5.552563 0.583366,-1.166732 1.610137,-2.055894 3.239092,-2.839204 0.318734,-0.122319 0.599832,-0.301092 0.836237,-0.537497 0.907981,-0.9197419 0.903276,-2.4122651 -0.0094,-3.3190699 z m -6.172388,5.6466539 c -0.96326,1.932399 -1.397256,3.963595 -1.405489,6.591094 L 4.3430214,10.238589 c 2.5157659,0 4.4858018,-0.3940079 6.3464576,-1.2749372 L 10.965872,8.840157 c 1.645421,-0.8221227 2.902716,-2.2264352 3.984766,-4.5093251 l 4.615178,4.7645472 c -2.191151,1.0502949 -3.594287,2.3052369 -4.41641,3.9506589 z"
id="path5617"
style="stroke-width:1.17614;fill:#000000;fill-opacity:0.78039217" />
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

@@ -0,0 +1,31 @@
<?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"
version="1.2"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg4924">
<metadata
id="metadata4930">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4928" />
<path
d="M 16.641616,2.36759 C 16.156078,1.879557 15.367237,1.8770607 14.876708,2.3626 14.7469,2.4924093 14.657031,2.6459337 14.595871,2.8056991 13.557396,4.9725159 12.414076,6.1944709 10.971195,6.915911 9.3523243,7.7147375 7.4938043,8.270172 4.4982051,8.270172 c -0.1622616,0 -0.3245233,0.0312 -0.4767996,0.09486 -0.3058008,0.127313 -0.547945,0.370705 -0.675258,0.675258 -0.1260648,0.304552 -0.1260648,0.649046 0,0.953599 0.063657,0.153524 0.1547727,0.292071 0.2708521,0.406902 L 7.6648033,14.448593 2.0018723,22 l 7.551407,-5.662931 4.0465547,4.046555 c 0.114831,0.117328 0.253378,0.207196 0.406902,0.270852 0.152277,0.06366 0.314538,0.09736 0.4768,0.09736 0.162261,0 0.324524,-0.0337 0.476799,-0.09736 0.305801,-0.127313 0.549193,-0.36821 0.675259,-0.675259 0.06366,-0.151027 0.09611,-0.314537 0.09611,-0.475551 0,-2.995598 0.554186,-4.854118 1.351763,-6.448027 0.720193,-1.44288 1.942148,-2.586201 4.110213,-3.624676 0.161013,-0.06115 0.31329,-0.151028 0.441851,-0.280836 0.485536,-0.49053 0.48304,-1.2793713 -0.005,-1.7649081 z"
id="path4922"
style="stroke-width:1.24817;fill:#000000;fill-opacity:0.78039217" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

+13
View File
@@ -96,6 +96,7 @@ class Config:
self.projColWidth = [140, 55, 140] self.projColWidth = [140, 55, 140]
self.mainPanePos = [300, 800] self.mainPanePos = [300, 800]
self.docPanePos = [400, 400] self.docPanePos = [400, 400]
self.viewPanePos = [500, 150]
self.outlnPanePos = [500, 150] self.outlnPanePos = [500, 150]
self.isFullScreen = False self.isFullScreen = False
@@ -363,6 +364,9 @@ class Config:
self.docPanePos = self._parseLine( self.docPanePos = self._parseLine(
cnfParse, cnfSec, "docpane", self.CNF_LIST, self.docPanePos cnfParse, cnfSec, "docpane", self.CNF_LIST, self.docPanePos
) )
self.viewPanePos = self._parseLine(
cnfParse, cnfSec, "viewpane", self.CNF_LIST, self.viewPanePos
)
self.outlnPanePos = self._parseLine( self.outlnPanePos = self._parseLine(
cnfParse, cnfSec, "outlinepane", self.CNF_LIST, self.outlnPanePos cnfParse, cnfSec, "outlinepane", self.CNF_LIST, self.outlnPanePos
) )
@@ -513,6 +517,7 @@ class Config:
cnfParse.set(cnfSec,"projcols", self._packList(self.projColWidth)) cnfParse.set(cnfSec,"projcols", self._packList(self.projColWidth))
cnfParse.set(cnfSec,"mainpane", self._packList(self.mainPanePos)) cnfParse.set(cnfSec,"mainpane", self._packList(self.mainPanePos))
cnfParse.set(cnfSec,"docpane", self._packList(self.docPanePos)) cnfParse.set(cnfSec,"docpane", self._packList(self.docPanePos))
cnfParse.set(cnfSec,"viewpane", self._packList(self.viewPanePos))
cnfParse.set(cnfSec,"outlinepane", self._packList(self.outlnPanePos)) cnfParse.set(cnfSec,"outlinepane", self._packList(self.outlnPanePos))
cnfParse.set(cnfSec,"fullscreen", str(self.isFullScreen)) cnfParse.set(cnfSec,"fullscreen", str(self.isFullScreen))
@@ -730,6 +735,11 @@ class Config:
self.confChanged = True self.confChanged = True
return True return True
def setViewPanePos(self, panePos):
self.viewPanePos = [int(x/self.guiScale) for x in panePos]
self.confChanged = True
return True
def setOutlinePanePos(self, panePos): def setOutlinePanePos(self, panePos):
self.outlnPanePos = [int(x/self.guiScale) for x in panePos] self.outlnPanePos = [int(x/self.guiScale) for x in panePos]
self.confChanged = True self.confChanged = True
@@ -770,6 +780,9 @@ class Config:
def getDocPanePos(self): def getDocPanePos(self):
return [int(x*self.guiScale) for x in self.docPanePos] return [int(x*self.guiScale) for x in self.docPanePos]
def getViewPanePos(self):
return [int(x*self.guiScale) for x in self.viewPanePos]
def getOutlinePanePos(self): def getOutlinePanePos(self):
return [int(x*self.guiScale) for x in self.outlnPanePos] return [int(x*self.guiScale) for x in self.outlnPanePos]
+1 -1
View File
@@ -77,7 +77,7 @@ class OptionState():
"headerOrder", "headerOrder",
"columnWidth", "columnWidth",
"columnHidden", "columnHidden",
]) ]),
} }
return return
+1
View File
@@ -579,6 +579,7 @@ class NWProject():
def closeProject(self): def closeProject(self):
"""Close the current project and clear all meta data. """Close the current project and clear all meta data.
""" """
self.optState.saveSettings()
self.projTree.writeToCFiles() self.projTree.writeToCFiles()
self._appendSessionStats() self._appendSessionStats()
self._clearLockFile() self._clearLockFile()
+1 -2
View File
@@ -2,8 +2,7 @@
from nw.gui.about import GuiAbout from nw.gui.about import GuiAbout
from nw.gui.build import GuiBuildNovel from nw.gui.build import GuiBuildNovel
from nw.gui.docbars import GuiDocTitleBar, GuiSearchBar from nw.gui.docbars import GuiDocTitleBar, GuiSearchBar, GuiDocViewDetails
from nw.gui.docdetails import GuiDocViewDetails
from nw.gui.doceditor import GuiDocEditor from nw.gui.doceditor import GuiDocEditor
from nw.gui.docmerge import GuiDocMerge from nw.gui.docmerge import GuiDocMerge
from nw.gui.docsplit import GuiDocSplit from nw.gui.docsplit import GuiDocSplit
+201 -4
View File
@@ -7,7 +7,9 @@
File History: File History:
Created: 2019-09-29 [0.2.1] GuiSearchBar Created: 2019-09-29 [0.2.1] GuiSearchBar
Created: 2019-10-31 [0.3.2] GuiDocViewDetails
Created: 2020-04-25 [0.4.5] GuiDocTitleBar Created: 2020-04-25 [0.4.5] GuiDocTitleBar
Created: 2020-06-09 [0.8.0] GuiDocViewFooter
This file is a part of novelWriter This file is a part of novelWriter
Copyright 2020, Veronica Berglyd Olsen Copyright 2020, Veronica Berglyd Olsen
@@ -30,10 +32,10 @@ import logging
import nw import nw
from PyQt5.QtCore import Qt, QSize from PyQt5.QtCore import Qt, QSize
from PyQt5.QtGui import QPalette, QColor from PyQt5.QtGui import QPalette, QColor, QIcon
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
qApp, QWidget, QFrame, QGridLayout, QLabel, QLineEdit, QPushButton, qApp, QWidget, QFrame, QGridLayout, QLabel, QLineEdit, QPushButton,
QHBoxLayout, QToolButton QHBoxLayout, QToolButton, QScrollArea
) )
from nw.constants import nwDocAction, nwUnicode from nw.constants import nwDocAction, nwUnicode
@@ -170,14 +172,14 @@ class GuiSearchBar(QWidget):
class GuiDocTitleBar(QWidget): class GuiDocTitleBar(QWidget):
def __init__(self, theParent, theProject, isEditor): def __init__(self, theParent, isEditor):
QWidget.__init__(self, theParent) QWidget.__init__(self, theParent)
logger.debug("Initialising GuiDocTitleBar ...") logger.debug("Initialising GuiDocTitleBar ...")
self.mainConf = nw.CONFIG self.mainConf = nw.CONFIG
self.theParent = theParent self.theParent = theParent
self.theProject = theProject self.theProject = theParent.theProject
self.theTheme = theParent.theTheme self.theTheme = theParent.theTheme
self.theHandle = None self.theHandle = None
self.isEditor = isEditor self.isEditor = isEditor
@@ -351,3 +353,198 @@ class GuiDocTitleBar(QWidget):
return return
# END Class GuiDocTitleBar # END Class GuiDocTitleBar
class GuiDocViewFooter(QWidget):
def __init__(self, theParent):
QWidget.__init__(self, theParent)
logger.debug("Initialising GuiDocViewFooter ...")
self.mainConf = nw.CONFIG
self.theParent = theParent
self.theTheme = theParent.theTheme
self.optState = theParent.theProject.optState
self.viewMeta = theParent.theParent.viewMeta
self.theHandle = None
# Make a QPalette that matches the Syntax Theme
self.thePalette = QPalette()
self.thePalette.setColor(QPalette.Window, QColor(*self.theTheme.colBack))
self.thePalette.setColor(QPalette.Text, QColor(*self.theTheme.colText))
fPx = int(0.9*self.theTheme.fontPixelSize)
hSp = self.mainConf.pxInt(6)
# Main Widget Settings
self.setContentsMargins(0, 0, 0, 0)
self.setAutoFillBackground(True)
self.setPalette(self.thePalette)
buttonStyle = (
"QToolButton {{border: none; background: transparent;}} "
"QToolButton:hover {{border: none; background: rgba({0},{1},{2},0.2);}}"
).format(*self.theTheme.colText)
# Show/Hide Details
self.showHide = QToolButton(self)
self.showHide.setToolButtonStyle(Qt.ToolButtonIconOnly)
self.showHide.setStyleSheet(buttonStyle)
self.showHide.setIcon(self.theTheme.getIcon("reference"))
self.showHide.setIconSize(QSize(fPx, fPx))
self.showHide.setFixedSize(QSize(fPx, fPx))
self.showHide.clicked.connect(self._doShowHide)
# Sticky Button
stickyOn = self.theTheme.getPixmap("sticky-on", (fPx, fPx))
stickyOff = self.theTheme.getPixmap("sticky-off", (fPx, fPx))
stickyIcon = QIcon()
stickyIcon.addPixmap(stickyOn, QIcon.Normal, QIcon.On)
stickyIcon.addPixmap(stickyOff, QIcon.Normal, QIcon.Off)
self.stickyRefs = QToolButton(self)
self.stickyRefs.setCheckable(True)
self.stickyRefs.setToolButtonStyle(Qt.ToolButtonIconOnly)
self.stickyRefs.setStyleSheet(buttonStyle)
self.stickyRefs.setIcon(stickyIcon)
self.stickyRefs.setIconSize(QSize(fPx, fPx))
self.stickyRefs.setFixedSize(QSize(fPx, fPx))
self.stickyRefs.toggled.connect(self._doToggleSticky)
# Labels
self.lblRefs = QLabel("References")
self.lblRefs.setBuddy(self.showHide)
self.lblRefs.setIndent(0)
self.lblRefs.setMargin(0)
self.lblRefs.setContentsMargins(0, 0, 0, 0)
self.lblRefs.setAutoFillBackground(True)
self.lblRefs.setFixedHeight(fPx)
self.lblRefs.setAlignment(Qt.AlignLeft | Qt.AlignTop)
self.lblRefs.setPalette(self.thePalette)
self.lblSticky = QLabel("Sticky")
self.lblSticky.setBuddy(self.stickyRefs)
self.lblSticky.setIndent(0)
self.lblSticky.setMargin(0)
self.lblSticky.setContentsMargins(0, 0, 0, 0)
self.lblSticky.setAutoFillBackground(True)
self.lblSticky.setFixedHeight(fPx)
self.lblSticky.setAlignment(Qt.AlignLeft | Qt.AlignTop)
self.lblSticky.setPalette(self.thePalette)
lblFont = self.font()
lblFont.setPointSizeF(0.9*self.theTheme.fontPointSize)
self.lblRefs.setFont(lblFont)
self.lblSticky.setFont(lblFont)
# Assemble Layout
self.outerBox = QHBoxLayout()
self.outerBox.setSpacing(hSp)
self.outerBox.addWidget(self.showHide, 0)
self.outerBox.addWidget(self.lblRefs, 0)
self.outerBox.addWidget(self.stickyRefs, 0)
self.outerBox.addWidget(self.lblSticky, 0)
self.outerBox.addStretch(1)
self.setLayout(self.outerBox)
logger.debug("GuiDocViewFooter initialisation complete")
return
##
# Slots
##
def _doShowHide(self):
"""Toggle the expand/collapse of the panel.
"""
isVisible = self.viewMeta.isVisible()
self.viewMeta.setVisible(not isVisible)
return
def _doToggleSticky(self, theState):
"""Toggle the sticky flag for the reference panel.
"""
logger.verbose("Reference sticky is %s" % str(theState))
self.theParent.stickyRef = theState
if not theState and self.theParent.theHandle is not None:
self.viewMeta.refreshReferences(self.theParent.theHandle)
return
# END Class GuiDocViewFooter
class GuiDocViewDetails(QScrollArea):
def __init__(self, theParent):
QScrollArea.__init__(self, theParent)
logger.debug("Initialising DocViewDetails ...")
self.mainConf = nw.CONFIG
self.theParent = theParent
self.theProject = theParent.theProject
self.theTheme = theParent.theTheme
self.currHandle = None
self.refList = QLabel("None")
self.refList.setWordWrap(True)
self.refList.setAlignment(Qt.AlignTop)
self.refList.setScaledContents(True)
self.refList.linkActivated.connect(self._linkClicked)
hCol = self.palette().highlight().color()
self.linkStyle = "style='color: rgb({0},{1},{2})'".format(
*self.theTheme.colLink
)
# Assemble
self.outerWidget = QWidget()
self.outerBox = QHBoxLayout()
self.outerBox.addWidget(self.refList, 1)
self.outerWidget.setLayout(self.outerBox)
self.setWidget(self.outerWidget)
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
self.setWidgetResizable(True)
self.setMinimumHeight(self.mainConf.pxInt(50))
logger.debug("DocViewDetails initialisation complete")
return
def refreshReferences(self, tHandle):
"""Update the current list of document references from the
project index.
"""
self.currHandle = tHandle
if self.theParent.docViewer.stickyRef:
return
theRefs = self.theParent.theIndex.getBackReferenceList(tHandle)
theList = []
for tHandle in theRefs:
tItem = self.theProject.projTree[tHandle]
if tItem is not None:
theList.append("<a href='#head_%s:%s' %s>%s</a>" % (
tHandle, theRefs[tHandle], self.linkStyle, tItem.itemName
))
self.refList.setText(", ".join(theList))
return
##
# Internal Functions
##
def _linkClicked(self, theLink):
"""Capture the link-click and forward it to the document viewer
class for handling.
"""
logger.verbose("Clicked link: '%s'" % theLink)
if len(theLink) == 27:
tHandle = theLink[6:19]
self.theParent.viewDocument(tHandle, theLink)
return
# END Class GuiDocViewDetails
-156
View File
@@ -1,156 +0,0 @@
# -*- coding: utf-8 -*-
"""novelWriter GUI DocView Details
novelWriter GUI DocView Details
===================================
Class holding the document view details panel
File History:
Created: 2019-10-31 [0.3.2]
This file is a part of novelWriter
Copyright 2020, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
"""
import logging
import nw
from PyQt5.QtCore import Qt, QSize
from PyQt5.QtWidgets import (
QWidget, QLabel, QScrollArea, QFrame, QToolButton, QCheckBox, QGridLayout
)
logger = logging.getLogger(__name__)
class GuiDocViewDetails(QWidget):
def __init__(self, theParent):
QWidget.__init__(self, theParent)
logger.debug("Initialising DocViewDetails ...")
self.mainConf = nw.CONFIG
self.theParent = theParent
self.theProject = theParent.theProject
self.theTheme = theParent.theTheme
self.currHandle = None
x4 = self.mainConf.pxInt(4)
x80 = self.mainConf.pxInt(80)
iPx = self.theTheme.textIconSize
self.outerBox = QGridLayout(self)
self.outerBox.setContentsMargins(0, 0, 0, 0)
self.outerBox.setHorizontalSpacing(0)
self.outerBox.setVerticalSpacing(x4)
self.refLabel = QLabel("Referenced By", self)
self.showHide = QToolButton()
self.showHide.setStyleSheet("QToolButton { border: none; }")
self.showHide.setToolButtonStyle(Qt.ToolButtonIconOnly)
self.showHide.setArrowType(Qt.DownArrow)
self.showHide.setCheckable(True)
self.showHide.setIconSize(QSize(iPx, iPx))
self.showHide.toggled.connect(self._doShowHide)
self.isSticky = QCheckBox("Sticky")
self.isSticky.setChecked(False)
self.isSticky.toggled.connect(self._doSticky)
self.refList = QLabel("None")
self.refList.setWordWrap(True)
self.refList.setAlignment(Qt.AlignTop)
self.refList.setScaledContents(True)
self.refList.linkActivated.connect(self._linkClicked)
self.scrollBox = QScrollArea()
self.scrollBox.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.scrollBox.setFrameStyle(QFrame.NoFrame)
self.scrollBox.setWidgetResizable(True)
self.scrollBox.setFixedHeight(x80)
self.scrollBox.setWidget(self.refList)
self.outerBox.addWidget(self.showHide, 0, 0)
self.outerBox.addWidget(self.refLabel, 0, 1)
self.outerBox.addWidget(self.isSticky, 0, 2)
self.outerBox.addWidget(self.scrollBox, 1, 1, 1, 2)
self.outerBox.setColumnStretch(1, 1)
self.setLayout(self.outerBox)
self.setContentsMargins(0, 0, 0, 0)
self._doShowHide(self.mainConf.showRefPanel)
logger.debug("DocViewDetails initialisation complete")
return
def refreshReferences(self, tHandle):
"""Update the current list of document references from the
project index.
"""
self.currHandle = tHandle
if self.isSticky.isChecked():
return
theRefs = self.theParent.theIndex.getBackReferenceList(tHandle)
theList = []
for tHandle in theRefs:
tItem = self.theProject.projTree[tHandle]
if tItem is not None:
theList.append("<a href='#head_%s:%s'>%s</a>" % (
tHandle, theRefs[tHandle], tItem.itemName
))
self.refList.setText(", ".join(theList))
self.refList.adjustSize()
return
##
# Internal Functions
##
def _linkClicked(self, theLink):
"""Capture the link-click and forward it to the document viewer
class for handling.
"""
logger.verbose("Clicked link: '%s'" % theLink)
if len(theLink) == 27:
tHandle = theLink[6:19]
self.theParent.viewDocument(tHandle, theLink)
return
def _doShowHide(self, chState):
"""Toggle the expand/collapse of the panel.
"""
self.scrollBox.setVisible(chState)
self.mainConf.setShowRefPanel(chState)
if chState:
self.showHide.setArrowType(Qt.DownArrow)
else:
self.showHide.setArrowType(Qt.RightArrow)
return
def _doSticky(self, chState):
"""Toggle the sticky feature of the references.
"""
if not chState and self.currHandle is not None:
self.refreshReferences(self.currHandle)
return
# END Class GuiDocViewDetails
+1 -1
View File
@@ -85,7 +85,7 @@ class GuiDocEditor(QTextEdit):
self.qDocument.contentsChange.connect(self._docChange) self.qDocument.contentsChange.connect(self._docChange)
# Document Title # Document Title
self.docTitle = GuiDocTitleBar(self, self.theProject, isEditor=True) self.docTitle = GuiDocTitleBar(self, isEditor=True)
self.docTitle.setGeometry(0, 0, self.docTitle.width(), self.docTitle.height()) self.docTitle.setGeometry(0, 0, self.docTitle.width(), self.docTitle.height())
self.setViewportMargins(0, self.docTitle.height(), 0, 0) self.setViewportMargins(0, self.docTitle.height(), 0, 0)
+12 -10
View File
@@ -34,7 +34,7 @@ from PyQt5.QtGui import QTextOption, QFont, QPalette, QColor, QTextCursor
from nw.core import ToHtml from nw.core import ToHtml
from nw.constants import nwAlert, nwItemType, nwDocAction from nw.constants import nwAlert, nwItemType, nwDocAction
from nw.gui.docbars import GuiDocTitleBar from nw.gui.docbars import GuiDocTitleBar, GuiDocViewFooter
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -57,10 +57,10 @@ class GuiDocViewer(QTextBrowser):
self.setOpenExternalLinks(False) self.setOpenExternalLinks(False)
self.initViewer() self.initViewer()
# Document Title # Document Title and Footer
self.docTitle = GuiDocTitleBar(self, self.theProject, isEditor=False) self.docTitle = GuiDocTitleBar(self, isEditor=False)
self.docTitle.setGeometry(0, 0, self.docTitle.width(), self.docTitle.height()) self.docFooter = GuiDocViewFooter(self)
self.setViewportMargins(0, self.docTitle.height(), 0, 0) self.stickyRef = False
theOpt = QTextOption() theOpt = QTextOption()
if self.mainConf.doJustify: if self.mainConf.doJustify:
@@ -233,15 +233,17 @@ class GuiDocViewer(QTextBrowser):
tB = self.lineWidth() tB = self.lineWidth()
tW = self.width() - 2*tB - sW tW = self.width() - 2*tB - sW
tH = self.docTitle.height() tH = self.docTitle.height()
fH = self.docFooter.height()
fY = self.height() - fH - tB
tT = self.mainConf.getTextMargin() - tH tT = self.mainConf.getTextMargin() - tH
bT = self.mainConf.getTextMargin() - fH
self.docTitle.setGeometry(tB, tB, tW, tH) self.docTitle.setGeometry(tB, tB, tW, tH)
self.setViewportMargins(0, tH, 0, 0) self.docFooter.setGeometry(tB, fY, tW, fH)
self.setViewportMargins(0, tH, 0, fH)
docFormat = self.qDocument.rootFrame().frameFormat() docFormat = self.qDocument.rootFrame().frameFormat()
if tT > 0: docFormat.setTopMargin(max(0, tT))
docFormat.setTopMargin(tT) docFormat.setBottomMargin(max(0, bT))
else:
docFormat.setTopMargin(0)
self.qDocument.blockSignals(True) self.qDocument.blockSignals(True)
self.qDocument.rootFrame().setFrameFormat(docFormat) self.qDocument.rootFrame().setFrameFormat(docFormat)
-2
View File
@@ -216,11 +216,9 @@ class GuiOutlineDetails(QScrollArea):
self.outerBox = QHBoxLayout() self.outerBox = QHBoxLayout()
self.outerBox.addWidget(self.mainGroup, 0) self.outerBox.addWidget(self.mainGroup, 0)
self.outerBox.addWidget(self.tagsGroup, 1) self.outerBox.addWidget(self.tagsGroup, 1)
# self.outerBox.addStretch(1)
self.outerWidget.setLayout(self.outerBox) self.outerWidget.setLayout(self.outerBox)
self.setWidget(self.outerWidget) self.setWidget(self.outerWidget)
self.show()
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+3
View File
@@ -537,6 +537,9 @@ class GuiIcons:
"maximise" : (None, None), "maximise" : (None, None),
"minimise" : (None, None), "minimise" : (None, None),
"refresh" : (None, None), "refresh" : (None, None),
"reference" : (None, None),
"sticky-on" : (None, None),
"sticky-off" : (None, None),
## Other Icons ## Other Icons
"warning" : (QStyle.SP_MessageBoxWarning, "dialog-warning"), "warning" : (QStyle.SP_MessageBoxWarning, "dialog-warning"),
+52 -44
View File
@@ -92,8 +92,8 @@ class GuiMain(QMainWindow):
self.statusBar = GuiMainStatus(self) self.statusBar = GuiMainStatus(self)
self.treeView = GuiProjectTree(self) self.treeView = GuiProjectTree(self)
self.docEditor = GuiDocEditor(self) self.docEditor = GuiDocEditor(self)
self.docViewer = GuiDocViewer(self)
self.viewMeta = GuiDocViewDetails(self) self.viewMeta = GuiDocViewDetails(self)
self.docViewer = GuiDocViewer(self)
self.searchBar = GuiSearchBar(self) self.searchBar = GuiSearchBar(self)
self.treeMeta = GuiItemDetails(self) self.treeMeta = GuiItemDetails(self)
self.projView = GuiOutline(self) self.projView = GuiOutline(self)
@@ -120,19 +120,15 @@ class GuiMain(QMainWindow):
self.docEdit.addWidget(self.docEditor) self.docEdit.addWidget(self.docEditor)
self.editPane.setLayout(self.docEdit) self.editPane.setLayout(self.docEdit)
self.viewPane = QWidget() self.splitView = QSplitter(Qt.Vertical)
self.docView = QVBoxLayout() self.splitView.addWidget(self.docViewer)
self.docView.setContentsMargins(0, 0, 0, 0) self.splitView.addWidget(self.viewMeta)
self.docView.setSpacing(self.mainConf.pxInt(2)) self.splitView.setSizes(self.mainConf.getViewPanePos())
self.docView.addWidget(self.docViewer)
self.docView.addWidget(self.viewMeta)
self.docView.setStretch(0, 1)
self.viewPane.setLayout(self.docView)
self.splitView = QSplitter(Qt.Horizontal) self.splitDocs = QSplitter(Qt.Horizontal)
self.splitView.setOpaqueResize(False) self.splitDocs.setOpaqueResize(False)
self.splitView.addWidget(self.editPane) self.splitDocs.addWidget(self.editPane)
self.splitView.addWidget(self.viewPane) self.splitDocs.addWidget(self.splitView)
self.splitOutline = QSplitter(Qt.Vertical) self.splitOutline = QSplitter(Qt.Vertical)
self.splitOutline.addWidget(self.projView) self.splitOutline.addWidget(self.projView)
@@ -142,7 +138,7 @@ class GuiMain(QMainWindow):
self.tabWidget = QTabWidget() self.tabWidget = QTabWidget()
self.tabWidget.setTabPosition(QTabWidget.East) self.tabWidget.setTabPosition(QTabWidget.East)
self.tabWidget.setStyleSheet("QTabWidget::pane {border: 0;}") self.tabWidget.setStyleSheet("QTabWidget::pane {border: 0;}")
self.tabWidget.addTab(self.splitView, "Editor") self.tabWidget.addTab(self.splitDocs, "Editor")
self.tabWidget.addTab(self.splitOutline, "Outline") self.tabWidget.addTab(self.splitOutline, "Outline")
self.tabWidget.currentChanged.connect(self._mainTabChanged) self.tabWidget.currentChanged.connect(self._mainTabChanged)
@@ -156,20 +152,23 @@ class GuiMain(QMainWindow):
self.setCentralWidget(self.splitMain) self.setCentralWidget(self.splitMain)
self.idxTree = self.splitMain.indexOf(self.treePane) self.idxTree = self.splitMain.indexOf(self.treePane)
self.idxMain = self.splitMain.indexOf(self.tabWidget) self.idxMain = self.splitMain.indexOf(self.tabWidget)
self.idxEditor = self.splitView.indexOf(self.editPane) self.idxEditor = self.splitDocs.indexOf(self.editPane)
self.idxViewer = self.splitView.indexOf(self.viewPane) self.idxViewer = self.splitDocs.indexOf(self.splitView)
self.idxViewDoc = self.splitView.indexOf(self.docViewer)
self.idxTabEdit = self.tabWidget.indexOf(self.splitView) self.idxViewMeta = self.splitView.indexOf(self.viewMeta)
self.idxTabProj = self.tabWidget.indexOf(self.splitOutline) self.idxTabEdit = self.tabWidget.indexOf(self.splitDocs)
self.idxTabProj = self.tabWidget.indexOf(self.splitOutline)
self.splitMain.setCollapsible(self.idxTree, False) self.splitMain.setCollapsible(self.idxTree, False)
self.splitMain.setCollapsible(self.idxMain, False) self.splitMain.setCollapsible(self.idxMain, False)
self.splitView.setCollapsible(self.idxEditor, False) self.splitDocs.setCollapsible(self.idxEditor, False)
self.splitView.setCollapsible(self.idxViewer, True) self.splitDocs.setCollapsible(self.idxViewer, True)
self.splitView.setCollapsible(self.idxViewDoc, False)
self.splitView.setCollapsible(self.idxViewMeta, False)
self.viewPane.setVisible(False) self.splitView.setVisible(False)
self.searchBar.setVisible(False) self.searchBar.setVisible(False)
# Build the Tree View # Build the Tree View
@@ -353,7 +352,7 @@ class GuiMain(QMainWindow):
self.theIndex.clearIndex() self.theIndex.clearIndex()
self.clearGUI() self.clearGUI()
self.hasProject = False self.hasProject = False
self.tabWidget.setCurrentWidget(self.splitView) self.tabWidget.setCurrentWidget(self.splitDocs)
return saveOK return saveOK
@@ -371,7 +370,7 @@ class GuiMain(QMainWindow):
return False return False
# Switch main tab to editor view # Switch main tab to editor view
self.tabWidget.setCurrentWidget(self.splitView) self.tabWidget.setCurrentWidget(self.splitDocs)
# Try to open the project # Try to open the project
if not self.theProject.openProject(projFile): if not self.theProject.openProject(projFile):
@@ -475,7 +474,7 @@ class GuiMain(QMainWindow):
""" """
if self.hasProject: if self.hasProject:
self.closeDocument() self.closeDocument()
self.tabWidget.setCurrentWidget(self.splitView) self.tabWidget.setCurrentWidget(self.splitDocs)
if self.docEditor.loadText(tHandle, tLine): if self.docEditor.loadText(tHandle, tLine):
if changeFocus: if changeFocus:
self.docEditor.setFocus() self.docEditor.setFocus()
@@ -508,16 +507,17 @@ class GuiMain(QMainWindow):
return False return False
# Make sure main tab is in Editor view # Make sure main tab is in Editor view
self.tabWidget.setCurrentWidget(self.splitView) self.tabWidget.setCurrentWidget(self.splitDocs)
if self.docViewer.loadText(tHandle): if self.docViewer.loadText(tHandle):
if not self.viewPane.isVisible(): if not self.splitView.isVisible():
bPos = self.splitMain.sizes() bPos = self.splitMain.sizes()
self.viewPane.setVisible(True) self.splitView.setVisible(True)
vPos = [0, 0] vPos = [0, 0]
vPos[0] = int(bPos[1]/2) vPos[0] = int(bPos[1]/2)
vPos[1] = bPos[1] - vPos[0] vPos[1] = bPos[1] - vPos[0]
self.splitView.setSizes(vPos) self.splitDocs.setSizes(vPos)
self.viewMeta.setVisible(self.mainConf.showRefPanel)
self.docViewer.navigateTo(navLink) self.docViewer.navigateTo(navLink)
return True return True
@@ -842,16 +842,22 @@ class GuiMain(QMainWindow):
return False return False
logger.info("Exiting %s" % nw.__package__) logger.info("Exiting %s" % nw.__package__)
if self.hasProject:
self.closeProject(True)
if not self.isZenMode:
self.mainConf.setMainPanePos(self.splitMain.sizes())
self.mainConf.setDocPanePos(self.splitDocs.sizes())
self.mainConf.setOutlinePanePos(self.splitOutline.sizes())
if self.viewMeta.isVisible():
self.mainConf.setViewPanePos(self.splitView.sizes())
self.mainConf.setShowRefPanel(self.viewMeta.isVisible())
self.mainConf.setTreeColWidths(self.treeView.getColumnSizes()) self.mainConf.setTreeColWidths(self.treeView.getColumnSizes())
if not self.mainConf.isFullScreen: if not self.mainConf.isFullScreen:
self.mainConf.setWinSize(self.width(), self.height()) self.mainConf.setWinSize(self.width(), self.height())
if not self.isZenMode:
self.mainConf.setMainPanePos(self.splitMain.sizes()) if self.hasProject:
self.mainConf.setDocPanePos(self.splitView.sizes()) self.closeProject(True)
self.mainConf.setOutlinePanePos(self.splitOutline.sizes())
self.mainConf.saveConfig() self.mainConf.saveConfig()
self.reportConfErr() self.reportConfErr()
@@ -874,13 +880,15 @@ class GuiMain(QMainWindow):
return return
def closeDocViewer(self): def closeDocViewer(self):
"""Close the document view panel.
"""
self.docViewer.clearViewer() self.docViewer.clearViewer()
self.theProject.setLastViewed(None) self.theProject.setLastViewed(None)
bPos = self.splitMain.sizes() bPos = self.splitMain.sizes()
self.viewPane.setVisible(False) self.splitView.setVisible(False)
vPos = [bPos[1], 0] vPos = [bPos[1], 0]
self.splitView.setSizes(vPos) self.splitDocs.setSizes(vPos)
return not self.viewPane.isVisible() return not self.splitView.isVisible()
def toggleZenMode(self): def toggleZenMode(self):
"""Main GUI Zen Mode hides tree, view pane and optionally also """Main GUI Zen Mode hides tree, view pane and optionally also
@@ -893,7 +901,7 @@ class GuiMain(QMainWindow):
self.isZenMode = not self.isZenMode self.isZenMode = not self.isZenMode
if self.isZenMode: if self.isZenMode:
logger.debug("Activating Zen mode") logger.debug("Activating Zen mode")
self.tabWidget.setCurrentWidget(self.splitView) self.tabWidget.setCurrentWidget(self.splitDocs)
else: else:
logger.debug("Deactivating Zen mode") logger.debug("Deactivating Zen mode")
@@ -903,10 +911,10 @@ class GuiMain(QMainWindow):
self.mainMenu.setVisible(isVisible) self.mainMenu.setVisible(isVisible)
self.tabWidget.tabBar().setVisible(isVisible) self.tabWidget.tabBar().setVisible(isVisible)
if self.viewPane.isVisible(): if self.splitView.isVisible():
self.viewPane.setVisible(False) self.splitView.setVisible(False)
elif self.docViewer.theHandle is not None: elif self.docViewer.theHandle is not None:
self.viewPane.setVisible(True) self.splitView.setVisible(True)
return True return True
+2 -1
View File
@@ -1,5 +1,5 @@
[Main] [Main]
timestamp = 2020-06-03 20:42:03 timestamp = 2020-06-09 23:05:17
theme = default theme = default
syntax = default_light syntax = default_light
icons = typicons_colour_light icons = typicons_colour_light
@@ -13,6 +13,7 @@ treecols = 120, 30, 50
projcols = 140, 55, 140 projcols = 140, 55, 140
mainpane = 300, 800 mainpane = 300, 800
docpane = 400, 400 docpane = 400, 400
viewpane = 500, 150
outlinepane = 500, 150 outlinepane = 500, 150
fullscreen = False fullscreen = False