diff options
author | Jakub Steiner <jimmac@gmail.com> | 2015-07-30 20:28:10 +0200 |
---|---|---|
committer | Jakub Steiner <jimmac@gmail.com> | 2015-08-05 13:43:22 +0200 |
commit | 6865dbdd1bf4836fa8dd7de151c7206a97193eb4 (patch) | |
tree | b3f67f3400cad6538e1c800e8027d14bf7db29a8 | |
parent | 741c84bc41710003694d3848c70c4e7b9b0cf1ce (diff) | |
download | gnome-shell-wip/csoriano/modal-dialog-button-style.tar.gz |
spinner: use a 60fps spinnerwip/csoriano/modal-dialog-button-style
- sync with gtk+ and provide a fluid spinner
https://bugzilla.gnome.org/show_bug.cgi?id=753064
m--------- | data/theme/gnome-shell-sass | 0 | ||||
-rw-r--r-- | data/theme/process-working.svg | 2421 | ||||
-rw-r--r-- | js/gdm/authPrompt.js | 2 | ||||
-rw-r--r-- | js/ui/animation.js | 2 | ||||
-rw-r--r-- | js/ui/modalDialog.js | 69 | ||||
-rw-r--r-- | js/ui/panel.js | 2 | ||||
-rw-r--r-- | js/ui/status/network.js | 2 |
7 files changed, 2407 insertions, 91 deletions
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass -Subproject 23e0bc1e71d0cd84d580916638ec5755f2f2d4e +Subproject e0e74382f166e596f1c8af4765404bfb65db76a diff --git a/data/theme/process-working.svg b/data/theme/process-working.svg index 43ffccad3..920a67d2d 100644 --- a/data/theme/process-working.svg +++ b/data/theme/process-working.svg @@ -12,9 +12,9 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg5369" version="1.1" - inkscape:version="0.48.5 r10040" - width="96" - height="48" + inkscape:version="0.91 r13725" + width="512" + height="32" sodipodi:docname="process-working.svg" style="display:inline"> <metadata @@ -25,7 +25,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -596,7 +596,7 @@ <radialGradient inkscape:collect="always" xlink:href="#linearGradient8231-1-4-4-1" - id="radialGradient10713" + id="radialGradient11663" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" cx="-0.067823187" @@ -607,7 +607,1327 @@ <radialGradient inkscape:collect="always" xlink:href="#linearGradient5767-6" - id="radialGradient10715" + id="radialGradient11665" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14128" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14140" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14152" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14164" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14176" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14188" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14200" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14212" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14224" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14236" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14248" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14260" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14272" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14284" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14296" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14308" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14320" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14332" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14344" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14356" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14368" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14380" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14392" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14404" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14416" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14428" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14440" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14452" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14464" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14476" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14488" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14500" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14512" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14524" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14536" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14548" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14560" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14572" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14584" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14596" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14608" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14620" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14632" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14644" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14656" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14668" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14680" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14692" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14704" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14716" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14728" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14740" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14752" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14764" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14776" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14788" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14800" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14812" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14824" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14836" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14848" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14860" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14872" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14884" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14896" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14908" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14920" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14932" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14944" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14956" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14968" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient14980" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient14992" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15004" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15016" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15028" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15040" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15052" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15064" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15076" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15088" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15100" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15112" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15124" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15136" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15148" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15160" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15172" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15184" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15196" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15208" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15220" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15232" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15244" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15256" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15268" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15280" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15292" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15304" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15316" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15328" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15340" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15352" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15364" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15376" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15388" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15400" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15412" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15424" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15436" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15448" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15460" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15472" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15484" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15496" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15508" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient15520" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient15532" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" + cx="0.053942412" + cy="189.15244" + fx="0.053942412" + fy="189.15244" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8231-1-4-4-1" + id="radialGradient18026" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)" + cx="-0.067823187" + cy="188.51917" + fx="-0.067823187" + fy="188.51917" + r="27.330345" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5767-6" + id="radialGradient18028" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)" cx="0.053942412" @@ -628,14 +1948,14 @@ inkscape:window-width="1975" inkscape:window-height="1098" id="namedview5371" - showgrid="true" + showgrid="false" borderlayer="true" inkscape:showpageshadow="false" - inkscape:zoom="5.6568542" - inkscape:cx="40.82607" - inkscape:cy="30.594699" - inkscape:window-x="2560" - inkscape:window-y="33" + inkscape:zoom="1" + inkscape:cx="346.23664" + inkscape:cy="-6.4057938" + inkscape:window-x="139" + inkscape:window-y="73" inkscape:window-maximized="0" inkscape:current-layer="layer2" inkscape:snap-bbox="true" @@ -643,18 +1963,21 @@ <inkscape:grid type="xygrid" id="grid11933" - empspacing="5" + empspacing="16" visible="true" enabled="true" - snapvisiblegridlinesonly="true" /> + snapvisiblegridlinesonly="true" + empcolor="#0000ff" + empopacity="0.47843137" /> </sodipodi:namedview> <g inkscape:groupmode="layer" id="layer1" inkscape:label="tiles" - style="display:none"> + style="display:none" + transform="translate(0,-16)"> <rect - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="rect12451" width="24" height="24" @@ -666,23 +1989,23 @@ height="24" width="24" id="rect12453" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> <rect y="0" x="24" height="24" width="24" id="rect12455" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> <rect - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="rect12457" width="24" height="24" x="24" y="24" /> <rect - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="rect12459" width="24" height="24" @@ -694,16 +2017,16 @@ height="24" width="24" id="rect12461" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> <rect y="0" x="72" height="24" width="24" id="rect12463" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> <rect - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="rect12465" width="24" height="24" @@ -713,10 +2036,768 @@ <g inkscape:groupmode="layer" id="layer2" - inkscape:label="spinner"> + inkscape:label="spinner" + transform="translate(0,-16)"> <g - transform="matrix(0.43142675,0,0,0.43298814,218.13188,-592.92581)" - id="g10450-5-3" + style="display:inline" + id="g12246" + transform="matrix(0.29521872,0,0,0.2952381,149.03971,-388.51498)"> + <path + transform="matrix(-0.16397381,0.61157081,-0.61162275,-0.16377992,-372.32298,1442.5061)" + d="m -3.4436513,184.72075 a 22.98097,22.98097 0 0 1 -25.9046347,17.42496 22.98097,22.98097 0 0 1 -19.37345,-24.4816 22.98097,22.98097 0 0 1 22.91234,-21.20622" + sodipodi:ry="22.98097" + sodipodi:rx="22.98097" + sodipodi:cy="179.43886" + sodipodi:cx="-25.809397" + id="path12248" + style="display:inline;fill:none;stroke:url(#radialGradient11663);stroke-width:17.83196449;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:type="arc" + sodipodi:start="0.23191105" + sodipodi:end="4.712389" + sodipodi:open="true" + inkscape:export-filename="/home/hbons/Moblin/git/carrick-ng/data/icons/network-connecting.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/hbons/Moblin/git/carrick-ng/data/icons/network-connecting.png" + sodipodi:open="true" + sodipodi:end="4.712389" + sodipodi:start="0.23191105" + sodipodi:type="arc" + style="display:inline;fill:none;stroke:url(#radialGradient11665);stroke-width:17.83196449;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path12250" + sodipodi:cx="-25.809397" + sodipodi:cy="179.43886" + sodipodi:rx="22.98097" + sodipodi:ry="22.98097" + d="m -3.4436513,184.72075 a 22.98097,22.98097 0 0 1 -25.9046347,17.42496 22.98097,22.98097 0 0 1 -19.37345,-24.4816 22.98097,22.98097 0 0 1 22.91234,-21.20622" + transform="matrix(-0.63300818,0.01438356,-0.01458424,-0.63300359,-491.4014,1510.996)" /> + </g> + <use + height="100%" + width="100%" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,48.943073,-180.55304)" + id="use12258" + xlink:href="#g10450-5" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.97814761,0.20791169,-0.20791169,0.97814761,70.553652,-185.80321)" + id="use12260" + xlink:href="#use12000" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.95105653,0.30901699,-0.30901699,0.95105653,146.76602,-177.21804)" + id="use12266" + xlink:href="#g10450-5" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.91354547,0.40673664,-0.40673664,0.91354547,169.60833,-183.68101)" + id="use12270" + xlink:href="#use12000" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.86602542,0.5,-0.5,0.86602542,194.48539,-193.2587)" + id="use12272" + xlink:href="#use12002" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.80901701,0.58778525,-0.58778525,0.80901701,289.93475,-156.19404)" + id="use12278" + xlink:href="#g10450-5" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.74314484,0.66913061,-0.66913061,0.74314484,315.02774,-163.93338)" + id="use12282" + xlink:href="#use12000" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.66913062,0.74314483,-0.74314483,0.66913062,343.01848,-174.00634)" + id="use12284" + xlink:href="#use12002" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.58778527,0.809017,-0.809017,0.58778527,374.34035,-185.86931)" + id="use12290" + xlink:href="#use12008" + y="0" + x="0" /> + <use + x="0" + y="0" + xlink:href="#use12290" + id="use12494" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,31.624213,-28.945572)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12494" + id="use12498" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,31.778114,-31.872282)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12498" + id="use12502" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,31.931711,-34.799662)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12502" + id="use12506" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,32.085178,-37.729332)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12506" + id="use12510" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,32.238466,-40.661342)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12510" + id="use12514" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,32.390823,-43.585942)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12514" + id="use12518" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,32.543439,-46.510902)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12518" + id="use12522" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,32.696338,-49.437422)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12522" + id="use12526" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,32.849272,-52.363942)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12526" + id="use12530" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.002239,-55.290422)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12530" + id="use12534" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.155242,-58.216862)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12534" + id="use12538" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.308287,-61.143262)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12538" + id="use12542" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.461378,-64.069632)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12542" + id="use12546" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.614517,-66.995962)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12546" + id="use12550" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.767708,-69.922282)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12550" + id="use12554" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,33.920952,-72.848572)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12554" + id="use12558" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.074252,-75.774862)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12558" + id="use12562" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.228224,-78.701442)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12562" + id="use12566" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.384481,-81.628162)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12566" + id="use12570" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.543085,-84.555062)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12570" + id="use12574" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.694273,-87.482889)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12574" + id="use12578" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.845821,-90.410449)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12578" + id="use12582" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,34.998931,-93.337739)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12582" + id="use12586" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,35.152046,-96.264989)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12586" + id="use12590" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,35.305116,-99.192209)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12590" + id="use12594" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,35.458143,-102.11938)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12594" + id="use12598" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,35.611131,-105.04652)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12598" + id="use12602" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,35.764086,-107.97361)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12602" + id="use12606" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,35.917013,-110.90066)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12606" + id="use12610" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.069915,-113.82765)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12610" + id="use12614" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.2228,-116.75459)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12614" + id="use12618" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.375673,-119.68147)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12618" + id="use12622" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.52885,-122.60769)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12622" + id="use12626" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.682157,-125.53161)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12626" + id="use12630" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.835642,-128.45319)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12630" + id="use12634" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,36.990059,-131.38219)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12634" + id="use12638" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,37.144216,-134.31083)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12638" + id="use12642" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,37.298091,-137.2379)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12642" + id="use12646" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,37.45193,-140.16497)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12646" + id="use12650" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,37.605737,-143.09209)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12650" + id="use12654" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,37.759507,-146.01924)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12654" + id="use12658" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,37.913236,-148.94644)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12658" + id="use12662" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.066918,-151.87367)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12662" + id="use12666" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.220552,-154.80093)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12666" + id="use12670" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.374134,-157.72821)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12670" + id="use12674" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.527663,-160.65551)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12674" + id="use12678" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.681136,-163.58282)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12678" + id="use12682" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.833937,-166.50983)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12682" + id="use12686" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,38.984453,-169.4367)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use12686" + id="use12690" + transform="matrix(0.9945219,0.10452846,-0.10452846,0.9945219,39.132623,-172.3634)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g12246" + id="use17640" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.463174,-0.6860274)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17640" + id="use17642" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.545526,-2.3041175)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17642" + id="use17644" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.627869,-3.9222415)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17644" + id="use17646" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.710256,-5.5403957)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17646" + id="use17648" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.792682,-7.1585849)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17648" + id="use17650" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.875146,-8.776813)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17650" + id="use17652" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,18.957642,-10.395084)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17652" + id="use17654" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.040166,-12.0134)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17654" + id="use17656" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.122713,-13.631765)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17656" + id="use17658" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.205279,-15.250181)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17658" + id="use17660" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.287857,-16.868648)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17660" + id="use17662" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.370295,-18.487328)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17662" + id="use17664" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.452449,-20.10785)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17664" + id="use17666" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.534518,-21.730599)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17666" + id="use17668" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,19.616047,-23.351029)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g12246" + id="use17670" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,288.32996,17.191525)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17640" + id="use17672" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,305.13809,1.2121247)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17642" + id="use17674" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,321.94624,-14.767309)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17644" + id="use17676" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,338.75439,-30.746723)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17646" + id="use17678" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,355.56257,-46.726112)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17648" + id="use17680" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,372.37079,-62.705487)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17650" + id="use17682" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,389.179,-78.684846)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17652" + id="use17684" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,405.98726,-94.664188)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17654" + id="use17686" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,422.79551,-110.64352)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17656" + id="use17688" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,439.60382,-126.62284)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17658" + id="use17690" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,456.41215,-142.60217)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17660" + id="use17692" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,473.22049,-158.58145)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17662" + id="use17694" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,490.02954,-174.56102)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17664" + id="use17696" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,506.83972,-190.54059)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17666" + id="use17698" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,523.65101,-206.52033)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use17668" + id="use17700" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,540.45771,-222.50042)" + width="100%" + height="100%" /> + <g + transform="matrix(-0.29521867,7.2137245e-5,-7.2124844e-5,-0.29523807,-132.95323,452.47763)" + id="g17702" style="display:inline"> <path inkscape:export-ydpi="90" @@ -726,23 +2807,23 @@ sodipodi:end="4.712389" sodipodi:start="0.23191105" sodipodi:type="arc" - style="fill:none;stroke:url(#radialGradient10713);stroke-width:12.18051815;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="path10452-5" + style="display:inline;fill:none;stroke:url(#radialGradient18026);stroke-width:17.83196449;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path17704" sodipodi:cx="-25.809397" sodipodi:cy="179.43886" sodipodi:rx="22.98097" sodipodi:ry="22.98097" - d="m -3.4436513,184.72075 c -2.9171108,12.35226 -15.2953817,20.00096 -27.6476417,17.08385 -12.35226,-2.91711 -20.00096,-15.29538 -17.083849,-27.64764 2.449452,-10.372 11.708437,-17.69907 22.365746,-17.69907" + d="m -3.4436513,184.72075 a 22.98097,22.98097 0 0 1 -25.9046347,17.42496 22.98097,22.98097 0 0 1 -19.37345,-24.4816 22.98097,22.98097 0 0 1 22.91234,-21.20622" transform="matrix(-0.16397381,0.61157081,-0.61162275,-0.16377992,-372.32298,1442.5061)" /> <path transform="matrix(-0.63300818,0.01438356,-0.01458424,-0.63300359,-491.4014,1510.996)" - d="m -3.4436513,184.72075 c -2.9171108,12.35226 -15.2953817,20.00096 -27.6476417,17.08385 -12.35226,-2.91711 -20.00096,-15.29538 -17.083849,-27.64764 2.449452,-10.372 11.708437,-17.69907 22.365746,-17.69907" + d="m -3.4436513,184.72075 a 22.98097,22.98097 0 0 1 -25.9046347,17.42496 22.98097,22.98097 0 0 1 -19.37345,-24.4816 22.98097,22.98097 0 0 1 22.91234,-21.20622" sodipodi:ry="22.98097" sodipodi:rx="22.98097" sodipodi:cy="179.43886" sodipodi:cx="-25.809397" - id="path10454-7" - style="fill:none;stroke:url(#radialGradient10715);stroke-width:12.18051815;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" + id="path17706" + style="display:inline;fill:none;stroke:url(#radialGradient18028);stroke-width:17.83196449;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" sodipodi:type="arc" sodipodi:start="0.23191105" sodipodi:end="4.712389" @@ -752,60 +2833,252 @@ inkscape:export-ydpi="90" /> </g> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.081742,-0.6039496)" + id="use17708" + xlink:href="#g17702" y="0" - xlink:href="#g10450-5-3" - id="use13294" - transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,35.986458,-4.9737924)" - width="96" - height="48" /> + x="0" /> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.164094,-2.2220396)" + id="use17710" + xlink:href="#use17708" y="0" - xlink:href="#use13294" - id="use13314" - transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,43.036943,-21.933639)" - width="96" - height="48" /> + x="0" /> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.246437,-3.8401636)" + id="use17712" + xlink:href="#use17710" y="0" - xlink:href="#use13314" - id="use13334" - transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,50.085328,-38.904987)" - width="96" - height="48" /> + x="0" /> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.328824,-5.4583176)" + id="use17714" + xlink:href="#use17712" y="0" - xlink:href="#use13334" - id="use13354" - transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-38.894841,-31.888724)" - width="96" - height="48" /> + x="0" /> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.41125,-7.0765066)" + id="use17716" + xlink:href="#use17714" y="0" - xlink:href="#use13354" - id="use13374" - transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,52.971072,2.0670843)" - width="96" - height="48" /> + x="0" /> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.493714,-8.6947346)" + id="use17718" + xlink:href="#use17716" y="0" - xlink:href="#use13374" - id="use13394" - transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,60.017834,-14.929741)" - width="96" - height="48" /> + x="0" /> <use - x="0" + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.57621,-10.313006)" + id="use17720" + xlink:href="#use17718" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.658734,-11.931322)" + id="use17722" + xlink:href="#use17720" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.741281,-13.549687)" + id="use17724" + xlink:href="#use17722" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.823847,-15.168103)" + id="use17726" + xlink:href="#use17724" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.906425,-16.78657)" + id="use17728" + xlink:href="#use17726" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,20.988863,-18.40525)" + id="use17730" + xlink:href="#use17728" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,21.071017,-20.025772)" + id="use17732" + xlink:href="#use17730" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,21.153086,-21.648521)" + id="use17734" + xlink:href="#use17732" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(0.99487012,0.10116048,-0.10116048,0.99487012,21.234615,-23.268951)" + id="use17736" + xlink:href="#use17734" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,304.30952,33.999897)" + id="use17738" + xlink:href="#g17702" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,321.11765,18.020497)" + id="use17740" + xlink:href="#use17708" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,337.9258,2.0410622)" + id="use17742" + xlink:href="#use17710" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,354.73395,-13.938351)" + id="use17744" + xlink:href="#use17712" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,371.54213,-29.91774)" + id="use17746" + xlink:href="#use17714" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,388.35035,-45.897115)" + id="use17748" + xlink:href="#use17716" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,405.15856,-61.876474)" + id="use17750" + xlink:href="#use17718" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,421.96682,-77.855816)" + id="use17752" + xlink:href="#use17720" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,438.77507,-93.835152)" + id="use17754" + xlink:href="#use17722" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,455.58338,-109.81448)" + id="use17756" + xlink:href="#use17724" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,472.39171,-125.79381)" + id="use17758" + xlink:href="#use17726" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,489.20005,-141.77309)" + id="use17760" + xlink:href="#use17728" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,506.0091,-157.75266)" + id="use17762" + xlink:href="#use17730" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,522.81928,-173.73223)" + id="use17764" + xlink:href="#use17732" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,539.63057,-189.71197)" + id="use17766" + xlink:href="#use17734" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="matrix(-0.0505232,0.99872288,-0.99872288,-0.0505232,556.43727,-205.69206)" + id="use17768" + xlink:href="#use17736" y="0" - xlink:href="#use13394" - id="use13414" - transform="matrix(0.86602541,0.50000001,-0.50000001,0.86602541,50.044124,-25.16226)" - width="96" - height="48" /> + x="0" /> </g> </svg> diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js index b57b00bb7..2b79701fc 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js @@ -14,7 +14,7 @@ const ShellEntry = imports.ui.shellEntry; const Tweener = imports.ui.tweener; const UserWidget = imports.ui.userWidget; -const DEFAULT_BUTTON_WELL_ICON_SIZE = 24; +const DEFAULT_BUTTON_WELL_ICON_SIZE = 16; const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0; const DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3; diff --git a/js/ui/animation.js b/js/ui/animation.js index 736b3d72d..08f8f7e15 100644 --- a/js/ui/animation.js +++ b/js/ui/animation.js @@ -7,7 +7,7 @@ const St = imports.gi.St; const Signals = imports.signals; const Atk = imports.gi.Atk; -const ANIMATED_ICON_UPDATE_TIMEOUT = 100; +const ANIMATED_ICON_UPDATE_TIMEOUT = 14; const Animation = new Lang.Class({ Name: 'Animation', diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js index 960e0dca3..4d461e607 100644 --- a/js/ui/modalDialog.js +++ b/js/ui/modalDialog.js @@ -14,6 +14,7 @@ const Atk = imports.gi.Atk; const Params = imports.misc.params; +const Animation = imports.ui.animation; const Layout = imports.ui.layout; const Lightbox = imports.ui.lightbox; const Main = imports.ui.main; @@ -22,6 +23,10 @@ const Tweener = imports.ui.tweener; const OPEN_AND_CLOSE_TIME = 0.1; const FADE_OUT_DIALOG_TIME = 1.0; +const WORK_SPINNER_ICON_SIZE = 16; +const WORK_SPINNER_ANIMATION_DELAY = 1.0; +const WORK_SPINNER_ANIMATION_TIME = 0.3; + const State = { OPENED: 0, CLOSED: 1, @@ -74,9 +79,7 @@ const ModalDialog = new Lang.Class({ this._group.add_actor(this._backgroundBin); this.dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog', - x_align: Clutter.ActorAlign.CENTER, - y_align: Clutter.ActorAlign.CENTER, - vertical: true }); + vertical: true }); // modal dialogs are fixed width and grow vertically; set the request // mode accordingly so wrapped labels are handled correctly during // size requests. @@ -97,8 +100,7 @@ const ModalDialog = new Lang.Class({ this.backgroundStack.add_actor(this.dialogLayout); - this.contentLayout = new St.BoxLayout({ vertical: true, - style_class: "modal-dialog-content-box" }); + this.contentLayout = new St.BoxLayout({ vertical: true }); this.dialogLayout.add(this.contentLayout, { expand: true, x_fill: true, @@ -106,7 +108,8 @@ const ModalDialog = new Lang.Class({ x_align: St.Align.MIDDLE, y_align: St.Align.START }); - this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout ({ homogeneous:true }) }); + this.buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box', + vertical: false }); this.dialogLayout.add(this.buttonLayout, { x_align: St.Align.MIDDLE, y_align: St.Align.END }); @@ -115,6 +118,8 @@ const ModalDialog = new Lang.Class({ this._initialKeyFocus = this.dialogLayout; this._initialKeyFocusDestroyId = 0; this._savedKeyFocus = null; + + this._workSpinner = null; }, destroy: function() { @@ -142,12 +147,16 @@ const ModalDialog = new Lang.Class({ else x_alignment = St.Align.MIDDLE; - this.addButton(buttonInfo); + this.addButton(buttonInfo, { expand: true, + x_fill: false, + y_fill: false, + x_align: x_alignment, + y_align: St.Align.MIDDLE }); } }, - addButton: function(buttonInfo) { - let label = buttonInfo['label'] + addButton: function(buttonInfo, layoutInfo) { + let label = buttonInfo['label']; let action = buttonInfo['action']; let key = buttonInfo['key']; let isDefault = buttonInfo['default']; @@ -161,12 +170,10 @@ const ModalDialog = new Lang.Class({ else keys = []; - let button = new St.Button({ style_class: 'modal-dialog-linked-button', + let button = new St.Button({ style_class: 'modal-dialog-button button', button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE, reactive: true, can_focus: true, - x_expand: true, - y_expand: true, label: label }); button.connect('clicked', action); @@ -181,11 +188,47 @@ const ModalDialog = new Lang.Class({ for (let i in keys) this._buttonKeys[keys[i]] = buttonInfo; - this.buttonLayout.add_actor(button); + this.buttonLayout.add(button, layoutInfo); return button; }, + placeSpinner: function(layoutInfo) { + let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg'); + this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE); + this._workSpinner.actor.opacity = 0; + this._workSpinner.actor.show(); + + this.buttonLayout.add(this._workSpinner.actor, layoutInfo); + }, + + setWorking: function(working) { + if (!this._workSpinner) + return; + + Tweener.removeTweens(this._workSpinner.actor); + if (working) { + this._workSpinner.play(); + Tweener.addTween(this._workSpinner.actor, + { opacity: 255, + delay: WORK_SPINNER_ANIMATION_DELAY, + time: WORK_SPINNER_ANIMATION_TIME, + transition: 'linear' + }); + } else { + Tweener.addTween(this._workSpinner.actor, + { opacity: 0, + time: WORK_SPINNER_ANIMATION_TIME, + transition: 'linear', + onCompleteScope: this, + onComplete: function() { + if (this._workSpinner) + this._workSpinner.stop(); + } + }); + } + }, + _onKeyPressEvent: function(object, event) { this._pressedKey = event.get_key_symbol(); return Clutter.EVENT_PROPAGATE; diff --git a/js/ui/panel.js b/js/ui/panel.js index ec85fc651..5b9d308b2 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -30,7 +30,7 @@ const APP_MENU_ICON_MARGIN = 0; const BUTTON_DND_ACTIVATION_TIMEOUT = 250; -const SPINNER_ANIMATION_TIME = 0.2; +const SPINNER_ANIMATION_TIME = 1.0; // To make sure the panel corners blend nicely with the panel, // we draw background and borders the same way, e.g. drawing diff --git a/js/ui/status/network.js b/js/ui/status/network.js index bd369f23d..767656bdb 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -877,7 +877,7 @@ const NMWirelessDialog = new Lang.Class({ y_align: Clutter.ActorAlign.CENTER }); let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg'); - this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24); + this._noNetworksSpinner = new Animation.AnimatedIcon(file, 16, 16); this._noNetworksBox.add_actor(this._noNetworksSpinner.actor); this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label', text: _("No Networks") })); |