Cachemere

Merge lp:~fransschreuder1/cachemere/trunk into lp:cachemere

  1. trunk
  2. Merge into trunk
Proposed by FransSchreuder
Status: Needs review
Proposed branch: lp:~fransschreuder1/cachemere/trunk
Merge into: lp:cachemere
Diff against target: 7874 lines (+6591/-724)
29 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+1/-1)
CMakeLists.txt.user (+0/-622)
app/cachemere.qml (+23/-1)
app/ui/BrowserTab.qml (+1/-0)
app/ui/CMakeLists.txt (+1/-1)
app/ui/CompassTab.qml (+315/-0)
app/ui/DetailsTab.qml (+72/-5)
app/ui/GeocachesTab.qml (+29/-12)
app/ui/ListItemWithActions.qml (+456/-0)
app/ui/MapTab.qml (+148/-38)
app/ui/NESW.svg (+166/-0)
app/ui/WaypointDialog.qml (+392/-0)
app/ui/cachemere.svg (+2109/-0)
app/ui/compass.svg (+255/-0)
app/ui/treasure_closed.svg (+728/-0)
app/ui/treasure_open.svg (+1138/-0)
app/ui/utils.js (+19/-0)
app/ui/waypoint.svg (+107/-0)
backend/modules/Cachemere/backend.cpp (+1/-0)
backend/modules/Cachemere/cachemodel.cpp (+7/-0)
backend/modules/Cachemere/cachemodel.h (+1/-0)
backend/modules/Cachemere/geocache.cpp (+136/-2)
backend/modules/Cachemere/geocache.h (+47/-2)
cachemere.apparmor (+2/-1)
manifest.json.in (+2/-2)
po/com.mikeasoft.cachemere.pot (+96/-16)
po/fr.po (+102/-21)
po/nl.po (+236/-0)
To merge this branch: bzr merge lp:~fransschreuder1/cachemere/trunk
Reviewer Review Type Date Requested Status
Michael Sheldon Pending
Review via email: mp+256557@code.launchpad.net

This proposal supersedes a proposal from 2015-04-13.

Description of the change

*Added a compass tab (with direction to the cache coordinate
*Changed metric units according to system settings
*Changed compass into SVG
*Changed colour of letters to white
*Added waypoints + dialog to edit them

To post a comment you must log in.
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Hello Mike,

I have done quite a few changes on Cachemere, now I also added a dialog to add / edit waypoints.
I hope you like my changes and find some time to review.

Regards,

Frans

ps:
I read you work for Canonical / Ubuntu touch. Which part are you working on?

Reply
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Frans, that looks great; I'll try and find time to review it all properly this weekend.

I mostly work on the keyboard, but I do odd bits and pieces on other projects like content-hub and the browser from time to time as well :).

Reply
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Ah, so did I find the right person for a feature request?
I am still missing a degree symbol on the keyboard (for entering GPS coordinates in maps)

Reply
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Yep, I'd be the right person to poke about that sort of thing, best idea would be to file a bug report for it here: https://bugs.launchpad.net/ubuntu-keyboard

That way it can get tracked and scheduled into our normal process, otherwise there's a strong chance it'll get lost in the pile of other things I have to do ;)

Reply
lp:~fransschreuder1/cachemere/trunk updated
13. By Frans Schreuder

Added this line to all position sources:
preferredPositioningMethods: PositionSource.SatellitePositioningMethod

14. By Frans Schreuder

Added Dutch translation

15. By FransSchreuder

* Show distance in center of compass
* Show Accuracy of GPS on Compass tab

16. By FransSchreuder

Added flickable delete action button to geocaches, now able to delete geocaches.
Confirmation dialog needed?

17. By FransSchreuder

Added active waypoint to map
changed some button colours

18. By FransSchreuder

*added current selected waypoint (if any) to map
*Added status information of GPS below compass

19. By FransSchreuder

Fixed function call to updateGpsStatus

20. By FransSchreuder

*Fixed waypoints list on map
*Fixed geocache list on map
*Active geocache can also be selected from map

Revision history for this message
FransSchreuder (fransschreuder1) :
Reply
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Hi Mike,

I think I made quite a nice tool out of it now:

    I have fixed the mapitems that were not working (inactive geocaches)
    Added waypoints to the map
    active geocache can now be selected by clicking the item on the map as well
    Added PreferredPositioningMethods to Satellite

I hope you can merge my changes soon and put it in the ubuntu store.

Frans

Reply
lp:~fransschreuder1/cachemere/trunk updated
21. By Frans Schreuder

*Improved waypoints dialog (3 digits now have 3 select controls)
*fixed typo in button colours

22. By FransSchreuder

Added pin to mark waypoints on map: thanks to Jeroen Buurmans for the artwork

23. By Frans Schreuder

*Added images for geocaches (treasure chest open / closed)
*Added cachemere logo to current location

24. By Frans Schreuder

Beep when near selected waypoint (not necessarily the starting point)

25. By Jeroen Buurmans <email address hidden>

Changed the waypoint icon to a red cross.

26. By Frans Schreuder

Animation for compass (rotation)

27. By FransSchreuder

fixed compass animation, now stop animation when compass is updated. Compass will stabilize around target rotation and looks more relaxed

28. By FransSchreuder

changed namespace, in order to publish the app under cachemere.fransschreuder

Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Hello Mike,

I took the freedom to publish te app on my own. If you are ready to review and merge things, I can remove my version from the ubuntu store again.

Frans

Reply
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Frans,

 Sure thing; sorry I haven't found time to review this yet, past couple of weeks my spare time was mostly taken up with the new Podbird release and this week I'm away on a work trip all week. I'll try and find some time for it after I get home next week.

Cheers,
 Mike.

Reply
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Enjoy your trip! Meanwhile download my version from the Ubuntu Store and enjoy some Geocaches during the free hours of your work trip.

Reply

Unmerged revisions

28. By FransSchreuder

changed namespace, in order to publish the app under cachemere.fransschreuder

27. By FransSchreuder

fixed compass animation, now stop animation when compass is updated. Compass will stabilize around target rotation and looks more relaxed

26. By Frans Schreuder

Animation for compass (rotation)

25. By Jeroen Buurmans <email address hidden>

Changed the waypoint icon to a red cross.

24. By Frans Schreuder

Beep when near selected waypoint (not necessarily the starting point)

23. By Frans Schreuder

*Added images for geocaches (treasure chest open / closed)
*Added cachemere logo to current location

22. By FransSchreuder

Added pin to mark waypoints on map: thanks to Jeroen Buurmans for the artwork

21. By Frans Schreuder

*Improved waypoints dialog (3 digits now have 3 select controls)
*fixed typo in button colours

20. By FransSchreuder

*Fixed waypoints list on map
*Fixed geocache list on map
*Active geocache can also be selected from map

19. By FransSchreuder

