[gnome-control-center/wip/benzea/wifi-panel-with-editor-changes: 4/19] wireless-security: Inline 'Show' toggles
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/benzea/wifi-panel-with-editor-changes: 4/19] wireless-security: Inline 'Show' toggles
- Date: Thu, 13 Dec 2018 17:09:37 +0000 (UTC)
commit b3a8c1b31e1ed36106be033f76b20d64cf395bbd
Author: Adrien Plazas <kekun plazas laposte net>
Date: Tue Dec 4 12:42:09 2018 +0100
wireless-security: Inline 'Show' toggles
Turn the 'Show password' and 'Show key' checkboxes into toggle buttons
with an eye icon, and inline them with their corresponding entries.
panels/network/entry-show-symbolic.svg | 1824 ++++++++++++++++++++
panels/network/meson.build | 11 +
panels/network/wireless-security/eap-method-leap.c | 2 +-
.../network/wireless-security/eap-method-leap.ui | 58 +-
.../network/wireless-security/eap-method-simple.c | 2 +-
.../network/wireless-security/eap-method-simple.ui | 71 +-
panels/network/wireless-security/eap-method-tls.c | 4 +-
panels/network/wireless-security/eap-method-tls.ui | 56 +-
panels/network/wireless-security/ws-leap.c | 4 +-
panels/network/wireless-security/ws-leap.ui | 58 +-
panels/network/wireless-security/ws-wep-key.c | 4 +-
panels/network/wireless-security/ws-wep-key.ui | 70 +-
panels/network/wireless-security/ws-wpa-psk.c | 4 +-
panels/network/wireless-security/ws-wpa-psk.ui | 72 +-
14 files changed, 2060 insertions(+), 180 deletions(-)
---
diff --git a/panels/network/entry-show-symbolic.svg b/panels/network/entry-show-symbolic.svg
new file mode 100644
index 000000000..12d047566
--- /dev/null
+++ b/panels/network/entry-show-symbolic.svg
@@ -0,0 +1,1824 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+ 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: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";
+ version="1.1"
+ width="16"
+ height="16"
+ id="svg7384"
+ inkscape:version="0.92.2 2405546, 2018-03-11"
+ sodipodi:docname="entry-show-symbolic.svg"
+ viewBox="0 0 16 16">
+ <metadata
+ id="metadata90">
+ <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>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ebebeb"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1376"
+ id="namedview88"
+ showgrid="false"
+ inkscape:zoom="32"
+ inkscape:cx="10.909371"
+ inkscape:cy="5.4768643"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="layer10"
+ showborder="false"
+ inkscape:snap-nodes="true"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-to-guides="true"
+ inkscape:snap-grids="true"
+ inkscape:snap-global="true"
+ inkscape:object-nodes="true"
+ inkscape:snap-bbox-midpoints="true"
+ inkscape:object-paths="true"
+ inkscape:snap-others="false"
+ inkscape:bbox-nodes="true"
+ inkscape:snap-bbox-edge-midpoints="true"
+ inkscape:measure-start="56,310.597"
+ inkscape:measure-end="0,0"
+ inkscape:document-rotation="0"
+ inkscape:snap-intersection-paths="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4866"
+ empspacing="2"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="1px"
+ spacingy="1px" />
+ </sodipodi:namedview>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <defs
+ id="defs7386">
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect17900"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4322"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3524"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3158"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3152"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3137"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4077"
+ is_visible="true" />
+ <inkscape:path-effect
+ is_visible="true"
+ id="path-effect4044"
+ effect="spiro" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4040"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3959"
+ is_visible="true" />
+ <inkscape:path-effect
+ is_visible="true"
+ id="path-effect3957"
+ effect="spiro" />
+ <inkscape:path-effect
+ is_visible="true"
+ id="path-effect3951"
+ effect="spiro" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3947"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3869"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3097"
+ is_visible="true" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5408">
+ <stop
+ style="stop-color:#bebebe;stop-opacity:1;"
+ offset="0"
+ id="stop5410" />
+ <stop
+ style="stop-color:#bebebe;stop-opacity:0;"
+ offset="1"
+ id="stop5412" />
+ </linearGradient>
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4601"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4597"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4593"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4589"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4585"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4580"
+ is_visible="true" />
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6279-6-1-4-5">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6281-3-0-3-5"
+ width="3.8250003"
+ height="6.3750005"
+ x="26.85"
+ y="220.75" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-33-6-5-1-3">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-6-9-1-4-8"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-6-8-2-1-6-6">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-4-9-2-0-9-0"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6279-2-3">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6281-5-3"
+ width="3.8250003"
+ height="6.3750005"
+ x="26.85"
+ y="220.75" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-3-5-6">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-1-8-1"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-8-8-8">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-6-0-7"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ id="clipPath3157-7-0"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ y="221.32954"
+ x="28.124998"
+ height="5.21591"
+ width="1.7386366"
+ id="rect3159-5-5"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
/>
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6279-6-1">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6281-3-1"
+ width="3.8250003"
+ height="6.3750005"
+ x="26.85"
+ y="220.75" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-33-6-4-0">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-6-9-19-3"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-6-8-2-8-0">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-4-9-2-7-0"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-33-4">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-6-5"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-6-8-25-4">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-4-9-24-2"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-6-4">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-4-9"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6279-7-9">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6281-1-9"
+ width="3.8250003"
+ height="6.3750005"
+ x="26.85"
+ y="220.75" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-3-4">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-1-9"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-8-81">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-6-6"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6279-3">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6281-9"
+ width="3.8250003"
+ height="6.3750005"
+ x="26.85"
+ y="220.75" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-334">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-61"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6259-5">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+ id="rect6261-61"
+ width="1.8762827"
+ height="4.8734746"
+ x="26.998718"
+ y="221.50153" />
+ </clipPath>
+ <clipPath
+ id="clipPath6810-7"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ y="281"
+ x="21"
+ height="11"
+ width="14"
+ id="rect6812-2"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
/>
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath3668">
+ <rect
+ y="221.50153"
+ x="26.998718"
+ height="3.3729413"
+ width="1.8762826"
+ id="rect3670"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
/>
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath3697">
+ <path
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ d="m 26.965789,221.32959 v 5.21591 h 0.579546 v -1.15909 h 2.318182 v -4.05682 z"
+ id="path3699"
+ inkscape:connector-curvature="0" />
+ </clipPath>
+ <clipPath
+ id="clipPath6810-7-87"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ y="281"
+ x="21"
+ height="11"
+ width="14"
+ id="rect6812-2-4"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
/>
+ </clipPath>
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect44198-7"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect44202-9"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect8915-0-8-2-7-4-4-8"
+ is_visible="true" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5408"
+ id="radialGradient5414"
+ cx="-196.78575"
+ cy="-28.512899"
+ fx="-196.78575"
+ fy="-28.512899"
+ r="1.607125"
+ gradientTransform="matrix(2.9445462,0,0,2.8235465,602.73629,270.04529)"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4601-8"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4597-5"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3869-0"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3097-4"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4040-0"
+ is_visible="true" />
+ <inkscape:path-effect
+ is_visible="true"
+ id="path-effect4044-4"
+ effect="spiro" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15264"
+ id="linearGradient15270"
+ x1="155"
+ y1="162.95799"
+ x2="230.13904"
+ y2="138.95799"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient15264">
+ <stop
+ style="stop-color:#cc0000;stop-opacity:1;"
+ offset="0"
+ id="stop15266" />
+ <stop
+ style="stop-color:#ff4c4c;stop-opacity:1"
+ offset="1"
+ id="stop15268" />
+ </linearGradient>
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect14728"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3524-7"
+ is_visible="true" />
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath6265-334-4">
+ <rect
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+ id="rect6267-61-0"
+ width="2.8977277"
+ height="5.21591"
+ x="26.96591"
+ y="221.32954" />
+ </clipPath>
+ <inkscape:path-effect
+ is_visible="true"
+ id="path-effect8588"
+ effect="spiro" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect121411"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect8915-0-8-2-7-4-4-8-1"
+ is_visible="true" />
+ <linearGradient
+ y2="217"
+ x2="98.59375"
+ y1="218.75"
+ x1="49.75"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-15.026687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6398"
+ xlink:href="#linearGradient20627-8-0"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="150.20921"
+ x2="149.73004"
+ y1="210.79668"
+ x1="126.7462"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-15.026687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6395"
+ xlink:href="#linearGradient20104-9-1-6"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="155.54919"
+ x2="175.08"
+ y1="157.29919"
+ x1="113.81474"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-13.568754)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6392"
+ xlink:href="#linearGradient20114-7-2-5-2-9"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="169.25"
+ x2="112.75"
+ y1="173.5"
+ x1="98.5"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-15.026687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6389"
+ xlink:href="#linearGradient22395-8-5"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="175.54919"
+ x2="182.08"
+ y1="175.54919"
+ x1="130.81474"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-13.568754)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6386"
+ xlink:href="#linearGradient20114-7-6-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="175.54919"
+ x2="182.08"
+ y1="175.54919"
+ x1="130.81474"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-15.026687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6382"
+ xlink:href="#linearGradient20114-7-4-6-4-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="169.875"
+ x2="103.25"
+ y1="159.375"
+ x1="118"
+ gradientTransform="matrix(0.09719553,0,0,0.09719553,18.439855,-15.026687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6379"
+ xlink:href="#linearGradient22799-6-7"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="169.875"
+ x2="103.25"
+ y1="159.375"
+ x1="118"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6376"
+ xlink:href="#linearGradient22799-6-7"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="175.54919"
+ x2="182.08"
+ y1="175.54919"
+ x1="130.81474"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6374"
+ xlink:href="#linearGradient20114-7-4-6-4-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="175.54919"
+ x2="182.08"
+ y1="175.54919"
+ x1="130.81474"
+ gradientTransform="translate(507.9375,68.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6372"
+ xlink:href="#linearGradient20114-7-6-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="169.25"
+ x2="112.75"
+ y1="173.5"
+ x1="98.5"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6370"
+ xlink:href="#linearGradient22395-8-5"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="155.54919"
+ x2="175.08"
+ y1="157.29919"
+ x1="113.81474"
+ gradientTransform="translate(507.9375,68.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6368"
+ xlink:href="#linearGradient20114-7-2-5-2-9"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="150.20921"
+ x2="149.73004"
+ y1="210.79668"
+ x1="126.7462"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6366"
+ xlink:href="#linearGradient20104-9-1-6"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="217"
+ x2="98.59375"
+ y1="218.75"
+ x1="49.75"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6364"
+ xlink:href="#linearGradient20627-8-0"
+ inkscape:collect="always" />
+ <radialGradient
+ r="34.5"
+ fy="49.24028"
+ fx="149.48978"
+ cy="49.24028"
+ cx="149.48978"
+ gradientTransform="matrix(1.0999298,0,0,0.4738253,-14.938489,37.028868)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6352"
+ xlink:href="#linearGradient14683-3"
+ inkscape:collect="always" />
+ <radialGradient
+ r="31.25"
+ fy="115.99819"
+ fx="127.8913"
+ cy="115.99819"
+ cx="127.8913"
+ gradientTransform="matrix(1.7826226,0,0,1.7826226,-100.09062,-90.782804)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6350"
+ xlink:href="#linearGradient14745-0"
+ inkscape:collect="always" />
+ <radialGradient
+ r="34.93745"
+ fy="129.83951"
+ fx="129.25"
+ cy="129.83951"
+ cx="129.25"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6348"
+ xlink:href="#linearGradient14971-4"
+ inkscape:collect="always" />
+ <radialGradient
+ r="31.25"
+ fy="122.20717"
+ fx="125.57332"
+ cy="122.20717"
+ cx="125.57332"
+ gradientTransform="matrix(0.27434839,0,0,0.4367642,286.54047,15.723175)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6346"
+ xlink:href="#linearGradient14670-0"
+ inkscape:collect="always" />
+ <radialGradient
+ r="13.625"
+ fy="194.625"
+ fx="149.375"
+ cy="194.625"
+ cx="149.375"
+ gradientTransform="matrix(1,0,0,0.57798165,0,82.135321)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6344"
+ xlink:href="#linearGradient14755-8"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="173.69757"
+ x2="171.2774"
+ y1="272.52652"
+ x1="171.2774"
+ gradientTransform="matrix(0.10118493,0,0,0.10118493,17.685349,-15.508913)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6342"
+ xlink:href="#linearGradient19627"
+ inkscape:collect="always" />
+ <radialGradient
+ r="34.75"
+ fy="250.70465"
+ fx="81.881546"
+ cy="250.70465"
+ cx="81.881546"
+ gradientTransform="matrix(0.17477181,-0.00863071,0.00354741,0.07183502,10.470145,-7.8999845)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6338"
+ xlink:href="#linearGradient15009-5-8"
+ inkscape:collect="always" />
+ <radialGradient
+ r="34.75"
+ fy="218.765"
+ fx="88.25"
+ cy="218.765"
+ cx="88.25"
+ gradientTransform="matrix(0.17477181,-0.00863071,0.00354741,0.07183502,10.470145,-7.8999845)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6335"
+ xlink:href="#linearGradient15009-2"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="191.56073"
+ x2="92.707535"
+ y1="194.96349"
+ x1="58.907967"
+ gradientTransform="matrix(0.09997235,0,0,0.09997235,17.847246,-15.265484)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6332"
+ xlink:href="#linearGradient60943"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="195.5"
+ x2="156.5"
+ y1="189"
+ x1="105.5"
+ gradientTransform="matrix(0.09997235,0,0,0.09997235,17.847246,-15.265484)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6329"
+ xlink:href="#linearGradient60637"
+ inkscape:collect="always" />
+ <radialGradient
+ r="30.75"
+ fy="187.73877"
+ fx="80.25"
+ cy="187.73877"
+ cx="80.25"
+ gradientTransform="matrix(0.11297688,-0.0292602,0.01813654,0.07002722,13.398699,-6.8944776)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6324"
+ xlink:href="#linearGradient14991-1"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient36566"
+ inkscape:collect="always">
+ <stop
+ id="stop36568"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop36570"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="43.284622"
+ fy="60.712517"
+ fx="151.68309"
+ cy="60.712517"
+ cx="151.68309"
+ gradientTransform="matrix(3.5960718,-1.7955579,1.4342795,3.5765632,-485.76309,114.25751)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60931"
+ xlink:href="#linearGradient36566"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient14683-3"
+ inkscape:collect="always">
+ <stop
+ id="stop14685-5"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop14687-3"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="34.5"
+ fy="49.24028"
+ fx="149.48978"
+ cy="49.24028"
+ cx="149.48978"
+ gradientTransform="matrix(1.0999298,0,0,0.4738253,-14.938489,37.028868)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60929"
+ xlink:href="#linearGradient14683-3"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient14745-0"
+ inkscape:collect="always">
+ <stop
+ id="stop14747-5"
+ offset="0"
+ style="stop-color:#ff4141;stop-opacity:1" />
+ <stop
+ id="stop14749-3"
+ offset="1"
+ style="stop-color:#cc0000;stop-opacity:1" />
+ </linearGradient>
+ <radialGradient
+ r="31.25"
+ fy="115.99819"
+ fx="127.8913"
+ cy="115.99819"
+ cx="127.8913"
+ gradientTransform="matrix(1.7826226,0,0,1.7826226,-100.09062,-90.782804)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60927"
+ xlink:href="#linearGradient14745-0"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient14971-4"
+ inkscape:collect="always">
+ <stop
+ id="stop14973-7"
+ offset="0"
+ style="stop-color:#fabebe;stop-opacity:1;" />
+ <stop
+ id="stop14975-2"
+ offset="1"
+ style="stop-color:#fabebe;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="34.93745"
+ fy="129.83951"
+ fx="129.25"
+ cy="129.83951"
+ cx="129.25"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60925"
+ xlink:href="#linearGradient14971-4"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient14670-0"
+ inkscape:collect="always">
+ <stop
+ id="stop14672-2"
+ offset="0"
+ style="stop-color:#f57676;stop-opacity:1" />
+ <stop
+ id="stop14674-7"
+ offset="1"
+ style="stop-color:#ed1212;stop-opacity:1" />
+ </linearGradient>
+ <radialGradient
+ r="31.25"
+ fy="122.20717"
+ fx="125.57332"
+ cy="122.20717"
+ cx="125.57332"
+ gradientTransform="matrix(0.27434839,0,0,0.4367642,286.54047,15.723175)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60935"
+ xlink:href="#linearGradient14670-0"
+ inkscape:collect="always" />
+ <radialGradient
+ r="13.625"
+ fy="194.625"
+ fx="149.375"
+ cy="194.625"
+ cx="149.375"
+ gradientTransform="matrix(1,0,0,0.57798165,0,82.135321)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60921"
+ xlink:href="#linearGradient14755-8"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient22799-6-7"
+ inkscape:collect="always">
+ <stop
+ id="stop22801-7-5"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1" />
+ <stop
+ id="stop22803-5-9"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0.37280703" />
+ </linearGradient>
+ <linearGradient
+ y2="169.875"
+ x2="103.25"
+ y1="159.375"
+ x1="118"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60919"
+ xlink:href="#linearGradient22799-6-7"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient20114-7-4-6-4-1"
+ inkscape:collect="always">
+ <stop
+ id="stop20116-5-9-2-3-4"
+ offset="0"
+ style="stop-color:#888a85;stop-opacity:1;" />
+ <stop
+ id="stop20118-4-3-9-0-3"
+ offset="1"
+ style="stop-color:#a4a5a1;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ y2="175.54919"
+ x2="182.08"
+ y1="175.54919"
+ x1="130.81474"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60913"
+ xlink:href="#linearGradient20114-7-4-6-4-1"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient20114-7-6-1"
+ inkscape:collect="always">
+ <stop
+ id="stop20116-5-4-8"
+ offset="0"
+ style="stop-color:#888a85;stop-opacity:1;" />
+ <stop
+ id="stop20118-4-2-6"
+ offset="1"
+ style="stop-color:#a4a5a1;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ y2="175.54919"
+ x2="182.08"
+ y1="175.54919"
+ x1="130.81474"
+ gradientTransform="translate(507.9375,68.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60911"
+ xlink:href="#linearGradient20114-7-6-1"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient22395-8-5"
+ inkscape:collect="always">
+ <stop
+ id="stop22397-0-6"
+ offset="0"
+ style="stop-color:#bdbdbd;stop-opacity:1;" />
+ <stop
+ id="stop22399-6-9"
+ offset="1"
+ style="stop-color:#cdcdcd;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ y2="169.25"
+ x2="112.75"
+ y1="173.5"
+ x1="98.5"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60907"
+ xlink:href="#linearGradient22395-8-5"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient20114-7-2-5-2-9"
+ inkscape:collect="always">
+ <stop
+ id="stop20116-5-2-3-4-0"
+ offset="0"
+ style="stop-color:#888a85;stop-opacity:1;" />
+ <stop
+ id="stop20118-4-5-6-9-2"
+ offset="1"
+ style="stop-color:#a4a5a1;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ y2="155.54919"
+ x2="175.08"
+ y1="157.29919"
+ x1="113.81474"
+ gradientTransform="translate(507.9375,68.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60905"
+ xlink:href="#linearGradient20114-7-2-5-2-9"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient20104-9-1-6"
+ inkscape:collect="always">
+ <stop
+ id="stop20106-9-6-9"
+ offset="0"
+ style="stop-color:#826a00;stop-opacity:1;" />
+ <stop
+ id="stop20108-6-6-9"
+ offset="1"
+ style="stop-color:#d9b100;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ y2="150.20921"
+ x2="149.73004"
+ y1="210.79668"
+ x1="126.7462"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60903"
+ xlink:href="#linearGradient20104-9-1-6"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient20627-8-0">
+ <stop
+ style="stop-color:#ded9c4;stop-opacity:1"
+ offset="0"
+ id="stop20629-8-6" />
+ <stop
+ id="stop22486-6-5"
+ offset="0.17803359"
+ style="stop-color:#f8d022;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ebe3c1;stop-opacity:1"
+ offset="1"
+ id="stop20631-9-6" />
+ </linearGradient>
+ <linearGradient
+ y2="217"
+ x2="98.59375"
+ y1="218.75"
+ x1="49.75"
+ gradientTransform="translate(507.9375,53.736825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60901"
+ xlink:href="#linearGradient20627-8-0"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient14991-1"
+ inkscape:collect="always">
+ <stop
+ id="stop14993-0"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop14995-0"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="30.75"
+ fy="187.73877"
+ fx="80.25"
+ cy="187.73877"
+ cx="80.25"
+ gradientTransform="matrix(0.2099842,-0.0543844,0.03370944,0.13015591,292.3401,42.974975)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60895"
+ xlink:href="#linearGradient14991-1"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient14755-8"
+ inkscape:collect="always">
+ <stop
+ id="stop14757-1"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop14759-3"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="13.625"
+ fy="194.625"
+ fx="149.375"
+ cy="194.625"
+ cx="149.375"
+ gradientTransform="matrix(1,0,0,0.57798165,0,82.135321)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60893"
+ xlink:href="#linearGradient14755-8"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient60637">
+ <stop
+ style="stop-color:#8e9884;stop-opacity:1"
+ offset="0"
+ id="stop60639" />
+ <stop
+ style="stop-color:#9ea896;stop-opacity:1"
+ offset="1"
+ id="stop60641" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.18581336,0,0,0.18581336,300.60838,27.416225)"
+ y2="195.5"
+ x2="156.5"
+ y1="189"
+ x1="105.5"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60887"
+ xlink:href="#linearGradient60637"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient60943">
+ <stop
+ style="stop-color:#c7cdc1;stop-opacity:1"
+ offset="0"
+ id="stop60945" />
+ <stop
+ style="stop-color:#e8eae5;stop-opacity:1"
+ offset="1"
+ id="stop60947" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.18581336,0,0,0.18581336,300.60838,27.416225)"
+ y2="191.56073"
+ x2="92.707535"
+ y1="194.96349"
+ x1="58.907967"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60885"
+ xlink:href="#linearGradient60943"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient15009-2"
+ inkscape:collect="always">
+ <stop
+ id="stop15011-8"
+ offset="0"
+ style="stop-color:#383e34;stop-opacity:1" />
+ <stop
+ id="stop15013-2"
+ offset="1"
+ style="stop-color:#84917c;stop-opacity:1" />
+ </linearGradient>
+ <radialGradient
+ r="34.75"
+ fy="218.765"
+ fx="88.25"
+ cy="218.765"
+ cx="88.25"
+ gradientTransform="matrix(0.32483918,-0.01604144,0.00659338,0.13351598,286.89695,41.106092)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60883"
+ xlink:href="#linearGradient15009-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient15009-5-8"
+ inkscape:collect="always">
+ <stop
+ id="stop15011-5-3"
+ offset="0"
+ style="stop-color:#383e34;stop-opacity:1" />
+ <stop
+ id="stop15013-7-58"
+ offset="1"
+ style="stop-color:#84917c;stop-opacity:1" />
+ </linearGradient>
+ <radialGradient
+ r="34.75"
+ fy="250.70465"
+ fx="81.881546"
+ cy="250.70465"
+ cx="81.881546"
+ gradientTransform="matrix(0.32483918,-0.01604144,0.00659338,0.13351598,286.89695,41.106092)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient60881"
+ xlink:href="#linearGradient15009-5-8"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient19627"
+ inkscape:collect="always">
+ <stop
+ id="stop19629"
+ offset="0"
+ style="stop-color:#56604f;stop-opacity:1;" />
+ <stop
+ id="stop19631"
+ offset="1"
+ style="stop-color:#acb5a5;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ y2="173.69757"
+ x2="171.2774"
+ y1="272.52652"
+ x1="171.2774"
+ gradientTransform="matrix(0.18806711,0,0,0.18806711,300.30747,26.963777)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient60877"
+ xlink:href="#linearGradient19627"
+ inkscape:collect="always" />
+ <linearGradient
+ osb:paint="solid"
+ id="linearGradient7212">
+ <stop
+ id="stop7214"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4857-3"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4322-2">
+ <stop
+ style="stop-color:#ce5c00;stop-opacity:1;"
+ offset="0"
+ id="stop4324-0" />
+ <stop
+ style="stop-color:#f57900;stop-opacity:1"
+ offset="1"
+ id="stop4326-5" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4853-7"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4845-0"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4847-0"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4849-9"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4851-5"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4322-2"
+ id="linearGradient4855-1"
+ gradientUnits="userSpaceOnUse"
+ x1="319.44705"
+ y1="84.263908"
+ x2="319.07645"
+ y2="61.901653" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4300-9"
+ id="linearGradient4859-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,50.010414,9.874115)"
+ x1="313.21677"
+ y1="83.391716"
+ x2="326.33179"
+ y2="62.562637" />
+ <linearGradient
+ id="linearGradient4300-9">
+ <stop
+ style="stop-color:#fdbe61;stop-opacity:1;"
+ offset="0"
+ id="stop4302-1" />
+ <stop
+ style="stop-color:#fee7c5;stop-opacity:1"
+ offset="1"
+ id="stop4304-9" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4332-4"
+ id="linearGradient4861-9"
+ gradientUnits="userSpaceOnUse"
+ x1="322.73212"
+ y1="75.205376"
+ x2="328.88287"
+ y2="60.532906" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4332-4">
+ <stop
+ style="stop-color:#ce5c00;stop-opacity:1;"
+ offset="0"
+ id="stop4334-0" />
+ <stop
+ style="stop-color:#f57900;stop-opacity:1"
+ offset="1"
+ id="stop4336-7" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4216-8"
+ id="linearGradient4863-4"
+ gradientUnits="userSpaceOnUse"
+ x1="310.2431"
+ y1="66.91993"
+ x2="317.93289"
+ y2="102.56467"
+ gradientTransform="translate(0,-14.015867)" />
+ <linearGradient
+ id="linearGradient4216-8">
+ <stop
+ style="stop-color:#fee0b3;stop-opacity:1"
+ offset="0"
+ id="stop4218-9" />
+ <stop
+ style="stop-color:#fcaf3e;stop-opacity:0;"
+ offset="1"
+ id="stop4220-7" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4300-9"
+ id="linearGradient4865-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,50.010414,9.8741155)"
+ x1="313.21677"
+ y1="83.391716"
+ x2="326.33179"
+ y2="62.562637" />
+ <linearGradient
+ id="linearGradient18175">
+ <stop
+ style="stop-color:#fdbe61;stop-opacity:1;"
+ offset="0"
+ id="stop18177" />
+ <stop
+ style="stop-color:#fee7c5;stop-opacity:1"
+ offset="1"
+ id="stop18179" />
+ </linearGradient>
+ <linearGradient
+ y2="62.562637"
+ x2="326.33179"
+ y1="83.391716"
+ x1="313.21677"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,19.579569,9.8741155)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17953"
+ xlink:href="#linearGradient4300-9"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient18182">
+ <stop
+ style="stop-color:#fdbe61;stop-opacity:1;"
+ offset="0"
+ id="stop18184" />
+ <stop
+ style="stop-color:#fee7c5;stop-opacity:1"
+ offset="1"
+ id="stop18186" />
+ </linearGradient>
+ <linearGradient
+ y2="62.562637"
+ x2="326.33179"
+ y1="83.391716"
+ x1="313.21677"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,19.579569,9.8741155)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient18206"
+ xlink:href="#linearGradient4300-9"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4300-9"
+ id="linearGradient18356"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,277.02543,-150.10262)"
+ x1="313.21677"
+ y1="83.391716"
+ x2="326.33179"
+ y2="62.562637" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4300-9"
+ id="linearGradient18359"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,255.70627,-163.47762)"
+ x1="313.21677"
+ y1="83.391716"
+ x2="326.33179"
+ y2="62.562637" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4216-8"
+ id="linearGradient18362"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(257.44586,-173.99261)"
+ x1="310.2431"
+ y1="66.91993"
+ x2="317.93289"
+ y2="102.56467" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4300-9"
+ id="linearGradient18371"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.84508549,0,0,0.84944843,255.70627,-163.47763)"
+ x1="313.21677"
+ y1="83.391716"
+ x2="326.33179"
+ y2="62.562637" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4332-4"
+ id="linearGradient18373"
+ gradientUnits="userSpaceOnUse"
+ x1="322.73212"
+ y1="75.205376"
+ x2="328.88287"
+ y2="60.532906"
+ gradientTransform="translate(205.69586,-173.35174)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4216-8-9"
+ id="linearGradient18362-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(257.44586,-173.99261)"
+ x1="310.2431"
+ y1="66.91993"
+ x2="317.93289"
+ y2="102.56467" />
+ <linearGradient
+ id="linearGradient4216-8-9">
+ <stop
+ style="stop-color:#fee0b3;stop-opacity:1"
+ offset="0"
+ id="stop4218-9-5" />
+ <stop
+ style="stop-color:#fcaf3e;stop-opacity:0;"
+ offset="1"
+ id="stop4220-7-8" />
+ </linearGradient>
+ <linearGradient
+ y2="66.612579"
+ x2="307.38507"
+ y1="66.91993"
+ x1="310.2431"
+ gradientTransform="matrix(0.46298233,0,0,0.55362034,-119.57946,243.12192)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient18405"
+ xlink:href="#linearGradient4216-8-9"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8813-4-2-0"
+ id="radialGradient9615"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.64718177,0,0,0.64718177,164.39851,-61.096573)"
+ cx="-101.5"
+ cy="413.5"
+ fx="-101.5"
+ fy="413.5"
+ r="95.5" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8813-4-2-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop8815-9-4-2" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop8817-9-1-7" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8813-4-2-0"
+ id="radialGradient9617"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.64718177,0,0,0.64718177,134.75539,-61.096573)"
+ cx="-101.5"
+ cy="413.5"
+ fx="-101.5"
+ fy="413.5"
+ r="95.5" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8277-0-7-8"
+ id="linearGradient9619"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99664346,0,0,0.99664346,-1.8521001,6.5874067)"
+ x1="273.8349"
+ y1="54.751827"
+ x2="151.10538"
+ y2="-67.172523" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8277-0-7-8">
+ <stop
+ style="stop-color:#cc0000;stop-opacity:1"
+ offset="0"
+ id="stop8279-6-5-3" />
+ <stop
+ style="stop-color:#ef2929;stop-opacity:1"
+ offset="1"
+ id="stop8281-3-1-3" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9473"
+ id="radialGradient9621"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.2343999,0,0,2.2152241,-185.6473,-103.59983)"
+ cx="150.39478"
+ cy="85.755272"
+ fx="150.39478"
+ fy="85.755272"
+ r="96.409164" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient9473">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop9475" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop9477" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8983-0-2"
+ id="linearGradient9623"
+ gradientUnits="userSpaceOnUse"
+ x1="25.750032"
+ y1="104.5"
+ x2="25.750032"
+ y2="557.84375" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8983-0-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop8985-8-3" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop8987-4-8" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8813-4-2-0"
+ id="radialGradient12904"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.64718177,0,0,0.64718177,164.39851,-61.096573)"
+ cx="-101.5"
+ cy="413.5"
+ fx="-101.5"
+ fy="413.5"
+ r="95.5" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8813-4-2-0"
+ id="radialGradient12906"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.64718177,0,0,0.64718177,134.75539,-61.096573)"
+ cx="-101.5"
+ cy="413.5"
+ fx="-101.5"
+ fy="413.5"
+ r="95.5" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8277-0-7-8"
+ id="linearGradient12908"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99664346,0,0,0.99664346,-1.8521001,6.5874067)"
+ x1="273.8349"
+ y1="54.751827"
+ x2="151.10538"
+ y2="-67.172523" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8277-0-7-8"
+ id="linearGradient12912"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.05605206,0.05559138,-0.05605206,0.05559138,326.82347,238.48697)"
+ x1="273.8349"
+ y1="54.751827"
+ x2="151.10538"
+ y2="-67.172523" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8813-4-2-0"
+ id="radialGradient12915"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.05126352,0,0,0.05126352,578.97234,-133.61664)"
+ cx="-101.5"
+ cy="413.5"
+ fx="-101.5"
+ fy="413.5"
+ r="95.5" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8813-4-2-0"
+ id="radialGradient12918"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.05126352,0,0,0.05126352,581.32038,-133.61664)"
+ cx="-101.5"
+ cy="413.5"
+ fx="-101.5"
+ fy="413.5"
+ r="95.5" />
+ <linearGradient
+ id="linearGradient3832"
+ inkscape:collect="always">
+ <stop
+ id="stop3834"
+ offset="0"
+ style="stop-color:#b3b3b3;stop-opacity:1;" />
+ <stop
+ id="stop3836"
+ offset="1"
+ style="stop-color:#b3b3b3;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="translate(459.77914,236.57143)"
+ gradientUnits="userSpaceOnUse"
+ y2="371.50504"
+ x2="271.57281"
+ y1="371.50504"
+ x1="8.7128944"
+ id="linearGradient3838"
+ xlink:href="#linearGradient3832"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2215-89">
+ <stop
+ id="stop2217-5"
+ offset="0"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ id="stop2219-02"
+ offset="1"
+ style="stop-color:#505050;stop-opacity:1;" />
+ </linearGradient>
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4597-5-1"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect14745"
+ is_visible="true" />
+ </defs>
+ <g
+ transform="translate(-261,-489)"
+ id="layer3"
+ style="display:inline" />
+ <g
+ transform="translate(-261,-489)"
+ id="layer2"
+ style="display:inline">
+ <g
+ transform="translate(99.9998,334)"
+ id="g11578"
+ style="display:inline">
+ <g
+ transform="translate(-93.968752,-337)"
+ id="g11582"
+ style="display:inline" />
+ </g>
+ </g>
+ <g
+ transform="translate(-241.0002,-460)"
+ id="layer4"
+ style="display:inline">
+ <g
+ transform="translate(-20.99975,-28)"
+ id="layer3-5"
+ style="display:inline" />
+ <g
+ transform="translate(-20.99975,-28)"
+ id="layer2-1"
+ style="display:inline" />
+ <g
+ transform="translate(-1,1)"
+ id="layer4-4"
+ style="display:inline" />
+ <g
+ transform="translate(-1,244)"
+ id="layer5-9" />
+ <g
+ transform="translate(-20.99975,-28)"
+ id="layer1-8"
+ style="display:inline" />
+ </g>
+ <g
+ id="layer8"
+ transform="translate(-241.0002,-217)" />
+ <g
+ id="layer7"
+ transform="translate(-241.0002,-217)" />
+ <g
+ id="layer5"
+ transform="translate(-241.0002,-217)">
+ <g
+ transform="translate(14)"
+ id="g11716" />
+ </g>
+ <g
+ id="layer6"
+ transform="translate(-241.0002,-217)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer9"
+ inkscape:label="shapes"
+ style="display:inline"
+ transform="translate(-241.0002,-217)" />
+ <g
+ transform="translate(-241.0002,-217)"
+ style="display:inline"
+ inkscape:label="other"
+ id="g7628"
+ inkscape:groupmode="layer" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="ui"
+ style="display:inline"
+ transform="translate(0,-584)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer10"
+ inkscape:label="body"
+ style="display:inline"
+ transform="translate(0,-584)">
+ <g
+ id="g1113">
+ <path
+ id="path2314"
+ d="M 8,585.99968 A 8,8 0 0 0 0.26172,592.00945 8,8 0 0 0 8,597.99968 8,8 0 0 0 15.73828,591.98991
8,8 0 0 0 8,585.99968 Z m 0,2 a 4,4 0 0 1 4,4 4,4 0 0 1 -4,4 4,4 0 0 1 -4,-4 4,4 0 0 1 4,-4 z"
+
style="opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+ inkscape:connector-curvature="0" />
+ <circle
+
style="vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path2318"
+ cx="8"
+ cy="591.99969"
+ r="2" />
+ </g>
+ </g>
+ <g
+ inkscape:label="devices"
+ id="g6387"
+ inkscape:groupmode="layer"
+ style="display:inline"
+ transform="translate(0,-584)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer11"
+ inkscape:label="art-libre"
+ style="display:inline"
+ transform="translate(0,-584)" />
+</svg>
diff --git a/panels/network/meson.build b/panels/network/meson.build
index 049b4b0ea..d2aa9d43c 100644
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -59,6 +59,17 @@ resource_data = files(
'network-wifi.ui',
)
+status_icons_files = [
+ 'entry-show-symbolic.svg'
+]
+
+foreach file: status_icons_files
+ install_data(
+ file,
+ install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'status')
+ )
+endforeach
+
sources += gnome.compile_resources(
'cc-' + cappletname + '-resources',
cappletname + '.gresource.xml',
diff --git a/panels/network/wireless-security/eap-method-leap.c
b/panels/network/wireless-security/eap-method-leap.c
index 57d8759b9..da480d9c0 100644
--- a/panels/network/wireless-security/eap-method-leap.c
+++ b/panels/network/wireless-security/eap-method-leap.c
@@ -243,7 +243,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name,
FALSE, secrets_only);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapleap"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_togglebutton_eapleap"));
g_assert (widget);
method->show_password = GTK_TOGGLE_BUTTON (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
diff --git a/panels/network/wireless-security/eap-method-leap.ui
b/panels/network/wireless-security/eap-method-leap.ui
index 93ba95975..8946a3313 100644
--- a/panels/network/wireless-security/eap-method-leap.ui
+++ b/panels/network/wireless-security/eap-method-leap.ui
@@ -49,11 +49,43 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_leap_password_entry">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkEntry" id="eap_leap_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="show_togglebutton_eapleap">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">Show</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">entry-show-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -63,24 +95,6 @@
<property name="y_options"/>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="show_checkbutton_eapleap">
- <property name="label" translatable="yes">Sho_w password</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
<child>
<object class="GtkEntry" id="eap_leap_username_entry">
<property name="visible">True</property>
diff --git a/panels/network/wireless-security/eap-method-simple.c
b/panels/network/wireless-security/eap-method-simple.c
index 2287b99cd..baf694d43 100644
--- a/panels/network/wireless-security/eap-method-simple.c
+++ b/panels/network/wireless-security/eap-method-simple.c
@@ -346,7 +346,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
G_CALLBACK (password_storage_changed),
method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapsimple"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_togglebutton_eapsimple"));
g_assert (widget);
method->show_password = GTK_TOGGLE_BUTTON (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
diff --git a/panels/network/wireless-security/eap-method-simple.ui
b/panels/network/wireless-security/eap-method-simple.ui
index df8191c5c..3dd38366c 100644
--- a/panels/network/wireless-security/eap-method-simple.ui
+++ b/panels/network/wireless-security/eap-method-simple.ui
@@ -49,11 +49,43 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_simple_password_entry">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkEntry" id="eap_simple_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="show_togglebutton_eapsimple">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">Show</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">entry-show-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -75,37 +107,6 @@
<property name="y_options"/>
</packing>
</child>
- <child>
- <object class="GtkBox" id="vbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="show_checkbutton_eapsimple">
- <property name="label" translatable="yes">Sho_w password</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
</object>
</child>
<child type="tab">
diff --git a/panels/network/wireless-security/eap-method-tls.c
b/panels/network/wireless-security/eap-method-tls.c
index aa0491c56..fd8d3a972 100644
--- a/panels/network/wireless-security/eap-method-tls.c
+++ b/panels/network/wireless-security/eap-method-tls.c
@@ -39,7 +39,7 @@ struct _EAPMethodTLS {
static void
-show_toggled_cb (GtkCheckButton *button, EAPMethod *method)
+show_toggled_cb (GtkToggleButton *button, EAPMethod *method)
{
GtkWidget *widget;
gboolean visible;
@@ -522,7 +522,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name,
FALSE, secrets_only);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eaptls"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_togglebutton_eaptls"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_toggled_cb,
diff --git a/panels/network/wireless-security/eap-method-tls.ui
b/panels/network/wireless-security/eap-method-tls.ui
index a399460fa..ea6bd8599 100644
--- a/panels/network/wireless-security/eap-method-tls.ui
+++ b/panels/network/wireless-security/eap-method-tls.ui
@@ -147,33 +147,49 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_tls_private_key_password_entry">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkEntry" id="eap_tls_private_key_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="show_togglebutton_eaptls">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">Show</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">entry-show-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">5</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="show_checkbutton_eaptls">
- <property name="label" translatable="yes">Sho_w password</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
</object>
</child>
<child type="tab">
diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c
index 35b2e034b..472093168 100644
--- a/panels/network/wireless-security/ws-leap.c
+++ b/panels/network/wireless-security/ws-leap.c
@@ -36,7 +36,7 @@ struct _WirelessSecurityLEAP {
};
static void
-show_toggled_cb (GtkCheckButton *button, WirelessSecurity *sec)
+show_toggled_cb (GtkToggleButton *button, WirelessSecurity *sec)
{
GtkWidget *widget;
gboolean visible;
@@ -202,7 +202,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
if (secrets_only)
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_leap"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_togglebutton_leap"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_toggled_cb,
diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
index d8dd0ecc7..62f35ffdd 100644
--- a/panels/network/wireless-security/ws-leap.ui
+++ b/panels/network/wireless-security/ws-leap.ui
@@ -49,11 +49,43 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="leap_password_entry">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkEntry" id="leap_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="show_togglebutton_leap">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">Show</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">entry-show-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -63,24 +95,6 @@
<property name="y_options"/>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="show_checkbutton_leap">
- <property name="label" translatable="yes">Sho_w password</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
<child>
<object class="GtkEntry" id="leap_username_entry">
<property name="visible">True</property>
diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c
index 8b78515b1..f67576f11 100644
--- a/panels/network/wireless-security/ws-wep-key.c
+++ b/panels/network/wireless-security/ws-wep-key.c
@@ -41,7 +41,7 @@ struct _WirelessSecurityWEPKey {
};
static void
-show_toggled_cb (GtkCheckButton *button, WirelessSecurity *sec)
+show_toggled_cb (GtkToggleButton *button, WirelessSecurity *sec)
{
GtkWidget *widget;
gboolean visible;
@@ -334,7 +334,7 @@ ws_wep_key_new (NMConnection *connection,
if (connection)
update_secrets (WIRELESS_SECURITY (sec), connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_wep"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_togglebutton_wep"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_toggled_cb,
diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
index e06a0c81a..bca3b5d74 100644
--- a/panels/network/wireless-security/ws-wep-key.ui
+++ b/panels/network/wireless-security/ws-wep-key.ui
@@ -63,47 +63,47 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="wep_key_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">64</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label31">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_checkbutton_wep">
- <property name="label" translatable="yes">Sho_w key</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkEntry" id="wep_key_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="show_togglebutton_wep">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">Show</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">entry-show-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c
index 29064f4f3..77f4121ed 100644
--- a/panels/network/wireless-security/ws-wpa-psk.c
+++ b/panels/network/wireless-security/ws-wpa-psk.c
@@ -40,7 +40,7 @@ struct _WirelessSecurityWPAPSK {
};
static void
-show_toggled_cb (GtkCheckButton *button, WirelessSecurity *sec)
+show_toggled_cb (GtkToggleButton *button, WirelessSecurity *sec)
{
GtkWidget *widget;
gboolean visible;
@@ -210,7 +210,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
if (connection)
update_secrets (WIRELESS_SECURITY (sec), connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_wpa"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_togglebutton_wpa"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_toggled_cb,
diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
index a38a2dedb..2430b6591 100644
--- a/panels/network/wireless-security/ws-wpa-psk.ui
+++ b/panels/network/wireless-security/ws-wpa-psk.ui
@@ -29,12 +29,43 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="wpa_psk_entry">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">64</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkEntry" id="wpa_psk_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="show_togglebutton_wpa">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">Show</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">entry-show-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -58,37 +89,6 @@
<property name="y_options"/>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_checkbutton_wpa">
- <property name="label" translatable="yes">Sho_w password</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
<child>
<object class="GtkComboBox" id="wpa_psk_type_combo">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
