rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support for colorblind people

Browse Source 
Fix #1340
This commit is contained in:
Julien Duponchelle
2016-08-18 11:38:55 +02:00
parent ea3191739b
commit d57652815e
4 changed files with 130162 additions and 129756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gns3/items/ethernet_link_item.py
View File

@@ -116,13 +116,16 @@ class EthernetLinkItem(LinkItem):
if self._source_port.status() == Port.started:
# port is active
color = QtCore.Qt.green
shape = QtCore.Qt.RoundCap
elif self._source_port.status() == Port.suspended:
# port is suspended
color = QtCore.Qt.yellow
shape = QtCore.Qt.RoundCap
else:
color = QtCore.Qt.red
shape = QtCore.Qt.SquareCap
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.MiterJoin))
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
point1 = QtCore.QPointF(self.source + self.edge_offset) + QtCore.QPointF((self.dx * self._source_collision_offset) / self.length, (self.dy * self._source_collision_offset) / self.length)
# avoid any collision of the status point with the source node
@@ -155,13 +158,16 @@ class EthernetLinkItem(LinkItem):
if self._destination_port.status() == Port.started:
# port is active
color = QtCore.Qt.green
shape = QtCore.Qt.RoundCap
elif self._destination_port.status() == Port.suspended:
# port is suspended
color = QtCore.Qt.yellow
shape = QtCore.Qt.RoundCap
else:
color = QtCore.Qt.red
shape = QtCore.Qt.SquareCap
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.MiterJoin))
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
point2 = QtCore.QPointF(self.destination - self.edge_offset) - QtCore.QPointF((self.dx * self._destination_collision_offset) / self.length, (self.dy * self._destination_collision_offset) / self.length)
# avoid any collision of the status point with the destination node

8
gns3/items/serial_link_item.py
View File

@@ -117,11 +117,14 @@ class SerialLinkItem(LinkItem):
# source point color
if self._source_port.status() == Port.started:
# port is active
shape = QtCore.Qt.RoundCap
color = QtCore.Qt.green
elif self._source_port.status() == Port.suspended:
# port is suspended
shape = QtCore.Qt.RoundCap
color = QtCore.Qt.yellow
else:
shape = QtCore.Qt.SquareCap
color = QtCore.Qt.red
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.MiterJoin))
@@ -145,13 +148,16 @@ class SerialLinkItem(LinkItem):
if self._destination_port.status() == Port.started:
# port is active
color = QtCore.Qt.green
shape = QtCore.Qt.RoundCap
elif self._destination_port.status() == Port.suspended:
# port is suspended
color = QtCore.Qt.yellow
shape = QtCore.Qt.RoundCap
else:
color = QtCore.Qt.red
shape = QtCore.Qt.SquareCap
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.MiterJoin))
painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
destination_port_label = self._destination_port.label()

259398
gns3/ui/resources_rc.py
View File

File diff suppressed because it is too large Load Diff

502
resources/icons/led_red.svg Executable file → Normal file
View File

