Part 1 of GeoView: icons, configs and preferences

svn: r11438
This commit is contained in:
Benny Malengier 2008-12-07 22:48:30 +00:00
parent d77966da25
commit 432466fc09
12 changed files with 737 additions and 4 deletions

View File

@ -177,6 +177,11 @@ PRIVATE_RECORD_TEXT = ('preferences', 'private-record-text', 2)
RELATION_DISPLAY_THEME= ('preferences', 'relation-display-theme', 2) RELATION_DISPLAY_THEME= ('preferences', 'relation-display-theme', 2)
INVALID_DATE_FORMAT = ('preferences', 'invalid-date-format', 2) INVALID_DATE_FORMAT = ('preferences', 'invalid-date-format', 2)
FULLSCREEN = ('interface', 'fullscreen', 0) FULLSCREEN = ('interface', 'fullscreen', 0)
GEOVIEW = ('preferences', 'geoview', 0)
GEOVIEW_GOOGLEMAPS = ('preferences', 'googlemap', 0)
GEOVIEW_OPENLAYERS = ('preferences', 'openlayers', 0)
GEOVIEW_YAHOO = ('preferences', 'yahoo', 0)
GEOVIEW_MICROSOFT = ('preferences', 'microsoft', 0)
default_value = { default_value = {
DEFAULT_SOURCE : False, DEFAULT_SOURCE : False,
@ -306,4 +311,9 @@ default_value = {
RELATION_DISPLAY_THEME: "CLASSIC", RELATION_DISPLAY_THEME: "CLASSIC",
INVALID_DATE_FORMAT : "<b>%s</b>", INVALID_DATE_FORMAT : "<b>%s</b>",
FULLSCREEN : False, FULLSCREEN : False,
GEOVIEW : False,
GEOVIEW_GOOGLEMAPS : True,
GEOVIEW_OPENLAYERS : False,
GEOVIEW_YAHOO : False,
GEOVIEW_MICROSOFT : False,
} }

View File

@ -22,7 +22,7 @@
""" """
Package init for the DataViews package. Package init for the DataViews package.
""" """
print 'start'
from GrampletView import GrampletView, register, Gramplet from GrampletView import GrampletView, register, Gramplet
from PersonView import PersonView from PersonView import PersonView
from RelationView import RelationshipView from RelationView import RelationshipView
@ -35,10 +35,32 @@ from MediaView import MediaView
from RepositoryView import RepositoryView from RepositoryView import RepositoryView
from NoteView import NoteView from NoteView import NoteView
geopresent = True
try:
from GeoView import GeoView
except:
geopresent = False
try: try:
import Config import Config
DATA_VIEWS = eval("["+Config.get(Config.DATA_VIEWS)+"]") DATA_VIEWS = eval("["+Config.get(Config.DATA_VIEWS)+"]")
except: #add GeoView if in config and present
if geopresent and Config.get(Config.GEOVIEW) and \
not GeoView in DATA_VIEWS:
DATA_VIEWS.append(GeoView)
Config.set(Config.DATA_VIEWS,
Config.get(Config.DATA_VIEWS)+",GeoView")
elif geopresent and not Config.get(Config.GEOVIEW) and \
GeoView in DATA_VIEWS:
DATA_VIEWS.remove(GeoView)
newval = Config.get(Config.DATA_VIEWS).replace('GeoView','')\
.replace(',,',',')
if newval[-1] == ',':
newval = newval[:-1]
Config.set(Config.DATA_VIEWS, newval)
print Config.get(Config.DATA_VIEWS)
except AttributeError:
print 'exep'
# Fallback if bad config line, or if no Config system # Fallback if bad config line, or if no Config system
DATA_VIEWS = [ DATA_VIEWS = [
GrampletView, GrampletView,
@ -50,10 +72,11 @@ except:
SourceView, SourceView,
PlaceView, PlaceView,
MediaView, MediaView,
#MapView,
RepositoryView, RepositoryView,
NoteView, NoteView,
] ]
if geopresent:
DATA_VIEWS.append(GeoView)
def get_views(): def get_views():
""" """

View File

@ -56,6 +56,15 @@ from widgets import MarkupLabel, BasicLabel
from QuestionDialog import ErrorDialog, QuestionDialog2 from QuestionDialog import ErrorDialog, QuestionDialog2
from Errors import NameDisplayError from Errors import NameDisplayError
geopresent = True
try:
import DataViews.GeoView
except:
geopresent = False
#experimental feature, don't show in release
if not const.VERSION.find('SVN') == -1:
gepresent = False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Constants # Constants
@ -161,6 +170,9 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
MarkupLabel(_('Researcher'))) MarkupLabel(_('Researcher')))
panel.append_page(self.add_color_panel(), panel.append_page(self.add_color_panel(),
MarkupLabel(_('Marker Colors'))) MarkupLabel(_('Marker Colors')))
if geopresent:
panel.append_page(self.add_geoview_panel(),
MarkupLabel(_('GeoView')))
self.window.show_all() self.window.show_all()
self.show() self.show()
@ -266,6 +278,50 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
for widget in [self.comp_color, self.todo_color, self.custom_color]: for widget in [self.comp_color, self.todo_color, self.custom_color]:
widget.emit('color-set') widget.emit('color-set')
def add_geoview_panel(self):
table = gtk.Table(3, 8)
table.set_border_width(12)
table.set_col_spacings(12)
table.set_row_spacings(6)
self.add_text(
table, _('You need a broadband internet connection to use GeoView')
, 0)
self.add_checkbox(
table, _('Add the GeoView view.'),
1, Config.GEOVIEW)
self.add_text(
table, _('GeoView uses OpenStreetMap and one other map provider.'),
2)
self.add_text(
table, _('Choose one of the following map providers'),
3)
maps=self.add_radiobox(
table, _('Google Maps'),
4, Config.GEOVIEW_GOOGLEMAPS, None, 1)
self.add_radiobox(
table, _('OpenLayers'),
4, Config.GEOVIEW_OPENLAYERS, maps, 2)
self.add_radiobox(
table, _('Yahoo! Maps'),
4, Config.GEOVIEW_YAHOO, maps, 3)
self.add_radiobox(
table, _('Microsoft Maps'),
4, Config.GEOVIEW_MICROSOFT, maps, 4)
self.add_text(
table, _('You need to restart GRAMPS for above settings to take'
'effect'), 6)
return table
def add_name_panel(self): def add_name_panel(self):
""" """
Name format settings panel Name format settings panel
@ -769,7 +825,22 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
checkbox = gtk.CheckButton(label) checkbox = gtk.CheckButton(label)
checkbox.set_active(Config.get(constant)) checkbox.set_active(Config.get(constant))
checkbox.connect('toggled', self.update_checkbox, constant) checkbox.connect('toggled', self.update_checkbox, constant)
table.attach(checkbox, 1, 3, index, index+1, yoptions=0) table.attach(checkbox, 1, 9, index, index+1, yoptions=0)
def add_radiobox(self, table, label, index, constant, group, column):
radiobox = gtk.RadioButton(group,label)
if Config.get(constant) == True:
radiobox.set_active(True)
radiobox.connect('toggled', self.update_radiobox, constant)
table.attach(radiobox, column, column+1, index, index+1, yoptions=0)
return radiobox
def add_text(self, table, label, index):
text = gtk.Label()
text.set_line_wrap(True)
text.set_alignment(0.,0.)
text.set_text(label)
table.attach(text, 1, 9, index, index+1, yoptions=0)
def add_path_box(self, table, label, index, entry, path, callback_label, def add_path_box(self, table, label, index, entry, path, callback_label,
callback_sel): callback_sel):
@ -902,6 +973,9 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
def update_checkbox(self, obj, constant): def update_checkbox(self, obj, constant):
Config.set(constant, obj.get_active()) Config.set(constant, obj.get_active())
def update_radiobox(self, obj, constant):
Config.set(constant, obj.get_active())
def build_menu_names(self, obj): def build_menu_names(self, obj):
return (_('Preferences'), None) return (_('Preferences'), None)