Fixed function call to updateGpsStatus

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2015-04-28 21:23:25 +0000
4@@ -0,0 +1,1 @@
5+CMakeLists.txt.user
6
7=== modified file 'CMakeLists.txt'
8--- CMakeLists.txt 2014-12-26 20:50:55 +0000
9+++ CMakeLists.txt 2015-04-28 21:23:25 +0000
10@@ -25,7 +25,7 @@
11 option(INSTALL_TESTS "Install the tests on make install" on)
12
13 set(APP_NAME Cachemere)
14-set(APP_ID "com.mikeasoft.cachemere")
15+set(APP_ID "cachemere.fransschreuder")
16 set(CACHEMERE_DIR "share/qml/cachemere")
17 set(MAIN_QML "cachemere.qml")
18 set(ICON "graphics/cachemere.png")
19
20=== removed file 'CMakeLists.txt.user'
21--- CMakeLists.txt.user 2014-12-26 20:50:55 +0000
22+++ CMakeLists.txt.user 1970-01-01 00:00:00 +0000
23@@ -1,622 +0,0 @@
24-<?xml version="1.0" encoding="UTF-8"?>
25-<!DOCTYPE QtCreatorProject>
26-<!-- Written by QtCreator 3.1.1, 2014-12-26T20:29:42. -->
27-<qtcreator>
28- <data>
29- <variable>ProjectExplorer.Project.ActiveTarget</variable>
30- <value type="int">3</value>
31- </data>
32- <data>
33- <variable>ProjectExplorer.Project.EditorSettings</variable>
34- <valuemap type="QVariantMap">
35- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
36- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
37- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
38- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
39- <value type="QString" key="language">Cpp</value>
40- <valuemap type="QVariantMap" key="value">
41- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
42- </valuemap>
43- </valuemap>
44- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
45- <value type="QString" key="language">QmlJS</value>
46- <valuemap type="QVariantMap" key="value">
47- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
48- </valuemap>
49- </valuemap>
50- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
51- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
52- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
53- <value type="int" key="EditorConfiguration.IndentSize">4</value>
54- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
55- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
56- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
57- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
58- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
59- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
60- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
61- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
62- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
63- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
64- <value type="int" key="EditorConfiguration.TabSize">8</value>
65- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
66- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
67- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
68- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
69- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
70- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
71- </valuemap>
72- </data>
73- <data>
74- <variable>ProjectExplorer.Project.PluginSettings</variable>
75- <valuemap type="QVariantMap"/>
76- </data>
77- <data>
78- <variable>ProjectExplorer.Project.Target.0</variable>
79- <valuemap type="QVariantMap">
80- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
81- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
82- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{897ebcf3-e88f-4573-bb26-c210d7efb2ef}</value>
83- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
84- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
85- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
86- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
87- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
88- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mike/src/build-cachemere-Desktop-Default</value>
89- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
90- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
91- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
92- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
93- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
94- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
95- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
96- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
97- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
98- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
99- </valuemap>
100- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
101- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
102- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
103- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
104- </valuemap>
105- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
106- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
107- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
108- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
109- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
110- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
111- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
112- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
113- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
114- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
115- </valuemap>
116- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
117- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
118- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
119- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
120- </valuemap>
121- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
122- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
123- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
124- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
125- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
126- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
127- </valuemap>
128- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
129- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
130- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
131- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
132- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
133- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
134- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
135- </valuemap>
136- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
137- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
138- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
139- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
140- </valuemap>
141- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
142- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
143- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
144- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
145- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
146- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
147- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
148- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
149- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
150- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
151- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
152- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
153- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
154- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
155- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
156- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
157- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
158- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
159- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
160- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
161- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
162- <value type="int">0</value>
163- <value type="int">1</value>
164- <value type="int">2</value>
165- <value type="int">3</value>
166- <value type="int">4</value>
167- <value type="int">5</value>
168- <value type="int">6</value>
169- <value type="int">7</value>
170- <value type="int">8</value>
171- <value type="int">9</value>
172- <value type="int">10</value>
173- <value type="int">11</value>
174- <value type="int">12</value>
175- <value type="int">13</value>
176- <value type="int">14</value>
177- </valuelist>
178- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
179- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
180- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
181- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">cachemere</value>
182- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuRunConfiguration.Appcachemere</value>
183- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
184- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
185- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
186- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
187- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
188- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
189- </valuemap>
190- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
191- </valuemap>
192- </data>
193- <data>
194- <variable>ProjectExplorer.Project.Target.1</variable>
195- <valuemap type="QVariantMap">
196- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK for armhf (GCC ubuntu-sdk-14.10-utopic)</value>
197- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">UbuntuSDK for armhf (GCC ubuntu-sdk-14.10-utopic)</value>
198- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{bf187ee2-704d-4b3d-aaa9-27ca3cce46cc}</value>
199- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
200- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
201- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
202- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
203- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
204- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mike/src/build-cachemere-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default</value>
205- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
206- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
207- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
208- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
209- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
210- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
211- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
212- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu SDK Make</value>
213- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
214- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.MakeStep</value>
215- </valuemap>
216- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
217- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
218- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
219- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
220- </valuemap>
221- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
222- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
223- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
224- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
225- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
226- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
227- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
228- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu SDK Make</value>
229- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
230- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.MakeStep</value>
231- </valuemap>
232- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
233- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
234- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
235- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
236- </valuemap>
237- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
238- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
239- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
240- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
241- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
242- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.BuildConfiguration</value>
243- </valuemap>
244- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
245- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
246- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
247- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
248- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
249- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK Click build</value>
250- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
251- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.ClickPackageStep</value>
252- <value type="int" key="Ubuntu.UbuntuPackageStep.PackageMode">1</value>
253- </valuemap>
254- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
255- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
256- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Upload files to Ubuntu Device</value>
257- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
258- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UploadStep</value>
259- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
260- <value type="QString">/home/mike/src/build-cachemere-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/com.mikeasoft.cachemere_0.1_armhf.click</value>
261- <value type="QString">/usr/share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py</value>
262- </valuelist>
263- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
264- <value type="QString">127.0.0.1</value>
265- <value type="QString">127.0.0.1</value>
266- </valuelist>
267- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
268- <value type="QString">/tmp</value>
269- <value type="QString">/tmp</value>
270- </valuelist>
271- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots">
272- <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
273- <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
274- </valuelist>
275- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
276- <value type="QDateTime">2014-12-22T11:43:52</value>
277- <value type="QDateTime">2014-12-22T11:43:52</value>
278- </valuelist>
279- </valuemap>
280- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
281- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
282- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
283- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
284- </valuemap>
285- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
286- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Ubuntu Device</value>
287- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
288- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.DeployConfiguration</value>
289- </valuemap>
290- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
291- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
292- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
293- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
294- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
295- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
296- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
297- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
298- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
299- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
300- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
301- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
302- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
303- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
304- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
305- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
306- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
307- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
308- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
309- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
310- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
311- <value type="int">0</value>
312- <value type="int">1</value>
313- <value type="int">2</value>
314- <value type="int">3</value>
315- <value type="int">4</value>
316- <value type="int">5</value>
317- <value type="int">6</value>
318- <value type="int">7</value>
319- <value type="int">8</value>
320- <value type="int">9</value>
321- <value type="int">10</value>
322- <value type="int">11</value>
323- <value type="int">12</value>
324- <value type="int">13</value>
325- <value type="int">14</value>
326- </valuelist>
327- <value type="int" key="PE.EnvironmentAspect.Base">1</value>
328- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
329- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
330- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">cachemere</value>
331- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.RemoteRunConfiguration.Appcachemere</value>
332- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
333- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
334- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
335- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
336- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
337- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
338- <value type="bool" key="UbuntuRemoteRunConfiguration.ForceInstall">false</value>
339- <value type="bool" key="UbuntuRemoteRunConfiguration.Uninstall">true</value>
340- </valuemap>
341- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
342- </valuemap>
343- </data>
344- <data>
345- <variable>ProjectExplorer.Project.Target.2</variable>
346- <valuemap type="QVariantMap">
347- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK for amd64 (GCC ubuntu-sdk-14.10-utopic)</value>
348- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">UbuntuSDK for amd64 (GCC ubuntu-sdk-14.10-utopic)</value>
349- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{36b99870-db07-478b-861c-af2da9f17393}</value>
350- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
351- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
352- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
353- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
354- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
355- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mike/src/build-cachemere-UbuntuSDK_for_amd64_GCC_ubuntu_sdk_14_10_utopic-Default</value>
356- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
357- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
358- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
359- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
360- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
361- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
362- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
363- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu SDK Make</value>
364- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
365- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.MakeStep</value>
366- </valuemap>
367- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
368- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
369- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
370- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
371- </valuemap>
372- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
373- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
374- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
375- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
376- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
377- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
378- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
379- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu SDK Make</value>
380- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
381- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.MakeStep</value>
382- </valuemap>
383- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
384- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
385- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
386- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
387- </valuemap>
388- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
389- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
390- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
391- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
392- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
393- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.BuildConfiguration</value>
394- </valuemap>
395- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
396- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
397- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
398- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
399- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
400- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK Click build</value>
401- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
402- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.ClickPackageStep</value>
403- <value type="int" key="Ubuntu.UbuntuPackageStep.PackageMode">1</value>
404- </valuemap>
405- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
406- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
407- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Upload files to Ubuntu Device</value>
408- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
409- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UploadStep</value>
410- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/>
411- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/>
412- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/>
413- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots"/>
414- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/>
415- </valuemap>
416- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
417- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
418- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
419- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
420- </valuemap>
421- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
422- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Ubuntu Device</value>
423- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
424- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.DeployConfiguration</value>
425- </valuemap>
426- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
427- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
428- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
429- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
430- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
431- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
432- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
433- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
434- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
435- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
436- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
437- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
438- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
439- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
440- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
441- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
442- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
443- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
444- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
445- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
446- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
447- <value type="int">0</value>
448- <value type="int">1</value>
449- <value type="int">2</value>
450- <value type="int">3</value>
451- <value type="int">4</value>
452- <value type="int">5</value>
453- <value type="int">6</value>
454- <value type="int">7</value>
455- <value type="int">8</value>
456- <value type="int">9</value>
457- <value type="int">10</value>
458- <value type="int">11</value>
459- <value type="int">12</value>
460- <value type="int">13</value>
461- <value type="int">14</value>
462- </valuelist>
463- <value type="int" key="PE.EnvironmentAspect.Base">1</value>
464- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
465- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
466- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">cachemere</value>
467- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.RemoteRunConfiguration.Appcachemere</value>
468- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
469- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
470- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
471- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
472- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
473- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
474- <value type="bool" key="UbuntuRemoteRunConfiguration.ForceInstall">false</value>
475- <value type="bool" key="UbuntuRemoteRunConfiguration.Uninstall">true</value>
476- </valuemap>
477- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
478- </valuemap>
479- </data>
480- <data>
481- <variable>ProjectExplorer.Project.Target.3</variable>
482- <valuemap type="QVariantMap">
483- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu Device2 (GCC armhf-ubuntu-sdk-14.10-utopic)</value>
484- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Ubuntu Device2 (GCC armhf-ubuntu-sdk-14.10-utopic)</value>
485- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{4c1399b6-f9f9-42aa-b0ab-92397136624f}</value>
486- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
487- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
488- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
489- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
490- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
491- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mike/src/build-cachemere-Ubuntu_Device2_GCC_armhf_ubuntu_sdk_14_10_utopic-Default</value>
492- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
493- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
494- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
495- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
496- <value type="QString">all</value>
497- </valuelist>
498- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
499- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
500- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
501- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu SDK Make</value>
502- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
503- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.MakeStep</value>
504- </valuemap>
505- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
506- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
507- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
508- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
509- </valuemap>
510- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
511- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
512- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
513- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
514- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
515- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
516- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
517- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Ubuntu SDK Make</value>
518- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
519- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.MakeStep</value>
520- </valuemap>
521- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
522- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
523- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
524- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
525- </valuemap>
526- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
527- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
528- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
529- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
530- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
531- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuCMake.BuildConfiguration</value>
532- </valuemap>
533- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
534- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
535- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
536- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
537- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
538- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK Click build</value>
539- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
540- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.ClickPackageStep</value>
541- <value type="int" key="Ubuntu.UbuntuPackageStep.PackageMode">1</value>
542- </valuemap>
543- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
544- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
545- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Upload files to Ubuntu Device</value>
546- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
547- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UploadStep</value>
548- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
549- <value type="QString">/home/mike/src/build-cachemere-Ubuntu_Device2_GCC_armhf_ubuntu_sdk_14_10_utopic-Default/com.mikeasoft.cachemere_0.1_armhf.click</value>
550- <value type="QString">/usr/share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py</value>
551- </valuelist>
552- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
553- <value type="QString">127.0.0.1</value>
554- <value type="QString">127.0.0.1</value>
555- </valuelist>
556- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
557- <value type="QString">/tmp</value>
558- <value type="QString">/tmp</value>
559- </valuelist>
560- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots">
561- <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
562- <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
563- </valuelist>
564- <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
565- <value type="QDateTime">2014-12-26T20:00:20</value>
566- <value type="QDateTime">2014-12-26T20:00:20</value>
567- </valuelist>
568- </valuemap>
569- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
570- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
571- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
572- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
573- </valuemap>
574- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
575- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Ubuntu Device</value>
576- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
577- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.DeployConfiguration</value>
578- </valuemap>
579- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
580- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
581- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
582- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
583- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
584- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
585- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
586- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
587- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
588- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
589- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
590- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
591- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
592- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
593- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
594- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
595- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
596- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
597- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
598- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
599- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
600- <value type="int">0</value>
601- <value type="int">1</value>
602- <value type="int">2</value>
603- <value type="int">3</value>
604- <value type="int">4</value>
605- <value type="int">5</value>
606- <value type="int">6</value>
607- <value type="int">7</value>
608- <value type="int">8</value>
609- <value type="int">9</value>
610- <value type="int">10</value>
611- <value type="int">11</value>
612- <value type="int">12</value>
613- <value type="int">13</value>
614- <value type="int">14</value>
615- </valuelist>
616- <value type="int" key="PE.EnvironmentAspect.Base">1</value>
617- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
618- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
619- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">cachemere</value>
620- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.RemoteRunConfiguration.Appcachemere</value>
621- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
622- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
623- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
624- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
625- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
626- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
627- <value type="bool" key="UbuntuRemoteRunConfiguration.ForceInstall">false</value>
628- <value type="bool" key="UbuntuRemoteRunConfiguration.Uninstall">true</value>
629- </valuemap>
630- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
631- </valuemap>
632- </data>
633- <data>
634- <variable>ProjectExplorer.Project.TargetCount</variable>
635- <value type="int">4</value>
636- </data>
637- <data>
638- <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
639- <value type="QByteArray">{3ee15b72-49ad-410a-9e6d-9cdc390d3098}</value>
640- </data>
641- <data>
642- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
643- <value type="int">15</value>
644- </data>
645-</qtcreator>
646
647=== modified file 'app/cachemere.qml'
648--- app/cachemere.qml 2014-12-26 20:50:55 +0000
649+++ app/cachemere.qml 2015-04-28 21:23:25 +0000
650@@ -1,12 +1,13 @@
651 import QtQuick 2.0
652 import Ubuntu.Components 1.1
653+import QtQml 2.2
654 import Cachemere 1.0
655 import "ui"
656
657 MainView {
658 id: root
659 objectName: "mainView"
660- applicationName: "com.mikeasoft.cachemere"
661+ applicationName: "cachemere.fransschreuder"
662 automaticOrientation: false
663 useDeprecatedToolbar: false
664 width: units.gu(100)
665@@ -15,6 +16,8 @@
666 property var activeGeocache: null;
667 property bool miles: true;
668
669+
670+
671 CacheModel {
672 id: cacheModel
673 }
674@@ -23,6 +26,7 @@
675 id: tabs
676
677 GeocachesTab {
678+ id: geocachesTab
679 objectName: "geocachesTab"
680 }
681
682@@ -35,11 +39,29 @@
683 objectName: "mapTab"
684 }
685
686+ CompassTab {
687+ id: compassTab
688+ objectName: "compassTab"
689+ }
690+
691 BrowserTab {
692 id: browserTab
693 objectName: "browserTab"
694 }
695
696 }
697+ Component.onCompleted: {
698+
699+ console.log("Locale:", Qt.locale().measurementSystem, " ", Locale.MetricSystem);
700+ if(Qt.locale().measurementSystem==Locale.MetricSystem)
701+ {
702+ root.miles = false;
703+ }
704+ else
705+ {
706+ root.miles = true;
707+ }
708+ }
709+
710 }
711
712
713=== modified file 'app/ui/BrowserTab.qml'
714--- app/ui/BrowserTab.qml 2014-12-26 20:50:55 +0000
715+++ app/ui/BrowserTab.qml 2015-04-28 21:23:25 +0000
716@@ -69,6 +69,7 @@
717 id: src
718 active: true
719 updateInterval: 60000
720+ preferredPositioningMethods: PositionSource.SatellitePositioningMethods
721 }
722
723 WebView {
724
725=== modified file 'app/ui/CMakeLists.txt'
726--- app/ui/CMakeLists.txt 2014-12-26 20:50:55 +0000
727+++ app/ui/CMakeLists.txt 2015-04-28 21:23:25 +0000
728@@ -1,4 +1,4 @@
729-file(GLOB UI_QML_JS_FILES *.qml *.js *.wav)
730+file(GLOB UI_QML_JS_FILES *.qml *.js *.wav *.svg)
731
732 # Make the files visible in the qtcreator tree
733 add_custom_target(cachemere_ui_QMlFiles ALL SOURCES ${UI_QML_JS_FILES})
734
735=== added file 'app/ui/CompassTab.qml'
736--- app/ui/CompassTab.qml 1970-01-01 00:00:00 +0000
737+++ app/ui/CompassTab.qml 2015-04-28 21:23:25 +0000
738@@ -0,0 +1,315 @@
739+/*
740+ * Copyright 2014 Frans Schreuder <info@schreuderelectronics.com>
741+ *
742+ * This file is part of Cachemere.
743+ *
744+ * Cachemere is free software; you can redistribute it and/or modify
745+ * it under the terms of the GNU General Public License as published by
746+ * the Free Software Foundation; version 3.
747+ *
748+ * Cachemere is distributed in the hope that it will be useful,
749+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
750+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
751+ * GNU General Public License for more details.
752+ *
753+ * You should have received a copy of the GNU General Public License
754+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
755+ */
756+
757+import QtQuick 2.2
758+import Ubuntu.Components 1.1
759+import Ubuntu.Web 0.2
760+import Ubuntu.Components.Popups 1.0
761+import QtLocation 5.0
762+import QtPositioning 5.2
763+import Cachemere 1.0
764+import "."
765+import "utils.js" as Utils
766+Tab {
767+ title: i18n.tr("Compass")
768+ function updateGpsStatus(){
769+ var posStatus="";
770+
771+ posStatus += "<b>"+i18n.tr("Source error:")+"</b> ";
772+ switch(src.sourceError){
773+ case PositionSource.AccessError:
774+ posStatus+=i18n.tr("Access Error")+"<br/>";
775+ break;
776+ case PositionSource.NoError:
777+ posStatus+=i18n.tr("No Error")+"<br/>";
778+ break;
779+ case PositionSource.ClosedError:
780+ posStatus+=i18n.tr("Closed Error")+"<br/>";
781+ break;
782+ case PositionSource.UnknownSourceError:
783+ posStatus+=i18n.tr("Unknown Source Error")+"<br/>";
784+ break;
785+ case PositionSource.SocketError:
786+ posStatus+=i18n.tr("Socket Error")+"<br/>";
787+ break;
788+ default:
789+ posStatus+=src.sourceError+"<br/>";
790+
791+ }
792+
793+ posStatus += "<b>"+i18n.tr("Supported methods:")+"</b> ";
794+ switch(src.supportedPositioningMethods)
795+ {
796+ case PositionSource.NoPositioningMethods:
797+ posStatus+= i18n.tr("None")+"<br/>";
798+ break;
799+ case PositionSource.SatellitePositioningMethods:
800+ posStatus+= i18n.tr("Satellite")+"<br/>";
801+ break;
802+ case PositionSource.NonSatellitePositioningMethods:
803+ posStatus+= i18n.tr("Non Satellite")+"<br/>";
804+ break;
805+ case PositionSource.AllPositioningMethods:
806+ posStatus+= i18n.tr("All")+"<br/>";
807+ break;
808+ default:
809+ posStatus+=src.supportedPositioningMethods+"<br/>";
810+ break;
811+ }
812+ posStatus += "<b>"+i18n.tr("Source valid:")+"</b> "+src.valid+"<br/>";
813+ posStatus += "<b>"+i18n.tr("Position valid:")+"</b> "+(src.position.latitudeValid&&src.position.longitudeValid);
814+ gpsStatus.text = posStatus;
815+ }
816+
817+ page: Page {
818+
819+ Flickable {
820+ id: compassPage
821+ anchors.centerIn: parent
822+ width: parent.width - units.gu(4)
823+ height: parent.height - units.gu(4)
824+ contentWidth: width; contentHeight: col.height
825+ clip: true
826+ Column{
827+ id: col
828+ width: parent.width;
829+ spacing: units.gu(2)
830+
831+ Row{
832+ width: parent.width
833+ height: parent.width
834+ Image {
835+ //anchors.top: distance.bottom
836+ //anchors.left: distance.left
837+ anchors.topMargin: units.gu(2)
838+ id: compass
839+ width: parent.width
840+ height: parent.width
841+ source: "compass.svg"
842+ RotationAnimator on rotation {
843+ id: compassAnimator
844+ from: 0;
845+ to: 360;
846+ duration: 3000
847+ direction: RotationAnimator.Shortest
848+ }
849+ }
850+ Image {
851+ id: nesw
852+ anchors.centerIn: compass
853+ width: parent.width
854+ height: parent.width
855+ source: "NESW.svg"
856+ RotationAnimator on rotation {
857+ id: neswAnimator
858+ from: 0;
859+ to: 360;
860+ duration: 3000
861+ direction: RotationAnimator.Shortest
862+ }
863+ }
864+
865+ Label {
866+ width: parent.width
867+ height: parent.height
868+ verticalAlignment: Text.AlignVCenter
869+ horizontalAlignment: Text.AlignHCenter
870+ anchors.centerIn: compass
871+ id: distance
872+ wrapMode: Text.WordWrap
873+ text: ""
874+ color: "white"
875+ onTextChanged: {
876+ parent.width = width;
877+ }
878+ }
879+ }
880+
881+ Label {
882+ id: lPosition
883+ width: parent.width
884+ wrapMode: Text.WordWrap
885+ text: "<b>" + i18n.tr("Position:") + " </b>" + ((src.position.latitudeValid == true)?Utils.displayCoordinates(src.position.coordinate.latitude, src.position.coordinate.longitude): i18n.tr("Waiting for fix"))
886+
887+ }
888+ Column{
889+ width: parent.width
890+ visible: root.activeGeocache!=null
891+ spacing: units.gu(2)
892+ OptionSelector{
893+ id: sWaypoints
894+ width: parent.width
895+ expanded: false
896+ model: root.activeGeocache.waypoints
897+ delegate: selectorDelegate
898+ onSelectedIndexChanged: {root.activeGeocache.currentwaypoint = selectedIndex;}
899+ }
900+
901+ Component {
902+ id: selectorDelegate
903+ OptionSelectorDelegate {
904+ text: model.name
905+ subText: Utils.displayCoordinates(model.latitude, model.longitude)
906+ }
907+ }
908+
909+
910+
911+ Row{
912+ spacing: units.gu(2)
913+ width: parent.width
914+ Button {
915+ id: addWaypoint
916+ width: (parent.width-units.gu(4))/3 //parent.width
917+ height: width
918+ iconName: "add"
919+ color: enabled?UbuntuColors.green:UbuntuColors.lightGrey
920+ onClicked: {
921+ compassAnimator.running = false;
922+ neswAnimator.running = false;
923+ var wpName;
924+ wpName = "WP"+(root.activeGeocache.waypoints.length);
925+ root.activeGeocache.modelData.addWaypoint(wpName,
926+ src.position.coordinate.latitude,
927+ src.position.coordinate.longitude);
928+ PopupUtils.open(wpDialog);
929+ }
930+ }
931+ Button {
932+ id: editWaypoint
933+ width: addWaypoint.width
934+ height: width
935+ iconName: "edit"
936+ color: enabled?UbuntuColors.green:UbuntuColors.lightGrey
937+ enabled: (sWaypoints.selectedIndex!=0)
938+ onClicked: {
939+ compassAnimator.running = false;
940+ neswAnimator.running = false;
941+ root.activeGeocache.currentwaypoint = sWaypoints.selectedIndex;
942+ PopupUtils.open(wpDialog);
943+ }
944+ }
945+ Button {
946+ id: eraseWaypoint
947+ width: addWaypoint.width
948+ height: width
949+ iconName: "delete"
950+ color: enabled?UbuntuColors.red:UbuntuColors.lightGrey
951+ enabled: (sWaypoints.selectedIndex!=0)
952+ onClicked: {
953+ compassAnimator.running = false;
954+ neswAnimator.running = false;
955+ root.activeGeocache.modelData.deleteWaypoint(sWaypoints.selectedIndex);
956+ root.activeGeocache.modelData.updateWaypoints();
957+ }
958+ }
959+ }
960+ }
961+ Label{
962+ width: parent.width
963+ id: gpsStatus
964+ }
965+ WaypointDialog {
966+ id: wpDialog
967+ }
968+ }
969+ Label {
970+ anchors {
971+ left: parent.left
972+ top: parent.top
973+ }
974+ width: parent.width
975+ id: accuracy
976+ text: src.position.horizontalAccuracyValid?"<b>"+i18n.tr("Accuracy:")+"</b><br/>"+Utils.displayLength(src.position.horizontalAccuracy/1000):""
977+ onTextChanged: {
978+ parent.width = width;
979+ }
980+ }
981+ }
982+
983+
984+ Timer{
985+ interval: 10000
986+ repeat: true
987+ running: true
988+ onTriggered: {
989+ updateGpsStatus();
990+ }
991+
992+ }
993+
994+
995+ PositionSource {
996+ id: src
997+ active: true
998+ updateInterval: 1000
999+ preferredPositioningMethods: PositionSource.SatellitePositioningMethods
1000+
1001+ onPositionChanged: {
1002+ lPosition.update;
1003+ distance.update;
1004+ var coord = src.position.coordinate;
1005+ var targetDirection = 0;
1006+ var movingDirection = -1*nesw.rotation;
1007+ if(root.activeGeocache!=null){
1008+ var targetlat = root.activeGeocache.waypoints[sWaypoints.selectedIndex].latitude;
1009+ var targetlon = root.activeGeocache.waypoints[sWaypoints.selectedIndex].longitude;
1010+ targetDirection = Utils.calculateDirection(coord.longitude, coord.latitude,targetlon, targetlat);
1011+ distance.text = src.position.latitudeValid?Utils.displayDistance(src.position.coordinate.latitude, src.position.coordinate.longitude, targetlat,targetlon, root.miles) : "";
1012+ }
1013+ if(Utils.lastCoordLon != coord.longitude || Utils.lastCoordLat != coord.latitude)
1014+ {
1015+ if(src.position.latitudeValid){
1016+ movingDirection = Utils.calculateDirection(Utils.lastCoordLon,Utils.lastCoordLat,coord.longitude, coord.latitude);
1017+ neswAnimator.running = false;
1018+ neswAnimator.from = nesw.rotation;
1019+ neswAnimator.to = -1*movingDirection;
1020+ neswAnimator.running = true;
1021+ //nesw.rotation = -1*movingDirection;
1022+ Utils.lastCoordLon = coord.longitude;
1023+ Utils.lastCoordLat = coord.latitude;
1024+ if(root.activeGeocache != null)
1025+ {
1026+ if(src.position.latitudeValid){
1027+ //compass.rotation = targetDirection - movingDirection;
1028+ compassAnimator.running = false;
1029+ compassAnimator.from = compass.rotation;
1030+ compassAnimator.to = targetDirection - movingDirection;
1031+ compassAnimator.running = true;
1032+ }
1033+ }
1034+ else
1035+ {
1036+ if(src.position.latitudeValid){
1037+ //compass.rotation = -1*movingDirection;
1038+ compassAnimator.running = false;
1039+ compassAnimator.from = compass.rotation;
1040+ compassAnimator.to = -1*movingDirection;
1041+ compassAnimator.running = true;
1042+ }
1043+ }
1044+ }
1045+ }
1046+
1047+ updateGpsStatus();
1048+ }
1049+ }
1050+ }
1051+}
1052+
1053+
1054
1055=== modified file 'app/ui/DetailsTab.qml'
1056--- app/ui/DetailsTab.qml 2014-12-26 20:50:55 +0000
1057+++ app/ui/DetailsTab.qml 2015-04-28 21:23:25 +0000
1058@@ -54,7 +54,7 @@
1059 Label {
1060 width: parent.width
1061 wrapMode: Text.WordWrap
1062- text: "<b>" + i18n.tr("Name:") + " </b>" + root.activeGeocache.name + " (" + root.activeGeocache.id + ")"
1063+ text: root.activeGeocache!=null?"<b>" + i18n.tr("Name:") + " </b>" + root.activeGeocache.name + " (" + root.activeGeocache.id + ")":""
1064 }
1065
1066 Label {
1067@@ -113,8 +113,75 @@
1068 text: i18n.tr("View cache page")
1069 onClicked: {
1070 browserTab.url = root.activeGeocache.url;
1071- tabs.selectedTabIndex = 3;
1072- }
1073+ tabs.selectedTabIndex = 4;
1074+ }
1075+ }
1076+ Label{
1077+ width: parent.width
1078+ text: "<b>" + i18n.tr("Waypoints") + "</b>"
1079+ }
1080+
1081+ OptionSelector{
1082+ id: sWaypoints
1083+ width: parent.width
1084+ expanded: false
1085+ model: root.activeGeocache.waypoints
1086+ delegate: selectorDelegate
1087+ }
1088+
1089+ Component {
1090+ id: selectorDelegate
1091+ OptionSelectorDelegate {
1092+ text: model.name
1093+ subText: Utils.displayCoordinates(model.latitude, model.longitude)
1094+ }
1095+ }
1096+ WaypointDialog {
1097+ id: wpDialog
1098+ }
1099+ Row{
1100+ spacing: units.gu(2)
1101+ width: parent.width
1102+ Button {
1103+ id: addWaypoint
1104+ width: (parent.width-units.gu(4))/3 //parent.width
1105+ height: width
1106+ color: enabled?UbuntuColors.green:UbuntuColors.lightGrey
1107+ iconName: "add"
1108+ onClicked: {
1109+ var wpName;
1110+ wpName = "WP"+(root.activeGeocache.waypoints.length);
1111+ root.activeGeocache.modelData.addWaypoint(wpName,
1112+ src.position.coordinate.latitude,
1113+ src.position.coordinate.longitude);
1114+ PopupUtils.open(wpDialog);
1115+ }
1116+ }
1117+ Button {
1118+ id: editWaypoint
1119+ width: addWaypoint.width
1120+ height: width
1121+ iconName: "edit"
1122+ color: enabled?UbuntuColors.green:UbuntuColors.lightGrey
1123+ enabled: (sWaypoints.selectedIndex!=0)
1124+ onClicked: {
1125+ root.activeGeocache.currentwaypoint = sWaypoints.selectedIndex;
1126+ PopupUtils.open(wpDialog);
1127+ }
1128+ }
1129+ Button {
1130+ id: eraseWaypoint
1131+ width: addWaypoint.width
1132+ height: width
1133+ iconName: "delete"
1134+ color: enabled?UbuntuColors.red:UbuntuColors.lightGrey
1135+ enabled: (sWaypoints.selectedIndex!=0)
1136+ onClicked: {
1137+ root.activeGeocache.modelData.deleteWaypoint(sWaypoints.selectedIndex);
1138+ root.activeGeocache.modelData.updateWaypoints();
1139+ }
1140+ }
1141+
1142 }
1143 }
1144 }
1145@@ -130,9 +197,9 @@
1146 PositionSource {
1147 id: src
1148 active: true
1149- updateInterval: 60000
1150+ updateInterval: 10000
1151+ preferredPositioningMethods: PositionSource.SatellitePositioningMethods
1152 }
1153-
1154 }
1155 }
1156
1157
1158=== modified file 'app/ui/GeocachesTab.qml'
1159--- app/ui/GeocachesTab.qml 2014-12-26 20:50:55 +0000
1160+++ app/ui/GeocachesTab.qml 2015-04-28 21:23:25 +0000
1161@@ -23,10 +23,16 @@
1162 import Ubuntu.Web 0.2
1163 import Ubuntu.Components.Popups 1.0
1164 import Cachemere 1.0
1165+import Ubuntu.Components.ListItems 1.0
1166 import "utils.js" as Utils
1167-
1168+import "."
1169 Tab {
1170 title: i18n.tr("Geocaches")
1171+ function setActiveGeocache(index)
1172+ {
1173+ cacheList.currentIndex=index;
1174+ cacheList.currentItem._onItemClicked();
1175+ }
1176
1177 page: Page {
1178
1179@@ -38,11 +44,18 @@
1180 spacing: units.gu(1)
1181 anchors.margins: units.gu(2)
1182
1183- delegate: Item {
1184+ delegate: ListItemWithActions{
1185+ leftSideAction: Action {
1186+ iconName: "delete"
1187+ text: i18n.tr("Delete")
1188+ onTriggered: {
1189+ cacheModel.removeGeocache(index);
1190+ }
1191+ }
1192 height: col.height
1193 width: parent.width
1194
1195- Column {
1196+ contents:Column {
1197 id: col
1198 spacing: units.gu(0.5)
1199
1200@@ -63,13 +76,16 @@
1201 fontSize: "small"
1202 font.bold: root.activeGeocache == model
1203 }
1204- }
1205- MouseArea {
1206- anchors.fill: parent
1207- onClicked: {
1208- root.activeGeocache = model
1209- tabs.selectedTabIndex = 2
1210- }
1211+
1212+
1213+ }
1214+ function _onItemClicked(){
1215+ root.activeGeocache = model;
1216+ tabs.selectedTabIndex = 2;
1217+ }
1218+
1219+ onItemClicked: {
1220+ _onItemClicked();
1221 }
1222 }
1223 }
1224@@ -90,14 +106,15 @@
1225 anchors.margins: units.gu(2)
1226 text: i18n.tr("Download Geocaches")
1227 onClicked: {
1228- tabs.selectedTabIndex = 3
1229+ tabs.selectedTabIndex = 4
1230 }
1231 }
1232
1233 PositionSource {
1234 id: src
1235 active: true
1236- updateInterval: 60000
1237+ updateInterval: 10000
1238+ preferredPositioningMethods: PositionSource.SatellitePositioningMethods
1239 }
1240 }
1241 }
1242
1243=== added file 'app/ui/ListItemWithActions.qml'
1244--- app/ui/ListItemWithActions.qml 1970-01-01 00:00:00 +0000
1245+++ app/ui/ListItemWithActions.qml 2015-04-28 21:23:25 +0000
1246@@ -0,0 +1,456 @@
1247+/*
1248+ * Copyright (C) 2012-2014 Canonical, Ltd.
1249+ *
1250+ * This program is free software; you can redistribute it and/or modify
1251+ * it under the terms of the GNU General Public License as published by
1252+ * the Free Software Foundation; version 3.
1253+ *
1254+ * This program is distributed in the hope that it will be useful,
1255+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
1256+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1257+ * GNU General Public License for more details.
1258+ *
1259+ * You should have received a copy of the GNU General Public License
1260+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
1261+ */
1262+
1263+import QtQuick 2.2
1264+import Ubuntu.Components 1.1
1265+
1266+
1267+Item {
1268+ id: root
1269+
1270+ property Action leftSideAction: null
1271+ property list<Action> rightSideActions
1272+ property double defaultHeight: units.gu(8)
1273+ property bool locked: false
1274+ property Action activeAction: null
1275+ property var activeItem: null
1276+ property bool triggerActionOnMouseRelease: false
1277+ property color color: Theme.palette.normal.background
1278+ property color selectedColor: "#E6E6E6"
1279+ property bool selected: false
1280+ property bool selectionMode: false
1281+ property alias internalAnchors: mainContents.anchors
1282+ default property alias contents: mainContents.children
1283+
1284+ readonly property double actionWidth: units.gu(4)
1285+ readonly property double leftActionWidth: units.gu(10)
1286+ readonly property double actionThreshold: actionWidth * 0.4
1287+ readonly property double threshold: 0.4
1288+ readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
1289+ readonly property alias swipping: mainItemMoving.running
1290+ readonly property bool _showActions: mouseArea.pressed || swipeState != "Normal" || swipping
1291+
1292+ /* internal */
1293+ property var _visibleRightSideActions: filterVisibleActions(rightSideActions)
1294+
1295+ signal itemClicked(var mouse)
1296+ signal itemPressAndHold(var mouse)
1297+
1298+ function returnToBoundsRTL(direction)
1299+ {
1300+ var actionFullWidth = actionWidth + units.gu(2)
1301+
1302+ // go back to normal state if swipping reverse
1303+ if (direction === "LTR") {
1304+ updatePosition(0)
1305+ return
1306+ } else if (!triggerActionOnMouseRelease) {
1307+ updatePosition(-rightActionsView.width + units.gu(2))
1308+ return
1309+ }
1310+
1311+ var xOffset = Math.abs(main.x)
1312+ var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
1313+ var newX = 0
1314+ if (index === _visibleRightSideActions.length) {
1315+ newX = -(rightActionsView.width - units.gu(2))
1316+ } else if (index >= 1) {
1317+ newX = -(actionFullWidth * index)
1318+ }
1319+ updatePosition(newX)
1320+ }
1321+
1322+ function returnToBoundsLTR(direction)
1323+ {
1324+ var finalX = leftActionWidth
1325+ if ((direction === "RTL") || (main.x <= (finalX * root.threshold)))
1326+ finalX = 0
1327+ updatePosition(finalX)
1328+ }
1329+
1330+ function returnToBounds(direction)
1331+ {
1332+ if (main.x < 0) {
1333+ returnToBoundsRTL(direction)
1334+ } else if (main.x > 0) {
1335+ returnToBoundsLTR(direction)
1336+ } else {
1337+ updatePosition(0)
1338+ }
1339+ }
1340+
1341+ function contains(item, point, marginX)
1342+ {
1343+ var itemStartX = item.x - marginX
1344+ var itemEndX = item.x + item.width + marginX
1345+ return (point.x >= itemStartX) && (point.x <= itemEndX) &&
1346+ (point.y >= item.y) && (point.y <= (item.y + item.height));
1347+ }
1348+
1349+ function getActionAt(point)
1350+ {
1351+ if (contains(leftActionView, point, 0)) {
1352+ return leftSideAction
1353+ } else if (contains(rightActionsView, point, 0)) {
1354+ var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
1355+ for (var i = 0; i < rightActionsRepeater.count; i++) {
1356+ var child = rightActionsRepeater.itemAt(i)
1357+ if (contains(child, newPoint, units.gu(1))) {
1358+ return i
1359+ }
1360+ }
1361+ }
1362+ return -1
1363+ }
1364+
1365+ function updateActiveAction()
1366+ {
1367+ if (triggerActionOnMouseRelease &&
1368+ (main.x <= -(root.actionWidth + units.gu(2))) &&
1369+ (main.x > -(rightActionsView.width - units.gu(2)))) {
1370+ var actionFullWidth = actionWidth + units.gu(2)
1371+ var xOffset = Math.abs(main.x)
1372+ var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
1373+ index = index - 1
1374+ if (index > -1) {
1375+ root.activeItem = rightActionsRepeater.itemAt(index)
1376+ root.activeAction = root._visibleRightSideActions[index]
1377+ }
1378+ } else {
1379+ root.activeAction = null
1380+ }
1381+ }
1382+
1383+ function resetSwipe()
1384+ {
1385+ updatePosition(0)
1386+ }
1387+
1388+ function filterVisibleActions(actions)
1389+ {
1390+ var visibleActions = []
1391+ for(var i = 0; i < actions.length; i++) {
1392+ var action = actions[i]
1393+ if (action.visible) {
1394+ visibleActions.push(action)
1395+ }
1396+ }
1397+ return visibleActions
1398+ }
1399+
1400+ function updatePosition(pos)
1401+ {
1402+ if (!root.triggerActionOnMouseRelease && (pos !== 0)) {
1403+ mouseArea.state = pos > 0 ? "RightToLeft" : "LeftToRight"
1404+ } else {
1405+ mouseArea.state = ""
1406+ }
1407+ main.x = pos
1408+ }
1409+
1410+ states: [
1411+ State {
1412+ name: "select"
1413+ when: selectionMode || selected
1414+ PropertyChanges {
1415+ target: selectionIcon
1416+ source: Qt.resolvedUrl("ListItemWithActionsCheckBox.qml")
1417+ anchors.leftMargin: units.gu(2)
1418+ }
1419+ PropertyChanges {
1420+ target: root
1421+ locked: true
1422+ }
1423+ PropertyChanges {
1424+ target: main
1425+ x: 0
1426+ }
1427+ }
1428+ ]
1429+
1430+ height: defaultHeight
1431+ clip: height !== defaultHeight
1432+
1433+ Rectangle {
1434+ id: leftActionView
1435+
1436+ anchors {
1437+ top: parent.top
1438+ bottom: parent.bottom
1439+ right: main.left
1440+ }
1441+ width: root.leftActionWidth + actionThreshold
1442+ visible: leftSideAction
1443+ color: UbuntuColors.red
1444+
1445+ Icon {
1446+ anchors {
1447+ centerIn: parent
1448+ horizontalCenterOffset: actionThreshold / 2
1449+ }
1450+ name: leftSideAction && _showActions ? leftSideAction.iconName : ""
1451+ color: Theme.palette.selected.field
1452+ height: units.gu(3)
1453+ width: units.gu(3)
1454+ }
1455+ }
1456+
1457+ Rectangle {
1458+ id: rightActionsView
1459+
1460+ anchors {
1461+ top: main.top
1462+ left: main.right
1463+ bottom: main.bottom
1464+ }
1465+ visible: _visibleRightSideActions.length > 0
1466+ width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
1467+ color: "white"
1468+ Row {
1469+ anchors{
1470+ top: parent.top
1471+ left: parent.left
1472+ leftMargin: units.gu(2)
1473+ right: parent.right
1474+ rightMargin: units.gu(2)
1475+ bottom: parent.bottom
1476+ }
1477+ spacing: units.gu(2)
1478+ Repeater {
1479+ id: rightActionsRepeater
1480+
1481+ model: _showActions ? _visibleRightSideActions : []
1482+ Item {
1483+ property alias image: img
1484+
1485+ height: rightActionsView.height
1486+ width: root.actionWidth
1487+
1488+ Icon {
1489+ id: img
1490+
1491+ anchors.centerIn: parent
1492+ width: units.gu(3)
1493+ height: units.gu(3)
1494+ name: modelData.iconName
1495+ source: modelData.iconSource
1496+ color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
1497+ }
1498+ }
1499+ }
1500+ }
1501+ }
1502+
1503+
1504+ Rectangle {
1505+ id: main
1506+ objectName: "mainItem"
1507+
1508+ anchors {
1509+ top: parent.top
1510+ bottom: parent.bottom
1511+ }
1512+
1513+ width: parent.width
1514+ color: root.selected ? root.selectedColor : root.color
1515+
1516+ Loader {
1517+ id: selectionIcon
1518+
1519+ anchors {
1520+ left: main.left
1521+ verticalCenter: main.verticalCenter
1522+ }
1523+ width: (status === Loader.Ready) ? item.implicitWidth : 0
1524+ visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
1525+ Behavior on width {
1526+ NumberAnimation {
1527+ duration: UbuntuAnimation.SnapDuration
1528+ }
1529+ }
1530+ }
1531+
1532+
1533+ Item {
1534+ id: mainContents
1535+
1536+ anchors {
1537+ left: selectionIcon.right
1538+// leftMargin: units.gu(2)
1539+ top: parent.top
1540+// topMargin: units.gu(1)
1541+ right: parent.right
1542+// rightMargin: units.gu(2)
1543+ bottom: parent.bottom
1544+// bottomMargin: units.gu(1)
1545+ }
1546+ }
1547+
1548+ Behavior on x {
1549+ UbuntuNumberAnimation {
1550+ id: mainItemMoving
1551+
1552+ easing.type: Easing.OutElastic
1553+ duration: UbuntuAnimation.SlowDuration
1554+ }
1555+ }
1556+ Behavior on color {
1557+ ColorAnimation {}
1558+ }
1559+ }
1560+
1561+ SequentialAnimation {
1562+ id: triggerAction
1563+
1564+ property var currentItem: root.activeItem ? root.activeItem.image : null
1565+
1566+ running: false
1567+ ParallelAnimation {
1568+ UbuntuNumberAnimation {
1569+ target: triggerAction.currentItem
1570+ property: "opacity"
1571+ from: 1.0
1572+ to: 0.0
1573+ duration: UbuntuAnimation.SlowDuration
1574+ easing {type: Easing.InOutBack; }
1575+ }
1576+ UbuntuNumberAnimation {
1577+ target: triggerAction.currentItem
1578+ properties: "width, height"
1579+ from: units.gu(3)
1580+ to: root.actionWidth
1581+ duration: UbuntuAnimation.SlowDuration
1582+ easing {type: Easing.InOutBack; }
1583+ }
1584+ }
1585+ PropertyAction {
1586+ target: triggerAction.currentItem
1587+ properties: "width, height"
1588+ value: units.gu(3)
1589+ }
1590+ PropertyAction {
1591+ target: triggerAction.currentItem
1592+ properties: "opacity"
1593+ value: 1.0
1594+ }
1595+ ScriptAction {
1596+ script: {
1597+ root.activeAction.triggered(root)
1598+ root.activeAction = null;
1599+ mouseArea.state = ""
1600+ }
1601+ }
1602+ PauseAnimation {
1603+ duration: 500
1604+ }
1605+ UbuntuNumberAnimation {
1606+ target: main
1607+ property: "x"
1608+ to: 0
1609+ }
1610+ }
1611+
1612+ MouseArea {
1613+ id: mouseArea
1614+
1615+ property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0))
1616+ property bool manual: false
1617+ property string direction: "None"
1618+ property real lastX: -1
1619+
1620+ anchors.fill: parent
1621+ drag {
1622+ target: locked ? null : main
1623+ axis: Drag.XAxis
1624+ minimumX: rightActionsView.visible ? -(rightActionsView.width) : 0
1625+ maximumX: leftActionView.visible ? leftActionView.width : 0
1626+ threshold: root.actionThreshold
1627+ }
1628+
1629+ states: [
1630+ State {
1631+ name: "LeftToRight"
1632+ PropertyChanges {
1633+ target: mouseArea
1634+ drag.maximumX: 0
1635+ }
1636+ },
1637+ State {
1638+ name: "RightToLeft"
1639+ PropertyChanges {
1640+ target: mouseArea
1641+ drag.minimumX: 0
1642+ }
1643+ }
1644+ ]
1645+
1646+ onMouseXChanged: {
1647+ var offset = (lastX - mouseX)
1648+ if (Math.abs(offset) <= root.actionThreshold) {
1649+ return
1650+ }
1651+ lastX = mouseX
1652+ direction = offset > 0 ? "RTL" : "LTR";
1653+ }
1654+
1655+ onPressed: {
1656+ lastX = mouse.x
1657+ }
1658+
1659+ onReleased: {
1660+ if (root.triggerActionOnMouseRelease && root.activeAction) {
1661+ triggerAction.start()
1662+ } else {
1663+ root.returnToBounds(direction)
1664+ root.activeAction = null
1665+ }
1666+ lastX = -1
1667+ direction = "None"
1668+ }
1669+ onClicked: {
1670+ if (main.x === 0) {
1671+ root.itemClicked(mouse)
1672+ } else if (main.x > 0) {
1673+ var action = getActionAt(Qt.point(mouse.x, mouse.y))
1674+ if (action && action !== -1) {
1675+ action.triggered(root)
1676+ }
1677+ } else {
1678+ var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
1679+ if (actionIndex !== -1) {
1680+ root.activeItem = rightActionsRepeater.itemAt(actionIndex)
1681+ root.activeAction = root._visibleRightSideActions[actionIndex]
1682+ triggerAction.start()
1683+ return
1684+ }
1685+ }
1686+ root.resetSwipe()
1687+ }
1688+
1689+ onPositionChanged: {
1690+ if (mouseArea.pressed) {
1691+ updateActiveAction()
1692+ }
1693+ }
1694+ onPressAndHold: {
1695+ if (main.x === 0) {
1696+ root.itemPressAndHold(mouse)
1697+ }
1698+ }
1699+ z: -1
1700+ }
1701+}
1702+
1703
1704=== modified file 'app/ui/MapTab.qml'
1705--- app/ui/MapTab.qml 2014-12-26 20:50:55 +0000
1706+++ app/ui/MapTab.qml 2015-04-28 21:23:25 +0000
1707@@ -42,6 +42,11 @@
1708 }
1709 }
1710
1711+ onActiveChanged: {
1712+ waypointsModel.updateWaypoints();
1713+ geocachesModel.updateGeocaches();
1714+ }
1715+
1716 Map {
1717 id: map
1718 zoomLevel: 10
1719@@ -87,38 +92,142 @@
1720 visible: !!coordinate.latitude
1721 anchorPoint.x: centerPositionImage.width/2
1722 anchorPoint.y: centerPositionImage.height
1723- sourceItem: Icon {
1724+ sourceItem: Image {
1725 id: centerPositionImage
1726- width: 24
1727- height: 24
1728- name: "location"
1729- color: "black"
1730+ width: units.gu(5)
1731+ height: units.gu(5)
1732+ source: "cachemere.svg"
1733+ }
1734+ }
1735+
1736+ ListModel {
1737+ id: geocachesModel
1738+ function updateGeocaches () {
1739+ clear();
1740+ var place;
1741+ for (var i = 0; i < cacheModel.geocaches.length; i++) {
1742+ place = {};
1743+ place.lat = cacheModel.geocaches[i].latitude;
1744+ place.lng = cacheModel.geocaches[i].longitude;
1745+ place.osm_id = i + "geocache";
1746+ place.name = cacheModel.geocaches[i].name;
1747+ place.tags = {};
1748+ append(place);
1749+ }
1750 }
1751 }
1752
1753 MapItemView {
1754 id: cacheView
1755
1756- model: cacheModel.geocaches
1757- Component.onCompleted: { console.log("Model Length: " + cacheModel.geocaches.length) }
1758+ model: geocachesModel
1759 delegate: MapQuickItem {
1760- coordinate.latitude: latitude
1761- coordinate.longitude: longitude
1762-
1763- Component.onCompleted: { console.log("Loaded: " + name + ", latitude: " + latitude ) }
1764+ coordinate.latitude: lat
1765+ coordinate.longitude: lng
1766
1767 anchorPoint.x: sourceItem.width / 2
1768 anchorPoint.y: sourceItem.height / 2
1769 //visible: map.zoomLevel >= 14
1770-
1771- sourceItem: Rectangle {
1772- width: units.gu(2)
1773- height: units.gu(1)
1774- color: "green"
1775- opacity: 0.5
1776- border.color: "black"
1777-
1778- }
1779+ visible: name!=activeGeocache.name
1780+
1781+ sourceItem: Item {
1782+ id: geoItem
1783+ width: geoImage.width
1784+ height: geoImage.height
1785+ Image{
1786+ id: geoImage
1787+ source: "treasure_closed.svg"
1788+ width: units.gu(6)
1789+ height: units.gu(6*1.39)
1790+ }
1791+
1792+ MouseArea{
1793+ anchors.fill: parent
1794+ onClicked:{
1795+ //change active geocache.
1796+ geocachesTab.setActiveGeocache(index);
1797+ //root.activeGeocache=cacheModel.geocaches[index];
1798+ geocachesModel.updateGeocaches();
1799+ waypointsModel.updateWaypoints();
1800+ }
1801+ }
1802+
1803+ }
1804+ }
1805+ }
1806+
1807+
1808+ ListModel {
1809+ id: waypointsModel
1810+ function updateWaypoints () {
1811+ clear();
1812+ var place;
1813+ if(root.activeGeocache==null)return;
1814+ for (var i = 0; i < root.activeGeocache.waypoints.length; i++) {
1815+ place = {};
1816+ place.lat = root.activeGeocache.waypoints[i].latitude;
1817+ place.lng = root.activeGeocache.waypoints[i].longitude;
1818+ place.osm_id = i + "waypoint";
1819+ place.name = root.activeGeocache.waypoints[i].name;
1820+ place.tags = {};
1821+ append(place);
1822+ }
1823+ }
1824+ }
1825+
1826+ MapItemView {
1827+ id: waypointView
1828+
1829+ model:waypointsModel
1830+ Component.onCompleted: { console.log("Waypoints Length: " + root.activeGeocache.waypoints.length) }
1831+ delegate: MapQuickItem {
1832+ coordinate.latitude: lat
1833+ coordinate.longitude: lng
1834+
1835+ //Component.onCompleted: { console.log("Loaded: " + name + ", latitude: " + latitude ) }
1836+
1837+ anchorPoint.x: sourceItem.width / 2
1838+ anchorPoint.y: wpPin.height / 2
1839+ visible: index!=0
1840+
1841+ sourceItem: Item {
1842+ height: wpPin.height+wpRect.height
1843+ width: wpRect.width
1844+
1845+ Image{
1846+ id: wpPin
1847+ source: "waypoint.svg"
1848+ anchors.top: parent.top
1849+ anchors.horizontalCenter: parent.horizontalCenter
1850+ width: units.gu(5)
1851+ height: units.gu(5/1.9)
1852+ smooth: true
1853+ }
1854+ Rectangle{
1855+ anchors.bottom: parent.bottom
1856+ anchors.left: parent.left
1857+ id: wpRect
1858+ width: wpLabel.width
1859+ height: wpLabel.height
1860+ color: index==root.activeGeocache.currentwaypoint?"red":"green"
1861+ opacity: 0.5
1862+ border.color: "black"
1863+ Label{
1864+ id: wpLabel
1865+ anchors.centerIn: parent
1866+ text: name
1867+ fontSize: "x-small"
1868+ }
1869+ }
1870+ MouseArea{
1871+ anchors.fill: parent
1872+ onClicked:{
1873+ root.activeGeocache.currentwaypoint=index;
1874+ waypointsModel.updateWaypoints();
1875+ }
1876+ }
1877+ }
1878+
1879 }
1880 }
1881
1882@@ -132,22 +241,15 @@
1883 anchorPoint.x: sourceItem.width / 2
1884 anchorPoint.y: sourceItem.height / 2
1885
1886- sourceItem: Rectangle {
1887- width: units.gu(3)
1888- height: units.gu(1.5)
1889-
1890- color: "yellow"
1891- opacity: 0.8
1892- border.color: "black"
1893-
1894- Rectangle {
1895- width: parent.width
1896- height: parent.height / 3
1897- color: "white"
1898- anchors.top: parent.top
1899- border.color: "black"
1900+ sourceItem: Item{
1901+ width: treasureImage.width
1902+ height: treasureImage.height
1903+ Image{
1904+ id: treasureImage
1905+ source: "treasure_open.svg"
1906+ width: units.gu(6)
1907+ height: units.gu(6*1.7)
1908 }
1909-
1910 MouseArea {
1911 anchors.fill: parent
1912 onClicked: {
1913@@ -169,6 +271,10 @@
1914 }
1915 }
1916
1917+
1918+
1919+
1920+
1921 Rectangle {
1922 anchors {
1923 right: parent.right
1924@@ -211,7 +317,7 @@
1925 anchors.rightMargin: units.gu(2)
1926 anchors.verticalCenter: parent.verticalCenter
1927 visible: src.position.latitudeValid
1928- text: "<b>" + Utils.displayDistance(src.position.coordinate.latitude, src.position.coordinate.longitude, root.activeGeocache.latitude, root.activeGeocache.longitude, root.miles) + "</b>"
1929+ text: src.position.latitudeValid&&activeGeocache!=null?"<b>" + Utils.displayDistance(src.position.coordinate.latitude, src.position.coordinate.longitude, root.activeGeocache.waypoints[root.activeGeocache.currentwaypoint].latitude, root.activeGeocache.waypoints[root.activeGeocache.currentwaypoint].longitude, root.miles) + "</b>":"<b></b>"
1930 }
1931
1932 }
1933@@ -221,21 +327,25 @@
1934 source: "beep.wav"
1935 }
1936
1937+
1938 PositionSource {
1939 id: src
1940 active: true
1941 updateInterval: 1000
1942+ preferredPositioningMethods: PositionSource.SatellitePositioningMethods
1943 property bool beeped: false
1944 onPositionChanged: {
1945- if (root.activeGeocache != null && Utils.distance(position.coordinate.latitude, position.coordinate.longitude, root.activeGeocache.latitude, root.activeGeocache.longitude) < 0.03) {
1946+ if (root.activeGeocache != null && Utils.distance(position.coordinate.latitude, position.coordinate.longitude, root.activeGeocache.waypoints[root.activeGeocache.currentwaypoint].latitude, root.activeGeocache.waypoints[root.activeGeocache.currentwaypoint].longitude) < 0.03) {
1947 if (!beeped) {
1948 beep.play();
1949 beeped = true;
1950 }
1951 } else {
1952- beeped = false
1953+ beeped = false;
1954 }
1955
1956+
1957+
1958 map.updateUserPosition(position)
1959 }
1960 }
1961
1962=== added file 'app/ui/NESW.svg'
1963--- app/ui/NESW.svg 1970-01-01 00:00:00 +0000
1964+++ app/ui/NESW.svg 2015-04-28 21:23:25 +0000
1965@@ -0,0 +1,166 @@
1966+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1967+<!-- Created with Inkscape (http://www.inkscape.org/) -->
1968+
1969+<svg
1970+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
1971+ xmlns:dc="http://purl.org/dc/elements/1.1/"
1972+ xmlns:cc="http://creativecommons.org/ns#"
1973+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1974+ xmlns:svg="http://www.w3.org/2000/svg"
1975+ xmlns="http://www.w3.org/2000/svg"
1976+ xmlns:xlink="http://www.w3.org/1999/xlink"
1977+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1978+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1979+ id="svg3071"
1980+ version="1.1"
1981+ inkscape:version="0.48.4 r9939"
1982+ width="448"
1983+ height="448"
1984+ sodipodi:docname="NESW.svg">
1985+ <metadata
1986+ id="metadata3077">
1987+ <rdf:RDF>
1988+ <cc:Work
1989+ rdf:about="">
1990+ <dc:format>image/svg+xml</dc:format>
1991+ <dc:type
1992+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1993+ <dc:title></dc:title>
1994+ </cc:Work>
1995+ </rdf:RDF>
1996+ </metadata>
1997+ <defs
1998+ id="defs3075">
1999+ <linearGradient
2000+ id="linearGradient5602">
2001+ <stop
2002+ id="stop5604"
2003+ offset="0"
2004+ style="stop-color:#000000;stop-opacity:1;" />
2005+ <stop
2006+ style="stop-color:#000000;stop-opacity:0.49803922;"
2007+ offset="0.5"
2008+ id="stop5606" />
2009+ <stop
2010+ id="stop5608"
2011+ offset="1"
2012+ style="stop-color:#000000;stop-opacity:0;" />
2013+ </linearGradient>
2014+ <linearGradient
2015+ id="linearGradient5592">
2016+ <stop
2017+ style="stop-color:#000000;stop-opacity:0;"
2018+ offset="0"
2019+ id="stop5610" />
2020+ <stop
2021+ id="stop5652"
2022+ offset="0.83999997"
2023+ style="stop-color:#808080;stop-opacity:1;" />
2024+ <stop
2025+ id="stop5622"
2026+ offset="0.93000001"
2027+ style="stop-color:#000000;stop-opacity:1;" />
2028+ <stop
2029+ id="stop5650"
2030+ offset="1"
2031+ style="stop-color:#808080;stop-opacity:1;" />
2032+ </linearGradient>
2033+ <linearGradient
2034+ id="linearGradient5582"
2035+ osb:paint="solid">
2036+ <stop
2037+ style="stop-color:#000000;stop-opacity:1;"
2038+ offset="0"
2039+ id="stop5584" />
2040+ </linearGradient>
2041+ <radialGradient
2042+ inkscape:collect="always"
2043+ xlink:href="#linearGradient5592"
2044+ id="radialGradient5598"
2045+ cx="225"
2046+ cy="228.5"
2047+ fx="225"
2048+ fy="228.5"
2049+ r="231.56505"
2050+ gradientTransform="matrix(1,0,0,1.0237514,0,-5.4272006)"
2051+ gradientUnits="userSpaceOnUse"
2052+ spreadMethod="reflect" />
2053+ </defs>
2054+ <sodipodi:namedview
2055+ pagecolor="#ffffff"
2056+ bordercolor="#666666"
2057+ borderopacity="1"
2058+ objecttolerance="10"
2059+ gridtolerance="10000"
2060+ guidetolerance="10"
2061+ inkscape:pageopacity="0"
2062+ inkscape:pageshadow="2"
2063+ inkscape:window-width="1871"
2064+ inkscape:window-height="1176"
2065+ id="namedview3073"
2066+ showgrid="true"
2067+ inkscape:zoom="0.5"
2068+ inkscape:cx="-676.22107"
2069+ inkscape:cy="454.28616"
2070+ inkscape:window-x="49"
2071+ inkscape:window-y="24"
2072+ inkscape:window-maximized="1"
2073+ inkscape:current-layer="svg3071">
2074+ <inkscape:grid
2075+ type="xygrid"
2076+ id="grid3882"
2077+ empspacing="5"
2078+ visible="true"
2079+ enabled="true"
2080+ snapvisiblegridlinesonly="true" />
2081+ </sodipodi:namedview>
2082+ <text
2083+ xml:space="preserve"
2084+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
2085+ x="213.55196"
2086+ y="26.200001"
2087+ id="text5692"
2088+ sodipodi:linespacing="125%"><tspan
2089+ sodipodi:role="line"
2090+ id="tspan5694"
2091+ x="213.55196"
2092+ y="26.200001"
2093+ style="font-size:28px;fill:#ffffff;fill-opacity:1">N</tspan></text>
2094+ <text
2095+ xml:space="preserve"
2096+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
2097+ x="423.19995"
2098+ y="233.89999"
2099+ id="text5696"
2100+ sodipodi:linespacing="125%"><tspan
2101+ sodipodi:role="line"
2102+ id="tspan5698"
2103+ x="423.19995"
2104+ y="233.89999"
2105+ style="font-size:28px;fill:#ffffff;fill-opacity:1">E</tspan></text>
2106+ <text
2107+ xml:space="preserve"
2108+ style="font-size:11.99994087px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
2109+ x="215.00136"
2110+ y="442.5473"
2111+ id="text5700"
2112+ sodipodi:linespacing="125%"
2113+ transform="scale(0.99999511,1.0000049)"><tspan
2114+ sodipodi:role="line"
2115+ id="tspan5702"
2116+ x="215.00136"
2117+ y="442.5473"
2118+ style="font-size:27.99986267px;fill:#ffffff;fill-opacity:1">S</tspan></text>
2119+ <text
2120+ xml:space="preserve"
2121+ style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
2122+ x="2.0503149"
2123+ y="234.1501"
2124+ id="text5704"
2125+ sodipodi:linespacing="125%"><tspan
2126+ sodipodi:role="line"
2127+ id="tspan5706"
2128+ x="2.0503149"
2129+ y="234.1501"
2130+ style="font-size:28px;fill:#ffffff;fill-opacity:1">W</tspan></text>
2131+</svg>
2132
2133=== added file 'app/ui/WaypointDialog.qml'
2134--- app/ui/WaypointDialog.qml 1970-01-01 00:00:00 +0000
2135+++ app/ui/WaypointDialog.qml 2015-04-28 21:23:25 +0000
2136@@ -0,0 +1,392 @@
2137+/*
2138+ * Copyright 2013-2014 Canonical Ltd.
2139+ *
2140+ * This file is part of cachemere.
2141+ *
2142+ * webbrowser-app is free software; you can redistribute it and/or modify
2143+ * it under the terms of the GNU General Public License as published by
2144+ * the Free Software Foundation; version 3.
2145+ *
2146+ * webbrowser-app is distributed in the hope that it will be useful,
2147+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2148+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2149+ * GNU General Public License for more details.
2150+ *
2151+ * You should have received a copy of the GNU General Public License
2152+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2153+ */
2154+
2155+import QtQuick 2.0
2156+import Ubuntu.Components 1.1
2157+import Ubuntu.Components.Popups 1.0
2158+import Ubuntu.Components.Pickers 1.0
2159+
2160+import Ubuntu.Components.ListItems 1.0
2161+import "utils.js" as Utils
2162+Component{
2163+ id: comp
2164+ Dialog {
2165+ id: dialogue
2166+ title: i18n.tr("Edit Waypoint")
2167+ //text: ""
2168+ modal: true
2169+ TextEdit{
2170+ width: parent.width
2171+ id: wpName
2172+ }
2173+ Flickable{
2174+ width: parent.width
2175+ height: latRow.height
2176+ contentWidth: latRow.width
2177+ contentHeight: latRow.height
2178+ flickableDirection: Flickable.HorizontalFlick
2179+ Row{
2180+ id: latRow
2181+ width: parent.width
2182+ Picker {
2183+ id: latNSPicker
2184+
2185+ selectedIndex: 0 // this will be set to 0 at the model completion
2186+ width: units.gu(4)
2187+ height: units.gu(12)
2188+ circular: true
2189+ delegate: PickerDelegate {
2190+ Label {
2191+ text: modelData
2192+ }
2193+ }
2194+ Component.onCompleted: {
2195+ var stack = [];
2196+ stack.push(" N");
2197+ stack.push(" S");
2198+ model = stack;
2199+ selectedIndex = 0;
2200+ }
2201+ }
2202+ Picker {
2203+ id: latDegPicker
2204+
2205+ selectedIndex: 0 // this will be set to 0 at the model completion
2206+ width: units.gu(5)
2207+ height: units.gu(12)
2208+ circular: true
2209+ delegate: PickerDelegate {
2210+ Label {
2211+ text: modelData
2212+ }
2213+ }
2214+ Component.onCompleted: {
2215+ var stack = [];
2216+ for (var i = 0; i < 180; i++) {
2217+ stack.push(" "+i);
2218+ }
2219+ model = stack;
2220+ selectedIndex = 0;
2221+ }
2222+ }
2223+ Label{
2224+ text: "°"
2225+ font.pixelSize: units.gu(6)
2226+ }
2227+
2228+ Picker {
2229+ id: latMinPicker
2230+ selectedIndex: 0 // this will be set to 0 at the model completion
2231+ width: units.gu(5)
2232+ height: units.gu(12)
2233+ circular: true
2234+ delegate: PickerDelegate {
2235+ Label {
2236+ text: modelData
2237+ }
2238+ }
2239+ Component.onCompleted: {
2240+ var stack = [];
2241+ for (var i = 0; i < 60; i++) {
2242+ stack.push(" "+i);
2243+ }
2244+ model = stack;
2245+ selectedIndex = 0;
2246+ }
2247+ }
2248+ Label{
2249+ text: "."
2250+ font.pixelSize: units.gu(6)
2251+ }
2252+
2253+ Picker {
2254+ id: latFracPicker1
2255+ selectedIndex: 0 // this will be set to 0 at the model completion
2256+ width: units.gu(4)
2257+ height: units.gu(12)
2258+ circular: true
2259+ delegate: PickerDelegate {
2260+ Label {
2261+ text: modelData
2262+ }
2263+ }
2264+ Component.onCompleted: {
2265+ var stack = [];
2266+ for (var i = 0; i < 10; i++) {
2267+ stack.push(" "+i);
2268+ }
2269+ model = stack;
2270+ selectedIndex = 0;
2271+ }
2272+ }
2273+ Picker {
2274+ id: latFracPicker2
2275+ selectedIndex: 0 // this will be set to 0 at the model completion
2276+ width: units.gu(4)
2277+ height: units.gu(12)
2278+ circular: true
2279+ delegate: PickerDelegate {
2280+ Label {
2281+ text: modelData
2282+ }
2283+ }
2284+ Component.onCompleted: {
2285+ var stack = [];
2286+ for (var i = 0; i < 10; i++) {
2287+ stack.push(" "+i);
2288+ }
2289+ model = stack;
2290+ selectedIndex = 0;
2291+ }
2292+ }
2293+ Picker {
2294+ id: latFracPicker3
2295+ selectedIndex: 0 // this will be set to 0 at the model completion
2296+ width: units.gu(4)
2297+ height: units.gu(12)
2298+ circular: true
2299+ delegate: PickerDelegate {
2300+ Label {
2301+ text: modelData
2302+ }
2303+ }
2304+ Component.onCompleted: {
2305+ var stack = [];
2306+ for (var i = 0; i < 10; i++) {
2307+ stack.push(" "+i);
2308+ }
2309+ model = stack;
2310+ selectedIndex = 0;
2311+ }
2312+ }
2313+ }
2314+ }
2315+
2316+ Flickable{
2317+ width: parent.width
2318+ height: lonRow.height
2319+ contentWidth: lonRow.width
2320+ contentHeight: lonRow.height
2321+ flickableDirection: Flickable.HorizontalFlick
2322+ Row{
2323+ id: lonRow
2324+ width: parent.width
2325+ Picker {
2326+ id: lonEWPicker
2327+
2328+ selectedIndex: 0 // this will be set to 0 at the model completion
2329+ width: units.gu(4)
2330+ height: units.gu(12)
2331+ circular: true
2332+ delegate: PickerDelegate {
2333+ Label {
2334+ text: modelData
2335+ }
2336+ }
2337+ Component.onCompleted: {
2338+ var stack = [];
2339+ stack.push(" E");
2340+ stack.push(" W");
2341+ model = stack;
2342+ selectedIndex = 0;
2343+ }
2344+ }
2345+ Picker {
2346+ id: lonDegPicker
2347+
2348+ selectedIndex: 0 // this will be set to 0 at the model completion
2349+ width: units.gu(5)
2350+ height: units.gu(12)
2351+ circular: true
2352+ delegate: PickerDelegate {
2353+ Label {
2354+ text: modelData
2355+ }
2356+ }
2357+ Component.onCompleted: {
2358+ var stack = [];
2359+ for (var i = 0; i < 90; i++) {
2360+ stack.push(" "+i);
2361+ }
2362+ model = stack;
2363+ selectedIndex = 0;
2364+ }
2365+ }
2366+ Label{
2367+ text: "°"
2368+ font.pixelSize: units.gu(6)
2369+ }
2370+
2371+ Picker {
2372+ id: lonMinPicker
2373+ selectedIndex: 0 // this will be set to 0 at the model completion
2374+ width: units.gu(5)
2375+ height: units.gu(12)
2376+ circular: true
2377+ delegate: PickerDelegate {
2378+ Label {
2379+ text: modelData
2380+ }
2381+ }
2382+ Component.onCompleted: {
2383+ var stack = [];
2384+ for (var i = 0; i < 60; i++) {
2385+ stack.push(" "+i);
2386+ }
2387+ model = stack;
2388+ selectedIndex = 0;
2389+ }
2390+ }
2391+ Label{
2392+ text: "."
2393+ font.pixelSize: units.gu(6)
2394+ }
2395+
2396+ Picker {
2397+ id: lonFracPicker1
2398+ selectedIndex: 0 // this will be set to 0 at the model completion
2399+ width: units.gu(4)
2400+ height: units.gu(12)
2401+ circular: true
2402+ delegate: PickerDelegate {
2403+ Label {
2404+ text: modelData
2405+ }
2406+ }
2407+ Component.onCompleted: {
2408+ var stack = [];
2409+ for (var i = 0; i < 10; i++) {
2410+ stack.push(" "+i);
2411+ }
2412+ model = stack;
2413+ selectedIndex = 0;
2414+ }
2415+ }
2416+ Picker {
2417+ id: lonFracPicker2
2418+ selectedIndex: 0 // this will be set to 0 at the model completion
2419+ width: units.gu(4)
2420+ height: units.gu(12)
2421+ circular: true
2422+ delegate: PickerDelegate {
2423+ Label {
2424+ text: modelData
2425+ }
2426+ }
2427+ Component.onCompleted: {
2428+ var stack = [];
2429+ for (var i = 0; i < 10; i++) {
2430+ stack.push(" "+i);
2431+ }
2432+ model = stack;
2433+ selectedIndex = 0;
2434+ }
2435+ }
2436+ Picker {
2437+ id: lonFracPicker3
2438+ selectedIndex: 0 // this will be set to 0 at the model completion
2439+ width: units.gu(4)
2440+ height: units.gu(12)
2441+ circular: true
2442+ delegate: PickerDelegate {
2443+ Label {
2444+ text: modelData
2445+ }
2446+ }
2447+ Component.onCompleted: {
2448+ var stack = [];
2449+ for (var i = 0; i < 10; i++) {
2450+ stack.push(" "+i);
2451+ }
2452+ model = stack;
2453+ selectedIndex = 0;
2454+ }
2455+ }
2456+ }
2457+ }
2458+ Button {
2459+ text: i18n.tr("Close")
2460+ onClicked: {
2461+
2462+ var activeLat = (latNSPicker.selectedIndex*2-1)*-1 *
2463+ (latDegPicker.selectedIndex+
2464+ latMinPicker.selectedIndex/60+
2465+ latFracPicker1.selectedIndex/600+
2466+ latFracPicker2.selectedIndex/6000+
2467+ latFracPicker3.selectedIndex/60000);
2468+ var activeLon = (lonEWPicker.selectedIndex*2-1)*-1 *
2469+ (lonDegPicker.selectedIndex+
2470+ lonMinPicker.selectedIndex/60+
2471+ lonFracPicker1.selectedIndex/600+
2472+ lonFracPicker2.selectedIndex/6000+
2473+ lonFracPicker3.selectedIndex/60000);
2474+ root.activeGeocache.modelData.setWaypoint(root.activeGeocache.currentwaypoint,
2475+ wpName.text, activeLat, activeLon);
2476+ PopupUtils.close(dialogue);
2477+ root.activeGeocache.modelData.updateWaypoints();
2478+
2479+ }
2480+ }
2481+ onVisibleChanged: {
2482+ if(visible)
2483+ {
2484+ //dialer.value = Math.floor(root.activeGeocache.latitude);
2485+ var curLat;
2486+ var curLon;
2487+ var i = root.activeGeocache.currentwaypoint;
2488+ var wp = root.activeGeocache.modelData.getWaypoint(i);
2489+
2490+ curLat = wp.latitude;
2491+ curLon = wp.longitude;
2492+
2493+ wpName.text = wp.name;
2494+ if(curLat<0)
2495+ {
2496+ latNSPicker.selectedIndex = 1;
2497+ curLat *= -1;
2498+ }
2499+ if(curLon<0)
2500+ {
2501+ lonEWPicker.selectedIndex = 1;
2502+ curLon *= -1;
2503+ }
2504+ latDegPicker.selectedIndex = Math.floor(curLat);
2505+ curLat = (curLat-Math.floor(curLat))*60;
2506+ latMinPicker.selectedIndex = Math.floor(curLat);
2507+ curLat = (curLat-Math.floor(curLat))*10;
2508+ latFracPicker1.selectedIndex = Math.floor(curLat);
2509+ curLat = (curLat-Math.floor(curLat))*10;
2510+ latFracPicker2.selectedIndex = Math.floor(curLat);
2511+ curLat = (curLat-Math.floor(curLat))*10;
2512+ latFracPicker3.selectedIndex = Math.floor(curLat);
2513+
2514+ lonDegPicker.selectedIndex = Math.floor(curLon);
2515+ curLon = (curLon-Math.floor(curLon))*60;
2516+ lonMinPicker.selectedIndex = Math.floor(curLon);
2517+ curLon = (curLon-Math.floor(curLon))*10;
2518+ lonFracPicker1.selectedIndex = Math.floor(curLon);
2519+ curLon = (curLon-Math.floor(curLon))*10;
2520+ lonFracPicker2.selectedIndex = Math.floor(curLon);
2521+ curLon = (curLon-Math.floor(curLon))*10;
2522+ lonFracPicker3.selectedIndex = Math.floor(curLon);
2523+
2524+
2525+ }
2526+ }
2527+ }
2528+}
2529
2530=== added file 'app/ui/cachemere.svg'
2531--- app/ui/cachemere.svg 1970-01-01 00:00:00 +0000
2532+++ app/ui/cachemere.svg 2015-04-28 21:23:25 +0000
2533@@ -0,0 +1,2109 @@
2534+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2535+<!-- Created with Inkscape (http://www.inkscape.org/) -->
2536+
2537+<svg
2538+ xmlns:dc="http://purl.org/dc/elements/1.1/"
2539+ xmlns:cc="http://creativecommons.org/ns#"
2540+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
2541+ xmlns:svg="http://www.w3.org/2000/svg"
2542+ xmlns="http://www.w3.org/2000/svg"
2543+ xmlns:xlink="http://www.w3.org/1999/xlink"
2544+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
2545+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
2546+ id="svg2"
2547+ viewBox="0 0 300 300"
2548+ version="1.0"
2549+ inkscape:version="0.48.5 r10040"
2550+ width="100%"
2551+ height="100%"
2552+ sodipodi:docname="cachemere.svg">
2553+ <defs
2554+ id="defs3185">
2555+ <marker
2556+ id="Dot_m"
2557+ refY="0"
2558+ refX="0"
2559+ style="overflow:visible"
2560+ orient="auto"
2561+ inkscape:stockid="Dot_m">
2562+ <path
2563+ inkscape:connector-curvature="0"
2564+ id="path6423"
2565+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2566+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2567+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2568+ </marker>
2569+ <marker
2570+ id="marker3201"
2571+ refY="0"
2572+ refX="0"
2573+ style="overflow:visible"
2574+ orient="auto"
2575+ inkscape:stockid="Dot_m">
2576+ <path
2577+ inkscape:connector-curvature="0"
2578+ id="path3203-4"
2579+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2580+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2581+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2582+ </marker>
2583+ <marker
2584+ id="marker3205"
2585+ refY="0"
2586+ refX="0"
2587+ style="overflow:visible"
2588+ orient="auto"
2589+ inkscape:stockid="Dot_m">
2590+ <path
2591+ inkscape:connector-curvature="0"
2592+ id="path3207"
2593+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2594+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2595+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2596+ </marker>
2597+ <linearGradient
2598+ id="linearGradient25311-5"
2599+ y2="351.37"
2600+ spreadMethod="repeat"
2601+ gradientUnits="userSpaceOnUse"
2602+ x2="1090"
2603+ gradientTransform="matrix(0,-0.68685,1.2364,0,-309.80703,201.44694)"
2604+ y1="351.37"
2605+ x1="528.02002"
2606+ inkscape:collect="always">
2607+ <stop
2608+ id="stop25264-2"
2609+ style="stop-color:white"
2610+ offset="0" />
2611+ <stop
2612+ id="stop25272-8"
2613+ style="stop-color:white"
2614+ offset="0.46" />
2615+ <stop
2616+ id="stop25270-4"
2617+ style="stop-color:white;stop-opacity:0"
2618+ offset="1" />
2619+ </linearGradient>
2620+ <filter
2621+ color-interpolation-filters="sRGB"
2622+ id="filter3640-7"
2623+ inkscape:collect="always">
2624+ <feGaussianBlur
2625+ id="feGaussianBlur3642-3"
2626+ stdDeviation="4.5427523"
2627+ inkscape:collect="always" />
2628+ </filter>
2629+ <radialGradient
2630+ id="radialGradient25309-2"
2631+ gradientUnits="userSpaceOnUse"
2632+ cy="477.09"
2633+ cx="809.03003"
2634+ gradientTransform="translate(-684.37703,-690.60208)"
2635+ r="335.09"
2636+ inkscape:collect="always">
2637+ <stop
2638+ id="stop23472-4"
2639+ style="stop-color:#00ccd3;stop-opacity:.78431"
2640+ offset="0" />
2641+ <stop
2642+ id="stop23478-4"
2643+ style="stop-color:#00dce2;stop-opacity:.58824"
2644+ offset=".5" />
2645+ <stop
2646+ id="stop23480-2"
2647+ style="stop-color:#00f8ff;stop-opacity:.58824"
2648+ offset=".75" />
2649+ <stop
2650+ id="stop23474-1"
2651+ style="stop-color:#3e6dd3;stop-opacity:.55114"
2652+ offset="1" />
2653+ </radialGradient>
2654+ <filter
2655+ color-interpolation-filters="sRGB"
2656+ id="filter3692-7"
2657+ inkscape:collect="always">
2658+ <feGaussianBlur
2659+ id="feGaussianBlur3694-8"
2660+ stdDeviation="12.000315"
2661+ inkscape:collect="always" />
2662+ </filter>
2663+ <marker
2664+ id="Dot_m-3"
2665+ refY="0"
2666+ refX="0"
2667+ style="overflow:visible"
2668+ orient="auto"
2669+ inkscape:stockid="Dot_m">
2670+ <path
2671+ inkscape:connector-curvature="0"
2672+ id="path6423-1"
2673+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2674+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2675+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2676+ </marker>
2677+ <marker
2678+ id="marker3501"
2679+ refY="0"
2680+ refX="0"
2681+ style="overflow:visible"
2682+ orient="auto"
2683+ inkscape:stockid="Dot_m">
2684+ <path
2685+ inkscape:connector-curvature="0"
2686+ id="path3503"
2687+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2688+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2689+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2690+ </marker>
2691+ <marker
2692+ id="marker3505"
2693+ refY="0"
2694+ refX="0"
2695+ style="overflow:visible"
2696+ orient="auto"
2697+ inkscape:stockid="Dot_m">
2698+ <path
2699+ inkscape:connector-curvature="0"
2700+ id="path3507"
2701+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2702+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2703+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2704+ </marker>
2705+ <filter
2706+ color-interpolation-filters="sRGB"
2707+ id="filter3686-9"
2708+ height="1.24"
2709+ width="1.24"
2710+ y="-0.12"
2711+ x="-0.12"
2712+ inkscape:collect="always">
2713+ <feGaussianBlur
2714+ id="feGaussianBlur3688-3"
2715+ stdDeviation="33.429449"
2716+ inkscape:collect="always" />
2717+ </filter>
2718+ <linearGradient
2719+ id="linearGradient25311-1"
2720+ y2="351.37"
2721+ spreadMethod="repeat"
2722+ gradientUnits="userSpaceOnUse"
2723+ x2="1090"
2724+ gradientTransform="matrix(0,-0.68685,1.2364,0,-309.80703,201.44694)"
2725+ y1="351.37"
2726+ x1="528.02002"
2727+ inkscape:collect="always">
2728+ <stop
2729+ id="stop25264-8"
2730+ style="stop-color:white"
2731+ offset="0" />
2732+ <stop
2733+ id="stop25272-86"
2734+ style="stop-color:white"
2735+ offset="0.46" />
2736+ <stop
2737+ id="stop25270-6"
2738+ style="stop-color:white;stop-opacity:0"
2739+ offset="1" />
2740+ </linearGradient>
2741+ <filter
2742+ color-interpolation-filters="sRGB"
2743+ id="filter3640-4"
2744+ inkscape:collect="always">
2745+ <feGaussianBlur
2746+ id="feGaussianBlur3642-9"
2747+ stdDeviation="4.5427523"
2748+ inkscape:collect="always" />
2749+ </filter>
2750+ <radialGradient
2751+ id="radialGradient25309-7"
2752+ gradientUnits="userSpaceOnUse"
2753+ cy="477.09"
2754+ cx="809.03003"
2755+ gradientTransform="translate(-684.37703,-690.60208)"
2756+ r="335.09"
2757+ inkscape:collect="always">
2758+ <stop
2759+ id="stop23472-0"
2760+ style="stop-color:#00ccd3;stop-opacity:.78431"
2761+ offset="0" />
2762+ <stop
2763+ id="stop23478-6"
2764+ style="stop-color:#00dce2;stop-opacity:.58824"
2765+ offset=".5" />
2766+ <stop
2767+ id="stop23480-4"
2768+ style="stop-color:#00f8ff;stop-opacity:.58824"
2769+ offset=".75" />
2770+ <stop
2771+ id="stop23474-15"
2772+ style="stop-color:#3e6dd3;stop-opacity:.55114"
2773+ offset="1" />
2774+ </radialGradient>
2775+ <filter
2776+ color-interpolation-filters="sRGB"
2777+ id="filter3692-8"
2778+ inkscape:collect="always">
2779+ <feGaussianBlur
2780+ id="feGaussianBlur3694-6"
2781+ stdDeviation="12.000315"
2782+ inkscape:collect="always" />
2783+ </filter>
2784+ <marker
2785+ id="Dot_m-8"
2786+ refY="0"
2787+ refX="0"
2788+ style="overflow:visible"
2789+ orient="auto"
2790+ inkscape:stockid="Dot_m">
2791+ <path
2792+ inkscape:connector-curvature="0"
2793+ id="path6423-2"
2794+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2795+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2796+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2797+ </marker>
2798+ <marker
2799+ id="marker3501-9"
2800+ refY="0"
2801+ refX="0"
2802+ style="overflow:visible"
2803+ orient="auto"
2804+ inkscape:stockid="Dot_m">
2805+ <path
2806+ inkscape:connector-curvature="0"
2807+ id="path3503-2"
2808+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2809+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2810+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2811+ </marker>
2812+ <marker
2813+ id="marker3505-1"
2814+ refY="0"
2815+ refX="0"
2816+ style="overflow:visible"
2817+ orient="auto"
2818+ inkscape:stockid="Dot_m">
2819+ <path
2820+ inkscape:connector-curvature="0"
2821+ id="path3507-6"
2822+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
2823+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
2824+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" />
2825+ </marker>
2826+ <filter
2827+ color-interpolation-filters="sRGB"
2828+ id="filter3686-4"
2829+ height="1.24"
2830+ width="1.24"
2831+ y="-0.12"
2832+ x="-0.12"
2833+ inkscape:collect="always">
2834+ <feGaussianBlur
2835+ id="feGaussianBlur3688-37"
2836+ stdDeviation="33.429449"
2837+ inkscape:collect="always" />
2838+ </filter>
2839+ <radialGradient
2840+ id="radialGradient50844"
2841+ fx="291.41"
2842+ fy="273.56"
2843+ xlink:href="#linearGradient14418"
2844+ spreadMethod="reflect"
2845+ gradientUnits="userSpaceOnUse"
2846+ cy="273.66"
2847+ cx="291.32001"
2848+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
2849+ r="2.3099"
2850+ inkscape:collect="always" />
2851+ <linearGradient
2852+ id="linearGradient14418">
2853+ <stop
2854+ id="stop14419"
2855+ style="stop-color:#e0b524"
2856+ offset="0" />
2857+ <stop
2858+ id="stop14420"
2859+ style="stop-color:#f3d727"
2860+ offset="1" />
2861+ </linearGradient>
2862+ <radialGradient
2863+ id="radialGradient50845"
2864+ fx="291.41"
2865+ fy="273.56"
2866+ xlink:href="#linearGradient14418"
2867+ spreadMethod="reflect"
2868+ gradientUnits="userSpaceOnUse"
2869+ cy="273.66"
2870+ cx="291.32001"
2871+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
2872+ r="2.3099"
2873+ inkscape:collect="always" />
2874+ <linearGradient
2875+ id="linearGradient4045">
2876+ <stop
2877+ id="stop4047"
2878+ style="stop-color:#e0b524"
2879+ offset="0" />
2880+ <stop
2881+ id="stop4049"
2882+ style="stop-color:#f3d727"
2883+ offset="1" />
2884+ </linearGradient>
2885+ <radialGradient
2886+ id="radialGradient50846"
2887+ fx="291.41"
2888+ fy="273.56"
2889+ xlink:href="#linearGradient14418"
2890+ spreadMethod="reflect"
2891+ gradientUnits="userSpaceOnUse"
2892+ cy="273.66"
2893+ cx="291.32001"
2894+ gradientTransform="scale(1.0115,0.98863)"
2895+ r="2.3099"
2896+ inkscape:collect="always" />
2897+ <linearGradient
2898+ id="linearGradient4052">
2899+ <stop
2900+ id="stop4054"
2901+ style="stop-color:#e0b524"
2902+ offset="0" />
2903+ <stop
2904+ id="stop4056"
2905+ style="stop-color:#f3d727"
2906+ offset="1" />
2907+ </linearGradient>
2908+ <radialGradient
2909+ id="radialGradient4058"
2910+ fx="291.41"
2911+ fy="273.56"
2912+ xlink:href="#linearGradient14418"
2913+ spreadMethod="reflect"
2914+ gradientUnits="userSpaceOnUse"
2915+ cy="273.66"
2916+ cx="291.32001"
2917+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
2918+ r="2.3099"
2919+ inkscape:collect="always" />
2920+ <linearGradient
2921+ id="linearGradient4060">
2922+ <stop
2923+ id="stop4062"
2924+ style="stop-color:#e0b524"
2925+ offset="0" />
2926+ <stop
2927+ id="stop4064"
2928+ style="stop-color:#f3d727"
2929+ offset="1" />
2930+ </linearGradient>
2931+ <radialGradient
2932+ id="radialGradient4066"
2933+ fx="291.41"
2934+ fy="273.56"
2935+ xlink:href="#linearGradient14418"
2936+ spreadMethod="reflect"
2937+ gradientUnits="userSpaceOnUse"
2938+ cy="273.66"
2939+ cx="291.32001"
2940+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
2941+ r="2.3099"
2942+ inkscape:collect="always" />
2943+ <linearGradient
2944+ id="linearGradient4068">
2945+ <stop
2946+ id="stop4070"
2947+ style="stop-color:#e0b524"
2948+ offset="0" />
2949+ <stop
2950+ id="stop4072"
2951+ style="stop-color:#f3d727"
2952+ offset="1" />
2953+ </linearGradient>
2954+ <radialGradient
2955+ id="radialGradient4074"
2956+ fx="291.41"
2957+ fy="273.56"
2958+ xlink:href="#linearGradient14418"
2959+ spreadMethod="reflect"
2960+ gradientUnits="userSpaceOnUse"
2961+ cy="273.66"
2962+ cx="291.32001"
2963+ gradientTransform="scale(1.0115,0.98863)"
2964+ r="2.3099"
2965+ inkscape:collect="always" />
2966+ <linearGradient
2967+ id="linearGradient4076">
2968+ <stop
2969+ id="stop4078"
2970+ style="stop-color:#e0b524"
2971+ offset="0" />
2972+ <stop
2973+ id="stop4080"
2974+ style="stop-color:#f3d727"
2975+ offset="1" />
2976+ </linearGradient>
2977+ <radialGradient
2978+ id="radialGradient4082"
2979+ fx="291.41"
2980+ fy="273.56"
2981+ xlink:href="#linearGradient14418"
2982+ spreadMethod="reflect"
2983+ gradientUnits="userSpaceOnUse"
2984+ cy="273.66"
2985+ cx="291.32001"
2986+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
2987+ r="2.3099"
2988+ inkscape:collect="always" />
2989+ <linearGradient
2990+ id="linearGradient4084">
2991+ <stop
2992+ id="stop4086"
2993+ style="stop-color:#e0b524"
2994+ offset="0" />
2995+ <stop
2996+ id="stop4088"
2997+ style="stop-color:#f3d727"
2998+ offset="1" />
2999+ </linearGradient>
3000+ <radialGradient
3001+ id="radialGradient4090"
3002+ fx="291.41"
3003+ fy="273.56"
3004+ xlink:href="#linearGradient14418"
3005+ spreadMethod="reflect"
3006+ gradientUnits="userSpaceOnUse"
3007+ cy="273.66"
3008+ cx="291.32001"
3009+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3010+ r="2.3099"
3011+ inkscape:collect="always" />
3012+ <linearGradient
3013+ id="linearGradient4092">
3014+ <stop
3015+ id="stop4094"
3016+ style="stop-color:#e0b524"
3017+ offset="0" />
3018+ <stop
3019+ id="stop4096"
3020+ style="stop-color:#f3d727"
3021+ offset="1" />
3022+ </linearGradient>
3023+ <radialGradient
3024+ id="radialGradient4098"
3025+ fx="291.41"
3026+ fy="273.56"
3027+ xlink:href="#linearGradient14418"
3028+ spreadMethod="reflect"
3029+ gradientUnits="userSpaceOnUse"
3030+ cy="273.66"
3031+ cx="291.32001"
3032+ gradientTransform="scale(1.0115,0.98863)"
3033+ r="2.3099"
3034+ inkscape:collect="always" />
3035+ <linearGradient
3036+ id="linearGradient4100">
3037+ <stop
3038+ id="stop4102"
3039+ style="stop-color:#e0b524"
3040+ offset="0" />
3041+ <stop
3042+ id="stop4104"
3043+ style="stop-color:#f3d727"
3044+ offset="1" />
3045+ </linearGradient>
3046+ <radialGradient
3047+ id="radialGradient4106"
3048+ fx="291.41"
3049+ fy="273.56"
3050+ xlink:href="#linearGradient14418"
3051+ spreadMethod="reflect"
3052+ gradientUnits="userSpaceOnUse"
3053+ cy="273.66"
3054+ cx="291.32001"
3055+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3056+ r="2.3099"
3057+ inkscape:collect="always" />
3058+ <linearGradient
3059+ id="linearGradient4108">
3060+ <stop
3061+ id="stop4110"
3062+ style="stop-color:#e0b524"
3063+ offset="0" />
3064+ <stop
3065+ id="stop4112"
3066+ style="stop-color:#f3d727"
3067+ offset="1" />
3068+ </linearGradient>
3069+ <radialGradient
3070+ id="radialGradient4114"
3071+ fx="291.41"
3072+ fy="273.56"
3073+ xlink:href="#linearGradient14418"
3074+ spreadMethod="reflect"
3075+ gradientUnits="userSpaceOnUse"
3076+ cy="273.66"
3077+ cx="291.32001"
3078+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3079+ r="2.3099"
3080+ inkscape:collect="always" />
3081+ <linearGradient
3082+ id="linearGradient4116">
3083+ <stop
3084+ id="stop4118"
3085+ style="stop-color:#e0b524"
3086+ offset="0" />
3087+ <stop
3088+ id="stop4120"
3089+ style="stop-color:#f3d727"
3090+ offset="1" />
3091+ </linearGradient>
3092+ <radialGradient
3093+ id="radialGradient4122"
3094+ fx="291.41"
3095+ fy="273.56"
3096+ xlink:href="#linearGradient14418"
3097+ spreadMethod="reflect"
3098+ gradientUnits="userSpaceOnUse"
3099+ cy="273.66"
3100+ cx="291.32001"
3101+ gradientTransform="scale(1.0115,0.98863)"
3102+ r="2.3099"
3103+ inkscape:collect="always" />
3104+ <linearGradient
3105+ id="linearGradient4124">
3106+ <stop
3107+ id="stop4126"
3108+ style="stop-color:#e0b524"
3109+ offset="0" />
3110+ <stop
3111+ id="stop4128"
3112+ style="stop-color:#f3d727"
3113+ offset="1" />
3114+ </linearGradient>
3115+ <radialGradient
3116+ id="radialGradient4130"
3117+ fx="291.41"
3118+ fy="273.56"
3119+ xlink:href="#linearGradient14418"
3120+ spreadMethod="reflect"
3121+ gradientUnits="userSpaceOnUse"
3122+ cy="273.66"
3123+ cx="291.32001"
3124+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3125+ r="2.3099"
3126+ inkscape:collect="always" />
3127+ <linearGradient
3128+ id="linearGradient4132">
3129+ <stop
3130+ id="stop4134"
3131+ style="stop-color:#e0b524"
3132+ offset="0" />
3133+ <stop
3134+ id="stop4136"
3135+ style="stop-color:#f3d727"
3136+ offset="1" />
3137+ </linearGradient>
3138+ <radialGradient
3139+ id="radialGradient4138"
3140+ fx="291.41"
3141+ fy="273.56"
3142+ xlink:href="#linearGradient14418"
3143+ spreadMethod="reflect"
3144+ gradientUnits="userSpaceOnUse"
3145+ cy="273.66"
3146+ cx="291.32001"
3147+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3148+ r="2.3099"
3149+ inkscape:collect="always" />
3150+ <linearGradient
3151+ id="linearGradient4140">
3152+ <stop
3153+ id="stop4142"
3154+ style="stop-color:#e0b524"
3155+ offset="0" />
3156+ <stop
3157+ id="stop4144"
3158+ style="stop-color:#f3d727"
3159+ offset="1" />
3160+ </linearGradient>
3161+ <radialGradient
3162+ id="radialGradient4146"
3163+ fx="291.41"
3164+ fy="273.56"
3165+ xlink:href="#linearGradient14418"
3166+ spreadMethod="reflect"
3167+ gradientUnits="userSpaceOnUse"
3168+ cy="273.66"
3169+ cx="291.32001"
3170+ gradientTransform="scale(1.0115,0.98863)"
3171+ r="2.3099"
3172+ inkscape:collect="always" />
3173+ <linearGradient
3174+ id="linearGradient4148">
3175+ <stop
3176+ id="stop4150"
3177+ style="stop-color:#e0b524"
3178+ offset="0" />
3179+ <stop
3180+ id="stop4152"
3181+ style="stop-color:#f3d727"
3182+ offset="1" />
3183+ </linearGradient>
3184+ <radialGradient
3185+ id="radialGradient4154"
3186+ fx="291.41"
3187+ fy="273.56"
3188+ xlink:href="#linearGradient14418"
3189+ spreadMethod="reflect"
3190+ gradientUnits="userSpaceOnUse"
3191+ cy="273.66"
3192+ cx="291.32001"
3193+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3194+ r="2.3099"
3195+ inkscape:collect="always" />
3196+ <linearGradient
3197+ id="linearGradient4156">
3198+ <stop
3199+ id="stop4158"
3200+ style="stop-color:#e0b524"
3201+ offset="0" />
3202+ <stop
3203+ id="stop4160"
3204+ style="stop-color:#f3d727"
3205+ offset="1" />
3206+ </linearGradient>
3207+ <radialGradient
3208+ id="radialGradient4162"
3209+ fx="291.41"
3210+ fy="273.56"
3211+ xlink:href="#linearGradient14418"
3212+ spreadMethod="reflect"
3213+ gradientUnits="userSpaceOnUse"
3214+ cy="273.66"
3215+ cx="291.32001"
3216+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3217+ r="2.3099"
3218+ inkscape:collect="always" />
3219+ <linearGradient
3220+ id="linearGradient4164">
3221+ <stop
3222+ id="stop4166"
3223+ style="stop-color:#e0b524"
3224+ offset="0" />
3225+ <stop
3226+ id="stop4168"
3227+ style="stop-color:#f3d727"
3228+ offset="1" />
3229+ </linearGradient>
3230+ <radialGradient
3231+ id="radialGradient4170"
3232+ fx="291.41"
3233+ fy="273.56"
3234+ xlink:href="#linearGradient14418"
3235+ spreadMethod="reflect"
3236+ gradientUnits="userSpaceOnUse"
3237+ cy="273.66"
3238+ cx="291.32001"
3239+ gradientTransform="scale(1.0115,0.98863)"
3240+ r="2.3099"
3241+ inkscape:collect="always" />
3242+ <linearGradient
3243+ id="linearGradient4172">
3244+ <stop
3245+ id="stop4174"
3246+ style="stop-color:#e0b524"
3247+ offset="0" />
3248+ <stop
3249+ id="stop4176"
3250+ style="stop-color:#f3d727"
3251+ offset="1" />
3252+ </linearGradient>
3253+ <radialGradient
3254+ id="radialGradient4178"
3255+ fx="291.41"
3256+ fy="273.56"
3257+ xlink:href="#linearGradient14418"
3258+ spreadMethod="reflect"
3259+ gradientUnits="userSpaceOnUse"
3260+ cy="273.66"
3261+ cx="291.32001"
3262+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3263+ r="2.3099"
3264+ inkscape:collect="always" />
3265+ <linearGradient
3266+ id="linearGradient4180">
3267+ <stop
3268+ id="stop4182"
3269+ style="stop-color:#e0b524"
3270+ offset="0" />
3271+ <stop
3272+ id="stop4184"
3273+ style="stop-color:#f3d727"
3274+ offset="1" />
3275+ </linearGradient>
3276+ <radialGradient
3277+ id="radialGradient4186"
3278+ fx="291.41"
3279+ fy="273.56"
3280+ xlink:href="#linearGradient14418"
3281+ spreadMethod="reflect"
3282+ gradientUnits="userSpaceOnUse"
3283+ cy="273.66"
3284+ cx="291.32001"
3285+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3286+ r="2.3099"
3287+ inkscape:collect="always" />
3288+ <linearGradient
3289+ id="linearGradient4188">
3290+ <stop
3291+ id="stop4190"
3292+ style="stop-color:#e0b524"
3293+ offset="0" />
3294+ <stop
3295+ id="stop4192"
3296+ style="stop-color:#f3d727"
3297+ offset="1" />
3298+ </linearGradient>
3299+ <radialGradient
3300+ id="radialGradient4194"
3301+ fx="291.41"
3302+ fy="273.56"
3303+ xlink:href="#linearGradient14418"
3304+ spreadMethod="reflect"
3305+ gradientUnits="userSpaceOnUse"
3306+ cy="273.66"
3307+ cx="291.32001"
3308+ gradientTransform="scale(1.0115,0.98863)"
3309+ r="2.3099"
3310+ inkscape:collect="always" />
3311+ <linearGradient
3312+ id="linearGradient4196">
3313+ <stop
3314+ id="stop4198"
3315+ style="stop-color:#e0b524"
3316+ offset="0" />
3317+ <stop
3318+ id="stop4200"
3319+ style="stop-color:#f3d727"
3320+ offset="1" />
3321+ </linearGradient>
3322+ <radialGradient
3323+ id="radialGradient4202"
3324+ fx="291.41"
3325+ fy="273.56"
3326+ xlink:href="#linearGradient14418"
3327+ spreadMethod="reflect"
3328+ gradientUnits="userSpaceOnUse"
3329+ cy="273.66"
3330+ cx="291.32001"
3331+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3332+ r="2.3099"
3333+ inkscape:collect="always" />
3334+ <linearGradient
3335+ id="linearGradient4204">
3336+ <stop
3337+ id="stop4206"
3338+ style="stop-color:#e0b524"
3339+ offset="0" />
3340+ <stop
3341+ id="stop4208"
3342+ style="stop-color:#f3d727"
3343+ offset="1" />
3344+ </linearGradient>
3345+ <radialGradient
3346+ id="radialGradient4210"
3347+ fx="291.41"
3348+ fy="273.56"
3349+ xlink:href="#linearGradient14418"
3350+ spreadMethod="reflect"
3351+ gradientUnits="userSpaceOnUse"
3352+ cy="273.66"
3353+ cx="291.32001"
3354+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3355+ r="2.3099"
3356+ inkscape:collect="always" />
3357+ <linearGradient
3358+ id="linearGradient4212">
3359+ <stop
3360+ id="stop4214"
3361+ style="stop-color:#e0b524"
3362+ offset="0" />
3363+ <stop
3364+ id="stop4216"
3365+ style="stop-color:#f3d727"
3366+ offset="1" />
3367+ </linearGradient>
3368+ <radialGradient
3369+ id="radialGradient4218"
3370+ fx="291.41"
3371+ fy="273.56"
3372+ xlink:href="#linearGradient14418"
3373+ spreadMethod="reflect"
3374+ gradientUnits="userSpaceOnUse"
3375+ cy="273.66"
3376+ cx="291.32001"
3377+ gradientTransform="scale(1.0115,0.98863)"
3378+ r="2.3099"
3379+ inkscape:collect="always" />
3380+ <linearGradient
3381+ id="linearGradient4220">
3382+ <stop
3383+ id="stop4222"
3384+ style="stop-color:#e0b524"
3385+ offset="0" />
3386+ <stop
3387+ id="stop4224"
3388+ style="stop-color:#f3d727"
3389+ offset="1" />
3390+ </linearGradient>
3391+ <radialGradient
3392+ id="radialGradient4226"
3393+ fx="291.41"
3394+ fy="273.56"
3395+ xlink:href="#linearGradient14418"
3396+ spreadMethod="reflect"
3397+ gradientUnits="userSpaceOnUse"
3398+ cy="273.66"
3399+ cx="291.32001"
3400+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3401+ r="2.3099"
3402+ inkscape:collect="always" />
3403+ <linearGradient
3404+ id="linearGradient4228">
3405+ <stop
3406+ id="stop4230"
3407+ style="stop-color:#e0b524"
3408+ offset="0" />
3409+ <stop
3410+ id="stop4232"
3411+ style="stop-color:#f3d727"
3412+ offset="1" />
3413+ </linearGradient>
3414+ <radialGradient
3415+ id="radialGradient4234"
3416+ fx="291.41"
3417+ fy="273.56"
3418+ xlink:href="#linearGradient14418"
3419+ spreadMethod="reflect"
3420+ gradientUnits="userSpaceOnUse"
3421+ cy="273.66"
3422+ cx="291.32001"
3423+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3424+ r="2.3099"
3425+ inkscape:collect="always" />
3426+ <linearGradient
3427+ id="linearGradient4236">
3428+ <stop
3429+ id="stop4238"
3430+ style="stop-color:#e0b524"
3431+ offset="0" />
3432+ <stop
3433+ id="stop4240"
3434+ style="stop-color:#f3d727"
3435+ offset="1" />
3436+ </linearGradient>
3437+ <radialGradient
3438+ id="radialGradient4242"
3439+ fx="291.41"
3440+ fy="273.56"
3441+ xlink:href="#linearGradient14418"
3442+ spreadMethod="reflect"
3443+ gradientUnits="userSpaceOnUse"
3444+ cy="273.66"
3445+ cx="291.32001"
3446+ gradientTransform="scale(1.0115,0.98863)"
3447+ r="2.3099"
3448+ inkscape:collect="always" />
3449+ <linearGradient
3450+ id="linearGradient4244">
3451+ <stop
3452+ id="stop4246"
3453+ style="stop-color:#e0b524"
3454+ offset="0" />
3455+ <stop
3456+ id="stop4248"
3457+ style="stop-color:#f3d727"
3458+ offset="1" />
3459+ </linearGradient>
3460+ <radialGradient
3461+ id="radialGradient4250"
3462+ fx="291.41"
3463+ fy="273.56"
3464+ xlink:href="#linearGradient14418"
3465+ spreadMethod="reflect"
3466+ gradientUnits="userSpaceOnUse"
3467+ cy="273.66"
3468+ cx="291.32001"
3469+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3470+ r="2.3099"
3471+ inkscape:collect="always" />
3472+ <linearGradient
3473+ id="linearGradient4252">
3474+ <stop
3475+ id="stop4254"
3476+ style="stop-color:#e0b524"
3477+ offset="0" />
3478+ <stop
3479+ id="stop4256"
3480+ style="stop-color:#f3d727"
3481+ offset="1" />
3482+ </linearGradient>
3483+ <radialGradient
3484+ id="radialGradient4258"
3485+ fx="291.41"
3486+ fy="273.56"
3487+ xlink:href="#linearGradient14418"
3488+ spreadMethod="reflect"
3489+ gradientUnits="userSpaceOnUse"
3490+ cy="273.66"
3491+ cx="291.32001"
3492+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3493+ r="2.3099"
3494+ inkscape:collect="always" />
3495+ <linearGradient
3496+ id="linearGradient4260">
3497+ <stop
3498+ id="stop4262"
3499+ style="stop-color:#e0b524"
3500+ offset="0" />
3501+ <stop
3502+ id="stop4264"
3503+ style="stop-color:#f3d727"
3504+ offset="1" />
3505+ </linearGradient>
3506+ <radialGradient
3507+ id="radialGradient4266"
3508+ fx="291.41"
3509+ fy="273.56"
3510+ xlink:href="#linearGradient14418"
3511+ spreadMethod="reflect"
3512+ gradientUnits="userSpaceOnUse"
3513+ cy="273.66"
3514+ cx="291.32001"
3515+ gradientTransform="scale(1.0115,0.98863)"
3516+ r="2.3099"
3517+ inkscape:collect="always" />
3518+ <linearGradient
3519+ id="linearGradient4268">
3520+ <stop
3521+ id="stop4270"
3522+ style="stop-color:#e0b524"
3523+ offset="0" />
3524+ <stop
3525+ id="stop4272"
3526+ style="stop-color:#f3d727"
3527+ offset="1" />
3528+ </linearGradient>
3529+ <radialGradient
3530+ r="2.3099"
3531+ fy="273.56"
3532+ fx="291.41"
3533+ cy="273.66"
3534+ cx="291.32001"
3535+ spreadMethod="reflect"
3536+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3537+ gradientUnits="userSpaceOnUse"
3538+ id="radialGradient4320"
3539+ xlink:href="#linearGradient14418"
3540+ inkscape:collect="always" />
3541+ <radialGradient
3542+ r="2.3099"
3543+ fy="273.56"
3544+ fx="291.41"
3545+ cy="273.66"
3546+ cx="291.32001"
3547+ spreadMethod="reflect"
3548+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3549+ gradientUnits="userSpaceOnUse"
3550+ id="radialGradient4322"
3551+ xlink:href="#linearGradient14418"
3552+ inkscape:collect="always" />
3553+ <radialGradient
3554+ r="2.3099"
3555+ fy="273.56"
3556+ fx="291.41"
3557+ cy="273.66"
3558+ cx="291.32001"
3559+ spreadMethod="reflect"
3560+ gradientTransform="scale(1.0115,0.98863)"
3561+ gradientUnits="userSpaceOnUse"
3562+ id="radialGradient4324"
3563+ xlink:href="#linearGradient14418"
3564+ inkscape:collect="always" />
3565+ <radialGradient
3566+ r="2.3099"
3567+ fy="273.56"
3568+ fx="291.41"
3569+ cy="273.66"
3570+ cx="291.32001"
3571+ spreadMethod="reflect"
3572+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3573+ gradientUnits="userSpaceOnUse"
3574+ id="radialGradient4326"
3575+ xlink:href="#linearGradient14418"
3576+ inkscape:collect="always" />
3577+ <radialGradient
3578+ r="2.3099"
3579+ fy="273.56"
3580+ fx="291.41"
3581+ cy="273.66"
3582+ cx="291.32001"
3583+ spreadMethod="reflect"
3584+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3585+ gradientUnits="userSpaceOnUse"
3586+ id="radialGradient4328"
3587+ xlink:href="#linearGradient14418"
3588+ inkscape:collect="always" />
3589+ <radialGradient
3590+ r="2.3099"
3591+ fy="273.56"
3592+ fx="291.41"
3593+ cy="273.66"
3594+ cx="291.32001"
3595+ spreadMethod="reflect"
3596+ gradientTransform="scale(1.0115,0.98863)"
3597+ gradientUnits="userSpaceOnUse"
3598+ id="radialGradient4330"
3599+ xlink:href="#linearGradient14418"
3600+ inkscape:collect="always" />
3601+ <radialGradient
3602+ r="2.3099"
3603+ fy="273.56"
3604+ fx="291.41"
3605+ cy="273.66"
3606+ cx="291.32001"
3607+ spreadMethod="reflect"
3608+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3609+ gradientUnits="userSpaceOnUse"
3610+ id="radialGradient4332"
3611+ xlink:href="#linearGradient14418"
3612+ inkscape:collect="always" />
3613+ <radialGradient
3614+ r="2.3099"
3615+ fy="273.56"
3616+ fx="291.41"
3617+ cy="273.66"
3618+ cx="291.32001"
3619+ spreadMethod="reflect"
3620+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3621+ gradientUnits="userSpaceOnUse"
3622+ id="radialGradient4334"
3623+ xlink:href="#linearGradient14418"
3624+ inkscape:collect="always" />
3625+ <radialGradient
3626+ r="2.3099"
3627+ fy="273.56"
3628+ fx="291.41"
3629+ cy="273.66"
3630+ cx="291.32001"
3631+ spreadMethod="reflect"
3632+ gradientTransform="scale(1.0115,0.98863)"
3633+ gradientUnits="userSpaceOnUse"
3634+ id="radialGradient4336"
3635+ xlink:href="#linearGradient14418"
3636+ inkscape:collect="always" />
3637+ <radialGradient
3638+ r="2.3099"
3639+ fy="273.56"
3640+ fx="291.41"
3641+ cy="273.66"
3642+ cx="291.32001"
3643+ spreadMethod="reflect"
3644+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3645+ gradientUnits="userSpaceOnUse"
3646+ id="radialGradient4338"
3647+ xlink:href="#linearGradient14418"
3648+ inkscape:collect="always" />
3649+ <radialGradient
3650+ r="2.3099"
3651+ fy="273.56"
3652+ fx="291.41"
3653+ cy="273.66"
3654+ cx="291.32001"
3655+ spreadMethod="reflect"
3656+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3657+ gradientUnits="userSpaceOnUse"
3658+ id="radialGradient4340"
3659+ xlink:href="#linearGradient14418"
3660+ inkscape:collect="always" />
3661+ <radialGradient
3662+ r="2.3099"
3663+ fy="273.56"
3664+ fx="291.41"
3665+ cy="273.66"
3666+ cx="291.32001"
3667+ spreadMethod="reflect"
3668+ gradientTransform="scale(1.0115,0.98863)"
3669+ gradientUnits="userSpaceOnUse"
3670+ id="radialGradient4342"
3671+ xlink:href="#linearGradient14418"
3672+ inkscape:collect="always" />
3673+ <radialGradient
3674+ r="2.3099"
3675+ fy="273.56"
3676+ fx="291.41"
3677+ cy="273.66"
3678+ cx="291.32001"
3679+ spreadMethod="reflect"
3680+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3681+ gradientUnits="userSpaceOnUse"
3682+ id="radialGradient4344"
3683+ xlink:href="#linearGradient14418"
3684+ inkscape:collect="always" />
3685+ <radialGradient
3686+ r="2.3099"
3687+ fy="273.56"
3688+ fx="291.41"
3689+ cy="273.66"
3690+ cx="291.32001"
3691+ spreadMethod="reflect"
3692+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3693+ gradientUnits="userSpaceOnUse"
3694+ id="radialGradient4346"
3695+ xlink:href="#linearGradient14418"
3696+ inkscape:collect="always" />
3697+ <radialGradient
3698+ r="2.3099"
3699+ fy="273.56"
3700+ fx="291.41"
3701+ cy="273.66"
3702+ cx="291.32001"
3703+ spreadMethod="reflect"
3704+ gradientTransform="scale(1.0115,0.98863)"
3705+ gradientUnits="userSpaceOnUse"
3706+ id="radialGradient4348"
3707+ xlink:href="#linearGradient14418"
3708+ inkscape:collect="always" />
3709+ <radialGradient
3710+ r="2.3099"
3711+ fy="273.56"
3712+ fx="291.41"
3713+ cy="273.66"
3714+ cx="291.32001"
3715+ spreadMethod="reflect"
3716+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3717+ gradientUnits="userSpaceOnUse"
3718+ id="radialGradient4350"
3719+ xlink:href="#linearGradient14418"
3720+ inkscape:collect="always" />
3721+ <radialGradient
3722+ r="2.3099"
3723+ fy="273.56"
3724+ fx="291.41"
3725+ cy="273.66"
3726+ cx="291.32001"
3727+ spreadMethod="reflect"
3728+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3729+ gradientUnits="userSpaceOnUse"
3730+ id="radialGradient4352"
3731+ xlink:href="#linearGradient14418"
3732+ inkscape:collect="always" />
3733+ <radialGradient
3734+ r="2.3099"
3735+ fy="273.56"
3736+ fx="291.41"
3737+ cy="273.66"
3738+ cx="291.32001"
3739+ spreadMethod="reflect"
3740+ gradientTransform="scale(1.0115,0.98863)"
3741+ gradientUnits="userSpaceOnUse"
3742+ id="radialGradient4354"
3743+ xlink:href="#linearGradient14418"
3744+ inkscape:collect="always" />
3745+ <radialGradient
3746+ r="2.3099"
3747+ fy="273.56"
3748+ fx="291.41"
3749+ cy="273.66"
3750+ cx="291.32001"
3751+ spreadMethod="reflect"
3752+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3753+ gradientUnits="userSpaceOnUse"
3754+ id="radialGradient4356"
3755+ xlink:href="#linearGradient14418"
3756+ inkscape:collect="always" />
3757+ <radialGradient
3758+ r="2.3099"
3759+ fy="273.56"
3760+ fx="291.41"
3761+ cy="273.66"
3762+ cx="291.32001"
3763+ spreadMethod="reflect"
3764+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3765+ gradientUnits="userSpaceOnUse"
3766+ id="radialGradient4358"
3767+ xlink:href="#linearGradient14418"
3768+ inkscape:collect="always" />
3769+ <radialGradient
3770+ r="2.3099"
3771+ fy="273.56"
3772+ fx="291.41"
3773+ cy="273.66"
3774+ cx="291.32001"
3775+ spreadMethod="reflect"
3776+ gradientTransform="scale(1.0115,0.98863)"
3777+ gradientUnits="userSpaceOnUse"
3778+ id="radialGradient4360"
3779+ xlink:href="#linearGradient14418"
3780+ inkscape:collect="always" />
3781+ <radialGradient
3782+ r="2.3099"
3783+ fy="273.56"
3784+ fx="291.41"
3785+ cy="273.66"
3786+ cx="291.32001"
3787+ spreadMethod="reflect"
3788+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3789+ gradientUnits="userSpaceOnUse"
3790+ id="radialGradient4362"
3791+ xlink:href="#linearGradient14418"
3792+ inkscape:collect="always" />
3793+ <radialGradient
3794+ r="2.3099"
3795+ fy="273.56"
3796+ fx="291.41"
3797+ cy="273.66"
3798+ cx="291.32001"
3799+ spreadMethod="reflect"
3800+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3801+ gradientUnits="userSpaceOnUse"
3802+ id="radialGradient4364"
3803+ xlink:href="#linearGradient14418"
3804+ inkscape:collect="always" />
3805+ <radialGradient
3806+ r="2.3099"
3807+ fy="273.56"
3808+ fx="291.41"
3809+ cy="273.66"
3810+ cx="291.32001"
3811+ spreadMethod="reflect"
3812+ gradientTransform="scale(1.0115,0.98863)"
3813+ gradientUnits="userSpaceOnUse"
3814+ id="radialGradient4366"
3815+ xlink:href="#linearGradient14418"
3816+ inkscape:collect="always" />
3817+ <radialGradient
3818+ r="2.3099"
3819+ fy="273.56"
3820+ fx="291.41"
3821+ cy="273.66"
3822+ cx="291.32001"
3823+ spreadMethod="reflect"
3824+ gradientTransform="matrix(0.2637,-0.083975,0.082076,0.25773,139.2,185.48)"
3825+ gradientUnits="userSpaceOnUse"
3826+ id="radialGradient4368"
3827+ xlink:href="#linearGradient14418"
3828+ inkscape:collect="always" />
3829+ <radialGradient
3830+ r="2.3099"
3831+ fy="273.56"
3832+ fx="291.41"
3833+ cy="273.66"
3834+ cx="291.32001"
3835+ spreadMethod="reflect"
3836+ gradientTransform="matrix(0.2765,-0.011541,0.01128,0.27025,152.06,158.35)"
3837+ gradientUnits="userSpaceOnUse"
3838+ id="radialGradient4370"
3839+ xlink:href="#linearGradient14418"
3840+ inkscape:collect="always" />
3841+ <radialGradient
3842+ r="2.3099"
3843+ fy="273.56"
3844+ fx="291.41"
3845+ cy="273.66"
3846+ cx="291.32001"
3847+ spreadMethod="reflect"
3848+ gradientTransform="scale(1.0115,0.98863)"
3849+ gradientUnits="userSpaceOnUse"
3850+ id="radialGradient4372"
3851+ xlink:href="#linearGradient14418"
3852+ inkscape:collect="always" />
3853+ </defs>
3854+ <sodipodi:namedview
3855+ pagecolor="#ffffff"
3856+ bordercolor="#666666"
3857+ borderopacity="1"
3858+ objecttolerance="10"
3859+ gridtolerance="10"
3860+ guidetolerance="10"
3861+ inkscape:pageopacity="0"
3862+ inkscape:pageshadow="2"
3863+ inkscape:window-width="1181"
3864+ inkscape:window-height="890"
3865+ id="namedview3183"
3866+ showgrid="false"
3867+ inkscape:zoom="0.81021697"
3868+ inkscape:cx="68.757814"
3869+ inkscape:cy="199.18924"
3870+ inkscape:window-x="679"
3871+ inkscape:window-y="117"
3872+ inkscape:window-maximized="0"
3873+ inkscape:current-layer="svg2" />
3874+ <g
3875+ id="layer1"
3876+ transform="translate(-203.11637,-386.55455)">
3877+ <path
3878+ id="path2383"
3879+ style="fill:#c8beb7;stroke:#000000;stroke-width:3.28740001;stroke-linecap:round;stroke-linejoin:round"
3880+ d="m 441.29,560.71 c 0.02,49.72 -40.29,90.04 -90.02,90.04 -49.72,0 -90.03,-40.32 -90.02,-90.04 -0.01,-49.73 40.3,-90.05 90.02,-90.05 49.73,0 90.04,40.32 90.02,90.05 z"
3881+ transform="matrix(1.2168,0,0,1.2168,-76.15,-121.55)"
3882+ inkscape:connector-curvature="0" />
3883+ <path
3884+ id="path3221"
3885+ style="fill:#000000;fill-opacity:0.31373004"
3886+ d="m 454.19,523.12 c 0.07,1.69 0.12,3.4 0.12,5.1 0,60.46 -49.06,109.53 -109.53,109.53 -47.26,0 -87.59,-30 -102.94,-71.97 2.66,58.11 50.68,104.47 109.44,104.47 60.47,0 109.53,-49.07 109.53,-109.53 0,-13.2 -2.34,-25.87 -6.62,-37.6 z"
3887+ inkscape:connector-curvature="0" />
3888+ <path
3889+ id="path3172"
3890+ style="fill:#6c5d53;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
3891+ d="m 359.45,671.28 c 0,9.09 14.67,9.38 32.74,9.38 18.07,0 32.73,0.69 32.73,-9.38 0,-17.72 -14.66,-32.1 -32.73,-32.1 -18.07,0 -32.74,14.38 -32.74,32.1 z"
3892+ inkscape:connector-curvature="0" />
3893+ <path
3894+ id="path3236"
3895+ style="fill:#000000;fill-opacity:0.31373004"
3896+ d="m 435.91,525.42 c 0,45.17 -55.12,81.84 -81.84,81.84 -25.72,0 -81.84,-36.67 -81.84,-81.84 0,-45.17 24.63,-81.84 81.84,-81.84 57.22,0 81.84,36.67 81.84,81.84 z"
3897+ inkscape:connector-curvature="0" />
3898+ <path
3899+ id="path3203"
3900+ style="fill:#6c5d53;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
3901+ d="m 318.63,579.05 c 7.75,17.93 11.36,23.33 11.13,33.59 -0.1,4.67 9.19,-7.64 9.83,-13.79 -0.47,8.88 1.2,11.31 2.18,20.51 0.99,9.19 4.25,25.14 5.2,21.56 1.96,-7.42 2.88,-22.82 8.27,-27.57 2.44,9.19 14.92,24.62 12.86,18.73 -5,-14.29 -6.84,-21.15 -2.46,-30.05 7.84,9.52 12.32,13.45 10.81,8.13 -2.54,-8.98 1.08,-21.31 7.66,-26.51 8.36,-6.61 -65.48,-4.95 -65.48,-4.6 z"
3902+ inkscape:connector-curvature="0" />
3903+ <path
3904+ id="path3174"
3905+ style="fill:#000000;fill-opacity:0.31373004;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
3906+ d="m 404.78,680.06 c 0,-16.37 -9.44,-26.44 -9.44,-26.44 0,0 3.77,13.85 3.14,26.44 h 6.3 z"
3907+ inkscape:connector-curvature="0" />
3908+ <path
3909+ id="path3155"
3910+ style="fill:#c8beb7;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
3911+ d="M 108.88,46.344 C 78.746,46.954 57.943,57.997 45.25,75.094 21.186,72.506 1.188,98.719 1.188,98.719 c -5e-4,0 18.891,9.451 32.062,1.531 -2.399,8.71 -3.562,18.11 -3.562,27.91 0,45.17 56.125,81.84 81.842,81.84 26.72,0 81.85,-36.67 81.85,-81.84 0,-9.8 -1.17,-19.2 -3.57,-27.91 13.17,7.92 32.03,-1.531 32.03,-1.531 0,0 -19.97,-26.205 -44.03,-23.625 -13.06,-17.595 -34.71,-28.75 -66.28,-28.75 -0.89,0 -1.78,-0.018 -2.65,0 z"
3912+ transform="translate(239.74,384.07)"
3913+ inkscape:connector-curvature="0" />
3914+ <path
3915+ id="path3157"
3916+ style="fill:#ffffff;stroke:#000000;stroke-width:15.88899994;stroke-linecap:round;stroke-linejoin:round"
3917+ d="m 441.29,560.71 c 0.02,49.72 -40.29,90.04 -90.02,90.04 -49.72,0 -90.03,-40.32 -90.02,-90.04 -0.01,-49.73 40.3,-90.05 90.02,-90.05 49.73,0 90.04,40.32 90.02,90.05 z"
3918+ transform="matrix(0.25175,0,0,0.25175,236.55,359.08)"
3919+ inkscape:connector-curvature="0" />
3920+ <path
3921+ id="path3159"
3922+ style="fill:#ffffff;stroke:#000000;stroke-width:15.88899994;stroke-linecap:round;stroke-linejoin:round"
3923+ d="m 441.29,560.71 c 0.02,49.72 -40.29,90.04 -90.02,90.04 -49.72,0 -90.03,-40.32 -90.02,-90.04 -0.01,-49.73 40.3,-90.05 90.02,-90.05 49.73,0 90.04,40.32 90.02,90.05 z"
3924+ transform="matrix(0.25175,0,0,0.25175,289.28,359.08)"
3925+ inkscape:connector-curvature="0" />
3926+ <path
3927+ id="path3161"
3928+ style="fill:#000000"
3929+ d="m 441.29,560.71 c 0.02,49.72 -40.29,90.04 -90.02,90.04 -49.72,0 -90.03,-40.32 -90.02,-90.04 -0.01,-49.73 40.3,-90.05 90.02,-90.05 49.73,0 90.04,40.32 90.02,90.05 z"
3930+ transform="matrix(0.083916,0,0,0.083916,343.2,457.18)"
3931+ inkscape:connector-curvature="0" />
3932+ <path
3933+ id="path3163"
3934+ style="fill:#000000"
3935+ d="m 441.29,560.71 c 0.02,49.72 -40.29,90.04 -90.02,90.04 -49.72,0 -90.03,-40.32 -90.02,-90.04 -0.01,-49.73 40.3,-90.05 90.02,-90.05 49.73,0 90.04,40.32 90.02,90.05 z"
3936+ transform="matrix(0.083916,0,0,0.083916,301.17,457.18)"
3937+ inkscape:connector-curvature="0" />
3938+ <path
3939+ id="path3179"
3940+ style="fill:#6c5d53;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
3941+ d="m 372.76,441.62 c -1.99,-10.39 12.58,-36.41 42.7,-46.12 20.71,-6.68 55.97,1.23 59.32,41.23 -13.48,-23.04 -37.38,-28.54 -48.7,-23.05 -22.74,11.01 -12.48,34.47 -23.37,40.65 -10.13,5.76 -27.88,-1.94 -29.95,-12.71 z"
3942+ inkscape:connector-curvature="0" />
3943+ <path
3944+ id="path3231"
3945+ style="fill:#000000;fill-opacity:0.31373004"
3946+ d="m 190.09,101.34 -1.87,2.66 c 0.25,3.08 0.34,6.2 0.34,9.38 0,45.17 -55.12,81.84 -81.84,81.84 -20.707,0 -61.098,-23.76 -76.064,-56.6 7.616,40.25 57.172,71.38 80.874,71.38 26.72,0 81.85,-36.67 81.85,-81.84 0,-9.4 -1.08,-18.41 -3.29,-26.82 z"
3947+ transform="translate(239.74,384.07)"
3948+ inkscape:connector-curvature="0" />
3949+ <path
3950+ id="path3329"
3951+ style="fill:#6c5d53;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
3952+ d="m 344.46,671.28 c 0,9.09 -14.67,9.38 -32.74,9.38 -18.07,0 -32.73,0.69 -32.73,-9.38 0,-17.72 14.66,-32.1 32.73,-32.1 18.07,0 32.74,14.38 32.74,32.1 z"
3953+ inkscape:connector-curvature="0" />
3954+ <path
3955+ id="path3331"
3956+ style="fill:#000000;fill-opacity:0.31373004;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
3957+ d="m 299.13,680.06 c 0,-16.37 9.44,-26.44 9.44,-26.44 0,0 -3.77,13.85 -3.14,26.44 h -6.3 z"
3958+ inkscape:connector-curvature="0" />
3959+ <path
3960+ id="path2398"
3961+ style="fill:#000000"
3962+ d="m 367.87,564.87 c -2.29,3.97 -6.5,5.84 -9.4,4.16 -2.89,-1.67 -3.38,-6.25 -1.09,-10.22 2.29,-3.97 6.5,-5.84 9.4,-4.16 2.89,1.67 3.38,6.24 1.09,10.22 z"
3963+ inkscape:connector-curvature="0" />
3964+ <path
3965+ id="path2412"
3966+ style="fill:#000000"
3967+ d="m 335.13,564.87 c 2.29,3.97 6.5,5.84 9.4,4.16 2.89,-1.67 3.38,-6.25 1.09,-10.22 -2.29,-3.97 -6.5,-5.84 -9.4,-4.16 -2.89,1.67 -3.38,6.24 -1.09,10.22 z"
3968+ inkscape:connector-curvature="0" />
3969+ <path
3970+ id="path3173"
3971+ style="fill:#6c5d53;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
3972+ d="m 332.6,441.62 c 2,-10.39 -12.58,-36.41 -42.69,-46.12 -20.72,-6.68 -55.98,1.23 -59.33,41.23 13.48,-23.04 37.38,-28.54 48.71,-23.05 22.73,11.01 12.48,34.47 23.36,40.65 10.13,5.76 27.89,-1.94 29.95,-12.71 z"
3973+ inkscape:connector-curvature="0" />
3974+ </g>
3975+ <g
3976+ id="g50771"
3977+ transform="matrix(1.2005442,0,0,1.2005442,-69.184748,-47.38489)">
3978+ <g
3979+ id="g50772">
3980+ <g
3981+ id="g50773"
3982+ transform="matrix(-0.063493,-0.68889,0.68889,-0.063493,71.355,376.37)">
3983+ <path
3984+ inkscape:connector-curvature="0"
3985+ id="path50774"
3986+ sodipodi:nodetypes="cscczzzccsz"
3987+ style="fill:url(#radialGradient4320);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
3988+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
3989+ <path
3990+ inkscape:connector-curvature="0"
3991+ id="path50775"
3992+ sodipodi:nodetypes="cscczzzccsz"
3993+ style="fill:url(#radialGradient4322);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
3994+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
3995+ <path
3996+ inkscape:connector-curvature="0"
3997+ id="path50776"
3998+ sodipodi:nodetypes="cscczzzccsz"
3999+ style="fill:url(#radialGradient4324);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4000+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4001+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4002+ </g>
4003+ <g
4004+ id="g50777"
4005+ transform="matrix(0.075718,-0.68765,0.68765,0.075718,33.628,349.92)">
4006+ <path
4007+ inkscape:connector-curvature="0"
4008+ id="path50778"
4009+ sodipodi:nodetypes="cscczzzccsz"
4010+ style="fill:url(#radialGradient4326);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4011+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4012+ <path
4013+ inkscape:connector-curvature="0"
4014+ id="path50779"
4015+ sodipodi:nodetypes="cscczzzccsz"
4016+ style="fill:url(#radialGradient4328);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4017+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4018+ <path
4019+ inkscape:connector-curvature="0"
4020+ id="path50780"
4021+ sodipodi:nodetypes="cscczzzccsz"
4022+ style="fill:url(#radialGradient4330);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4023+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4024+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4025+ </g>
4026+ </g>
4027+ <g
4028+ id="g50781"
4029+ transform="matrix(0.50725,-0.47042,0.47042,0.50725,-34.965,199.05)">
4030+ <g
4031+ id="g50782"
4032+ transform="matrix(0.94606,-0.324,0.324,0.94606,-84.548,98.129)">
4033+ <g
4034+ id="g50783"
4035+ transform="matrix(0.97975,-0.20022,0.20022,0.97975,-16.038,67.479)">
4036+ <path
4037+ inkscape:connector-curvature="0"
4038+ id="path50784"
4039+ sodipodi:nodetypes="cscczzzccsz"
4040+ style="fill:url(#radialGradient4332);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4041+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4042+ <path
4043+ inkscape:connector-curvature="0"
4044+ id="path50785"
4045+ sodipodi:nodetypes="cscczzzccsz"
4046+ style="fill:url(#radialGradient4334);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4047+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4048+ <path
4049+ inkscape:connector-curvature="0"
4050+ id="path50786"
4051+ sodipodi:nodetypes="cscczzzccsz"
4052+ style="fill:url(#radialGradient4336);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4053+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4054+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4055+ </g>
4056+ <g
4057+ id="g50787"
4058+ transform="translate(15.99,9.0895)">
4059+ <path
4060+ inkscape:connector-curvature="0"
4061+ id="path50788"
4062+ sodipodi:nodetypes="cscczzzccsz"
4063+ style="fill:url(#radialGradient4338);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4064+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4065+ <path
4066+ inkscape:connector-curvature="0"
4067+ id="path50789"
4068+ sodipodi:nodetypes="cscczzzccsz"
4069+ style="fill:url(#radialGradient4340);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4070+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4071+ <path
4072+ inkscape:connector-curvature="0"
4073+ id="path50790"
4074+ sodipodi:nodetypes="cscczzzccsz"
4075+ style="fill:url(#radialGradient4342);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4076+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4077+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4078+ </g>
4079+ </g>
4080+ <g
4081+ id="g50791"
4082+ transform="matrix(0.97975,-0.20022,0.20022,0.97975,-56.077,59.789)">
4083+ <path
4084+ inkscape:connector-curvature="0"
4085+ id="path50792"
4086+ sodipodi:nodetypes="cscczzzccsz"
4087+ style="fill:url(#radialGradient4344);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4088+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4089+ <path
4090+ inkscape:connector-curvature="0"
4091+ id="path50793"
4092+ sodipodi:nodetypes="cscczzzccsz"
4093+ style="fill:url(#radialGradient4346);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4094+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4095+ <path
4096+ inkscape:connector-curvature="0"
4097+ id="path50794"
4098+ sodipodi:nodetypes="cscczzzccsz"
4099+ style="fill:url(#radialGradient4348);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4100+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4101+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4102+ </g>
4103+ <g
4104+ id="g50795"
4105+ transform="translate(-24.049,1.3996)">
4106+ <path
4107+ inkscape:connector-curvature="0"
4108+ id="path50796"
4109+ sodipodi:nodetypes="cscczzzccsz"
4110+ style="fill:url(#radialGradient4350);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4111+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4112+ <path
4113+ inkscape:connector-curvature="0"
4114+ id="path50797"
4115+ sodipodi:nodetypes="cscczzzccsz"
4116+ style="fill:url(#radialGradient4352);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4117+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4118+ <path
4119+ inkscape:connector-curvature="0"
4120+ id="path50798"
4121+ sodipodi:nodetypes="cscczzzccsz"
4122+ style="fill:url(#radialGradient4354);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4123+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4124+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4125+ </g>
4126+ </g>
4127+ <g
4128+ id="g50799"
4129+ transform="matrix(0.69162,0.016131,-0.016131,0.69162,10.079,42.059)">
4130+ <g
4131+ id="g50800"
4132+ transform="matrix(0.94606,-0.324,0.324,0.94606,-84.548,98.129)">
4133+ <g
4134+ id="g50801"
4135+ transform="matrix(0.97975,-0.20022,0.20022,0.97975,-16.038,67.479)">
4136+ <path
4137+ inkscape:connector-curvature="0"
4138+ id="path50802"
4139+ sodipodi:nodetypes="cscczzzccsz"
4140+ style="fill:url(#radialGradient4356);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4141+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4142+ <path
4143+ inkscape:connector-curvature="0"
4144+ id="path50803"
4145+ sodipodi:nodetypes="cscczzzccsz"
4146+ style="fill:url(#radialGradient4358);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4147+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4148+ <path
4149+ inkscape:connector-curvature="0"
4150+ id="path50804"
4151+ sodipodi:nodetypes="cscczzzccsz"
4152+ style="fill:url(#radialGradient4360);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4153+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4154+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4155+ </g>
4156+ <g
4157+ id="g50805"
4158+ transform="translate(15.99,9.0895)">
4159+ <path
4160+ inkscape:connector-curvature="0"
4161+ id="path50806"
4162+ sodipodi:nodetypes="cscczzzccsz"
4163+ style="fill:url(#radialGradient4362);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4164+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4165+ <path
4166+ inkscape:connector-curvature="0"
4167+ id="path50807"
4168+ sodipodi:nodetypes="cscczzzccsz"
4169+ style="fill:url(#radialGradient4364);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4170+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4171+ <path
4172+ inkscape:connector-curvature="0"
4173+ id="path50808"
4174+ sodipodi:nodetypes="cscczzzccsz"
4175+ style="fill:url(#radialGradient4366);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4176+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4177+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4178+ </g>
4179+ </g>
4180+ <g
4181+ id="g50809"
4182+ transform="matrix(0.97975,-0.20022,0.20022,0.97975,-56.077,59.789)">
4183+ <path
4184+ inkscape:connector-curvature="0"
4185+ id="path50810"
4186+ sodipodi:nodetypes="cscczzzccsz"
4187+ style="fill:url(#radialGradient4368);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4188+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4189+ <path
4190+ inkscape:connector-curvature="0"
4191+ id="path50811"
4192+ sodipodi:nodetypes="cscczzzccsz"
4193+ style="fill:url(#radialGradient4370);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4194+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4195+ <path
4196+ inkscape:connector-curvature="0"
4197+ id="path50812"
4198+ sodipodi:nodetypes="cscczzzccsz"
4199+ style="fill:url(#radialGradient4372);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4200+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4201+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4202+ </g>
4203+ <g
4204+ id="g50813"
4205+ transform="translate(-24.049,1.3996)">
4206+ <path
4207+ inkscape:connector-curvature="0"
4208+ id="path50814"
4209+ sodipodi:nodetypes="cscczzzccsz"
4210+ style="fill:url(#radialGradient50844);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4211+ d="m 237.76,229.53 c -1.09,0.39 -1.78,1.73 -1.48,2.62 0.32,0.97 0.75,1.39 2.13,1.75 0.09,0.44 0.21,0.78 0.48,1.18 -1.6,0.15 -3.19,-0.84 -3.72,-2.47 -0.55,-1.66 0.26,-3.47 2.27,-4.12 2.08,-0.67 3.79,0.38 4.31,1.89 0.51,1.47 -0.07,3.76 -1.64,4.32 -0.27,-0.31 -0.45,-0.64 -0.52,-1.02 0.64,-0.25 1.4,-2 1.02,-3.04 -0.38,-1.05 -1.64,-1.53 -2.85,-1.11 z" />
4212+ <path
4213+ inkscape:connector-curvature="0"
4214+ id="path50815"
4215+ sodipodi:nodetypes="cscczzzccsz"
4216+ style="fill:url(#radialGradient50845);fill-rule:evenodd;stroke:#000000;stroke-width:0.068399pt"
4217+ d="m 235.54,226.82 c -1.16,0.08 -2.18,1.19 -2.13,2.13 0.06,1.03 0.36,1.54 1.6,2.25 -0.03,0.45 0,0.81 0.15,1.27 -1.58,-0.28 -2.85,-1.65 -2.94,-3.37 -0.09,-1.74 1.17,-3.27 3.28,-3.37 2.18,-0.1 3.55,1.36 3.66,2.96 0.11,1.55 -1.06,3.6 -2.72,3.74 -0.18,-0.38 -0.26,-0.74 -0.23,-1.13 0.68,-0.07 1.88,-1.56 1.78,-2.66 -0.09,-1.11 -1.18,-1.92 -2.45,-1.82 z" />
4218+ <path
4219+ inkscape:connector-curvature="0"
4220+ id="path50816"
4221+ sodipodi:nodetypes="cscczzzccsz"
4222+ style="fill:url(#radialGradient50846);fill-rule:evenodd;stroke:#000000;stroke-width:0.25pt"
4223+ d="m 294.41,262.73 c -4.25,0.13 -8.13,4.04 -8.09,7.48 0.04,3.75 1.08,5.67 5.49,8.47 -0.18,1.62 -0.12,2.93 0.36,4.63 -5.73,-1.25 -10.17,-6.45 -10.23,-12.74 -0.05,-6.38 4.78,-11.76 12.5,-11.81 7.98,-0.05 12.75,5.53 12.91,11.37 0.16,5.67 -4.41,13 -10.5,13.22 -0.62,-1.38 -0.85,-2.73 -0.69,-4.15 2.49,-0.14 7.1,-5.41 6.93,-9.43 -0.17,-4.08 -4.02,-7.18 -8.68,-7.04 z"
4224+ transform="matrix(0.27187,0.030699,-0.030699,0.27187,161.53,143.51)" />
4225+ </g>
4226+ </g>
4227+ </g>
4228+ <metadata
4229+ id="metadata3181">
4230+ <rdf:RDF>
4231+ <cc:Work>
4232+ <dc:format>image/svg+xml</dc:format>
4233+ <dc:type
4234+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
4235+ <cc:license
4236+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
4237+ <dc:publisher>
4238+ <cc:Agent
4239+ rdf:about="http://openclipart.org/">
4240+ <dc:title>Openclipart</dc:title>
4241+ </cc:Agent>
4242+ </dc:publisher>
4243+ <dc:title></dc:title>
4244+ <dc:date>2008-07-14T08:59:26</dc:date>
4245+ <dc:description>Cartoon goat, part of round cartoon animals set.</dc:description>
4246+ <dc:source>https://openclipart.org/detail/17824/cartoon-goat-by-lemmling</dc:source>
4247+ <dc:creator>
4248+ <cc:Agent>
4249+ <dc:title>lemmling</dc:title>
4250+ </cc:Agent>
4251+ </dc:creator>
4252+ <dc:subject>
4253+ <rdf:Bag>
4254+ <rdf:li>animal</rdf:li>
4255+ <rdf:li>cartoon</rdf:li>
4256+ <rdf:li>colour</rdf:li>
4257+ <rdf:li>goat</rdf:li>
4258+ <rdf:li>gray</rdf:li>
4259+ <rdf:li>mammal</rdf:li>
4260+ </rdf:Bag>
4261+ </dc:subject>
4262+ </cc:Work>
4263+ <cc:License
4264+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
4265+ <cc:permits
4266+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
4267+ <cc:permits
4268+ rdf:resource="http://creativecommons.org/ns#Distribution" />
4269+ <cc:permits
4270+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
4271+ </cc:License>
4272+ </rdf:RDF>
4273+ </metadata>
4274+ <path
4275+ inkscape:connector-curvature="0"
4276+ id="path3684-6"
4277+ style="opacity:0.84956001;fill:#000000;stroke:#a4aaf9;stroke-width:2;stroke-linecap:square;stroke-dashoffset:17.833;filter:url(#filter3686-4)"
4278+ d="m 124.65297,-547.81305 c -184.530004,0 -334.29,149.75999 -334.29,334.28999 0,184.530004 149.759996,334.29 334.29,334.29 184.53,0 334.3,-149.759996 334.3,-334.29 0,-184.53 -149.76,-334.28999 -334.3,-334.28999 z"
4279+ transform="matrix(0.07329595,0,0,0.07329595,141.12818,249.79146)" />
4280+ <path
4281+ inkscape:connector-curvature="0"
4282+ id="path3690-5"
4283+ style="opacity:0.75;fill:#ffffff;stroke:#a4aaf9;stroke-width:0.1465919;stroke-linecap:square;stroke-dashoffset:17.833"
4284+ d="m 150.26472,209.639 c -13.5253,0 -24.5021,10.9768 -24.5021,24.5021 0,13.5253 10.9768,24.5021 24.5021,24.5021 13.52533,0 24.50285,-10.9768 24.50285,-24.5021 0,-13.5253 -10.97681,-24.5021 -24.50285,-24.5021 z" />
4285+ <path
4286+ inkscape:connector-curvature="0"
4287+ id="path20797-2"
4288+ style="opacity:0.75;fill:url(#radialGradient25309-7);stroke:#0e1ddc;stroke-width:6;stroke-linecap:square;stroke-dashoffset:17.833;filter:url(#filter3692-8)"
4289+ d="m 124.65297,-547.81305 c -184.530004,0 -334.29,149.75999 -334.29,334.28999 0,184.530004 149.759996,334.29 334.29,334.29 184.53,0 334.3,-149.759996 334.3,-334.29 0,-184.53 -149.76,-334.28999 -334.3,-334.28999 z"
4290+ transform="matrix(0.07329595,0,0,0.07329595,141.12818,249.79146)" />
4291+ <g
4292+ id="g15330-2"
4293+ transform="matrix(0.07329595,0,0,0.07329595,123.25003,200.98576)">
4294+ <path
4295+ id="path12469-9"
4296+ sodipodi:rx="143.44167"
4297+ sodipodi:ry="143.44167"
4298+ style="fill-opacity:0;stroke:#000000;stroke-width:2.31599998;stroke-dashoffset:17.833"
4299+ sodipodi:type="arc"
4300+ d="m 202.03051,535.16406 c 0,79.22065 -64.22102,143.44167 -143.441662,143.44167 -79.220644,0 -143.441666,-64.22102 -143.441666,-143.44167 0,-79.22064 64.221022,-143.44166 143.441666,-143.44166 79.220642,0 143.441662,64.22102 143.441662,143.44166 z"
4301+ inkscape:tile-w="240.71188"
4302+ transform="matrix(0.83234,0,0,0.83234,319.8,6.9199)"
4303+ sodipodi:cy="535.16406"
4304+ sodipodi:cx="58.588848"
4305+ inkscape:tile-h="240.71188"
4306+ inkscape:tile-cx="368.56798"
4307+ inkscape:tile-cy="452.35784" />
4308+ <path
4309+ id="path6495-7"
4310+ sodipodi:rx="143.44167"
4311+ sodipodi:ry="143.44167"
4312+ style="fill-opacity:0;stroke:#000000;stroke-width:2.31599998;stroke-dashoffset:17.833"
4313+ sodipodi:type="arc"
4314+ d="m 202.03051,535.16406 c 0,79.22065 -64.22102,143.44167 -143.441662,143.44167 -79.220644,0 -143.441666,-64.22102 -143.441666,-143.44167 0,-79.22064 64.221022,-143.44166 143.441666,-143.44166 79.220642,0 143.441662,64.22102 143.441662,143.44166 z"
4315+ inkscape:tile-w="240.71188"
4316+ transform="matrix(0.83234,0,0,0.83234,319.8,6.9199)"
4317+ sodipodi:cy="535.16406"
4318+ sodipodi:cx="58.588848"
4319+ inkscape:tile-h="240.71188"
4320+ inkscape:tile-cx="368.56798"
4321+ inkscape:tile-cy="452.35784" />
4322+ <path
4323+ id="path1874-7"
4324+ style="fill:#583d33;stroke:#000000;stroke-width:2.5"
4325+ sodipodi:type="star"
4326+ sodipodi:sides="4"
4327+ sodipodi:r1="272.61395"
4328+ sodipodi:r2="43.618237"
4329+ transform="matrix(0.42708,-0.42708,0.42708,0.42708,54.573,484.91)"
4330+ sodipodi:arg2="-1.8325957"
4331+ sodipodi:arg1="-2.6179939"
4332+ inkscape:randomized="0"
4333+ sodipodi:cy="329.50504"
4334+ sodipodi:cx="405.71429"
4335+ inkscape:rounded="0"
4336+ inkscape:flatsided="false"
4337+ d="M 169.62368,193.19806 394.42506,287.37305 542.02127,93.414424 447.84628,318.21581 641.80491,465.81201 417.00352,371.63702 269.40732,565.59565 363.58231,340.79427 z" />
4338+ <path
4339+ inkscape:connector-curvature="0"
4340+ id="path9166-2"
4341+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4342+ d="m 368.57,342.21 -5.2185,-9.2185 5.2185,-9.2185 5.2185,9.2185 -5.2185,9.2185 z"
4343+ sodipodi:nodetypes="ccccc"
4344+ inkscape:tile-w="11.85101"
4345+ inkscape:tile-h="19.85101"
4346+ inkscape:tile-cx="374.15456"
4347+ inkscape:tile-cy="304.98812" />
4348+ <path
4349+ inkscape:connector-curvature="0"
4350+ id="path12346-8"
4351+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4352+ d="m 368.57,580.84 -5.2185,-9.2185 5.2185,-9.2185 5.2185,9.2185 -5.2185,9.2185 z"
4353+ sodipodi:nodetypes="ccccc"
4354+ inkscape:tile-w="11.85101"
4355+ inkscape:tile-h="19.85101"
4356+ inkscape:tile-cx="374.15456"
4357+ inkscape:tile-cy="304.98812" />
4358+ <path
4359+ inkscape:connector-curvature="0"
4360+ id="path12471-5"
4361+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4362+ d="m 368.57,342.21 -5.2185,-9.2185 5.2185,-9.2185 5.2185,9.2185 -5.2185,9.2185 z"
4363+ sodipodi:nodetypes="ccccc"
4364+ inkscape:tile-w="11.85101"
4365+ inkscape:tile-h="19.85101"
4366+ inkscape:tile-cx="374.15456"
4367+ inkscape:tile-cy="304.98812" />
4368+ <path
4369+ inkscape:connector-curvature="0"
4370+ id="path12473-2"
4371+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4372+ d="m 368.57,580.84 -5.2185,-9.2185 5.2185,-9.2185 5.2185,9.2185 -5.2185,9.2185 z"
4373+ sodipodi:nodetypes="ccccc"
4374+ inkscape:tile-w="11.85101"
4375+ inkscape:tile-h="19.85101"
4376+ inkscape:tile-cx="374.15456"
4377+ inkscape:tile-cy="304.98812" />
4378+ <path
4379+ inkscape:connector-curvature="0"
4380+ id="path12479-6"
4381+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4382+ d="m 397.06,345.96 -2.6548,-10.255 7.4266,-7.5537 2.6548,10.255 -7.4266,7.5538 z"
4383+ sodipodi:nodetypes="ccccc"
4384+ inkscape:tile-w="11.85101"
4385+ inkscape:tile-h="19.85101"
4386+ inkscape:tile-cx="374.15456"
4387+ inkscape:tile-cy="304.98812" />
4388+ <path
4389+ inkscape:connector-curvature="0"
4390+ id="path12481-1"
4391+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4392+ d="m 335.3,576.46 -2.6548,-10.255 7.4266,-7.5537 2.6548,10.255 -7.4266,7.5538 z"
4393+ sodipodi:nodetypes="ccccc"
4394+ inkscape:tile-w="11.85101"
4395+ inkscape:tile-h="19.85101"
4396+ inkscape:tile-cx="374.15456"
4397+ inkscape:tile-cy="304.98812" />
4398+ <path
4399+ inkscape:connector-curvature="0"
4400+ id="path12495-6"
4401+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4402+ d="m 446.62,374.28 2.8284,-10.209 10.208,-2.8284 -2.8284,10.209 -10.209,2.8284 z"
4403+ sodipodi:nodetypes="ccccc"
4404+ inkscape:tile-w="11.85101"
4405+ inkscape:tile-h="19.85101"
4406+ inkscape:tile-cx="374.15456"
4407+ inkscape:tile-cy="304.98812" />
4408+ <path
4409+ inkscape:connector-curvature="0"
4410+ id="path12497-6"
4411+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4412+ d="m 277.88,543.02 2.8284,-10.209 10.209,-2.8284 -2.8284,10.209 -10.209,2.8284 z"
4413+ sodipodi:nodetypes="ccccc"
4414+ inkscape:tile-w="11.85101"
4415+ inkscape:tile-h="19.85101"
4416+ inkscape:tile-cx="374.15456"
4417+ inkscape:tile-cy="304.98812" />
4418+ <path
4419+ inkscape:connector-curvature="0"
4420+ id="path12503-9"
4421+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4422+ d="m 464.04,397.22 5.3742,-9.1286 10.593,-0.0899 -5.3742,9.1286 -10.593,0.0899 z"
4423+ sodipodi:nodetypes="ccccc"
4424+ inkscape:tile-w="11.85101"
4425+ inkscape:tile-h="19.85101"
4426+ inkscape:tile-cx="374.15456"
4427+ inkscape:tile-cy="304.98812" />
4428+ <path
4429+ inkscape:connector-curvature="0"
4430+ id="path12505-8"
4431+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4432+ d="m 257.38,516.53 5.3742,-9.1286 10.593,-0.0899 -5.3742,9.1286 -10.593,0.0899 z"
4433+ sodipodi:nodetypes="ccccc"
4434+ inkscape:tile-w="11.85101"
4435+ inkscape:tile-h="19.85101"
4436+ inkscape:tile-cx="374.15456"
4437+ inkscape:tile-cy="304.98812" />
4438+ <path
4439+ inkscape:connector-curvature="0"
4440+ id="path12519-4"
4441+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4442+ d="m 478.67,452.3 9.2185,-5.2185 9.2185,5.2185 -9.2185,5.2185 L 478.67,452.3 z"
4443+ sodipodi:nodetypes="ccccc"
4444+ inkscape:tile-w="11.85101"
4445+ inkscape:tile-h="19.85101"
4446+ inkscape:tile-cx="374.15456"
4447+ inkscape:tile-cy="304.98812" />
4448+ <path
4449+ inkscape:connector-curvature="0"
4450+ id="path12521-5"
4451+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4452+ d="m 240.03,452.3 9.2185,-5.2185 9.2185,5.2185 -9.2185,5.2185 L 240.03,452.3 z"
4453+ sodipodi:nodetypes="ccccc"
4454+ inkscape:tile-w="11.85101"
4455+ inkscape:tile-h="19.85101"
4456+ inkscape:tile-cx="374.15456"
4457+ inkscape:tile-cy="304.98812" />
4458+ <path
4459+ inkscape:connector-curvature="0"
4460+ id="path12527-9"
4461+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4462+ d="m 474.91,480.8 10.255,-2.6548 7.5537,7.4266 -10.255,2.6548 -7.5538,-7.4266 z"
4463+ sodipodi:nodetypes="ccccc"
4464+ inkscape:tile-w="11.85101"
4465+ inkscape:tile-h="19.85101"
4466+ inkscape:tile-cx="374.15456"
4467+ inkscape:tile-cy="304.98812" />
4468+ <path
4469+ inkscape:connector-curvature="0"
4470+ id="path12529-2"
4471+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4472+ d="m 244.41,419.04 10.255,-2.6548 7.5537,7.4266 -10.255,2.6548 -7.5538,-7.4266 z"
4473+ sodipodi:nodetypes="ccccc"
4474+ inkscape:tile-w="11.85101"
4475+ inkscape:tile-h="19.85101"
4476+ inkscape:tile-cx="374.15456"
4477+ inkscape:tile-cy="304.98812" />
4478+ <path
4479+ inkscape:connector-curvature="0"
4480+ id="path12543-3"
4481+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4482+ d="m 446.59,530.35 10.209,2.8284 2.8284,10.208 -10.209,-2.8284 -2.8284,-10.209 z"
4483+ sodipodi:nodetypes="ccccc"
4484+ inkscape:tile-w="11.85101"
4485+ inkscape:tile-h="19.85101"
4486+ inkscape:tile-cx="374.15456"
4487+ inkscape:tile-cy="304.98812" />
4488+ <path
4489+ inkscape:connector-curvature="0"
4490+ id="path12545-5"
4491+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4492+ d="m 277.85,361.61 10.209,2.8284 2.8284,10.209 -10.209,-2.8284 -2.8284,-10.209 z"
4493+ sodipodi:nodetypes="ccccc"
4494+ inkscape:tile-w="11.85101"
4495+ inkscape:tile-h="19.85101"
4496+ inkscape:tile-cx="374.15456"
4497+ inkscape:tile-cy="304.98812" />
4498+ <path
4499+ inkscape:connector-curvature="0"
4500+ id="path12551-0"
4501+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4502+ d="m 423.65,547.77 9.1286,5.3742 0.0899,10.593 -9.1286,-5.3742 -0.0899,-10.593 z"
4503+ sodipodi:nodetypes="ccccc"
4504+ inkscape:tile-w="11.85101"
4505+ inkscape:tile-h="19.85101"
4506+ inkscape:tile-cx="374.15456"
4507+ inkscape:tile-cy="304.98812" />
4508+ <path
4509+ inkscape:connector-curvature="0"
4510+ id="path12553-7"
4511+ style="fill:#ffffff;stroke:#000000;stroke-width:1.41400003;stroke-linecap:square;stroke-dashoffset:17.833"
4512+ d="m 304.34,341.11 9.1286,5.3742 0.0899,10.593 -9.1286,-5.3742 -0.0899,-10.593 z"
4513+ sodipodi:nodetypes="ccccc"
4514+ inkscape:tile-w="11.85101"
4515+ inkscape:tile-h="19.85101"
4516+ inkscape:tile-cx="374.15456"
4517+ inkscape:tile-cy="304.98812" />
4518+ <path
4519+ id="path5428-6"
4520+ sodipodi:rx="267.69043"
4521+ sodipodi:ry="267.69043"
4522+ style="fill-opacity:0;stroke:#000000;stroke-width:2.61279988;stroke-dasharray:10.45119273, 10.45119273;stroke-dashoffset:20.119;marker-start:url(#Dot_m);marker-mid:url(#Dot_m);marker-end:url(#Dot_m)"
4523+ sodipodi:type="arc"
4524+ d="m 754.58395,548.29608 c 0,147.84134 -119.84908,267.69043 -267.69043,267.69043 -147.84134,0 -267.69043,-119.84909 -267.69043,-267.69043 0,-147.84134 119.84909,-267.69043 267.69043,-267.69043 147.84135,0 267.69043,119.84909 267.69043,267.69043 z"
4525+ transform="matrix(0.8562,-0.22942,0.22942,0.8562,-174.1,94.608)"
4526+ sodipodi:cy="548.29608"
4527+ sodipodi:cx="486.89352" />
4528+ <path
4529+ id="path5426-2"
4530+ sodipodi:rx="267.69043"
4531+ sodipodi:ry="267.69043"
4532+ style="fill-opacity:0;stroke:#000000;stroke-width:2.5"
4533+ sodipodi:type="arc"
4534+ d="m 754.58395,548.29608 c 0,147.84134 -119.84908,267.69043 -267.69043,267.69043 -147.84134,0 -267.69043,-119.84909 -267.69043,-267.69043 0,-147.84134 119.84909,-267.69043 267.69043,-267.69043 147.84135,0 267.69043,119.84909 267.69043,267.69043 z"
4535+ transform="matrix(0.79717,0,0,0.79717,-19.571,15.27)"
4536+ sodipodi:cy="548.29608"
4537+ sodipodi:cx="486.89352" />
4538+ <path
4539+ id="path1872-8"
4540+ style="fill:#323232;stroke:#000000;stroke-width:2.5"
4541+ sodipodi:type="star"
4542+ sodipodi:sides="4"
4543+ sodipodi:r1="272.61395"
4544+ sodipodi:r2="43.618237"
4545+ transform="translate(-37.146,122.85)"
4546+ sodipodi:arg2="-1.8325957"
4547+ sodipodi:arg1="-2.6179939"
4548+ inkscape:randomized="0"
4549+ sodipodi:cy="329.50504"
4550+ sodipodi:cx="405.71429"
4551+ inkscape:rounded="0"
4552+ inkscape:flatsided="false"
4553+ d="M 169.62368,193.19806 394.42506,287.37305 542.02127,93.414424 447.84628,318.21581 641.80491,465.81201 417.00352,371.63702 269.40732,565.59565 363.58231,340.79427 z" />
4554+ <path
4555+ inkscape:connector-curvature="0"
4556+ id="path2764-5"
4557+ style="fill:#ffffff;stroke:#000000;stroke-width:1.66789997"
4558+ d="m 465.74,298.61 -86.18,136.35 17.395,10.994 68.785,-147.35 z m -125.56,160.15 17.395,10.994 -86.18,136.35 68.785,-147.35 m 21.988,-34.789 -10.994,17.395 -136.35,-86.18 147.35,68.785 m 12.801,56.777 10.994,-17.395 136.35,86.18 -147.35,-68.785"
4559+ sodipodi:nodetypes="cccccccccccccccc" />
4560+ <path
4561+ id="path2762-9"
4562+ sodipodi:rx="29.285715"
4563+ sodipodi:ry="29.285715"
4564+ style="fill:#ffffff;stroke:#000000;stroke-width:2.5"
4565+ sodipodi:type="arc"
4566+ d="m 420.00001,474.50504 c 0,16.17405 -13.11166,29.28571 -29.28572,29.28571 -16.17405,0 -29.28571,-13.11166 -29.28571,-29.28571 0,-16.17406 13.11166,-29.28572 29.28571,-29.28572 16.17406,0 29.28572,13.11166 29.28572,29.28572 z"
4567+ transform="translate(-22.146,-22.147)"
4568+ sodipodi:cy="474.50504"
4569+ sodipodi:cx="390.71429" />
4570+ </g>
4571+ <path
4572+ id="path18130-3"
4573+ sodipodi:rx="162.85715"
4574+ sodipodi:ry="225.71428"
4575+ style="fill:none;stroke-width:0"
4576+ sodipodi:type="arc"
4577+ d="m 562.85715,440.93362 a 162.85715,225.71428 0 1 1 -325.7143,0 162.85715,225.71428 0 1 1 325.7143,0 z"
4578+ transform="matrix(0.07329595,0,0,0.07329595,120.94636,201.82308)"
4579+ sodipodi:cy="440.93362"
4580+ sodipodi:cx="400" />
4581+ <path
4582+ inkscape:connector-curvature="0"
4583+ id="path24367-5"
4584+ style="opacity:0.34956001;fill:url(#linearGradient25311-1);stroke:#a4aaf9;stroke-width:1.34300005;stroke-linecap:square;stroke-dashoffset:17.833;filter:url(#filter3640-4)"
4585+ d="m -137.11703,-354.23306 c 0,106.27 117.269996,192.51 261.77,192.51 144.5,0 261.77,-86.244 261.77,-192.51 0,-106.266 -117.27,-192.50999 -261.77,-192.50999 -144.500004,0 -261.77,86.24499 -261.77,192.50999 z"
4586+ transform="matrix(0.07329595,0,0,0.07329595,141.12818,249.79146)" />
4587+ <path
4588+ inkscape:connector-curvature="0"
4589+ id="path3236-5"
4590+ style="fill:#000000;fill-opacity:0.31373004"
4591+ d="m 233.66637,137.92258 c 0,45.17 -55.12,81.84 -81.84,81.84 -25.72,0 -81.839999,-36.67 -81.839999,-81.84 0,-45.169998 24.63,-81.839998 81.839999,-81.839998 57.22,0 81.84,36.67 81.84,81.839998 z" />
4592+ <path
4593+ inkscape:connector-curvature="0"
4594+ id="path3155-6"
4595+ style="fill:#c8beb7;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
4596+ d="m 146.37637,42.916572 c -30.134,0.61 -50.936999,11.653 -63.629999,28.75 -24.064001,-2.588 -44.062001,23.625 -44.062001,23.625 -5e-4,0 18.891,9.450998 32.062001,1.531 -2.399,8.709998 -3.562,18.109998 -3.562,27.909998 0,45.17 56.124999,81.84 81.841999,81.84 26.72,0 81.85,-36.67 81.85,-81.84 0,-9.8 -1.17,-19.2 -3.57,-27.909998 13.17,7.919998 32.03,-1.531 32.03,-1.531 0,0 -19.97,-26.205 -44.03,-23.625 -13.06,-17.595 -34.71,-28.75 -66.28,-28.75 -0.89,0 -1.78,-0.018 -2.65,0 z" />
4597+ <path
4598+ inkscape:connector-curvature="0"
4599+ id="path3157-7"
4600+ style="fill:#ffffff;stroke:#000000;stroke-width:4.00005579;stroke-linecap:round;stroke-linejoin:round"
4601+ d="m 145.40113,112.74131 c 0.005,12.51701 -10.14301,22.66757 -22.66254,22.66757 -12.51701,0 -22.66505,-10.15056 -22.66253,-22.66757 -0.002,-12.51952 10.14552,-22.670078 22.66253,-22.670078 12.51953,0 22.66757,10.150558 22.66254,22.670078 z" />
4602+ <path
4603+ inkscape:connector-curvature="0"
4604+ id="path3159-4"
4605+ style="fill:#ffffff;stroke:#000000;stroke-width:4.00005579;stroke-linecap:round;stroke-linejoin:round"
4606+ d="m 198.13113,112.74131 c 0.005,12.51701 -10.14301,22.66757 -22.66254,22.66757 -12.51701,0 -22.66505,-10.15056 -22.66253,-22.66757 -0.003,-12.51952 10.14552,-22.670078 22.66253,-22.670078 12.51953,0 22.66757,10.150558 22.66254,22.670078 z" />
4607+ <path
4608+ inkscape:connector-curvature="0"
4609+ id="path3161-8"
4610+ style="fill:#000000"
4611+ d="m 177.98766,116.73511 c 0.002,4.1723 -3.38097,7.5558 -7.55412,7.5558 -4.1723,0 -7.55495,-3.3835 -7.55412,-7.5558 -8.3e-4,-4.17314 3.38182,-7.55664 7.55412,-7.55664 4.17315,0 7.5558,3.3835 7.55412,7.55664 z" />
4612+ <path
4613+ inkscape:connector-curvature="0"
4614+ id="path3163-7"
4615+ style="fill:#000000"
4616+ d="m 135.95766,116.73511 c 0.002,4.1723 -3.38098,7.5558 -7.55412,7.5558 -4.1723,0 -7.55495,-3.3835 -7.55412,-7.5558 -8.3e-4,-4.17314 3.38182,-7.55664 7.55412,-7.55664 4.17314,0 7.5558,3.3835 7.55412,7.55664 z" />
4617+ <path
4618+ inkscape:connector-curvature="0"
4619+ id="path3179-9"
4620+ style="fill:#6c5d53;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
4621+ d="m 170.51637,54.122582 c -1.99,-10.39 12.58,-36.409999 42.7,-46.1199986 20.71,-6.6800003 55.97,1.23 59.32,41.2299986 -13.48,-23.039999 -37.38,-28.539999 -48.7,-23.049999 -22.74,11.009999 -12.48,34.469999 -23.37,40.649999 -10.13,5.76 -27.88,-1.94 -29.95,-12.71 z" />
4622+ <path
4623+ inkscape:connector-curvature="0"
4624+ id="path3231-2"
4625+ style="fill:#000000;fill-opacity:0.31373004"
4626+ d="m 227.58637,97.912572 -1.87,2.659998 c 0.25,3.08 0.34,6.2 0.34,9.38 0,45.17 -55.12,81.84 -81.84,81.84 -20.707,0 -61.097999,-23.76 -76.063999,-56.6 7.616,40.25 57.171999,71.38 80.873999,71.38 26.72,0 81.85,-36.67 81.85,-81.84 0,-9.4 -1.08,-18.41 -3.29,-26.819998 z" />
4627+ <path
4628+ inkscape:connector-curvature="0"
4629+ id="path2398-4"
4630+ style="fill:#000000"
4631+ d="m 165.62637,177.37258 c -2.29,3.97 -6.5,5.84 -9.4,4.16 -2.89,-1.67 -3.38,-6.25 -1.09,-10.22 2.29,-3.97 6.5,-5.84 9.4,-4.16 2.89,1.67 3.38,6.24 1.09,10.22 z" />
4632+ <path
4633+ inkscape:connector-curvature="0"
4634+ id="path2412-3"
4635+ style="fill:#000000"
4636+ d="m 132.88637,177.37258 c 2.29,3.97 6.5,5.84 9.4,4.16 2.89,-1.67 3.38,-6.25 1.09,-10.22 -2.29,-3.97 -6.5,-5.84 -9.4,-4.16 -2.89,1.67 -3.38,6.24 -1.09,10.22 z" />
4637+ <path
4638+ inkscape:connector-curvature="0"
4639+ id="path3173-8"
4640+ style="fill:#6c5d53;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linejoin:round"
4641+ d="m 130.35637,54.122582 c 2,-10.39 -12.58,-36.409999 -42.689999,-46.1199986 C 66.94637,1.3225831 31.686369,9.2325834 28.336369,49.232582 41.81637,26.192583 65.71637,20.692583 77.046371,26.182583 c 22.73,11.009999 12.48,34.469999 23.359999,40.649999 10.13,5.76 27.89,-1.94 29.95,-12.71 z" />
4642+</svg>
4643
4644=== added file 'app/ui/compass.svg'
4645--- app/ui/compass.svg 1970-01-01 00:00:00 +0000
4646+++ app/ui/compass.svg 2015-04-28 21:23:25 +0000
4647@@ -0,0 +1,255 @@
4648+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
4649+<!-- Created with Inkscape (http://www.inkscape.org/) -->
4650+
4651+<svg
4652+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
4653+ xmlns:dc="http://purl.org/dc/elements/1.1/"
4654+ xmlns:cc="http://creativecommons.org/ns#"
4655+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
4656+ xmlns:svg="http://www.w3.org/2000/svg"
4657+ xmlns="http://www.w3.org/2000/svg"
4658+ xmlns:xlink="http://www.w3.org/1999/xlink"
4659+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
4660+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
4661+ id="svg3071"
4662+ version="1.1"
4663+ inkscape:version="0.48.4 r9939"
4664+ width="448"
4665+ height="448"
4666+ sodipodi:docname="compass.png">
4667+ <metadata
4668+ id="metadata3077">
4669+ <rdf:RDF>
4670+ <cc:Work
4671+ rdf:about="">
4672+ <dc:format>image/svg+xml</dc:format>
4673+ <dc:type
4674+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
4675+ <dc:title></dc:title>
4676+ </cc:Work>
4677+ </rdf:RDF>
4678+ </metadata>
4679+ <defs
4680+ id="defs3075">
4681+ <linearGradient
4682+ id="linearGradient5602">
4683+ <stop
4684+ id="stop5604"
4685+ offset="0"
4686+ style="stop-color:#000000;stop-opacity:1;" />
4687+ <stop
4688+ style="stop-color:#000000;stop-opacity:0.49803922;"
4689+ offset="0.5"
4690+ id="stop5606" />
4691+ <stop
4692+ id="stop5608"
4693+ offset="1"
4694+ style="stop-color:#000000;stop-opacity:0;" />
4695+ </linearGradient>
4696+ <linearGradient
4697+ id="linearGradient5592">
4698+ <stop
4699+ style="stop-color:#000000;stop-opacity:0;"
4700+ offset="0"
4701+ id="stop5610" />
4702+ <stop
4703+ id="stop5652"
4704+ offset="0.83999997"
4705+ style="stop-color:#808080;stop-opacity:1;" />
4706+ <stop
4707+ id="stop5622"
4708+ offset="0.93000001"
4709+ style="stop-color:#000000;stop-opacity:1;" />
4710+ <stop
4711+ id="stop5650"
4712+ offset="1"
4713+ style="stop-color:#808080;stop-opacity:1;" />
4714+ </linearGradient>
4715+ <linearGradient
4716+ id="linearGradient5582"
4717+ osb:paint="solid">
4718+ <stop
4719+ style="stop-color:#000000;stop-opacity:1;"
4720+ offset="0"
4721+ id="stop5584" />
4722+ </linearGradient>
4723+ <radialGradient
4724+ inkscape:collect="always"
4725+ xlink:href="#linearGradient5592"
4726+ id="radialGradient5598"
4727+ cx="225"
4728+ cy="228.5"
4729+ fx="225"
4730+ fy="228.5"
4731+ r="231.56505"
4732+ gradientTransform="matrix(1,0,0,1.0237514,0,-5.4272006)"
4733+ gradientUnits="userSpaceOnUse"
4734+ spreadMethod="reflect" />
4735+ </defs>
4736+ <sodipodi:namedview
4737+ pagecolor="#ffffff"
4738+ bordercolor="#666666"
4739+ borderopacity="1"
4740+ objecttolerance="10"
4741+ gridtolerance="10000"
4742+ guidetolerance="10"
4743+ inkscape:pageopacity="0"
4744+ inkscape:pageshadow="2"
4745+ inkscape:window-width="1871"
4746+ inkscape:window-height="1176"
4747+ id="namedview3073"
4748+ showgrid="true"
4749+ inkscape:zoom="2"
4750+ inkscape:cx="237.40462"
4751+ inkscape:cy="258.11086"
4752+ inkscape:window-x="49"
4753+ inkscape:window-y="24"
4754+ inkscape:window-maximized="1"
4755+ inkscape:current-layer="svg3071">
4756+ <inkscape:grid
4757+ type="xygrid"
4758+ id="grid3882"
4759+ empspacing="5"
4760+ visible="true"
4761+ enabled="true"
4762+ snapvisiblegridlinesonly="true" />
4763+ </sodipodi:namedview>
4764+ <g
4765+ id="g4048"
4766+ transform="translate(0,-1)">
4767+ <g
4768+ id="g4044">
4769+ <path
4770+ style="fill:#ff0000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4771+ d="m 224,33 46,146 -46,46 z"
4772+ id="path3083"
4773+ inkscape:connector-curvature="0"
4774+ sodipodi:nodetypes="cccc" />
4775+ <path
4776+ style="fill:#de8787;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4777+ d="m 224,33 -46,146 46,46 z"
4778+ id="path3083-0"
4779+ inkscape:connector-curvature="0"
4780+ sodipodi:nodetypes="cccc" />
4781+ </g>
4782+ <g
4783+ id="g4040">
4784+ <path
4785+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4786+ d="M 32.000007,225 178,179 l 46,46 z"
4787+ id="path3083-4-6-5"
4788+ inkscape:connector-curvature="0"
4789+ sodipodi:nodetypes="cccc" />
4790+ <path
4791+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4792+ d="m 32,225 146,46 46,-46 z"
4793+ id="path3083-4-6-5-7"
4794+ inkscape:connector-curvature="0"
4795+ sodipodi:nodetypes="cccc" />
4796+ </g>
4797+ <g
4798+ id="g4036">
4799+ <path
4800+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4801+ d="M 224,417 178,271 224,225 z"
4802+ id="path3083-4-6"
4803+ inkscape:connector-curvature="0"
4804+ sodipodi:nodetypes="cccc" />
4805+ <path
4806+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4807+ d="M 224,417 270,271 224,225 z"
4808+ id="path3083-4-6-5-7-7"
4809+ inkscape:connector-curvature="0"
4810+ sodipodi:nodetypes="cccc" />
4811+ </g>
4812+ <g
4813+ id="g4032">
4814+ <path
4815+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4816+ d="M 416,225 270,271 224,225 z"
4817+ id="path3083-4"
4818+ inkscape:connector-curvature="0"
4819+ sodipodi:nodetypes="cccc" />
4820+ <path
4821+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4822+ d="M 416,225 270,179 224,225 z"
4823+ id="path3083-4-6-5-7-7-9"
4824+ inkscape:connector-curvature="0"
4825+ sodipodi:nodetypes="cccc" />
4826+ </g>
4827+ </g>
4828+ <g
4829+ id="g4028"
4830+ transform="translate(0,-1)">
4831+ <path
4832+ sodipodi:nodetypes="cccc"
4833+ inkscape:connector-curvature="0"
4834+ id="path3083-4-6-5-7-7-9-2"
4835+ d="m 344,105 -61,39 5,17 z"
4836+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4837+ <path
4838+ sodipodi:nodetypes="cccc"
4839+ inkscape:connector-curvature="0"
4840+ id="path3083-4-4"
4841+ d="m 344,105 -39,61 -17,-5 z"
4842+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4843+ </g>
4844+ <g
4845+ id="g4028-9"
4846+ transform="matrix(0,1,-1,0,449,0)">
4847+ <path
4848+ sodipodi:nodetypes="cccc"
4849+ inkscape:connector-curvature="0"
4850+ id="path3083-4-6-5-7-7-9-2-6"
4851+ d="m 344,105 -61,39 5,17 z"
4852+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4853+ <path
4854+ sodipodi:nodetypes="cccc"
4855+ inkscape:connector-curvature="0"
4856+ id="path3083-4-4-9"
4857+ d="m 344,105 -39,61 -17,-5 z"
4858+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4859+ </g>
4860+ <g
4861+ id="g4028-9-7"
4862+ transform="matrix(-1,0,0,-1,448,449)">
4863+ <path
4864+ sodipodi:nodetypes="cccc"
4865+ inkscape:connector-curvature="0"
4866+ id="path3083-4-6-5-7-7-9-2-6-6"
4867+ d="m 344,105 -61,39 5,17 z"
4868+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4869+ <path
4870+ sodipodi:nodetypes="cccc"
4871+ inkscape:connector-curvature="0"
4872+ id="path3083-4-4-9-1"
4873+ d="m 344,105 -39,61 -17,-5 z"
4874+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4875+ </g>
4876+ <g
4877+ id="g4028-9-7-8"
4878+ transform="matrix(0,-1,1,0,-1,448)">
4879+ <path
4880+ sodipodi:nodetypes="cccc"
4881+ inkscape:connector-curvature="0"
4882+ id="path3083-4-6-5-7-7-9-2-6-6-5"
4883+ d="m 344,105 -61,39 5,17 z"
4884+ style="fill:#4d4d4d;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4885+ <path
4886+ sodipodi:nodetypes="cccc"
4887+ inkscape:connector-curvature="0"
4888+ id="path3083-4-4-9-1-3"
4889+ d="m 344,105 -39,61 -17,-5 z"
4890+ style="fill:#000000;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
4891+ </g>
4892+ <path
4893+ sodipodi:type="arc"
4894+ style="fill:none;stroke:url(#radialGradient5598);stroke-width:33.13010962999999975;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
4895+ id="path4134"
4896+ sodipodi:cx="225"
4897+ sodipodi:cy="228.5"
4898+ sodipodi:rx="215"
4899+ sodipodi:ry="220.5"
4900+ d="m 440,228.5 a 215,220.5 0 1 1 -430,0 215,220.5 0 1 1 430,0 z"
4901+ transform="matrix(0.96820006,0,0,0.94404995,6.1549856,8.2845898)" />
4902+</svg>
4903
4904=== added file 'app/ui/treasure_closed.svg'
4905--- app/ui/treasure_closed.svg 1970-01-01 00:00:00 +0000
4906+++ app/ui/treasure_closed.svg 2015-04-28 21:23:25 +0000
4907@@ -0,0 +1,728 @@
4908+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
4909+<!-- Created with Inkscape (http://www.inkscape.org/) -->
4910+
4911+<svg
4912+ xmlns:dc="http://purl.org/dc/elements/1.1/"
4913+ xmlns:cc="http://creativecommons.org/ns#"
4914+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
4915+ xmlns:svg="http://www.w3.org/2000/svg"
4916+ xmlns="http://www.w3.org/2000/svg"
4917+ xmlns:xlink="http://www.w3.org/1999/xlink"
4918+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
4919+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
4920+ width="100.62252"
4921+ height="139.83162"
4922+ id="svg2"
4923+ version="1.1"
4924+ inkscape:version="0.48.4 r9939"
4925+ sodipodi:docname="treasure_closed.svg">
4926+ <title
4927+ id="title6482">Treasure_closed</title>
4928+ <defs
4929+ id="defs4">
4930+ <linearGradient
4931+ id="linearGradient5616">
4932+ <stop
4933+ style="stop-color:#000000;stop-opacity:0.58823532;"
4934+ offset="0"
4935+ id="stop5618" />
4936+ <stop
4937+ style="stop-color:#000000;stop-opacity:0;"
4938+ offset="1"
4939+ id="stop5620" />
4940+ </linearGradient>
4941+ <linearGradient
4942+ inkscape:collect="always"
4943+ id="linearGradient5294">
4944+ <stop
4945+ style="stop-color:#000000;stop-opacity:1;"
4946+ offset="0"
4947+ id="stop5296" />
4948+ <stop
4949+ style="stop-color:#000000;stop-opacity:0;"
4950+ offset="1"
4951+ id="stop5298" />
4952+ </linearGradient>
4953+ <linearGradient
4954+ inkscape:collect="always"
4955+ id="linearGradient5210">
4956+ <stop
4957+ style="stop-color:#000000;stop-opacity:1;"
4958+ offset="0"
4959+ id="stop5212" />
4960+ <stop
4961+ style="stop-color:#000000;stop-opacity:0;"
4962+ offset="1"
4963+ id="stop5214" />
4964+ </linearGradient>
4965+ <linearGradient
4966+ inkscape:collect="always"
4967+ id="linearGradient5194">
4968+ <stop
4969+ style="stop-color:#000000;stop-opacity:1;"
4970+ offset="0"
4971+ id="stop5196" />
4972+ <stop
4973+ style="stop-color:#000000;stop-opacity:0;"
4974+ offset="1"
4975+ id="stop5198" />
4976+ </linearGradient>
4977+ <linearGradient
4978+ id="linearGradient4831">
4979+ <stop
4980+ style="stop-color:#cdb200;stop-opacity:1;"
4981+ offset="0"
4982+ id="stop4833" />
4983+ <stop
4984+ id="stop4839"
4985+ offset="0.5"
4986+ style="stop-color:#ffff87;stop-opacity:1;" />
4987+ <stop
4988+ style="stop-color:#cdb200;stop-opacity:1;"
4989+ offset="1"
4990+ id="stop4835" />
4991+ </linearGradient>
4992+ <inkscape:path-effect
4993+ effect="skeletal"
4994+ id="path-effect4277"
4995+ is_visible="true"
4996+ pattern="m 0.75,9.636699 51.42858,9.28572 0.004,-0.005"
4997+ copytype="single_stretched"
4998+ prop_scale="1"
4999+ scale_y_rel="false"
5000+ spacing="0"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches