[gcompris/gcomprisbraille] New layout on removing lotto board|focus issue for tickets remaining
- From: Srishti Sethi <srishs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris/gcomprisbraille] New layout on removing lotto board|focus issue for tickets remaining
- Date: Fri, 15 Jul 2011 11:37:40 +0000 (UTC)
commit 5cd77374002e6b1644d736d413c8dc4ec4b1ff5f
Author: Srishti Sethi <srishakatux gmail com>
Date: Fri Jul 15 17:07:18 2011 +0530
New layout on removing lotto board|focus issue for tickets remaining
src/braille_lotto-activity/braille_lotto.py | 191 ++++++++------------
.../resources/braille_lotto/button.svg | 120 ++++++++++++
.../resources/braille_lotto/button2.png | Bin 0 -> 1535 bytes
.../resources/braille_lotto/callout1.svg | 6 +-
.../resources/braille_lotto/callout2.svg | 6 +-
.../resources/braille_lotto/tux.svg | 103 ++++++-----
6 files changed, 259 insertions(+), 167 deletions(-)
---
diff --git a/src/braille_lotto-activity/braille_lotto.py b/src/braille_lotto-activity/braille_lotto.py
index df2db05..bc23846 100644
--- a/src/braille_lotto-activity/braille_lotto.py
+++ b/src/braille_lotto-activity/braille_lotto.py
@@ -33,8 +33,8 @@ from BrailleChar import *
from BrailleMap import *
from gcompris import gcompris_gettext as _
-COLOR_ON = 0X00FFFFL
-COLOR_OFF = 0X00000000L
+COLOR_ON = 0X00FFFF
+COLOR_OFF = 0X000000
CIRCLE_FILL = "light green"
CIRCLE_STROKE = "black"
CELL_WIDTH = 30
@@ -97,33 +97,12 @@ class Gcompris_braille_lotto:
self.lotto_board()
def lotto_board(self):
- #Lotto Board
- board = goocanvas.Rect(
- parent = self.root,
- x = 40,
- y = 20,
- width = 420,
- height = 270,
- stroke_color = "blue",
- fill_color = "light blue" ,
- line_width=5)
-
- #Horizontal polylines for lotto board
- for index in range(8):
- p_points = goocanvas.Points([(40.0, 30 * index + 50),(460.0, 30 * index + 50)])
- polyline = goocanvas.Polyline(parent = self.root, points=p_points, stroke_color="blue")
-
- #Vertical polylines for lotto board
- for index in range(9):
- p_points = goocanvas.Points([(42 * index + 80, 20.0),(42 * index + 80, 290.0)])
- polyline = goocanvas.Polyline(parent = self.root, points=p_points, stroke_color="blue")
-
#Display Rectangle Ticket Boxes
self.rect = []
self.rect_x = []
self.rect_y = []
- self.displayTicketBox(40 , 310)
- self.displayTicketBox(500, 310)
+ self.displayTicketBox(40 , 40)
+ self.displayTicketBox(420, 40)
#Rectangle box with ticket number is made clickable
index = 0
@@ -139,8 +118,8 @@ class Gcompris_braille_lotto:
#PLAYER 1
goocanvas.Text(
parent = self.root,
- x=170.0,
- y=500.0,
+ x=200.0,
+ y=300.0,
text=_("PLAYER 1"),
fill_color="black",
anchor = gtk.ANCHOR_CENTER,
@@ -149,8 +128,8 @@ class Gcompris_braille_lotto:
#PLAYER TWO
goocanvas.Text(
parent = self.root,
- x=640.0,
- y=500.0,
+ x=580.0,
+ y=300.0,
text=_("PLAYER 2"),
fill_color="black",
anchor = gtk.ANCHOR_CENTER,
@@ -159,9 +138,9 @@ class Gcompris_braille_lotto:
#Button to display the number to be checked in the ticket
goocanvas.Image(parent = self.root,
- pixbuf = gcompris.utils.load_pixmap("braille_lotto/button.jpg"),
- x = 470,
- y = 35,
+ pixbuf = gcompris.utils.load_pixmap("braille_lotto/button.svg"),
+ x = -15,
+ y = 340,
)
#Check number
@@ -169,37 +148,11 @@ class Gcompris_braille_lotto:
parent = self.root,
text= _("Check Number"),
font = gcompris.skin.get_font("gcompris/board/medium"),
- x=560,
- y=55,
+ x=120,
+ y=390,
anchor=gtk.ANCHOR_CENTER,
)
- #Displaying Numbers in Lotto Board
- k = 0
- i = 0
- j = 10
- self.board_array = []
- self.board_array_x = []
- self.board_array_y = []
- while k < 9:
- spacing = 0
- for index in range(i,j):
- goocanvas.Text(
- parent = self.root,
- text = (index + 1),
- font = gcompris.skin.get_font("gcompris/board/medium"),
- x = spacing * 43 + 55,
- y = 30 * k + 35,
- anchor=gtk.ANCHOR_CENTER,
- )
- #Append number, x and y location to arrays
- self.board_array.append(index + 1)
- self.board_array_x.append(spacing * 43 + 55)
- self.board_array_y.append(30 * k + 35)
- spacing = spacing + 1
- i += 10
- j += 10
- k += 1
#Buttons for Clue
svghandle = gcompris.utils.load_svg("braille_lotto/button1.svg")
@@ -210,9 +163,10 @@ class Gcompris_braille_lotto:
svg_id = "#FIG1",
tooltip = "Click me to get some hint"
)
- self.hint_left_button.translate(470, 150)
+ self.hint_left_button.translate(210, 330)
self.hint_left_button.connect("button_press_event", self.clue_left)
- gcompris.utils.item_focus_init(self.hint_left_button, self.hint_left_button)
+ gcompris.utils.item_focus_init(self.hint_left_button, None)
+
#RIGHT Button
self.hint_right_button = goocanvas.Svg(
@@ -221,53 +175,63 @@ class Gcompris_braille_lotto:
svg_id = "#FIG2",
tooltip = "Click me to get some hint"
)
- self.hint_right_button.translate(470, 150)
+ self.hint_right_button.translate(290, 330)
self.hint_right_button.connect("button_press_event", self.clue_right)
- gcompris.utils.item_focus_init(self.hint_right_button, self.hint_right_button)
+ gcompris.utils.item_focus_init(self.hint_right_button, None)
+
#Displaying text on clue buttons
+ self.text_array = []
for index in range(2):
- goocanvas.Text(
+ clue_text = goocanvas.Text(
parent = self.root,
text = _("I don't have \n""this number \n\n" "PLAYER " + str(index + 1)),
font = gcompris.skin.get_font("gcompris/board/medium"),
- x = index * 160 + 550,
- y = 215,
+ x = index * 230 + 295,
+ y = 395,
anchor=gtk.ANCHOR_CENTER,
)
+ self.text_array.append(clue_text)
+ gcompris.utils.item_focus_init(self.text_array[0], self.hint_left_button)
+ self.text_array[0].connect("button_press_event", self.clue_left)
+ gcompris.utils.item_focus_init(self.text_array[1], self.hint_right_button)
+ self.text_array[1].connect("button_press_event", self.clue_right)
+
#Displaying Tux Lotto Master
goocanvas.Image(parent = self.root,
pixbuf = gcompris.utils.load_pixmap("braille_lotto/tux.svg"),
x = 360,
- y = 320,
+ y = 330,
)
goocanvas.Text(
parent = self.root,
text = _("Lotto Master"),
font = gcompris.skin.get_font("gcompris/board/medium"),
- x = 400,
- y = 430,
+ x = 410,
+ y = 455,
anchor=gtk.ANCHOR_CENTER,
)
#Generate Number Button
generate_number = goocanvas.Image(parent = self.root,
- pixbuf = gcompris.utils.load_pixmap("braille_lotto/generate_number.png"),
- x = 670,
- y = 30,
+ pixbuf = gcompris.utils.load_pixmap("braille_lotto/button2.png"),
+ x = 620,
+ y = 350,
)
generate_number.connect("button_press_event", self.generateNumber)
gcompris.utils.item_focus_init(generate_number, None)
- goocanvas.Text(
+ generate_text = goocanvas.Text(
parent = self.root,
text = _("Generate")+"\n"+_("Number"),
font = gcompris.skin.get_font("gcompris/board/medium"),
- x = 730,
- y = 90,
+ x = 700,
+ y = 390,
anchor=gtk.ANCHOR_CENTER,
)
+ generate_text.connect("button_press_event", self.generateNumber)
+ gcompris.utils.item_focus_init(generate_text, generate_number)
#Calling the random number and checking it on lotto board
@@ -278,32 +242,32 @@ class Gcompris_braille_lotto:
#Displaying the Braille Code for TICKETS A & B
#TICKET A
- self.displayTicket(1, 25, 55, 320)
- self.displayTicket(1, 25, 55, 432)
- self.displayTicket(26, 50, 122, 377)
- self.displayTicket(51, 75, 191, 320)
- self.displayTicket(51, 75, 191, 432)
- self.displayTicket(76, 90, 259, 377)
+ self.displayTicket(1, 25, 60, 50)
+ self.displayTicket(1, 25, 60, 200)
+ self.displayTicket(26, 50, 140, 125)
+ self.displayTicket(51, 75, 230, 50)
+ self.displayTicket(51, 75, 230, 200)
+ self.displayTicket(76, 90, 320, 125)
#TICKET B
- self.displayTicket(1, 25, 515, 320)
- self.displayTicket(1, 25, 515, 432)
- self.displayTicket(26, 50, 582, 377)
- self.displayTicket(51, 75, 650, 320)
- self.displayTicket(51, 75, 650, 432)
- self.displayTicket(76, 90, 718, 377)
+ self.displayTicket(1, 25, 440, 50)
+ self.displayTicket(1, 25, 440, 200)
+ self.displayTicket(26, 50, 520, 125)
+ self.displayTicket(51, 75, 610, 50)
+ self.displayTicket(51, 75, 610, 200)
+ self.displayTicket(76, 90, 700, 125)
def clue_left(self, event , target, item):
self.callout1 = goocanvas.Image(parent = self.root,
pixbuf = gcompris.utils.load_pixmap("braille_lotto/callout1.svg"),
x = 220,
- y = 340,
+ y =250,
)
self.status_one = goocanvas.Text(
parent = self.root,
text= "",
x=310,
- y=410,
+ y=320,
font = "SANS 10 BOLD",
anchor=gtk.ANCHOR_CENTER,
)
@@ -319,13 +283,13 @@ class Gcompris_braille_lotto:
self.callout2 = goocanvas.Image(parent = self.root,
pixbuf = gcompris.utils.load_pixmap("braille_lotto/callout2.svg"),
x = 400,
- y = 340,
+ y = 250,
)
self.status_two = goocanvas.Text(
parent = self.root,
text= "",
x=500,
- y=410,
+ y=320,
font = "SANS 10 BOLD",
anchor=gtk.ANCHOR_CENTER,
)
@@ -381,26 +345,19 @@ class Gcompris_braille_lotto:
self.check_number = goocanvas.Text(
parent = self.root,
text= CHECK_RANDOM[self.counter],
- x=560,
- y=100,
+ x=110,
+ y=420,
font = "SANS 20",
anchor=gtk.ANCHOR_CENTER,
)
- #Place the checked button on number which is being called
- goocanvas.Image(parent = self.root,
- pixbuf = gcompris.utils.load_pixmap("braille_lotto/button_checked.png"),
- x = self.board_array_x[CHECK_RANDOM[self.counter] - 1] - 10 ,
- y = self.board_array_y[CHECK_RANDOM[self.counter] - 1]- 10,
- )
-
def displayTicketBox(self, x, y):
goocanvas.Rect(
parent = self.root,
x = x + 5,
y = y + 5,
- width = 268,
- height = 168,
+ width = 350,
+ height = 230,
stroke_color = "dark green",
fill_color = "light green" ,
line_width=7)
@@ -409,37 +366,37 @@ class Gcompris_braille_lotto:
for j in range(3):
box = goocanvas.Rect(
parent = self.root,
- x = x + 5 + 68 * i,
- y = y + 5 + 57 * j,
- width = 65,
- height = 54,
+ x = x + 7 + 88 * i,
+ y = y + 7 + 77 * j,
+ width = 82,
+ height = 73,
stroke_color = "dark green",
fill_color = "light green" ,
line_width=2)
self.rect.append(box)
- self.rect_x.append(x + 5 + 68 * i)
- self.rect_y.append(y + 5 + 57 * j)
+ self.rect_x.append(x + 7 + 88 * i)
+ self.rect_y.append(y + 7 + 77 * j)
def displayTicket(self, a, b, x, y):
ticket = random.randint(a, b)
self.ticket_array.append(ticket)
if (ticket < 10):
- BrailleChar(self.root, x, y, 35 , ticket, COLOR_ON, COLOR_OFF ,
- CIRCLE_FILL, CIRCLE_FILL, False, False ,True, None)
+ BrailleChar(self.root, x, y, 50 , ticket, COLOR_ON, COLOR_OFF ,
+ CIRCLE_FILL, CIRCLE_FILL, False, False ,False, None)
else :
tens_digit = ticket / 10
ones_digit = ticket % 10
- BrailleChar(self.root, x - 7, y, 33 ,tens_digit, COLOR_ON, COLOR_OFF ,
- CIRCLE_FILL, CIRCLE_FILL, False, False ,True, None)
- BrailleChar(self.root, x + 20, y, 33 , ones_digit, COLOR_ON, COLOR_OFF ,
- CIRCLE_FILL, CIRCLE_FILL, False, False ,True, None)
+ BrailleChar(self.root, x - 7, y, 50 ,tens_digit, COLOR_ON, COLOR_OFF ,
+ CIRCLE_FILL, CIRCLE_FILL, False, False ,False, None)
+ BrailleChar(self.root, x + 25, y, 50 , ones_digit, COLOR_ON, COLOR_OFF ,
+ CIRCLE_FILL, CIRCLE_FILL, False, False ,False, None)
def cross_number(self,item, event, target, index):
#Cross Sign
goocanvas.Image(parent = self.root,
pixbuf = gcompris.utils.load_pixmap("braille_lotto/cross_button.png"),
- x = self.rect_x[index * 2]+8 ,
- y = self.rect_y[index * 2]+5,
+ x = self.rect_x[index * 2] + 8,
+ y = self.rect_y[index * 2] + 5,
)
if( CHECK_RANDOM[self.counter] == self.ticket_array[index]):
diff --git a/src/braille_lotto-activity/resources/braille_lotto/button.svg b/src/braille_lotto-activity/resources/braille_lotto/button.svg
new file mode 100644
index 0000000..7965f7d
--- /dev/null
+++ b/src/braille_lotto-activity/resources/braille_lotto/button.svg
@@ -0,0 +1,120 @@
+<?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="85mm"
+ height="54mm"
+ id="svg3098"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="button.svg">
+ <defs
+ id="defs3">
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3294"
+ id="linearGradient3332"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.3737772,0,0,0.1148277,-145.55742,-124.02192)"
+ x1="234.46304"
+ y1="735.4422"
+ x2="233.05591"
+ y2="480.19824" />
+ <linearGradient
+ id="linearGradient3294">
+ <stop
+ id="stop3296"
+ offset="0"
+ style="stop-color:#cf4700;stop-opacity:0.29019609;" />
+ <stop
+ id="stop3298"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="480.19824"
+ x2="233.05591"
+ y1="735.4422"
+ x1="234.46304"
+ gradientTransform="matrix(0.3737772,0,0,0.1148277,-145.55742,-124.02192)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3030"
+ xlink:href="#linearGradient3294"
+ inkscape:collect="always" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.2"
+ inkscape:cx="160"
+ inkscape:cy="82.083333"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1256"
+ inkscape:window-height="701"
+ inkscape:window-x="0"
+ inkscape:window-y="37"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3102">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g3327"
+ transform="matrix(2.3132409,0,0,1.3508219,261.22711,99.500916)"
+ style="opacity:0.7">
+ <rect
+ rx="9.5005054"
+ ry="9.5005054"
+ y="-65.378021"
+ x="-98.832886"
+ height="65.000015"
+ width="83.127678"
+ id="rect3321"
+ style="font-size:12px;fill:#fb8357;fill-opacity:1;fill-rule:evenodd" />
+ <rect
+ rx="6.7028937"
+ ry="6.7028937"
+ y="-63.386421"
+ x="-96.841278"
+ height="60.06572"
+ width="78.367561"
+ id="rect3323"
+ style="font-size:12px;fill:#c27030;fill-opacity:1;fill-rule:evenodd" />
+ <rect
+ rx="7.2771926"
+ ry="7.2771926"
+ y="-63.386421"
+ x="-96.841278"
+ height="24.07522"
+ width="78.367561"
+ id="rect3325"
+ style="font-size:12px;fill:url(#linearGradient3030);fill-opacity:1;fill-rule:evenodd" />
+ </g>
+ </g>
+</svg>
diff --git a/src/braille_lotto-activity/resources/braille_lotto/button2.png b/src/braille_lotto-activity/resources/braille_lotto/button2.png
new file mode 100644
index 0000000..c364bab
Binary files /dev/null and b/src/braille_lotto-activity/resources/braille_lotto/button2.png differ
diff --git a/src/braille_lotto-activity/resources/braille_lotto/callout1.svg b/src/braille_lotto-activity/resources/braille_lotto/callout1.svg
index 56bea13..547bb47 100644
--- a/src/braille_lotto-activity/resources/braille_lotto/callout1.svg
+++ b/src/braille_lotto-activity/resources/braille_lotto/callout1.svg
@@ -14,7 +14,7 @@
id="svg3004"
version="1.1"
inkscape:version="0.48.0 r9654"
- sodipodi:docname="callout1.svg">
+ sodipodi:docname="callout2 (copy).svg">
<defs
id="defs3" />
<sodipodi:namedview
@@ -26,7 +26,7 @@
inkscape:pageshadow="2"
inkscape:zoom="1.2"
inkscape:cx="160"
- inkscape:cy="74.166666"
+ inkscape:cy="66.249999"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -53,7 +53,7 @@
id="layer1">
<path
style="fill:#e6e6e6;fill-opacity:0.82352941;stroke:#0e181a;stroke-width:2.04655623;stroke-miterlimit:4;stroke-opacity:1;display:inline;enable-background:new"
- d="m 23.751057,17.681479 135.955353,0 c 2.38029,0 -9.87188,31.247525 4.29656,19.233162 l 14.995,-10.585728 -17.495,63.78035 c 0,10.655177 0.58373,29.233147 -1.79656,29.233147 l -135.955353,0 c -2.380294,0 -4.296543,-8.57797 -4.296543,-19.23315 l 0,-63.194619 c 0,-10.655148 1.916249,-19.233162 4.296543,-19.233162 z"
+ d="m 19.579809,17.681479 135.955361,0 c 2.38029,0 4.29656,8.578011 4.29656,19.23316 l -0.83791,10.247611 16.67124,59.61368 c -23.33333,-26.01149 -17.7496,12.56648 -20.12989,12.56648 l -135.955361,0 c -2.38029,0 -4.29654,-8.57797 -4.29654,-19.23315 l 0,-63.194621 c 0,-10.65515 1.91625,-19.23316 4.29654,-19.23316 z"
id="BUBBLE1"
sodipodi:nodetypes="cccccccccc"
inkscape:label="#BUBBLE1"
diff --git a/src/braille_lotto-activity/resources/braille_lotto/callout2.svg b/src/braille_lotto-activity/resources/braille_lotto/callout2.svg
index 973f117..b9f88e9 100644
--- a/src/braille_lotto-activity/resources/braille_lotto/callout2.svg
+++ b/src/braille_lotto-activity/resources/braille_lotto/callout2.svg
@@ -14,7 +14,7 @@
id="svg3004"
version="1.1"
inkscape:version="0.48.0 r9654"
- sodipodi:docname="callout1 (copy).svg">
+ sodipodi:docname="callout1.svg">
<defs
id="defs3" />
<sodipodi:namedview
@@ -26,7 +26,7 @@
inkscape:pageshadow="2"
inkscape:zoom="1.2"
inkscape:cx="160"
- inkscape:cy="74.166666"
+ inkscape:cy="66.249999"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -53,7 +53,7 @@
id="layer1">
<path
style="fill:#e6e6e6;fill-opacity:0.82352941;stroke:#0e181a;stroke-width:2.04655623;stroke-miterlimit:4;stroke-opacity:1;display:inline;enable-background:new"
- d="m 171.36852,119.34241 -135.955359,0 c -2.38029,0 -4.29656,-8.57801 -4.29656,-19.23316 L 31.954511,89.86164 15.283268,30.247964 C 38.616601,56.259451 33.032871,17.681481 35.413161,17.681481 l 135.955359,0 c 2.38029,0 4.29654,8.57797 4.29654,19.23315 l 0,63.194619 c 0,10.65515 -1.91625,19.23316 -4.29654,19.23316 z"
+ d="m 174.70143,119.34241 -135.955354,0 c -2.38029,0 9.87188,-31.24753 -4.29656,-19.23316 l -14.995,10.58572 17.495,-63.780344 c 0,-10.65518 -0.58373,-29.23315 1.79656,-29.23315 l 135.955354,0 c 2.38029,0 4.29654,8.57797 4.29654,19.23315 l 0,63.194624 c 0,10.65514 -1.91625,19.23316 -4.29654,19.23316 z"
id="BUBBLE1"
sodipodi:nodetypes="cccccccccc"
inkscape:label="#BUBBLE1"
diff --git a/src/braille_lotto-activity/resources/braille_lotto/tux.svg b/src/braille_lotto-activity/resources/braille_lotto/tux.svg
index 0616866..3761da4 100644
--- a/src/braille_lotto-activity/resources/braille_lotto/tux.svg
+++ b/src/braille_lotto-activity/resources/braille_lotto/tux.svg
@@ -15,7 +15,7 @@
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
- sodipodi:docname="tuxpaint.svg">
+ sodipodi:docname="tux.svg">
<defs
id="defs2887" />
<sodipodi:namedview
@@ -27,7 +27,7 @@
inkscape:pageshadow="2"
inkscape:zoom="3.4577522"
inkscape:cx="74.195726"
- inkscape:cy="39.967757"
+ inkscape:cy="37.220307"
inkscape:document-units="px"
inkscape:current-layer="layer1"
height="100px"
@@ -46,6 +46,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -54,76 +55,90 @@
inkscape:groupmode="layer"
id="layer1">
<g
- style="fill:white;fill-opacity:1;stroke:none;stroke-width:3.54768729;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
id="g11309"
- transform="matrix(0.229689,0,0,0.301668,89.1006,9.489927)">
+ transform="matrix(0.31123819,0,0,0.3692183,102.02142,5.0025741)">
<path
- style="fill-rule:evenodd;stroke:black;stroke-linecap:round;stroke-linejoin:round"
- d="M -177.46417,83.851927 C -232.875,63.623777 -237.39284,195.65284 -221.77754,198.5778 C -195.97456,215.99646 -143.77093,213.13916 -129.70437,200.04753 C -120.46962,192.48737 -108.27164,71.777887 -177.46417,83.851927 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+ d="m -177.46417,83.851927 c -55.41083,-20.22815 -59.92867,111.800913 -44.31337,114.725873 25.80298,17.41866 78.00661,14.56136 92.07317,1.46973 9.23475,-7.56016 21.43273,-128.269643 -47.7598,-116.195603 z"
id="path11311"
- sodipodi:nodetypes="cccc" />
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0" />
</g>
<path
- d="M 48.637091,7.0823121 C 31.503034,8.0149651 29.773571,60.242822 33.320646,68.25239 C 43.715726,77.287541 59.252443,74.974868 64.919348,68.184172 C 69.28368,59.61373 70.582015,5.1038565 48.637091,7.0823121 z M 49.254036,8.5321677 C 32.119978,9.4648197 30.390516,61.692678 33.937589,69.702253 C 44.332671,78.737398 59.869387,76.424725 65.536294,69.634029 C 69.900624,61.063586 71.198959,6.5537109 49.254036,8.5321677 z "
- style="fill:#111414;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.62175322;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- id="path11315" />
+ d="M 47.191671,2.0558397 C 23.974309,3.1973348 21.630815,67.120192 26.437248,76.923283 40.523015,87.98161 61.575916,85.151077 69.254809,76.83979 75.168661,66.350232 76.927959,-0.36563691 47.191671,2.0558397 z m 0.835986,1.7745111 C 24.810293,4.9718448 22.4668,68.894704 27.273232,78.697804 41.359002,89.756123 62.411901,86.925589 70.090797,78.6143 76.004646,68.124741 77.763944,1.4088705 48.027657,3.8303485 z"
+ style="fill:#111414;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.08851743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ id="path11315"
+ inkscape:connector-curvature="0" />
<path
- style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.37193298;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 49.531939,26.888424 C 46.998492,15.595959 63.235892,10.501264 56.929803,28.600121"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ d="M 48.404228,26.296989 C 44.9713,12.475886 66.973656,6.2403724 58.428642,28.391973"
id="path2186"
- sodipodi:nodetypes="cc" />
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
<path
- style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.53224468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 43.261677,28.868663 C 37.587298,13.405909 49.116513,13.051859 50.528607,27.624213"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ d="M 39.90776,28.720648 C 32.21874,9.7954332 47.841308,9.3621034 49.754753,27.197537"
id="path5435"
- sodipodi:nodetypes="cc" />
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccccccccccc"
id="path12075"
- style="fill:#ff8a00;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.29740274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 42.815896,72.519681 L 43.122938,77.956558 L 46.262152,82.634014 C 42.335681,85.634875 32.509056,83.339079 32.337657,80.088661 L 39.197588,77.945189 C 38.55927,80.517353 38.55927,71.086097 38.55927,71.086097 M 41.943347,72.948372 L 42.250388,78.385256 L 45.389602,83.062712 C 41.463132,86.063567 31.636507,83.767772 31.465108,80.517353 L 38.325038,78.373888 C 37.68672,80.946051 37.68672,71.514789 37.68672,71.514789" />
+ style="fill:#ff8a00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.67081416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 39.303709,82.146118 0.416054,6.654316 4.253767,5.724845 C 38.652997,98.198101 25.337509,95.388224 25.105257,91.409964 L 34.40075,88.78652 c -0.864947,3.148129 -0.864947,-8.394998 -0.864947,-8.394998 m 4.585566,2.279281 0.416052,6.654325 4.253767,5.724844 c -5.320531,3.672815 -18.636019,0.862939 -18.868271,-3.115323 l 9.295492,-2.623435 c -0.864947,3.148129 -0.864947,-8.395007 -0.864947,-8.395007"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccccccccccc"
id="path5438"
- style="fill:#ff8a00;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.29740274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 55.20487,73.190662 L 54.897829,78.627546 L 51.758614,83.304995 C 55.685087,86.30585 65.51171,84.010061 65.683109,80.759642 L 58.82318,78.616178 C 59.461497,81.188333 59.461497,71.757078 59.461497,71.757078 M 56.077419,73.619361 L 55.770378,79.056237 L 52.631163,83.733687 C 56.557636,86.734548 66.384259,84.438753 66.555658,81.188333 L 59.695729,79.044869 C 60.334046,81.617032 60.334046,72.185777 60.334046,72.185777" />
+ style="fill:#ff8a00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.67081416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 56.091286,82.967346 -0.416054,6.654326 -4.253767,5.724836 c 5.320535,3.672815 18.636019,0.862946 18.868272,-3.115315 l -9.295491,-2.623435 c 0.864947,3.148119 0.864947,-8.395007 0.864947,-8.395007 m -4.585566,2.27929 -0.416055,6.654316 -4.253767,5.724837 c 5.320536,3.672822 18.636019,0.862946 18.868272,-3.115317 l -9.29549,-2.623434 c 0.864947,3.148129 0.864947,-8.394998 0.864947,-8.394998"
+ inkscape:connector-curvature="0" />
<path
- style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.9338572;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 49.103364,35.276869 C 36.376129,29.174661 35.338433,69.003762 38.92509,69.886128 C 44.851741,75.140801 56.842318,74.278842 60.073246,70.329499 C 62.194361,68.048836 64.996099,31.634504 49.103364,35.276869 z "
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.20263481;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 47.82349,36.563796 c -17.245934,-7.46863 -18.652057,41.279109 -13.791986,42.359057 8.030859,6.431313 24.278592,5.376341 28.656634,0.542651 2.8742,-2.791355 6.670672,-47.359681 -14.864648,-42.901708 z"
id="path13611"
- sodipodi:nodetypes="cccc" />
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccccccc"
- d="M 49.203262,43.941779 C 43.123243,41.451771 40.648531,31.324863 41.817364,27.026922 C 47.898343,29.688368 50.424849,27.611437 58.113435,27.33021 C 57.864989,35.278379 54.996356,41.474178 49.203262,43.941779 z M 48.75037,44.436476 C 41.402454,40.28531 40.618272,32.234851 41.787103,27.93691 C 53.362313,26.86076 47.436157,27.27556 58.083179,28.240194 C 57.83473,36.188366 54.543465,43.630021 48.75037,44.436476 z "
- style="fill:#ff8a00;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.16583848;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- id="path5441" />
+ d="M 47.958856,47.168976 C 39.720177,44.121399 36.366838,31.726846 37.950656,26.4665 c 8.23998,3.257404 11.663502,0.715401 22.081857,0.371201 -0.336655,9.727943 -4.223773,17.311122 -12.073657,20.331275 z m -0.613688,0.605471 C 37.388436,42.693741 36.325836,32.840602 37.909651,27.580255 53.594544,26.26313 45.564356,26.770813 59.991514,27.951451 59.654856,37.679398 55.195055,46.787409 47.345168,47.774447 z"
+ style="fill:#ff8a00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.50138378;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ id="path5441"
+ inkscape:connector-curvature="0" />
<path
- style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:3.19383216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 54.072786,23.671056 C 56.013182,25.846826 53.676779,23.956497 53.676779,23.956497"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.11306334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 54.557265,22.359179 c 2.629317,2.662974 -0.536607,0.349358 -0.536607,0.349358"
id="path2188"
- sodipodi:nodetypes="cc" />
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
<path
- style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:3.19383216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 45.819411,23.751286 C 47.759808,25.927061 45.423409,24.036727 45.423409,24.036727"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.11306334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 43.373597,22.457374 c 2.629319,2.66298 -0.536599,0.349358 -0.536599,0.349358"
id="path5462"
- sodipodi:nodetypes="cc" />
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
<path
- d="M 65.44041,29.480417 C 72.642305,40.200352 80.077225,52.823507 76.584129,56.038365 C 67.293686,52.269803 71.769394,51.468809 66.187032,46.10719 M 66.184144,28.907913 C 73.38604,39.627847 80.82096,52.251002 77.327863,55.465859 C 68.037422,51.697292 72.513129,50.896305 66.930768,45.534692"
- style="fill:#111414;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.29740274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- id="path13605" />
+ d="M 69.96087,29.469387 C 79.719739,42.589759 89.794365,58.039524 85.061075,61.974262 72.472136,57.361834 78.536907,56.381479 70.972573,49.819272 m -0.004,-21.050585 C 80.727482,41.889057 90.80211,57.338823 86.068818,61.273559 73.479881,56.661124 79.544652,55.680778 71.98032,49.118579"
+ style="fill:#111414;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.67081416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ id="path13605"
+ inkscape:connector-curvature="0" />
<path
- style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.32640958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 47.659871,37.275791 C 48.479038,38.164709 47.492695,37.392403 47.492695,37.392403"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70816946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 45.867497,39.010322 c 1.110005,1.087968 -0.226531,0.142725 -0.226531,0.142725"
id="path13607"
- sodipodi:nodetypes="cc" />
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
<path
- style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.32640958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 51.040934,37.275791 C 51.860101,38.164709 50.873758,37.392403 50.873758,37.392403"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70816946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="m 50.448978,39.010322 c 1.110007,1.087968 -0.22653,0.142725 -0.22653,0.142725"
id="path13609"
- sodipodi:nodetypes="cc" />
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
<path
- d="M 35.480885,29.766664 C 28.27899,40.486597 20.844068,53.109753 24.337166,56.324609 C 33.627609,52.556049 29.151901,51.755055 34.734262,46.393443 M 34.73715,29.194162 C 27.535255,39.914096 20.100333,52.537248 23.593432,55.752105 C 32.883874,51.983544 28.408167,51.182543 33.990528,45.820938"
- style="fill:#111414;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.29740274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- id="path5464" />
+ d="M 29.364463,29.819731 C 19.605594,42.940101 9.5309639,58.389867 14.264258,62.324603 26.853196,57.712177 20.788425,56.731822 28.352756,50.169623 m 0.004,-21.050589 C 18.597865,42.239404 8.5232352,57.689166 13.25653,61.623901 25.845468,57.011474 19.780697,56.031111 27.345029,49.468922"
+ style="fill:#111414;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.67081416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ id="path5464"
+ inkscape:connector-curvature="0" />
</g>
</svg>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
