Commit 1b4c2cf9 authored by abgr's avatar abgr
Browse files

added small and large aurorae, updated xfwm4

parent 67788ab2
selection #7f44bb 1
bg #1b1b1b 1
bg-border #766576 1
bg-topleft #ff0000 0.4
bg-bottomright #0000ff 0.4
bg-hover #ffffff 0.15
bg-pressed #7f44bb 0.25
view #000000 0.6
view-hover #000000 0.8
text-selection #000000 1
text-bg #e0d8e0 1
text-view #e0d8e0 1
#!/bin/bash
# Usage: make_theme.sh colors.NAME
function hextorgb {
r=$((0x$(echo $1 | cut -b2-3)))
g=$((0x$(echo $1 | cut -b4-5)))
b=$((0x$(echo $1 | cut -b6-7)))
echo "$r,$g,$b"
}
colorscheme="$(echo "$1" | sed 's/colors.//')"
displayname="Trellium $colorscheme (Large)"
name="$(echo "$displayname" | tr -d ' ')"
rm -rv ../$name
cp -av . ../$name
cd ../$name
mv -v Trellium.sourcerc "$name"rc
sed -i "s/^Name=.*/Name=$displayname/" metadata.desktop
sed -i "s/^X-KDE-PluginInfo-Name=.*/X-KDE-PluginInfo-Name=$name/" metadata.desktop
# add 4px in button height
n=$(grep 'ButtonHeight=' "$name"rc | cut -d= -f2)
sed -i "s/ButtonHeight=$n/ButtonHeight=$((n + 4))/" "$name"rc
# add 6px in button width
cat "$name"rc | grep 'ButtonWidth.*=' | while read line; do
n=$(echo $line | cut -d= -f2)
sed -i "s/$line/$(echo $line | cut -d= -f1)=$((n + 6))/" "$name"rc
done
declare -A colors_source
while read key val; do
colors_source[$key]=$val
done < colors
declare -A colors_theme
while read key val alpha; do
colors_theme[$key]=$val
done < "colors.$colorscheme"
declare -A alpha
while read key val alpha; do
alpha[$key]=$alpha
done < "colors.$colorscheme"
sed -i "s/^ActiveTextColor=.*/ActiveTextColor=$(hextorgb ${colors_theme[text-bg]})/" "$name"rc
sed -i "s/^InactiveTextColor=.*/InactiveTextColor=$(hextorgb ${colors_theme[text-bg]})/" "$name"rc
for file in *.svg; do
sed -i '/#ff00ff/s/fill-opacity:1/fill-opacity:0/' $file
for i in ${!colors_source[@]}; do
sed -i "/${colors_source[$i]}/s/fill-opacity:1/fill-opacity:${alpha[$i]}/g" $file
sed -i "/${colors_source[$i]}/s/stop-opacity:1/stop-opacity:${alpha[$i]}/g" $file
done
for i in ${!colors_source[@]}; do
sed -i "s/${colors_source[$i]}/PLACEHOLDER-$i-PLACEHOLDER/g" $file
done
for i in ${!colors_source[@]}; do
sed -i "s/PLACEHOLDER-$i-PLACEHOLDER/${colors_theme[$i]}/g" $file
done
done
rm -v colors* *.sh *.colors
cd -
#!/bin/bash
# Usage: make_theme.sh colors.NAME
function hextorgb {
r=$((0x$(echo $1 | cut -b2-3)))
g=$((0x$(echo $1 | cut -b4-5)))
b=$((0x$(echo $1 | cut -b6-7)))
echo "$r,$g,$b"
}
colorscheme="$(echo "$1" | sed 's/colors.//')"
displayname="Trellium $colorscheme (Small)"
name="$(echo "$displayname" | tr -d ' ')"
rm -rv ../$name
cp -av . ../$name
cd ../$name
mv -v Trellium.sourcerc "$name"rc
sed -i "s/^Name=.*/Name=$displayname/" metadata.desktop
sed -i "s/^X-KDE-PluginInfo-Name=.*/X-KDE-PluginInfo-Name=$name/" metadata.desktop
# remove 4px in button height
n=$(grep 'ButtonHeight=' "$name"rc | cut -d= -f2)
sed -i "s/ButtonHeight=$n/ButtonHeight=$((n - 4))/" "$name"rc
# remove 6px in button width
cat "$name"rc | grep 'ButtonWidth.*=' | while read line; do
n=$(echo $line | cut -d= -f2)
sed -i "s/$line/$(echo $line | cut -d= -f1)=$((n - 6))/" "$name"rc
done
declare -A colors_source
while read key val; do
colors_source[$key]=$val
done < colors
declare -A colors_theme
while read key val alpha; do
colors_theme[$key]=$val
done < "colors.$colorscheme"
declare -A alpha
while read key val alpha; do
alpha[$key]=$alpha
done < "colors.$colorscheme"
sed -i "s/^ActiveTextColor=.*/ActiveTextColor=$(hextorgb ${colors_theme[text-bg]})/" "$name"rc
sed -i "s/^InactiveTextColor=.*/InactiveTextColor=$(hextorgb ${colors_theme[text-bg]})/" "$name"rc
for file in *.svg; do
sed -i '/#ff00ff/s/fill-opacity:1/fill-opacity:0/' $file
for i in ${!colors_source[@]}; do
sed -i "/${colors_source[$i]}/s/fill-opacity:1/fill-opacity:${alpha[$i]}/g" $file
sed -i "/${colors_source[$i]}/s/stop-opacity:1/stop-opacity:${alpha[$i]}/g" $file
done
for i in ${!colors_source[@]}; do
sed -i "s/${colors_source[$i]}/PLACEHOLDER-$i-PLACEHOLDER/g" $file
done
for i in ${!colors_source[@]}; do
sed -i "s/PLACEHOLDER-$i-PLACEHOLDER/${colors_theme[$i]}/g" $file
done
done
rm -v colors* *.sh *.colors
cd -
[General]
ActiveTextColor=0,0,0
InactiveTextColor=0,0,0
TitleAlignment=Center
LeftButtons=I
RightButtons=X
[Layout]
BorderLeft=4
BorderRight=4
BorderBottom=4
TitleEdgeTop=2
TitleEdgeBottom=1
TitleEdgeLeft=6
TitleEdgeRight=2
TitleBorderLeft=2
TitleBorderRight=2
TitleEdgeTopMaximized=0
TitleEdgeBottomMaximized=1
TitleEdgeLeftMaximized=0
TitleEdgeRightMaximized=0
ButtonHeight=29
ButtonWidth=41
ButtonWidthMenu=31
ButtonWidthMinimize=39
ButtonWidthMaximizeRestore=37
ButtonWidthShade=37
ButtonWidthClose=36
ButtonSpacing=0
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns: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"
width="73"
height="95"
id="svg2"
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="decoration.svg">
<sodipodi:namedview
id="base"
pagecolor="#a060a0"
bordercolor="#666666"
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="22.4"
inkscape:cx="28.77"
inkscape:cy="12.4"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:showpageshadow="false"
inkscape:window-width="1867"
inkscape:window-height="1055"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true">
<inkscape:grid
spacingy="1"
spacingx="1"
originy="40"
originx="5"
snapvisiblegridlinesonly="true"
enabled="true"
visible="true"
empspacing="5"
id="grid2985"
type="xygrid" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
id="linearGradient4889"
inkscape:collect="always">
<stop
id="stop4885"
offset="0"
style="stop-color:#aaffff;stop-opacity:0.6;" />
<stop
id="stop4887"
offset="1"
style="stop-color:#ffaaaa;stop-opacity:0.6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4889"
id="linearGradient4797"
x1="44"
y1="22"
x2="45"
y2="23"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-31,13)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4889"
id="linearGradient4805"
x1="50"
y1="24"
x2="51"
y2="25"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-45,19)" />
</defs>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
y="12"
x="12"
height="5"
width="5"
id="decoration-center"
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
<g
id="decoration-topleft"
transform="translate(5,-25)">
<path
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,34 A 2,2 0 0 0 4,36 H 6 Z"
id="path4528"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,33 A 3,3 0 0 0 3,36 H 5 A 1,1 0 0 1 6,35 Z"
id="path4524" />
<path
style="opacity:1;vector-effect:none;fill:#aaffff;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,35 A 1,1 0 0 0 5,36 H 6 Z"
id="path4530"
inkscape:connector-curvature="0" />
</g>
<g
id="decoration-topright"
transform="translate(5,-25)">
<path
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 13,34 v 2 h 2 a 2,2 0 0 0 -2,-2 z"
id="path4528-3"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 13,33 v 2 a 1,1 0 0 1 1,1 h 2 a 3,3 0 0 0 -3,-3 z"
id="path4524-5" />
<path
style="opacity:1;vector-effect:none;fill:url(#linearGradient4797);fill-opacity:1;stroke:none;stroke-width:0.15663119;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 13,35 v 1 h 1 a 1,1 0 0 0 -1,-1 z"
id="path4530-5"
inkscape:connector-curvature="0" />
</g>
<g
id="decoration-bottomleft"
transform="translate(5,-25)">
<path
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 4,43 a 2,2 0 0 0 2,2 v -2 z"
id="path4528-2"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 3,43 a 3,3 0 0 0 3,3 V 44 A 1,1 0 0 1 5,43 Z"
id="path4524-6" />
<path
style="opacity:1;vector-effect:none;fill:url(#linearGradient4805);fill-opacity:1;stroke:none;stroke-width:0.15663119;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 5,43 a 1,1 0 0 0 1,1 v -1 z"
id="path4530-9"
inkscape:connector-curvature="0" />
</g>
<g
id="decoration-bottomright"
transform="translate(5,-25)">
<path
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 13,43 v 2 a 2,2 0 0 0 2,-2 z"
id="path4528-27"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 14,43 a 1,1 0 0 1 -1,1 v 2 a 3,3 0 0 0 3,-3 z"
id="path4524-1" />
<path
style="opacity:1;vector-effect:none;fill:#ffaaaa;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 13,43 v 1 a 1,1 0 0 0 1,-1 z"
id="path4530-0"
inkscape:connector-curvature="0" />
</g>
<g
id="decoration-top"
transform="translate(5,-22)">
<rect
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.49531132;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4780"
width="5"
height="2"
x="7"
y="31" />
<rect
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4817"
width="5"
height="2"
x="7"
y="30" />
<rect
style="opacity:1;vector-effect:none;fill:#aaffff;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4851"
width="5"
height="1"
x="7"
y="32" />
</g>
<g
id="decoration-bottom"
transform="translate(5,-28)">
<rect
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.49531132;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4780-7"
width="5"
height="2"
x="7"
y="46" />
<rect
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4817-3"
width="5"
height="2"
x="7"
y="47" />
<rect
style="opacity:1;vector-effect:none;fill:#ffaaaa;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4851-1"
width="5"
height="1"
x="7"
y="46" />
</g>
<g
id="decoration-left"
transform="translate(8,-25)">
<rect
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.49531132;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4780-2"
width="2"
height="5"
x="1"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4834"
width="2"
height="5"
x="0"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#aaffff;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4868"
width="1"
height="5"
x="2"
y="37" />
</g>
<g
id="decoration-right"
transform="translate(2,-25)">
<rect
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.49531132;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4780-9"
width="2"
height="5"
x="16"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4834-6"
width="2"
height="5"
x="17"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#ffaaaa;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4868-2"
width="1"
height="5"
x="16"
y="37" />
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns: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"
width="73"
height="95"
id="svg2"
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="decoration.svg">
<sodipodi:namedview
id="base"
pagecolor="#a060a0"
bordercolor="#666666"
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="22.4"
inkscape:cx="28.77"
inkscape:cy="12.4"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:showpageshadow="false"
inkscape:window-width="1866"
inkscape:window-height="1055"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
inkscape:snap-bbox="false"
inkscape:bbox-nodes="true">
<inkscape:grid
spacingy="1"
spacingx="1"
originy="40"
originx="5"
snapvisiblegridlinesonly="true"
enabled="true"
visible="true"
empspacing="5"
id="grid2985"
type="xygrid" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
id="linearGradient4889"
inkscape:collect="always">
<stop
id="stop4885"
offset="0"
style="stop-color:#aaffff;stop-opacity:0.6;" />
<stop
id="stop4887"
offset="1"
style="stop-color:#ffaaaa;stop-opacity:0.6" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="46"
x2="6"
y1="43"
x1="3"
id="linearGradient4891"
xlink:href="#linearGradient4889"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="36"
x2="16"
y1="33"
x1="13"
id="linearGradient4899"
xlink:href="#linearGradient4889"
inkscape:collect="always" />
</defs>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
y="12"
x="12"
height="5"
width="5"
id="decoration-center"
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
<g
id="decoration-topleft"
transform="translate(5,-25)">
<path
style="opacity:1;vector-effect:none;fill:#f7f7f7;fill-opacity:0.8;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,31 A 5,5 0 0 0 1,36 H 6 Z"
id="path4718"
inkscape:connector-curvature="0" />
<path
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.6;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,30 A 6,6 0 0 0 0,36 H 2 A 4,4 0 0 1 6,32 Z"