View File

@ -108,6 +108,7 @@ def register_stock_icons ():
('gramps-font-color', _('Font Color'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-font-color', _('Font Color'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-font-bgcolor', _('Font Background Color'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-font-bgcolor', _('Font Background Color'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-gramplet', _('Gramplets'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-gramplet', _('Gramplets'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-geo', _('GeoView'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-lock', _('Public'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-lock', _('Public'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-media', _('Media'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-media', _('Media'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-notes', _('Notes'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-notes', _('Notes'), gtk.gdk.CONTROL_MASK, 0, ''),

View File

@ -18,6 +18,7 @@ dist_pkgdata_DATA = \
gramps-font-bgcolor.png \ gramps-font-bgcolor.png \
gramps-font-color.png \ gramps-font-color.png \
gramps-font.png \ gramps-font.png \
gramps-geo.png \
gramps-gramplet.png \ gramps-gramplet.png \
gramps-lock.png \ gramps-lock.png \
gramps-media.png \ gramps-media.png \

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 B

View File

@ -18,6 +18,7 @@ dist_pkgdata_DATA = \
gramps-font-bgcolor.png \ gramps-font-bgcolor.png \
gramps-font-color.png \ gramps-font-color.png \
gramps-font.png \ gramps-font.png \
gramps-geo.png \
gramps-gramplet.png \ gramps-gramplet.png \
gramps-lock.png \ gramps-lock.png \
gramps-media.png \ gramps-media.png \

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -18,6 +18,7 @@ dist_pkgdata_DATA = \
gramps-font-bgcolor.png \ gramps-font-bgcolor.png \
gramps-font-color.png \ gramps-font-color.png \
gramps-font.png \ gramps-font.png \
gramps-geo.png \
gramps-gramplet.png \ gramps-gramplet.png \
gramps-lock.png \ gramps-lock.png \
gramps-media.png \ gramps-media.png \

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -18,6 +18,7 @@ dist_pkgdata_DATA = \
gramps-font-bgcolor.svg \ gramps-font-bgcolor.svg \
gramps-font-color.svg \ gramps-font-color.svg \
gramps-font.svg \ gramps-font.svg \
gramps-geo.svg \
gramps-gramplet.svg \ gramps-gramplet.svg \
gramps-lock.svg \ gramps-lock.svg \
gramps-media.svg \ gramps-media.svg \

View File

@ -0,0 +1,621 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48px"
height="48px"
id="svg3440"
sodipodi:version="0.32"
inkscape:version="0.43+devel"
sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/categories"
sodipodi:docname="applications-internet.svg">
<defs
id="defs3">
<linearGradient
inkscape:collect="always"
id="linearGradient6001">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop6003" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop6005" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4825">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4827" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop4829" />
</linearGradient>
<linearGradient
id="linearGradient4126">
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop4128" />
<stop
style="stop-color:#ffffff;stop-opacity:0.16494845;"
offset="1.0000000"
id="stop4130" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4114">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4116" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop4118" />
</linearGradient>
<linearGradient
id="linearGradient3962">
<stop
style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop3964" />
<stop
style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
offset="0.15517241"
id="stop4134" />
<stop
style="stop-color:#4074ae;stop-opacity:1.0000000;"
offset="0.75000000"
id="stop4346" />
<stop
style="stop-color:#36486c;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop3966" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3962"
id="radialGradient3968"
gradientTransform="scale(0.999989,1.000011)"
cx="18.247644"
cy="15.716079"
fx="18.247644"
fy="15.716079"
r="29.993349"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4114"
id="radialGradient4120"
gradientTransform="scale(1.643990,0.608276)"
cx="15.115514"
cy="63.965388"
fx="15.115514"
fy="63.965388"
r="12.289036"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4126"
id="radialGradient4132"
gradientTransform="scale(0.999989,1.000011)"
cx="15.601279"
cy="12.142302"
fx="15.601279"
fy="12.142302"
r="43.526714"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4825"
id="radialGradient5983"
gradientUnits="userSpaceOnUse"
cx="12.071323"
cy="12.493138"
fx="12.071323"
fy="12.493138"
r="6.7175145" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4825"
id="radialGradient5985"
gradientUnits="userSpaceOnUse"
cx="12.071323"
cy="12.493138"
fx="12.071323"
fy="12.493138"
r="6.7175145" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4825"
id="radialGradient5987"
gradientUnits="userSpaceOnUse"
cx="12.071323"
cy="12.493138"
fx="12.071323"
fy="12.493138"
r="6.7175145" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4825"
id="radialGradient5989"
gradientUnits="userSpaceOnUse"
cx="12.071323"
cy="12.493138"
fx="12.071323"
fy="12.493138"
r="6.7175145" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6001"
id="linearGradient6007"
x1="-25.176178"
y1="30.057165"
x2="-22.252472"
y2="21.041553"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6001"
id="linearGradient6011"
gradientUnits="userSpaceOnUse"
x1="-25.176178"
y1="30.057165"
x2="-22.113543"
y2="22.661524" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6001"
id="linearGradient6015"
gradientUnits="userSpaceOnUse"
x1="-22.822565"
y1="28.337734"
x2="-22.113543"
y2="22.661524" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6001"
id="linearGradient6019"
gradientUnits="userSpaceOnUse"
x1="-21.658581"
y1="15.649428"
x2="-21.962101"
y2="21.336346" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="0.17254902"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="5.6568542"
inkscape:cx="49.190006"
inkscape:cy="25.586897"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1254"
inkscape:window-height="1039"
inkscape:window-x="2228"
inkscape:window-y="102"
inkscape:showpageshadow="false" />
<metadata
id="metadata4">
<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>Internet Category</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:contributor>
<cc:Agent>
<dc:title>Tuomas Kuosmanen</dc:title>
</cc:Agent>
</dc:contributor>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
<dc:source>http://jimmac.musichall.cz</dc:source>
<dc:subject>
<rdf:Bag>
<rdf:li>internet</rdf:li>
<rdf:li>tools</rdf:li>
<rdf:li>applications</rdf:li>
<rdf:li>category</rdf:li>
</rdf:Bag>
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Attribution" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
sodipodi:type="arc"
style="fill:url(#radialGradient4120);fill-opacity:1.0000000;stroke:none;stroke-opacity:1.0000000"
id="path4112"
sodipodi:cx="24.849752"
sodipodi:cy="38.908627"
sodipodi:rx="20.203051"
sodipodi:ry="7.4751287"
d="M 45.052803 38.908627 A 20.203051 7.4751287 0 1 1 4.6467018,38.908627 A 20.203051 7.4751287 0 1 1 45.052803 38.908627 z"
transform="matrix(1.000000,0.000000,0.000000,1.243244,0.000000,-10.27241)" />
<path
style="fill:url(#radialGradient3968);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#39396c;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
d="M 43.959853,23.485499 C 43.959853,34.195217 35.277750,42.877222 24.569505,42.877222 C 13.860279,42.877222 5.1786663,34.195119 5.1786663,23.485499 C 5.1786663,12.776272 13.860279,4.0951517 24.569505,4.0951517 C 35.277750,4.0951517 43.959853,12.776272 43.959853,23.485499 L 43.959853,23.485499 z "
id="path3214" />
<g
id="g4136"
style="fill:#204a87;fill-opacity:0.71345031;fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000;opacity:1"
transform="matrix(0.982371,0.000000,0.000000,0.982371,0.121079,0.232914)">
<g
id="g4138"
style="fill:#204a87">
<g
id="g4142"
style="fill:#204a87">
<path
d="M 44.071300,20.714400 C 44.071300,20.977100 44.071300,20.714400 44.071300,20.714400 L 43.526400,21.331600 C 43.192400,20.938000 42.817400,20.607000 42.436600,20.261300 L 41.600700,20.384300 L 40.837000,19.521000 L 40.837000,20.589400 L 41.491300,21.084500 L 41.926800,21.577700 L 42.508800,20.919500 C 42.655300,21.193900 42.799800,21.468300 42.945300,21.742700 L 42.945300,22.565000 L 42.290000,23.305200 L 41.090800,24.128400 L 40.182600,25.034700 L 39.600600,24.374500 L 39.891600,23.634300 L 39.310500,22.976100 L 38.329100,20.878400 L 37.493200,19.933100 L 37.274400,20.179200 L 37.602500,21.372600 L 38.219700,22.071800 C 38.572200,23.089400 38.920900,24.062000 39.383800,25.034700 C 40.101600,25.034700 40.778300,24.958500 41.491200,24.868700 L 41.491200,25.444900 L 40.619100,27.584100 L 39.819300,28.488400 L 39.165000,29.888800 C 39.165000,30.656400 39.165000,31.424000 39.165000,32.191500 L 39.383800,33.097800 L 39.020500,33.508000 L 38.219700,34.002100 L 37.383800,34.701300 L 38.075200,35.482600 L 37.129900,36.306800 L 37.311500,36.840000 L 35.893500,38.445500 L 34.949200,38.445500 L 34.149400,38.939600 L 33.639600,38.939600 L 33.639600,38.281400 L 33.422800,36.963000 C 33.141500,36.136800 32.848600,35.316500 32.550700,34.496200 C 32.550700,33.890700 32.586800,33.291100 32.623000,32.685700 L 32.987300,31.863400 L 32.477500,30.875100 L 32.514600,29.517700 L 31.823200,28.736400 L 32.168900,27.605500 L 31.606400,26.967300 L 30.624000,26.967300 L 30.296900,26.597200 L 29.315500,27.214900 L 28.916100,26.761300 L 28.006900,27.543000 C 27.389700,26.843300 26.771500,26.144100 26.153400,25.444900 L 25.426800,23.716400 L 26.081100,22.730100 L 25.717800,22.319000 L 26.516600,20.425400 C 27.172900,19.609000 27.858400,18.825800 28.551800,18.039700 L 29.788100,17.710600 L 31.169000,17.546500 L 32.114300,17.793600 L 33.459000,19.150000 L 33.931700,18.615800 L 34.585000,18.533800 L 35.821300,18.944900 L 36.766600,18.944900 L 37.420900,18.368700 L 37.711900,17.957600 L 37.056600,17.546500 L 35.965800,17.464500 C 35.663100,17.044600 35.381800,16.603200 35.022400,16.230100 L 34.658100,16.394200 L 34.512600,17.464500 L 33.858300,16.724300 L 33.713800,15.900100 L 32.987200,15.325900 L 32.695200,15.325900 L 33.422700,16.148200 L 33.131700,16.888400 L 32.550600,17.052500 L 32.913900,16.312300 L 32.258600,15.984200 L 31.678500,15.326000 L 30.586700,15.572100 L 30.442200,15.900200 L 29.787900,16.312300 L 29.424600,17.217600 L 28.516400,17.669700 L 28.116000,17.217600 L 27.680500,17.217600 L 27.680500,15.736200 L 28.625800,15.242100 L 29.352400,15.242100 L 29.205900,14.666900 L 28.625800,14.090700 L 29.606300,13.884600 L 30.151200,13.268400 L 30.586700,12.527200 L 31.387500,12.527200 L 31.168700,11.952000 L 31.678500,11.622900 L 31.678500,12.281100 L 32.768300,12.527200 L 33.858100,11.622900 L 33.931300,11.210800 L 34.875600,10.553100 C 34.533800,10.595600 34.192000,10.626800 33.858000,10.717700 L 33.858000,9.9766000 L 34.221300,9.1538000 L 33.858000,9.1538000 L 33.059600,9.8940000 L 32.840800,10.305600 L 33.059600,10.882300 L 32.695300,11.868600 L 32.114200,11.539500 L 31.606400,10.964300 L 30.805600,11.539500 L 30.514600,10.223600 L 31.895500,9.3188000 L 31.895500,8.8247000 L 32.768500,8.2490000 L 34.149400,7.9194000 L 35.094700,8.2490000 L 36.838800,8.5781000 L 36.403300,9.0713000 L 35.458000,9.0713000 L 36.403300,10.058600 L 37.129900,9.2363000 L 37.350600,8.8745000 C 37.350600,8.8745000 40.137700,11.372500 41.730500,14.105000 C 43.323300,16.838400 44.071300,20.060100 44.071300,20.714400 z "
id="path4144"
style="fill:#204a87" />
</g>
</g>
<g
id="g4146"
style="fill:#204a87">
<g
id="g4150"
style="fill:#204a87">
<path
d="M 26.070300,9.2363000 L 25.997100,9.7295000 L 26.506900,10.058600 L 27.378000,9.4829000 L 26.942500,8.9892000 L 26.360500,9.3188000 L 26.070500,9.2363000"
id="path4152"
style="fill:#204a87" />
</g>
</g>
<g
id="g4154"
style="fill:#204a87">
<g
id="g4158"
style="fill:#204a87">
<path
d="M 26.870100,5.8633000 L 24.979500,5.1226000 L 22.799800,5.3692000 L 20.109400,6.1094000 L 19.600600,6.6035000 L 21.272500,7.7549000 L 21.272500,8.4131000 L 20.618200,9.0713000 L 21.491200,10.800300 L 22.071300,10.470200 L 22.799800,9.3188000 C 23.922800,8.9716000 24.929700,8.5781000 25.997100,8.0844000 L 26.870100,5.8632000"
id="path4160"
style="fill:#204a87" />
</g>
</g>
<g
id="g4162"
style="fill:#204a87">
<g
id="g4166"
style="fill:#204a87">
<path
d="M 28.833000,12.774900 L 28.542000,12.033700 L 28.032200,12.198700 L 28.178700,13.103000 L 28.833000,12.774900"
id="path4168"
style="fill:#204a87" />
</g>
</g>
<g
id="g4170"
style="fill:#204a87">
<g
id="g4174"
style="fill:#204a87">
<path
d="M 29.123000,12.608900 L 28.977500,13.597200 L 29.777300,13.432200 L 30.358400,12.857000 L 29.849600,12.362900 C 29.678700,11.907800 29.482400,11.483000 29.268500,11.046500 L 28.833000,11.046500 L 28.833000,11.539700 L 29.123000,11.868800 L 29.123000,12.609000"
id="path4176"
style="fill:#204a87" />
</g>
</g>
<g
id="g4178"
style="fill:#204a87">
<g
id="g4182"
style="fill:#204a87">
<path
d="M 18.365200,28.242200 L 17.783200,27.089900 L 16.692900,26.843300 L 16.111400,25.280800 L 14.657800,25.444900 L 13.422400,24.540600 L 12.113300,25.692000 L 12.113300,25.873600 C 11.717300,25.759300 11.230500,25.743700 10.877900,25.526900 L 10.586900,24.704600 L 10.586900,23.799300 L 9.7148000,23.881300 C 9.7876000,23.305100 9.8598000,22.729900 9.9331000,22.153800 L 9.4238000,22.153800 L 8.9155000,22.812000 L 8.4062000,23.058100 L 7.6791000,22.647900 L 7.6063000,21.742600 L 7.7518000,20.755300 L 8.8426000,19.933000 L 9.7147000,19.933000 L 9.8597000,19.438900 L 10.950000,19.685000 L 11.749800,20.673300 L 11.895300,19.026800 L 13.276600,17.875400 L 13.785400,16.641000 L 14.803000,16.229900 L 15.384500,15.407600 L 16.692600,15.159600 L 17.347400,14.173300 C 16.693100,14.173300 16.038800,14.173300 15.384500,14.173300 L 16.620300,13.597100 L 17.491900,13.597100 L 18.728200,13.185000 L 18.873700,12.692800 L 18.437200,12.280700 L 17.928400,12.115700 L 18.073900,11.622500 L 17.710600,10.882300 L 16.838000,11.210400 L 16.983500,10.552700 L 15.965900,9.9765000 L 15.166600,11.374400 L 15.238900,11.868500 L 14.439600,12.198600 L 13.930300,13.267900 L 13.712500,12.280600 L 12.331200,11.704400 L 12.112900,10.964200 L 13.930300,9.8939000 L 14.730100,9.1537000 L 14.802900,8.2489000 L 14.366900,8.0018000 L 13.785400,7.9193000 L 13.422100,8.8246000 C 13.422100,8.8246000 12.814200,8.9437000 12.657900,8.9823000 C 10.661800,10.821700 6.6286000,14.792400 5.6916000,22.288500 C 5.7287000,22.462300 6.3708000,23.470100 6.3708000,23.470100 L 7.8972000,24.374400 L 9.4236000,24.786500 L 10.078400,25.609700 L 11.095500,26.349900 L 11.677000,26.267900 L 12.113000,26.464200 L 12.113000,26.597000 L 11.531900,28.160000 L 11.095400,28.818200 L 11.240900,29.148300 L 10.877600,30.380700 L 12.186200,32.767400 L 13.494300,33.919700 L 14.076300,34.742000 L 14.003100,36.470500 L 14.439600,37.456800 L 14.003100,39.349400 C 14.003100,39.349400 13.968900,39.337700 14.024600,39.527100 C 14.080800,39.716600 16.353700,40.978300 16.498200,40.870900 C 16.642200,40.761500 16.765300,40.665800 16.765300,40.665800 L 16.620300,40.255600 L 17.201400,39.679400 L 17.419700,39.103200 L 18.365000,38.773100 L 19.091600,36.962600 L 18.873800,36.470400 L 19.381600,35.730200 L 20.472400,35.482200 L 21.054400,34.165800 L 20.908900,32.521300 L 21.781000,31.286900 L 21.926500,30.052500 C 20.733100,29.460700 19.549500,28.851300 18.365000,28.242000"
id="path4184"
style="fill:#204a87" />
</g>
</g>
<g
id="g4186"
style="fill:#204a87">
<g
id="g4190"
style="fill:#204a87">
<path
d="M 16.765600,9.5649000 L 17.492200,10.058600 L 18.074200,10.058600 L 18.074200,9.4829000 L 17.347600,9.1538000 L 16.765600,9.5649000"
id="path4192"
style="fill:#204a87" />
</g>
</g>
<g
id="g4194"
style="fill:#204a87">
<g
id="g4198"
style="fill:#204a87">
<path
d="M 14.876000,8.9072000 L 14.512200,9.8120000 L 15.239300,9.8120000 L 15.603100,8.9892000 C 15.916600,8.7675000 16.228600,8.5444000 16.547900,8.3310000 L 17.275000,8.5781000 C 17.759400,8.9072000 18.243800,9.2363000 18.728600,9.5649000 L 19.456100,8.9072000 L 18.655800,8.5781000 L 18.292000,7.8374000 L 16.911100,7.6728000 L 16.838300,7.2612000 L 16.184000,7.4262000 L 15.893600,8.0020000 L 15.529800,7.2613000 L 15.384800,7.5904000 L 15.457600,8.4132000 L 14.876000,8.9072000"
id="path4200"
style="fill:#204a87" />
</g>
</g>
<g
id="g4202"
style="fill:#204a87">
<g
style="opacity:0.75000000;fill:#204a87"
id="g4204">
<path
id="path4206"
d=""
style="fill:#204a87" />
</g>
<g
id="g4208"
style="fill:#204a87">
<path
id="path4210"
d=""
style="fill:#204a87" />
</g>
</g>
<g
id="g4212"
style="fill:#204a87">
<g
style="opacity:0.75000000;fill:#204a87"
id="g4214">
<path
id="path4216"
d=""
style="fill:#204a87" />
</g>
<g
id="g4218"
style="fill:#204a87">
<path
id="path4220"
d=""
style="fill:#204a87" />
</g>
</g>
<g
id="g4222"
style="fill:#204a87">
<g
id="g4226"
style="fill:#204a87">
<path
d="M 17.492200,6.8496000 L 17.856000,6.5210000 L 18.583100,6.3564000 C 19.081100,6.1142000 19.581100,5.9511000 20.109500,5.7802000 L 19.819500,5.2865000 L 18.881000,5.4213000 L 18.437600,5.8632000 L 17.706600,5.9692000 L 17.056700,6.2744000 L 16.740800,6.4272000 L 16.547900,6.6855000 L 17.492200,6.8496000"
id="path4228"
style="fill:#204a87" />
</g>
</g>
<g
id="g4230"
style="fill:#204a87">
<g
id="g4234"
style="fill:#204a87">
<path
d="M 18.728500,14.666500 L 19.165000,14.008300 L 18.510200,13.515100 L 18.728500,14.666500"
id="path4236"
style="fill:#204a87" />
</g>
</g>
</g>
<path
style="fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient4132);stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;opacity:0.3956044"
d="M 42.975093,23.485534 C 42.975093,33.651354 34.733915,41.892440 24.569493,41.892440 C 14.404139,41.892440 6.1634261,33.651261 6.1634261,23.485534 C 6.1634261,13.320180 14.404139,5.0799340 24.569493,5.0799340 C 34.733915,5.0799340 42.975093,13.320180 42.975093,23.485534 L 42.975093,23.485534 z "
id="path4122" />
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6007);stroke-width:0.88164198;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path5991"
sodipodi:cx="-18.561554"
sodipodi:cy="21.041553"
sodipodi:rx="15.733126"
sodipodi:ry="9.4575529"
d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1 -34.29468,21.041553 A 15.733126 9.4575529 0 1 1 -2.8284283 21.041553 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="matrix(1.131034,0.613097,-0.476556,0.879144,54.09058,16.04435)" />
<path
transform="matrix(0.939326,-0.879086,0.683307,0.730131,32.31406,-4.451561)"
inkscape:r_cy="true"
inkscape:r_cx="true"
d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1 -34.29468,21.041553 A 15.733126 9.4575529 0 1 1 -2.8284283 21.041553 z"
sodipodi:ry="9.4575529"
sodipodi:rx="15.733126"
sodipodi:cy="21.041553"
sodipodi:cx="-18.561554"
id="path6009"
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6011);stroke-width:0.88164198;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<g
inkscape:r_cy="true"
inkscape:r_cx="true"
transform="matrix(-1.045772,0.767251,0.767251,1.045772,35.61651,-22.14396)"
id="g4933">
<path
transform="translate(14.95026,22.93047)"
inkscape:r_cy="true"
inkscape:r_cx="true"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
sodipodi:ry="6.7175145"
sodipodi:rx="6.7175145"
sodipodi:cy="12.493138"
sodipodi:cx="12.071323"
id="path4935"
style="opacity:1;color:#000000;fill:url(#radialGradient5987);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path4937"
sodipodi:cx="12.071323"
sodipodi:cy="12.493138"
sodipodi:rx="6.7175145"
sodipodi:ry="6.7175145"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)" />
</g>
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6015);stroke-width:0.88164198;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path6013"
sodipodi:cx="-18.561554"
sodipodi:cy="21.041553"
sodipodi:rx="15.733126"
sodipodi:ry="9.4575529"
d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1 -34.29468,21.041553 A 15.733126 9.4575529 0 1 1 -2.8284283 21.041553 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="matrix(-1.280316,-0.126159,9.806226e-2,-0.99518,-2.405125,40.52387)" />
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6019);stroke-width:0.90226138;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path6017"
sodipodi:cx="-18.561554"
sodipodi:cy="21.041553"
sodipodi:rx="15.733126"
sodipodi:ry="9.4575529"
d="M -2.8284283 21.041553 A 15.733126 9.4575529 0 1 1 -34.29468,21.041553 A 15.733126 9.4575529 0 1 1 -2.8284283 21.041553 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="matrix(0.917874,-0.858983,0.667701,0.713433,27.63317,-6.909069)" />
<g
id="g5075"
transform="matrix(-0.806276,0.59154,0.59154,0.806276,12.38564,-18.02921)"
inkscape:r_cx="true"
inkscape:r_cy="true">
<path
transform="translate(14.95026,22.93047)"
inkscape:r_cy="true"
inkscape:r_cx="true"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
sodipodi:ry="6.7175145"
sodipodi:rx="6.7175145"
sodipodi:cy="12.493138"
sodipodi:cx="12.071323"
id="path5077"
style="opacity:1;color:#000000;fill:url(#radialGradient5983);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path5079"
sodipodi:cx="12.071323"
sodipodi:cy="12.493138"
sodipodi:rx="6.7175145"
sodipodi:ry="6.7175145"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)" />
</g>
<g
inkscape:r_cy="true"
inkscape:r_cx="true"
transform="matrix(-0.806276,0.59154,0.59154,0.806276,13.4991,-31.50022)"
id="g4945">
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:url(#radialGradient5985);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path4947"
sodipodi:cx="12.071323"
sodipodi:cy="12.493138"
sodipodi:rx="6.7175145"
sodipodi:ry="6.7175145"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="translate(14.95026,22.93047)" />
<path
transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)"
inkscape:r_cy="true"
inkscape:r_cx="true"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
sodipodi:ry="6.7175145"
sodipodi:rx="6.7175145"
sodipodi:cy="12.493138"
sodipodi:cx="12.071323"
id="path4949"
style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
</g>
<g
style="opacity:1"
id="g4939"
transform="matrix(-0.870227,0.638572,0.638458,0.870381,25.20503,-35.31278)"
inkscape:r_cx="true"
inkscape:r_cy="true">
<path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:url(#radialGradient5989);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path4941"
sodipodi:cx="12.071323"
sodipodi:cy="12.493138"
sodipodi:rx="6.7175145"
sodipodi:ry="6.7175145"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
inkscape:r_cx="true"
inkscape:r_cy="true"
transform="translate(14.95026,22.93047)" />
<path
transform="matrix(0.308271,0,0,0.308271,23.30035,31.57234)"
inkscape:r_cy="true"
inkscape:r_cx="true"
d="M 18.788838 12.493138 A 6.7175145 6.7175145 0 1 1 5.3538089,12.493138 A 6.7175145 6.7175145 0 1 1 18.788838 12.493138 z"
sodipodi:ry="6.7175145"
sodipodi:rx="6.7175145"
sodipodi:cy="12.493138"
sodipodi:cx="12.071323"
id="path4943"
style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 31 KiB