@@ -1,284 +1,264 @@
<?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://web.resource.org/cc/"
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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="32"
id="svg9493"
inkscape:export-filename="/datas/Projs/Cliparts Stocker/led/led_circle_red.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
inkscape:version="0.44"
sodipodi:docbase="/media/LACIE/PFE/gns3-work/svg/icons"
sodipodi:docname="led_red.svg"
sodipodi:version="0.32"
width="32"
version="1.0">
<metadata
id="metadata3">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:title>LED Circle (Red)</dc:title>
<dc:description>jean.victor.balin@gmail.com</dc:description>
<dc:subject>
<rdf:Bag>
<rdf:li>led</rdf:li>
<rdf:li>shape</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:publisher>
<cc:Agent
rdf:about="http://www.openclipart.org/">
<dc:title>Open Clip Art Library</dc:title>
</cc:Agent>
</dc:publisher>
<dc:creator>
<cc:Agent>
<dc:title>Jean-Victor Balin</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>Jean-Victor Balin</dc:title>
</cc:Agent>
</dc:rights>
<dc:date>2005-08-21</dc:date>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://web.resource.org/cc/PublicDomain" />
<dc:language>en</dc:language>
</cc:Work>
<cc:License
rdf:about="http://web.resource.org/cc/PublicDomain">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:cc="http://web.resource.org/cc/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:ns1="http://sozi.baierouge.fr"
id="svg9493"
sodipodi:docname="led_square_red.svg"
inkscape:export-ydpi="90.000000"
inkscape:export-filename="/datas/Projs/Cliparts Stocker/led/led_square_red.png"
viewBox="0 0 50 50"
sodipodi:version="0.32"
inkscape:export-xdpi="90.000000"
inkscape:version="0.42"
sodipodi:docbase="/datas/Projs/Cliparts Stocker/led"
>
<defs
id="defs9495">
id="defs9495"
>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient6650"
inkscape:collect="always"
x1="23.402565"
x2="23.389874"
xlink:href="#linearGradient6506"
y1="44.066776"
y2="42.883698"
gradientTransform="matrix(0.494844,0,0,0.38268,9.310292,26.12426)" />
<linearGradient
id="linearGradient6494">
id="linearGradient31681"
y2="46.774"
gradientUnits="userSpaceOnUse"
y1="47.917"
gradientTransform="matrix(.38844 0 0 .61810 2.8069 2.6263)"
x2="21.594"
x1="21.594"
inkscape:collect="always"
>
<stop
id="stop6496"
offset="0.0000000"
style="stop-color:red;stop-opacity:1.0000000" />
id="stop6508"
style="stop-color:#ffffff;stop-opacity:0"
offset="0"
/>
<stop
id="stop6498"
offset="1.0000000"
style="stop-color:#ff8ba4;stop-opacity:1.0000000;" />
</linearGradient>
id="stop6510"
style="stop-color:#ffffff;stop-opacity:.87451"
offset="1"
/>
</linearGradient
>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient6648"
inkscape:collect="always"
x1="23.194286"
x2="23.20129"
xlink:href="#linearGradient6494"
y1="42.794029"
y2="43.892632"
gradientTransform="matrix(0.620206,0,0,0.620204,6.388612,15.9637)" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient6646"
inkscape:collect="always"
x1="23.349695"
x2="23.44058"
xlink:href="#linearGradient5756"
y1="42.767944"
y2="43.710873"
gradientTransform="matrix(0.692782,0,0,0.692782,4.696832,12.82138)" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient6644"
inkscape:collect="always"
x1="23.193102"
x2="23.200001"
xlink:href="#linearGradient5742"
y1="42.42923"
y2="44"
gradientTransform="matrix(0.64,0,0,0.64,5.997572,15.16826)" />
<linearGradient
id="linearGradient6506">
id="linearGradient31704"
y2="44.594"
gradientUnits="userSpaceOnUse"
y1="43.4"
x2="18.391"
x1="18.391"
inkscape:collect="always"
>
<stop
id="stop6508"
offset="0.0000000"
style="stop-color:#ffffff;stop-opacity:0.0000000;" />
id="stop6496"
style="stop-color:#cf0000"
offset="0"
/>
<stop
id="stop6510"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:0.87450981;" />
</linearGradient>
id="stop6498"
style="stop-color:#ff8ba4"
offset="1"
/>
</linearGradient
>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient7498"
inkscape:collect="always"
x1="23.402565"
x2="23.389874"
xlink:href="#linearGradient6506"
y1="44.066776"
y2="42.883698" />
<linearGradient
id="linearGradient7464">
id="linearGradient31624"
y2="44.656"
gradientUnits="userSpaceOnUse"
y1="43.338"
x2="19.031"
x1="17.728"
inkscape:collect="always"
>
<stop
id="stop7466"
offset="0.0000000"
style="stop-color:#00039a;stop-opacity:1.0000000;" />
id="stop5758"
style="stop-color:#828282"
offset="0"
/>
<stop
id="stop7468"
offset="1.0000000"
style="stop-color:#afa5ff;stop-opacity:1.0000000;" />
</linearGradient>
id="stop5760"
style="stop-color:#929292;stop-opacity:.35294"
offset="1"
/>
</linearGradient
>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient7496"
inkscape:collect="always"
x1="23.21398"
x2="23.20129"
xlink:href="#linearGradient7464"
y1="42.754631"
y2="43.892632" />
<linearGradient
id="linearGradient5756">
id="linearGradient31686"
y2="41.6"
gradientUnits="userSpaceOnUse"
y1="39.991"
gradientTransform="matrix(0.5 0 0 1 -3.6 -8.8)"
x2="29.6"
x1="29.6"
inkscape:collect="always"
>
<stop
id="stop5758"
offset="0.0000000"
style="stop-color:#828282;stop-opacity:1.0000000;" />
id="stop5744"
style="stop-color:#adadad"
offset="0"
/>
<stop
id="stop5760"
offset="1.0000000"
style="stop-color:#929292;stop-opacity:0.35294119;" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient9321"
inkscape:collect="always"
x1="22.93503"
x2="23.662106"
xlink:href="#linearGradient5756"
y1="42.699776"
y2="43.892632" />
<linearGradient
id="linearGradient5742">
<stop
id="stop5744"
offset="0.0000000"
style="stop-color:#adadad;stop-opacity:1.0000000;" />
<stop
id="stop5746"
offset="1.0000000"
style="stop-color:#f0f0f0;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient7492"
inkscape:collect="always"
x1="23.193102"
x2="23.200001"
xlink:href="#linearGradient5742"
y1="42.42923"
y2="44" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient9527"
inkscape:collect="always"
x1="23.193102"
x2="23.200001"
xlink:href="#linearGradient5742"
y1="42.42923"
y2="44" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient9529"
inkscape:collect="always"
x1="22.93503"
x2="23.662106"
xlink:href="#linearGradient5756"
y1="42.699776"
y2="43.892632" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient9531"
inkscape:collect="always"
x1="23.21398"
x2="23.20129"
xlink:href="#linearGradient7464"
y1="42.754631"
y2="43.892632" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient9533"
inkscape:collect="always"
x1="23.402565"
x2="23.389874"
xlink:href="#linearGradient6506"
y1="44.066776"
y2="42.883698" />
</defs>
id="stop5746"
style="stop-color:#f0f0f0"
offset="1"
/>
</linearGradient
>
</defs
>
<sodipodi:namedview
bordercolor="#666666"
borderopacity="1.0"
id="base"
inkscape:current-layer="g9447"
inkscape:cx="25"
inkscape:cy="13.454198"
inkscape:document-units="px"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:window-height="970"
inkscape:window-width="1390"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:zoom="10.48"
pagecolor="#ffffff" />
id="base"
bordercolor="#666666"
inkscape:pageshadow="2"
inkscape:window-width="1024"
pagecolor="#ffffff"
inkscape:zoom="10.480000"
inkscape:window-x="0"
borderopacity="1.0"
inkscape:current-layer="layer1"
inkscape:cx="25.000000"
inkscape:cy="25.000000"
inkscape:window-y="25"
inkscape:window-height="693"
inkscape:pageopacity="0.0"
inkscape:document-units="px"
/>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Calque 1"
transform="translate(-10.4008,2.992344)">
id="layer1"
inkscape:label="Calque 1"
inkscape:groupmode="layer"
>
<g
id="g9447"
style="overflow:visible"
transform="matrix(31.25,0,0,31.25,-625.0232,-1325)">
id="g31718"
transform="matrix(31.25 0 0 31.25 -325 -975)"
>
<path
d="M 21.357568,42.816245 C 21.357568,43.098869 21.128192,43.328245 20.845568,43.328245 C 20.562944,43.328245 20.333568,43.098869 20.333568,42.816245 C 20.333568,42.533621 20.562944,42.304245 20.845568,42.304245 C 21.128192,42.304245 21.357568,42.533621 21.357568,42.816245 z "
id="path6596"
style="fill:url(#linearGradient6644);fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;overflow:visible" />
id="path31614"
style="fill:url(#linearGradient31686)"
d="m10.4 31.2h1.6v1.6h-1.6v-1.6z"
/>
<path
d="M 21.258764,42.816245 C 21.258764,43.044329 21.073652,43.229441 20.845568,43.229441 C 20.617482,43.229441 20.432372,43.044329 20.432372,42.816245 C 20.432372,42.588161 20.617482,42.403049 20.845568,42.403049 C 21.073652,42.403049 21.258764,42.588161 21.258764,42.816245 z "
id="path6598"
style="fill:url(#linearGradient6646);fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;overflow:visible" />
id="path31616"
style="fill:url(#linearGradient31624)"
sodipodi:type="inkscape:offset"
d="m17.75 43.344v1.312h1.281v-1.312h-1.281z"
inkscape:original="M 17.593750 43.187500 L 17.593750 44.812500 L 19.187500 44.812500 L 19.187500 43.187500 L 17.593750 43.187500 z "
transform="translate(-7.1906 -12)"
inkscape:radius="-0.16249999"
/>
<path
d="M 21.215476,42.816245 C 21.215476,43.020435 21.049758,43.186153 20.845568,43.186153 C 20.641378,43.186153 20.475658,43.020435 20.475658,42.816245 C 20.475658,42.612055 20.641378,42.446335 20.845568,42.446335 C 21.049758,42.446335 21.215476,42.612055 21.215476,42.816245 z "
id="path6600"
style="fill:url(#linearGradient6648);fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;overflow:visible" />
id="path31618"
style="fill:url(#linearGradient31704)"
sodipodi:type="inkscape:offset"
d="m17.812 43.406v1.188h1.157v-1.188h-1.157z"
inkscape:original="M 17.593750 43.187500 L 17.593750 44.812500 L 19.187500 44.812500 L 19.187500 43.187500 L 17.593750 43.187500 z "
transform="translate(-7.1906 -12)"
inkscape:radius="-0.20625000"
/>
<path
d="M 21.140232,42.692857 C 21.140232,42.818847 21.00801,42.921099 20.845092,42.921099 C 20.682174,42.921099 20.549952,42.818847 20.549952,42.692857 C 20.549952,42.566867 20.682174,42.464615 20.845092,42.464615 C 21.00801,42.464615 21.140232,42.566867 21.140232,42.692857 z "
id="path6602"
style="fill:url(#linearGradient6650);fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;overflow:visible" />
</g>
</g>
</svg>
id="path31620"
sodipodi:nodetypes="csccscc"
style="fill:url(#linearGradient31681)"
d="m10.891 31.445c-0.261 0.001-0.23-0.052-0.23 0.348 0 0.195 0.108 0.367 0.23 0.367h0.619c0.123 0 0.219-0.165 0.219-0.367 0-0.403 0.026-0.351-0.219-0.348h-0.619z"
/>
</g
>
</g
>
<metadata
>
<rdf:RDF
>
<cc:Work
>
<dc:format
>image/svg+xml</dc:format
>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"
/>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/"
/>
<dc:publisher
>
<cc:Agent
rdf:about="http://openclipart.org/"
>
<dc:title
>Openclipart</dc:title
>
</cc:Agent
>
</dc:publisher
>
<dc:title
>led square red</dc:title
>
<dc:date
>2010-03-09T13:33:30</dc:date
>
<dc:description
>Glossy button by Jena-Victor Balin. From OCAL 0.18 release.</dc:description
>
<dc:source
>https://openclipart.org/detail/30463/led-square-red-by-anonymous</dc:source
>
<dc:creator
>
<cc:Agent
>
<dc:title
>Anonymous</dc:title
>
</cc:Agent
>
</dc:creator
>
<dc:subject
>
<rdf:Bag
>
<rdf:li
>button</rdf:li
>
<rdf:li
>glossy</rdf:li
>
<rdf:li
>red</rdf:li
>
<rdf:li
>square</rdf:li
>
</rdf:Bag
>
</dc:subject
>
</cc:Work
>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/"
>
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction"
/>
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution"
/>
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
/>
</cc:License
>
</rdf:RDF
>
</metadata
>
</svg
>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB