Merge lp:~parnold-x/switchboard-plug-pantheon-shell/hotcorner-widget into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
- hotcorner-widget
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Danielle Foré |
Proposed branch: | lp:~parnold-x/switchboard-plug-pantheon-shell/hotcorner-widget |
Merge into: | lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk |
Diff against target: |
2461 lines (+2293/-71) 14 files modified
CMakeLists.txt (+1/-1) data/0.svg (+69/-0) data/1.svg (+133/-0) data/2.svg (+250/-0) data/3.svg (+309/-0) data/4.svg (+152/-0) data/5.svg (+117/-0) data/6.svg (+131/-0) data/7.svg (+131/-0) data/button.svg (+250/-0) data/display.svg (+220/-0) src/CMakeLists.txt (+1/-0) src/Hotcorners.vala (+526/-0) src/desktop-plug.vala (+3/-70) |
To merge this branch: | bzr merge lp:~parnold-x/switchboard-plug-pantheon-shell/hotcorner-widget |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Fabio Zaramella (community) | Needs Information | ||
elementary UX | Pending | ||
elementary Apps team | Pending | ||
Review via email:
|
Commit message
Description of the change
Add Integrated hotcorner widget.
Mockup by Reda Lazri
See https:/
- 252. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 253. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 254. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 255. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 256. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 257. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 258. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Fabio Zaramella (fabiozaramella) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Djax (parnold-x) wrote : | # |
No blurr here but I can upload higher resolutions for the images in the next days...
A argument for your first point would be good.
I thought it is obv. for everybody what to do. In the category "hot corners" with drawn hot corners to hover over the hot corner but maybe I am assuming too much.
Np to add a label or something with instructions though.
- 259. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 260. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 261. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 262. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 263. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 264. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 265. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 266. By ffabio-96-x
-
Remove Small and Extra Large dock icon size options
- 267. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 268. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 269. By Djax
-
Use radio buttons for hide modes and better describe them (lp:1290340)
- 270. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 271. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 272. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 273. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 274. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 275. By Viko Adi Rahmawan
-
org.gnome.
desktop. background picture-uri only support uri, so we give them uri - 276. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 277. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 278. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 279. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 280. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 281. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 282. By artem-anufrij
-
Correct the index of hide_mode_ids which caused the dock settings to be jumbled (lp:1393303)
- 283. By Artem Anufrij
-
Equal hide_mode_ids value instead index
- 284. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 285. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 286. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 287. By Corentin Noël
-
Preparing for Switchboard search feature.
- 288. By Corentin Noël
-
Search the right query.
- 289. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 290. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 291. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 292. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 293. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 294. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 295. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 296. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 297. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 298. By Corentin Noël
-
Use libplank for controlling dock, gain support for new Gtk+ theme.
- 299. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 300. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 301. By Akshay Shekher
-
removed theme selection combo box (lp:1404611)
- 302. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 303. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 304. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 305. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 306. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 307. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 308. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 309. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 310. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 311. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 312. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 313. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 314. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 315. By Marvin Beckers
-
set wallpaper now via accountsservice to make it available for pantheon-greeter
- 316. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 317. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 318. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 319. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 320. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 321. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 322. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 323. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 324. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 325. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 326. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 327. By Erasmo Marín
-
Cache wallpapers for faster plug load time
Add a new wallpaper widget with selection improvements
- 328. By Cody Garver
-
Bump valac dependency to 0.26
- 329. By Rico Tzschichholz
-
debian: Do not hard-depend on a specific valac series
- 330. By Rico Tzschichholz
-
Bump gtk+ requirement to >= 3.14
- 331. By Cody Garver
-
Release 0.2.0
- 332. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 333. By Rico Tzschichholz
-
Adapt to plank's "Monitor" settings change.
- 334. By Cody Garver
-
Release 0.2.0.1
- 335. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 336. By Launchpad Translations on behalf of elementary-apps
-
Launchpad automatic translations update.
- 337. By Cody Garver
-
Initial support for new Plank window-dodge Hide Mode
- 338. By Cody Garver
-
Updated translation template
- 339. By Djax
-
add integrated hotcorner widget
Preview Diff
1 | === modified file 'CMakeLists.txt' | |||
2 | --- CMakeLists.txt 2015-04-07 01:24:23 +0000 | |||
3 | +++ CMakeLists.txt 2015-04-17 22:11:56 +0000 | |||
4 | @@ -49,7 +49,7 @@ | |||
5 | 49 | add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) | 49 | add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) |
6 | 50 | 50 | ||
7 | 51 | # Files | 51 | # Files |
9 | 52 | file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*.png") | 52 | file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*.svg") |
10 | 53 | 53 | ||
11 | 54 | install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-shell.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") | 54 | install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-shell.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") |
12 | 55 | 55 | ||
13 | 56 | 56 | ||
14 | === added file 'data/0.svg' | |||
15 | --- data/0.svg 1970-01-01 00:00:00 +0000 | |||
16 | +++ data/0.svg 2015-04-17 22:11:56 +0000 | |||
17 | @@ -0,0 +1,69 @@ | |||
18 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
19 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
20 | 3 | |||
21 | 4 | <svg | ||
22 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
23 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
24 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
25 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
26 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
27 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
28 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
29 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
30 | 13 | width="16" | ||
31 | 14 | height="16" | ||
32 | 15 | id="svg3010" | ||
33 | 16 | version="1.1" | ||
34 | 17 | inkscape:version="0.48.4 r9939" | ||
35 | 18 | sodipodi:docname="New document 1"> | ||
36 | 19 | <defs | ||
37 | 20 | id="defs3012" /> | ||
38 | 21 | <sodipodi:namedview | ||
39 | 22 | id="base" | ||
40 | 23 | pagecolor="#ffffff" | ||
41 | 24 | bordercolor="#666666" | ||
42 | 25 | borderopacity="1.0" | ||
43 | 26 | inkscape:pageopacity="0.0" | ||
44 | 27 | inkscape:pageshadow="2" | ||
45 | 28 | inkscape:zoom="31.678384" | ||
46 | 29 | inkscape:cx="6.5116781" | ||
47 | 30 | inkscape:cy="9.2795011" | ||
48 | 31 | inkscape:document-units="px" | ||
49 | 32 | inkscape:current-layer="layer1" | ||
50 | 33 | showgrid="false" | ||
51 | 34 | inkscape:window-width="1600" | ||
52 | 35 | inkscape:window-height="845" | ||
53 | 36 | inkscape:window-x="0" | ||
54 | 37 | inkscape:window-y="30" | ||
55 | 38 | inkscape:window-maximized="1" /> | ||
56 | 39 | <metadata | ||
57 | 40 | id="metadata3015"> | ||
58 | 41 | <rdf:RDF> | ||
59 | 42 | <cc:Work | ||
60 | 43 | rdf:about=""> | ||
61 | 44 | <dc:format>image/svg+xml</dc:format> | ||
62 | 45 | <dc:type | ||
63 | 46 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
64 | 47 | <dc:title></dc:title> | ||
65 | 48 | </cc:Work> | ||
66 | 49 | </rdf:RDF> | ||
67 | 50 | </metadata> | ||
68 | 51 | <g | ||
69 | 52 | inkscape:label="Layer 1" | ||
70 | 53 | inkscape:groupmode="layer" | ||
71 | 54 | id="layer1" | ||
72 | 55 | transform="translate(0,-1036.3622)"> | ||
73 | 56 | <image | ||
74 | 57 | y="1036.3442" | ||
75 | 58 | x="-0.013481841" | ||
76 | 59 | id="image3080" | ||
77 | 60 | xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAHVJREFU | ||
78 | 61 | OI3Fk9EJwCAMBc/iNI7jSu4TnMZx0n61pZKgpULvS0h4mIuGUgpfiF4h53ydVZVa67sAgJTSDtBa | ||
79 | 62 | C17PNrriiP8DIjyFeVg9InJLPIVZWLVT7JoRVNVc1cwaI2A+kn5mETED/l/jGokWntjpAO/39Rw3 | ||
80 | 63 | rytGcIv6FAAAAABJRU5ErkJggg== | ||
81 | 64 | " | ||
82 | 65 | height="16" | ||
83 | 66 | width="16" | ||
84 | 67 | style="fill:#000000" /> | ||
85 | 68 | </g> | ||
86 | 69 | </svg> | ||
87 | 0 | 70 | ||
88 | === added file 'data/1.svg' | |||
89 | --- data/1.svg 1970-01-01 00:00:00 +0000 | |||
90 | +++ data/1.svg 2015-04-17 22:11:56 +0000 | |||
91 | @@ -0,0 +1,133 @@ | |||
92 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
93 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
94 | 3 | |||
95 | 4 | <svg | ||
96 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
97 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
98 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
99 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
100 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
101 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
102 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
103 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
104 | 13 | width="16" | ||
105 | 14 | height="16" | ||
106 | 15 | id="svg6179" | ||
107 | 16 | version="1.1" | ||
108 | 17 | inkscape:version="0.48.4 r9939" | ||
109 | 18 | sodipodi:docname="1.svg"> | ||
110 | 19 | <defs | ||
111 | 20 | id="defs6181"> | ||
112 | 21 | <linearGradient | ||
113 | 22 | inkscape:collect="always" | ||
114 | 23 | xlink:href="#linearGradient5803-6-2" | ||
115 | 24 | id="linearGradient3324" | ||
116 | 25 | gradientUnits="userSpaceOnUse" | ||
117 | 26 | gradientTransform="matrix(0.4265442,0,0,0.41469579,-54.439253,2.5228637)" | ||
118 | 27 | x1="167.98311" | ||
119 | 28 | y1="13.398731" | ||
120 | 29 | x2="167.98311" | ||
121 | 30 | y2="54.780239" /> | ||
122 | 31 | <linearGradient | ||
123 | 32 | id="linearGradient5803-6-2"> | ||
124 | 33 | <stop | ||
125 | 34 | id="stop5805-7-1" | ||
126 | 35 | style="stop-color:#ffffff;stop-opacity:1;" | ||
127 | 36 | offset="0" /> | ||
128 | 37 | <stop | ||
129 | 38 | id="stop5807-8-5" | ||
130 | 39 | style="stop-color:#e6f4f8;stop-opacity:1;" | ||
131 | 40 | offset="1" /> | ||
132 | 41 | </linearGradient> | ||
133 | 42 | </defs> | ||
134 | 43 | <sodipodi:namedview | ||
135 | 44 | id="base" | ||
136 | 45 | pagecolor="#ffffff" | ||
137 | 46 | bordercolor="#666666" | ||
138 | 47 | borderopacity="1.0" | ||
139 | 48 | inkscape:pageopacity="0.0" | ||
140 | 49 | inkscape:pageshadow="2" | ||
141 | 50 | inkscape:zoom="11.313708" | ||
142 | 51 | inkscape:cx="-11.336265" | ||
143 | 52 | inkscape:cy="5.0980221" | ||
144 | 53 | inkscape:document-units="px" | ||
145 | 54 | inkscape:current-layer="layer1" | ||
146 | 55 | showgrid="true" | ||
147 | 56 | inkscape:showpageshadow="false" | ||
148 | 57 | inkscape:snap-page="true" | ||
149 | 58 | inkscape:window-width="1600" | ||
150 | 59 | inkscape:window-height="845" | ||
151 | 60 | inkscape:window-x="0" | ||
152 | 61 | inkscape:window-y="30" | ||
153 | 62 | inkscape:window-maximized="1" | ||
154 | 63 | inkscape:snap-bbox="true" | ||
155 | 64 | inkscape:bbox-nodes="true"> | ||
156 | 65 | <inkscape:grid | ||
157 | 66 | type="xygrid" | ||
158 | 67 | id="grid6187" | ||
159 | 68 | empspacing="5" | ||
160 | 69 | visible="true" | ||
161 | 70 | enabled="true" | ||
162 | 71 | snapvisiblegridlinesonly="true" /> | ||
163 | 72 | </sodipodi:namedview> | ||
164 | 73 | <metadata | ||
165 | 74 | id="metadata6184"> | ||
166 | 75 | <rdf:RDF> | ||
167 | 76 | <cc:Work | ||
168 | 77 | rdf:about=""> | ||
169 | 78 | <dc:format>image/svg+xml</dc:format> | ||
170 | 79 | <dc:type | ||
171 | 80 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
172 | 81 | <dc:title /> | ||
173 | 82 | </cc:Work> | ||
174 | 83 | </rdf:RDF> | ||
175 | 84 | </metadata> | ||
176 | 85 | <g | ||
177 | 86 | inkscape:label="Layer 1" | ||
178 | 87 | inkscape:groupmode="layer" | ||
179 | 88 | id="layer1" | ||
180 | 89 | transform="translate(0,-1036.3622)"> | ||
181 | 90 | <g | ||
182 | 91 | id="g2998"> | ||
183 | 92 | <rect | ||
184 | 93 | y="1036.3622" | ||
185 | 94 | x="0" | ||
186 | 95 | height="16" | ||
187 | 96 | width="16" | ||
188 | 97 | id="rect7100" | ||
189 | 98 | style="opacity:0;color:#000000;fill:#313e37;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
190 | 99 | <rect | ||
191 | 100 | ry="1" | ||
192 | 101 | rx="1" | ||
193 | 102 | y="1036.3622" | ||
194 | 103 | x="0" | ||
195 | 104 | height="11" | ||
196 | 105 | width="16" | ||
197 | 106 | id="rect7087" | ||
198 | 107 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
199 | 108 | <rect | ||
200 | 109 | ry="1" | ||
201 | 110 | rx="1" | ||
202 | 111 | y="1048.3622" | ||
203 | 112 | x="0" | ||
204 | 113 | height="3" | ||
205 | 114 | width="5" | ||
206 | 115 | id="rect7089" | ||
207 | 116 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
208 | 117 | <rect | ||
209 | 118 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
210 | 119 | id="rect7091" | ||
211 | 120 | width="5" | ||
212 | 121 | height="3" | ||
213 | 122 | x="6" | ||
214 | 123 | y="1048.3622" | ||
215 | 124 | rx="1" | ||
216 | 125 | ry="1" /> | ||
217 | 126 | <path | ||
218 | 127 | inkscape:connector-curvature="0" | ||
219 | 128 | id="rect7095" | ||
220 | 129 | d="m 13,1048.3622 0,1 -1,0 0,1 1,0 0,1 1,0 0,-1 1,0 0,-1 -1,0 0,-1 -1,0 z" | ||
221 | 130 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
222 | 131 | </g> | ||
223 | 132 | </g> | ||
224 | 133 | </svg> | ||
225 | 0 | 134 | ||
226 | === added file 'data/2.svg' | |||
227 | --- data/2.svg 1970-01-01 00:00:00 +0000 | |||
228 | +++ data/2.svg 2015-04-17 22:11:56 +0000 | |||
229 | @@ -0,0 +1,250 @@ | |||
230 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
231 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
232 | 3 | |||
233 | 4 | <svg | ||
234 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
235 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
236 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
237 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
238 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
239 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
240 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
241 | 12 | version="1.0" | ||
242 | 13 | width="16" | ||
243 | 14 | height="16" | ||
244 | 15 | id="svg2747" | ||
245 | 16 | sodipodi:version="0.32" | ||
246 | 17 | inkscape:version="0.48.4 r9939" | ||
247 | 18 | sodipodi:docname="2.svg" | ||
248 | 19 | inkscape:output_extension="org.inkscape.output.svg.inkscape"> | ||
249 | 20 | <metadata | ||
250 | 21 | id="metadata9"> | ||
251 | 22 | <rdf:RDF> | ||
252 | 23 | <cc:Work | ||
253 | 24 | rdf:about=""> | ||
254 | 25 | <dc:format>image/svg+xml</dc:format> | ||
255 | 26 | <dc:type | ||
256 | 27 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
257 | 28 | <dc:title /> | ||
258 | 29 | </cc:Work> | ||
259 | 30 | </rdf:RDF> | ||
260 | 31 | </metadata> | ||
261 | 32 | <sodipodi:namedview | ||
262 | 33 | inkscape:window-height="845" | ||
263 | 34 | inkscape:window-width="1600" | ||
264 | 35 | inkscape:pageshadow="2" | ||
265 | 36 | inkscape:pageopacity="0" | ||
266 | 37 | guidetolerance="10.0" | ||
267 | 38 | gridtolerance="10.0" | ||
268 | 39 | objecttolerance="10.0" | ||
269 | 40 | borderopacity="1.0" | ||
270 | 41 | bordercolor="#666666" | ||
271 | 42 | pagecolor="#dedede" | ||
272 | 43 | id="base" | ||
273 | 44 | showgrid="false" | ||
274 | 45 | showguides="false" | ||
275 | 46 | inkscape:guide-bbox="true" | ||
276 | 47 | showborder="true" | ||
277 | 48 | inkscape:zoom="10.822662" | ||
278 | 49 | inkscape:cx="18.390206" | ||
279 | 50 | inkscape:cy="20.04631" | ||
280 | 51 | inkscape:window-x="0" | ||
281 | 52 | inkscape:window-y="30" | ||
282 | 53 | inkscape:current-layer="svg2747" | ||
283 | 54 | fit-margin-top="0" | ||
284 | 55 | fit-margin-left="0" | ||
285 | 56 | fit-margin-right="0" | ||
286 | 57 | fit-margin-bottom="0" | ||
287 | 58 | inkscape:window-maximized="1"> | ||
288 | 59 | <sodipodi:guide | ||
289 | 60 | orientation="1,0" | ||
290 | 61 | position="286.91968,115.79117" | ||
291 | 62 | id="guide2386" /> | ||
292 | 63 | <sodipodi:guide | ||
293 | 64 | orientation="0,1" | ||
294 | 65 | position="299.19277,123.05221" | ||
295 | 66 | id="guide2388" /> | ||
296 | 67 | <inkscape:grid | ||
297 | 68 | type="xygrid" | ||
298 | 69 | id="grid2387" | ||
299 | 70 | visible="true" | ||
300 | 71 | enabled="true" | ||
301 | 72 | empspacing="5" | ||
302 | 73 | snapvisiblegridlinesonly="true" /> | ||
303 | 74 | </sodipodi:namedview> | ||
304 | 75 | <defs | ||
305 | 76 | id="defs2749"> | ||
306 | 77 | <linearGradient | ||
307 | 78 | id="linearGradient3587-6-5-1-5"> | ||
308 | 79 | <stop | ||
309 | 80 | offset="0" | ||
310 | 81 | style="stop-color:#000000;stop-opacity:1" | ||
311 | 82 | id="stop3589-9-2-8-5" /> | ||
312 | 83 | <stop | ||
313 | 84 | offset="1" | ||
314 | 85 | style="stop-color:#646464;stop-opacity:1" | ||
315 | 86 | id="stop3591-7-4-3-0" /> | ||
316 | 87 | </linearGradient> | ||
317 | 88 | </defs> | ||
318 | 89 | <text | ||
319 | 90 | id="text4087-2-6-5" | ||
320 | 91 | y="238.8988" | ||
321 | 92 | x="337.90759" | ||
322 | 93 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
323 | 94 | xml:space="preserve"><tspan | ||
324 | 95 | y="238.8988" | ||
325 | 96 | x="337.90759" | ||
326 | 97 | id="tspan4089-7-2-9" | ||
327 | 98 | sodipodi:role="line" /></text> | ||
328 | 99 | <text | ||
329 | 100 | xml:space="preserve" | ||
330 | 101 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
331 | 102 | x="-1677.7749" | ||
332 | 103 | y="1062.9437" | ||
333 | 104 | id="text4087-2-6-5-59"><tspan | ||
334 | 105 | sodipodi:role="line" | ||
335 | 106 | id="tspan4089-7-2-9-4" | ||
336 | 107 | x="-1677.7749" | ||
337 | 108 | y="1062.9437" /></text> | ||
338 | 109 | <flowRoot | ||
339 | 110 | xml:space="preserve" | ||
340 | 111 | id="flowRoot38698" | ||
341 | 112 | style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" | ||
342 | 113 | transform="translate(-81.87659,-690.30726)"><flowRegion | ||
343 | 114 | id="flowRegion38700"><rect | ||
344 | 115 | id="rect38702" | ||
345 | 116 | width="40" | ||
346 | 117 | height="23" | ||
347 | 118 | x="531" | ||
348 | 119 | y="299" /></flowRegion><flowPara | ||
349 | 120 | id="flowPara38704" /></flowRoot> <path | ||
350 | 121 | style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
351 | 122 | d="M 7.9999999,0 10.849999,2.8500001 8.45,5.2500002 7.9999999,5.7000003 10.3,8.0000003 10.749999,7.5500004 13.15,5.1500002 16,8.0000003 16,0 8,0 z M 0,8.0000003 0,16 l 8,0 -2.8999999,-2.899999 1.95,-1.9 L 7.9999999,10.3 5.7499999,8.0000003 4.8,8.9500004 2.9,10.9 0,8.0000003 z" | ||
352 | 123 | id="path6691" | ||
353 | 124 | inkscape:connector-curvature="0" /> | ||
354 | 125 | <text | ||
355 | 126 | id="text4087-2-6-5-1" | ||
356 | 127 | y="7.7151051" | ||
357 | 128 | x="-750.84784" | ||
358 | 129 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
359 | 130 | xml:space="preserve"><tspan | ||
360 | 131 | y="7.7151051" | ||
361 | 132 | x="-750.84784" | ||
362 | 133 | id="tspan4089-7-2-9-7" | ||
363 | 134 | sodipodi:role="line" /></text> | ||
364 | 135 | <text | ||
365 | 136 | id="text4087-2-6-5-7" | ||
366 | 137 | y="-449.28488" | ||
367 | 138 | x="141.77814" | ||
368 | 139 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
369 | 140 | xml:space="preserve"><tspan | ||
370 | 141 | y="-449.28488" | ||
371 | 142 | x="141.77814" | ||
372 | 143 | id="tspan4089-7-2-9-1" | ||
373 | 144 | sodipodi:role="line" /></text> | ||
374 | 145 | <text | ||
375 | 146 | id="text4087-2-6-5-5" | ||
376 | 147 | y="-494.31586" | ||
377 | 148 | x="168.26166" | ||
378 | 149 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
379 | 150 | xml:space="preserve"><tspan | ||
380 | 151 | y="-494.31586" | ||
381 | 152 | x="168.26166" | ||
382 | 153 | id="tspan4089-7-2-9-6" | ||
383 | 154 | sodipodi:role="line" /></text> | ||
384 | 155 | <text | ||
385 | 156 | id="text4087-2-6-5-3" | ||
386 | 157 | y="-502.28488" | ||
387 | 158 | x="-1480.2218" | ||
388 | 159 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
389 | 160 | xml:space="preserve"><tspan | ||
390 | 161 | y="-502.28488" | ||
391 | 162 | x="-1480.2218" | ||
392 | 163 | id="tspan4089-7-2-9-18" | ||
393 | 164 | sodipodi:role="line" /></text> | ||
394 | 165 | <text | ||
395 | 166 | id="text4087-2-6-5-4" | ||
396 | 167 | y="-804.28491" | ||
397 | 168 | x="134.086" | ||
398 | 169 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
399 | 170 | xml:space="preserve"><tspan | ||
400 | 171 | y="-804.28491" | ||
401 | 172 | x="134.086" | ||
402 | 173 | id="tspan4089-7-2-9-9" | ||
403 | 174 | sodipodi:role="line" /></text> | ||
404 | 175 | <text | ||
405 | 176 | id="text4087-2-6-5-7-1" | ||
406 | 177 | y="-111.61586" | ||
407 | 178 | x="1776.6676" | ||
408 | 179 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
409 | 180 | xml:space="preserve"><tspan | ||
410 | 181 | y="-111.61586" | ||
411 | 182 | x="1776.6676" | ||
412 | 183 | id="tspan4089-7-2-9-1-8" | ||
413 | 184 | sodipodi:role="line" /></text> | ||
414 | 185 | <text | ||
415 | 186 | id="text4087-2-6-5-5-5" | ||
416 | 187 | y="-156.64684" | ||
417 | 188 | x="1803.151" | ||
418 | 189 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
419 | 190 | xml:space="preserve"><tspan | ||
420 | 191 | y="-156.64684" | ||
421 | 192 | x="1803.151" | ||
422 | 193 | id="tspan4089-7-2-9-6-9" | ||
423 | 194 | sodipodi:role="line" /></text> | ||
424 | 195 | <text | ||
425 | 196 | id="text4087-2-6-5-75" | ||
426 | 197 | y="-164.61586" | ||
427 | 198 | x="154.66754" | ||
428 | 199 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
429 | 200 | xml:space="preserve"><tspan | ||
430 | 201 | y="-164.61586" | ||
431 | 202 | x="154.66754" | ||
432 | 203 | id="tspan4089-7-2-9-3" | ||
433 | 204 | sodipodi:role="line" /></text> | ||
434 | 205 | <text | ||
435 | 206 | id="text4087-2-6-5-4-8" | ||
436 | 207 | y="-466.61584" | ||
437 | 208 | x="1768.9755" | ||
438 | 209 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
439 | 210 | xml:space="preserve"><tspan | ||
440 | 211 | y="-466.61584" | ||
441 | 212 | x="1768.9755" | ||
442 | 213 | id="tspan4089-7-2-9-9-8" | ||
443 | 214 | sodipodi:role="line" /></text> | ||
444 | 215 | <text | ||
445 | 216 | id="text4087-2-6-5-45" | ||
446 | 217 | y="-217.77017" | ||
447 | 218 | x="-881.88147" | ||
448 | 219 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
449 | 220 | xml:space="preserve"><tspan | ||
450 | 221 | y="-217.77017" | ||
451 | 222 | x="-881.88147" | ||
452 | 223 | id="tspan4089-7-2-9-75" | ||
453 | 224 | sodipodi:role="line" /></text> | ||
454 | 225 | <text | ||
455 | 226 | xml:space="preserve" | ||
456 | 227 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
457 | 228 | x="-2897.564" | ||
458 | 229 | y="606.27478" | ||
459 | 230 | id="text4087-2-6-5-59-0"><tspan | ||
460 | 231 | sodipodi:role="line" | ||
461 | 232 | id="tspan4089-7-2-9-4-4" | ||
462 | 233 | x="-2897.564" | ||
463 | 234 | y="606.27478" /></text> | ||
464 | 235 | <g | ||
465 | 236 | transform="translate(-338.00604,-450.49095)" | ||
466 | 237 | inkscape:label="Layer#2" | ||
467 | 238 | id="layer4"> | ||
468 | 239 | <text | ||
469 | 240 | xml:space="preserve" | ||
470 | 241 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" | ||
471 | 242 | x="-664.2738" | ||
472 | 243 | y="1159.4154" | ||
473 | 244 | id="text4087-2-6-5-0"><tspan | ||
474 | 245 | sodipodi:role="line" | ||
475 | 246 | id="tspan4089-7-2-9-13" | ||
476 | 247 | x="-664.2738" | ||
477 | 248 | y="1159.4154" /></text> | ||
478 | 249 | </g> | ||
479 | 250 | </svg> | ||
480 | 0 | 251 | ||
481 | === added file 'data/3.svg' | |||
482 | --- data/3.svg 1970-01-01 00:00:00 +0000 | |||
483 | +++ data/3.svg 2015-04-17 22:11:56 +0000 | |||
484 | @@ -0,0 +1,309 @@ | |||
485 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
486 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
487 | 3 | |||
488 | 4 | <svg | ||
489 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
490 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
491 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
492 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
493 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
494 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
495 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
496 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
497 | 13 | version="1.2" | ||
498 | 14 | width="16" | ||
499 | 15 | height="16" | ||
500 | 16 | id="svg2747" | ||
501 | 17 | inkscape:version="0.48.4 r9939" | ||
502 | 18 | sodipodi:docname="3.svg"> | ||
503 | 19 | <sodipodi:namedview | ||
504 | 20 | pagecolor="#ffffff" | ||
505 | 21 | bordercolor="#666666" | ||
506 | 22 | borderopacity="1" | ||
507 | 23 | objecttolerance="10" | ||
508 | 24 | gridtolerance="10" | ||
509 | 25 | guidetolerance="10" | ||
510 | 26 | inkscape:pageopacity="0" | ||
511 | 27 | inkscape:pageshadow="2" | ||
512 | 28 | inkscape:window-width="1600" | ||
513 | 29 | inkscape:window-height="845" | ||
514 | 30 | id="namedview62" | ||
515 | 31 | showgrid="false" | ||
516 | 32 | inkscape:zoom="14.75" | ||
517 | 33 | inkscape:cx="2.6271183" | ||
518 | 34 | inkscape:cy="5.2881356" | ||
519 | 35 | inkscape:window-x="0" | ||
520 | 36 | inkscape:window-y="30" | ||
521 | 37 | inkscape:window-maximized="1" | ||
522 | 38 | inkscape:current-layer="svg2747" /> | ||
523 | 39 | <metadata | ||
524 | 40 | id="metadata9"> | ||
525 | 41 | <rdf:RDF> | ||
526 | 42 | <cc:Work | ||
527 | 43 | rdf:about=""> | ||
528 | 44 | <dc:format>image/svg+xml</dc:format> | ||
529 | 45 | <dc:type | ||
530 | 46 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
531 | 47 | <dc:title /> | ||
532 | 48 | </cc:Work> | ||
533 | 49 | </rdf:RDF> | ||
534 | 50 | </metadata> | ||
535 | 51 | <defs | ||
536 | 52 | id="defs2749"> | ||
537 | 53 | <linearGradient | ||
538 | 54 | id="linearGradient3788"> | ||
539 | 55 | <stop | ||
540 | 56 | id="stop3790" | ||
541 | 57 | style="stop-color:#ffffff;stop-opacity:1" | ||
542 | 58 | offset="0" /> | ||
543 | 59 | <stop | ||
544 | 60 | id="stop3792" | ||
545 | 61 | style="stop-color:#ffffff;stop-opacity:0" | ||
546 | 62 | offset="1" /> | ||
547 | 63 | </linearGradient> | ||
548 | 64 | <linearGradient | ||
549 | 65 | id="linearGradient3587-6-5-1-5"> | ||
550 | 66 | <stop | ||
551 | 67 | id="stop3589-9-2-8-5" | ||
552 | 68 | style="stop-color:#000000;stop-opacity:1" | ||
553 | 69 | offset="0" /> | ||
554 | 70 | <stop | ||
555 | 71 | id="stop3591-7-4-3-0" | ||
556 | 72 | style="stop-color:#646464;stop-opacity:1" | ||
557 | 73 | offset="1" /> | ||
558 | 74 | </linearGradient> | ||
559 | 75 | <linearGradient | ||
560 | 76 | x1="19.490692" | ||
561 | 77 | y1="-4.321744" | ||
562 | 78 | x2="22.886868" | ||
563 | 79 | y2="-0.92556846" | ||
564 | 80 | id="linearGradient6693" | ||
565 | 81 | xlink:href="#linearGradient3587-6-5-1-5" | ||
566 | 82 | gradientUnits="userSpaceOnUse" | ||
567 | 83 | gradientTransform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,8.878258,-7.4350298)" /> | ||
568 | 84 | <linearGradient | ||
569 | 85 | x1="22.863201" | ||
570 | 86 | y1="-0.94923496" | ||
571 | 87 | x2="26.23391" | ||
572 | 88 | y2="2.4214737" | ||
573 | 89 | id="linearGradient6695" | ||
574 | 90 | xlink:href="#linearGradient3587-6-5-1-5" | ||
575 | 91 | gradientUnits="userSpaceOnUse" | ||
576 | 92 | gradientTransform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,8.878258,-7.4350298)" /> | ||
577 | 93 | <linearGradient | ||
578 | 94 | x1="8.1313992" | ||
579 | 95 | y1="19.049677" | ||
580 | 96 | x2="8.1313992" | ||
581 | 97 | y2="15.935893" | ||
582 | 98 | id="linearGradient3794" | ||
583 | 99 | xlink:href="#linearGradient3788" | ||
584 | 100 | gradientUnits="userSpaceOnUse" | ||
585 | 101 | gradientTransform="matrix(1.1333334,0,0,0.99999997,-0.06666673,-2.9999999)" /> | ||
586 | 102 | <linearGradient | ||
587 | 103 | id="linearGradient3732-77"> | ||
588 | 104 | <stop | ||
589 | 105 | id="stop3734-3" | ||
590 | 106 | style="stop-color:#000000;stop-opacity:1" | ||
591 | 107 | offset="0" /> | ||
592 | 108 | <stop | ||
593 | 109 | id="stop3736-71" | ||
594 | 110 | style="stop-color:#000000;stop-opacity:0" | ||
595 | 111 | offset="1" /> | ||
596 | 112 | </linearGradient> | ||
597 | 113 | <linearGradient | ||
598 | 114 | x1="8.1313992" | ||
599 | 115 | y1="19.049677" | ||
600 | 116 | x2="8.1313992" | ||
601 | 117 | y2="15.935893" | ||
602 | 118 | id="linearGradient5038" | ||
603 | 119 | xlink:href="#linearGradient3732-77" | ||
604 | 120 | gradientUnits="userSpaceOnUse" | ||
605 | 121 | gradientTransform="matrix(0.8666667,0,0,0.73333335,2.0666666,-16.066667)" /> | ||
606 | 122 | <linearGradient | ||
607 | 123 | x1="25.570522" | ||
608 | 124 | y1="3.289499" | ||
609 | 125 | x2="22.077217" | ||
610 | 126 | y2="-0.20380709" | ||
611 | 127 | id="linearGradient6695-0" | ||
612 | 128 | xlink:href="#linearGradient3587-6-5-1-5-5" | ||
613 | 129 | gradientUnits="userSpaceOnUse" | ||
614 | 130 | gradientTransform="matrix(-0.7071068,-0.7071068,0.7071068,-0.7071068,22.87868,28.43503)" /> | ||
615 | 131 | <linearGradient | ||
616 | 132 | id="linearGradient3587-6-5-1-5-5"> | ||
617 | 133 | <stop | ||
618 | 134 | id="stop3589-9-2-8-5-6" | ||
619 | 135 | style="stop-color:#000000;stop-opacity:1" | ||
620 | 136 | offset="0" /> | ||
621 | 137 | <stop | ||
622 | 138 | id="stop3591-7-4-3-0-7" | ||
623 | 139 | style="stop-color:#646464;stop-opacity:1" | ||
624 | 140 | offset="1" /> | ||
625 | 141 | </linearGradient> | ||
626 | 142 | <linearGradient | ||
627 | 143 | x1="25.91716" | ||
628 | 144 | y1="-4.1850104" | ||
629 | 145 | x2="22.35718" | ||
630 | 146 | y2="-7.7449903" | ||
631 | 147 | id="linearGradient6693-5" | ||
632 | 148 | xlink:href="#linearGradient3587-6-5-1-5-5" | ||
633 | 149 | gradientUnits="userSpaceOnUse" | ||
634 | 150 | gradientTransform="matrix(-0.7071068,-0.7071068,0.7071068,-0.7071068,32.87868,18.43503)" /> | ||
635 | 151 | <linearGradient | ||
636 | 152 | id="linearGradient3254"> | ||
637 | 153 | <stop | ||
638 | 154 | id="stop3256" | ||
639 | 155 | style="stop-color:#000000;stop-opacity:1" | ||
640 | 156 | offset="0" /> | ||
641 | 157 | <stop | ||
642 | 158 | id="stop3258" | ||
643 | 159 | style="stop-color:#646464;stop-opacity:1" | ||
644 | 160 | offset="1" /> | ||
645 | 161 | </linearGradient> | ||
646 | 162 | </defs> | ||
647 | 163 | <text | ||
648 | 164 | x="337.90759" | ||
649 | 165 | y="238.8988" | ||
650 | 166 | id="text4087-2-6-5" | ||
651 | 167 | xml:space="preserve" | ||
652 | 168 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
653 | 169 | x="337.90759" | ||
654 | 170 | y="238.8988" | ||
655 | 171 | id="tspan4089-7-2-9" /></text> | ||
656 | 172 | <text | ||
657 | 173 | x="-1677.7749" | ||
658 | 174 | y="1062.9437" | ||
659 | 175 | id="text4087-2-6-5-59" | ||
660 | 176 | xml:space="preserve" | ||
661 | 177 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
662 | 178 | x="-1677.7749" | ||
663 | 179 | y="1062.9437" | ||
664 | 180 | id="tspan4089-7-2-9-4" /></text> | ||
665 | 181 | <flowRoot | ||
666 | 182 | transform="translate(-81.87659,-690.30726)" | ||
667 | 183 | id="flowRoot38698" | ||
668 | 184 | xml:space="preserve" | ||
669 | 185 | style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"><flowRegion | ||
670 | 186 | id="flowRegion38700"><rect | ||
671 | 187 | width="40" | ||
672 | 188 | height="23" | ||
673 | 189 | x="531" | ||
674 | 190 | y="299" | ||
675 | 191 | id="rect38702" /></flowRegion><flowPara | ||
676 | 192 | id="flowPara38704" /></flowRoot> <text | ||
677 | 193 | x="-750.84784" | ||
678 | 194 | y="7.7151051" | ||
679 | 195 | id="text4087-2-6-5-1" | ||
680 | 196 | xml:space="preserve" | ||
681 | 197 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
682 | 198 | x="-750.84784" | ||
683 | 199 | y="7.7151051" | ||
684 | 200 | id="tspan4089-7-2-9-7" /></text> | ||
685 | 201 | <text | ||
686 | 202 | x="141.77814" | ||
687 | 203 | y="-449.28488" | ||
688 | 204 | id="text4087-2-6-5-7" | ||
689 | 205 | xml:space="preserve" | ||
690 | 206 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
691 | 207 | x="141.77814" | ||
692 | 208 | y="-449.28488" | ||
693 | 209 | id="tspan4089-7-2-9-1" /></text> | ||
694 | 210 | <text | ||
695 | 211 | x="168.26166" | ||
696 | 212 | y="-494.31586" | ||
697 | 213 | id="text4087-2-6-5-5" | ||
698 | 214 | xml:space="preserve" | ||
699 | 215 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
700 | 216 | x="168.26166" | ||
701 | 217 | y="-494.31586" | ||
702 | 218 | id="tspan4089-7-2-9-6" /></text> | ||
703 | 219 | <text | ||
704 | 220 | x="-1480.2218" | ||
705 | 221 | y="-502.28488" | ||
706 | 222 | id="text4087-2-6-5-3" | ||
707 | 223 | xml:space="preserve" | ||
708 | 224 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
709 | 225 | x="-1480.2218" | ||
710 | 226 | y="-502.28488" | ||
711 | 227 | id="tspan4089-7-2-9-18" /></text> | ||
712 | 228 | <text | ||
713 | 229 | x="134.086" | ||
714 | 230 | y="-804.28491" | ||
715 | 231 | id="text4087-2-6-5-4" | ||
716 | 232 | xml:space="preserve" | ||
717 | 233 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
718 | 234 | x="134.086" | ||
719 | 235 | y="-804.28491" | ||
720 | 236 | id="tspan4089-7-2-9-9" /></text> | ||
721 | 237 | <text | ||
722 | 238 | x="1776.6676" | ||
723 | 239 | y="-111.61586" | ||
724 | 240 | id="text4087-2-6-5-7-1" | ||
725 | 241 | xml:space="preserve" | ||
726 | 242 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
727 | 243 | x="1776.6676" | ||
728 | 244 | y="-111.61586" | ||
729 | 245 | id="tspan4089-7-2-9-1-8" /></text> | ||
730 | 246 | <text | ||
731 | 247 | x="1803.151" | ||
732 | 248 | y="-156.64684" | ||
733 | 249 | id="text4087-2-6-5-5-5" | ||
734 | 250 | xml:space="preserve" | ||
735 | 251 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
736 | 252 | x="1803.151" | ||
737 | 253 | y="-156.64684" | ||
738 | 254 | id="tspan4089-7-2-9-6-9" /></text> | ||
739 | 255 | <text | ||
740 | 256 | x="154.66754" | ||
741 | 257 | y="-164.61586" | ||
742 | 258 | id="text4087-2-6-5-75" | ||
743 | 259 | xml:space="preserve" | ||
744 | 260 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
745 | 261 | x="154.66754" | ||
746 | 262 | y="-164.61586" | ||
747 | 263 | id="tspan4089-7-2-9-3" /></text> | ||
748 | 264 | <text | ||
749 | 265 | x="1768.9755" | ||
750 | 266 | y="-466.61584" | ||
751 | 267 | id="text4087-2-6-5-4-8" | ||
752 | 268 | xml:space="preserve" | ||
753 | 269 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
754 | 270 | x="1768.9755" | ||
755 | 271 | y="-466.61584" | ||
756 | 272 | id="tspan4089-7-2-9-9-8" /></text> | ||
757 | 273 | <text | ||
758 | 274 | x="-881.88147" | ||
759 | 275 | y="-217.77017" | ||
760 | 276 | id="text4087-2-6-5-45" | ||
761 | 277 | xml:space="preserve" | ||
762 | 278 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
763 | 279 | x="-881.88147" | ||
764 | 280 | y="-217.77017" | ||
765 | 281 | id="tspan4089-7-2-9-75" /></text> | ||
766 | 282 | <text | ||
767 | 283 | x="-2897.564" | ||
768 | 284 | y="606.27478" | ||
769 | 285 | id="text4087-2-6-5-59-0" | ||
770 | 286 | xml:space="preserve" | ||
771 | 287 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
772 | 288 | x="-2897.564" | ||
773 | 289 | y="606.27478" | ||
774 | 290 | id="tspan4089-7-2-9-4-4" /></text> | ||
775 | 291 | <g | ||
776 | 292 | transform="translate(-338.00604,-450.49095)" | ||
777 | 293 | id="layer4"> | ||
778 | 294 | <text | ||
779 | 295 | x="-664.2738" | ||
780 | 296 | y="1159.4154" | ||
781 | 297 | id="text4087-2-6-5-0" | ||
782 | 298 | xml:space="preserve" | ||
783 | 299 | style="font-size:14px;font-style:normal;font-weight:normal;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan | ||
784 | 300 | x="-664.2738" | ||
785 | 301 | y="1159.4154" | ||
786 | 302 | id="tspan4089-7-2-9-13" /></text> | ||
787 | 303 | </g> | ||
788 | 304 | <path | ||
789 | 305 | style="color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
790 | 306 | d="m 8.0000002,0 0,8 L 16,8 13.15,5.15 15.55,2.7500001 16,2.3000001 13.7,0 13.25,0.45 10.85,2.8500001 8.0000002,0 z m 0,8 L 0,8 2.9000001,10.9 0.95000002,12.8 0,13.7 2.25,16 l 0.9500001,-0.95 1.9,-1.95 2.9000001,2.9 0,-8 z" | ||
791 | 307 | id="path6691-1" | ||
792 | 308 | inkscape:connector-curvature="0" /> | ||
793 | 309 | </svg> | ||
794 | 0 | 310 | ||
795 | === added file 'data/4.svg' | |||
796 | --- data/4.svg 1970-01-01 00:00:00 +0000 | |||
797 | +++ data/4.svg 2015-04-17 22:11:56 +0000 | |||
798 | @@ -0,0 +1,152 @@ | |||
799 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
800 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
801 | 3 | |||
802 | 4 | <svg | ||
803 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
804 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
805 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
806 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
807 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
808 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
809 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
810 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
811 | 13 | width="16" | ||
812 | 14 | height="16" | ||
813 | 15 | id="svg6179" | ||
814 | 16 | version="1.1" | ||
815 | 17 | inkscape:version="0.48.4 r9939" | ||
816 | 18 | sodipodi:docname="4.svg"> | ||
817 | 19 | <defs | ||
818 | 20 | id="defs6181"> | ||
819 | 21 | <linearGradient | ||
820 | 22 | inkscape:collect="always" | ||
821 | 23 | xlink:href="#linearGradient5803-6-2" | ||
822 | 24 | id="linearGradient3324" | ||
823 | 25 | gradientUnits="userSpaceOnUse" | ||
824 | 26 | gradientTransform="matrix(0.4265442,0,0,0.41469579,-54.439253,2.5228637)" | ||
825 | 27 | x1="167.98311" | ||
826 | 28 | y1="13.398731" | ||
827 | 29 | x2="167.98311" | ||
828 | 30 | y2="54.780239" /> | ||
829 | 31 | <linearGradient | ||
830 | 32 | id="linearGradient5803-6-2"> | ||
831 | 33 | <stop | ||
832 | 34 | id="stop5805-7-1" | ||
833 | 35 | style="stop-color:#ffffff;stop-opacity:1;" | ||
834 | 36 | offset="0" /> | ||
835 | 37 | <stop | ||
836 | 38 | id="stop5807-8-5" | ||
837 | 39 | style="stop-color:#e6f4f8;stop-opacity:1;" | ||
838 | 40 | offset="1" /> | ||
839 | 41 | </linearGradient> | ||
840 | 42 | </defs> | ||
841 | 43 | <sodipodi:namedview | ||
842 | 44 | id="base" | ||
843 | 45 | pagecolor="#ffffff" | ||
844 | 46 | bordercolor="#666666" | ||
845 | 47 | borderopacity="1.0" | ||
846 | 48 | inkscape:pageopacity="0.0" | ||
847 | 49 | inkscape:pageshadow="2" | ||
848 | 50 | inkscape:zoom="15.999999" | ||
849 | 51 | inkscape:cx="19.708473" | ||
850 | 52 | inkscape:cy="2.3269378" | ||
851 | 53 | inkscape:document-units="px" | ||
852 | 54 | inkscape:current-layer="layer1" | ||
853 | 55 | showgrid="true" | ||
854 | 56 | inkscape:showpageshadow="false" | ||
855 | 57 | inkscape:snap-page="true" | ||
856 | 58 | inkscape:window-width="1600" | ||
857 | 59 | inkscape:window-height="845" | ||
858 | 60 | inkscape:window-x="0" | ||
859 | 61 | inkscape:window-y="30" | ||
860 | 62 | inkscape:window-maximized="1" | ||
861 | 63 | inkscape:snap-bbox="true" | ||
862 | 64 | inkscape:bbox-nodes="true"> | ||
863 | 65 | <inkscape:grid | ||
864 | 66 | type="xygrid" | ||
865 | 67 | id="grid6187" | ||
866 | 68 | empspacing="5" | ||
867 | 69 | visible="true" | ||
868 | 70 | enabled="true" | ||
869 | 71 | snapvisiblegridlinesonly="true" /> | ||
870 | 72 | </sodipodi:namedview> | ||
871 | 73 | <metadata | ||
872 | 74 | id="metadata6184"> | ||
873 | 75 | <rdf:RDF> | ||
874 | 76 | <cc:Work | ||
875 | 77 | rdf:about=""> | ||
876 | 78 | <dc:format>image/svg+xml</dc:format> | ||
877 | 79 | <dc:type | ||
878 | 80 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
879 | 81 | <dc:title /> | ||
880 | 82 | </cc:Work> | ||
881 | 83 | </rdf:RDF> | ||
882 | 84 | </metadata> | ||
883 | 85 | <g | ||
884 | 86 | inkscape:label="Layer 1" | ||
885 | 87 | inkscape:groupmode="layer" | ||
886 | 88 | id="layer1" | ||
887 | 89 | transform="translate(0,-1036.3622)"> | ||
888 | 90 | <g | ||
889 | 91 | id="g3017"> | ||
890 | 92 | <rect | ||
891 | 93 | y="1036.3622" | ||
892 | 94 | x="1.7e-05" | ||
893 | 95 | height="16" | ||
894 | 96 | width="16" | ||
895 | 97 | id="rect7077" | ||
896 | 98 | style="opacity:0;color:#000000;fill:#ffffff;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
897 | 99 | <rect | ||
898 | 100 | ry="1" | ||
899 | 101 | rx="1" | ||
900 | 102 | y="1042.3622" | ||
901 | 103 | x="4.0000172" | ||
902 | 104 | height="3" | ||
903 | 105 | width="3" | ||
904 | 106 | id="rect7032" | ||
905 | 107 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
906 | 108 | <path | ||
907 | 109 | sodipodi:nodetypes="scccssssssss" | ||
908 | 110 | inkscape:connector-curvature="0" | ||
909 | 111 | id="rect7064" | ||
910 | 112 | d="m 2.000017,1040.3622 3.5000091,0 2.4999916,-2.5303 2.4999913,2.5303 3.499991,0 c 0.554009,0 1.000017,0.446 1.000017,1 l 0,9 c 0,0.554 -0.446008,1 -1.000017,1 l -11.999983,0 c -0.5540096,0 -1.0000174,-0.446 -1.0000174,-1 l 0,-9 c 0,-0.554 0.4460078,-1 1.0000174,-1 z" | ||
911 | 113 | style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
912 | 114 | <rect | ||
913 | 115 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
914 | 116 | id="rect7069" | ||
915 | 117 | width="3" | ||
916 | 118 | height="3" | ||
917 | 119 | x="9.0000172" | ||
918 | 120 | y="1042.3622" | ||
919 | 121 | rx="1" | ||
920 | 122 | ry="1" /> | ||
921 | 123 | <rect | ||
922 | 124 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
923 | 125 | id="rect7073" | ||
924 | 126 | width="3" | ||
925 | 127 | height="3" | ||
926 | 128 | x="4.0000172" | ||
927 | 129 | y="1046.3622" | ||
928 | 130 | rx="1" | ||
929 | 131 | ry="1" /> | ||
930 | 132 | <rect | ||
931 | 133 | ry="1" | ||
932 | 134 | rx="1" | ||
933 | 135 | y="1046.3622" | ||
934 | 136 | x="9.0000172" | ||
935 | 137 | height="3" | ||
936 | 138 | width="3" | ||
937 | 139 | id="rect7075" | ||
938 | 140 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
939 | 141 | <rect | ||
940 | 142 | style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
941 | 143 | id="rect7073-5" | ||
942 | 144 | width="3" | ||
943 | 145 | height="3" | ||
944 | 146 | x="4" | ||
945 | 147 | y="1042.3622" | ||
946 | 148 | rx="1" | ||
947 | 149 | ry="1" /> | ||
948 | 150 | </g> | ||
949 | 151 | </g> | ||
950 | 152 | </svg> | ||
951 | 0 | 153 | ||
952 | === added file 'data/5.svg' | |||
953 | --- data/5.svg 1970-01-01 00:00:00 +0000 | |||
954 | +++ data/5.svg 2015-04-17 22:11:56 +0000 | |||
955 | @@ -0,0 +1,117 @@ | |||
956 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
957 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
958 | 3 | |||
959 | 4 | <svg | ||
960 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
961 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
962 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
963 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
964 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
965 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
966 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
967 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
968 | 13 | width="16" | ||
969 | 14 | height="16" | ||
970 | 15 | id="svg6179" | ||
971 | 16 | version="1.1" | ||
972 | 17 | inkscape:version="0.48.4 r9939" | ||
973 | 18 | sodipodi:docname="5.svg"> | ||
974 | 19 | <defs | ||
975 | 20 | id="defs6181"> | ||
976 | 21 | <linearGradient | ||
977 | 22 | inkscape:collect="always" | ||
978 | 23 | xlink:href="#linearGradient5803-6-2" | ||
979 | 24 | id="linearGradient3324" | ||
980 | 25 | gradientUnits="userSpaceOnUse" | ||
981 | 26 | gradientTransform="matrix(0.4265442,0,0,0.41469579,-54.439253,2.5228637)" | ||
982 | 27 | x1="167.98311" | ||
983 | 28 | y1="13.398731" | ||
984 | 29 | x2="167.98311" | ||
985 | 30 | y2="54.780239" /> | ||
986 | 31 | <linearGradient | ||
987 | 32 | id="linearGradient5803-6-2"> | ||
988 | 33 | <stop | ||
989 | 34 | id="stop5805-7-1" | ||
990 | 35 | style="stop-color:#ffffff;stop-opacity:1;" | ||
991 | 36 | offset="0" /> | ||
992 | 37 | <stop | ||
993 | 38 | id="stop5807-8-5" | ||
994 | 39 | style="stop-color:#e6f4f8;stop-opacity:1;" | ||
995 | 40 | offset="1" /> | ||
996 | 41 | </linearGradient> | ||
997 | 42 | <linearGradient | ||
998 | 43 | inkscape:collect="always" | ||
999 | 44 | xlink:href="#linearGradient3680-6-6-6-3-7-1-9" | ||
1000 | 45 | id="linearGradient3029" | ||
1001 | 46 | gradientUnits="userSpaceOnUse" | ||
1002 | 47 | gradientTransform="matrix(2.6375431,0,0,2.6375431,1.3780184,2.797842)" | ||
1003 | 48 | x1="20" | ||
1004 | 49 | y1="26.000008" | ||
1005 | 50 | x2="20" | ||
1006 | 51 | y2="13.000008" /> | ||
1007 | 52 | <linearGradient | ||
1008 | 53 | id="linearGradient3680-6-6-6-3-7-1-9"> | ||
1009 | 54 | <stop | ||
1010 | 55 | id="stop3682-4-6-1-3-7-7-1" | ||
1011 | 56 | style="stop-color:#dcdcdc;stop-opacity:1" | ||
1012 | 57 | offset="0" /> | ||
1013 | 58 | <stop | ||
1014 | 59 | id="stop3684-8-5-8-0-2-6-7" | ||
1015 | 60 | style="stop-color:#ffffff;stop-opacity:1" | ||
1016 | 61 | offset="1" /> | ||
1017 | 62 | </linearGradient> | ||
1018 | 63 | </defs> | ||
1019 | 64 | <sodipodi:namedview | ||
1020 | 65 | id="base" | ||
1021 | 66 | pagecolor="#ffffff" | ||
1022 | 67 | bordercolor="#666666" | ||
1023 | 68 | borderopacity="1.0" | ||
1024 | 69 | inkscape:pageopacity="0.0" | ||
1025 | 70 | inkscape:pageshadow="2" | ||
1026 | 71 | inkscape:zoom="22.627416" | ||
1027 | 72 | inkscape:cx="14.077767" | ||
1028 | 73 | inkscape:cy="7.480704" | ||
1029 | 74 | inkscape:document-units="px" | ||
1030 | 75 | inkscape:current-layer="layer1" | ||
1031 | 76 | showgrid="true" | ||
1032 | 77 | inkscape:showpageshadow="false" | ||
1033 | 78 | inkscape:snap-page="true" | ||
1034 | 79 | inkscape:window-width="1600" | ||
1035 | 80 | inkscape:window-height="845" | ||
1036 | 81 | inkscape:window-x="0" | ||
1037 | 82 | inkscape:window-y="30" | ||
1038 | 83 | inkscape:window-maximized="1" | ||
1039 | 84 | inkscape:snap-bbox="true" | ||
1040 | 85 | inkscape:bbox-nodes="true"> | ||
1041 | 86 | <inkscape:grid | ||
1042 | 87 | type="xygrid" | ||
1043 | 88 | id="grid6187" | ||
1044 | 89 | empspacing="5" | ||
1045 | 90 | visible="true" | ||
1046 | 91 | enabled="true" | ||
1047 | 92 | snapvisiblegridlinesonly="true" /> | ||
1048 | 93 | </sodipodi:namedview> | ||
1049 | 94 | <metadata | ||
1050 | 95 | id="metadata6184"> | ||
1051 | 96 | <rdf:RDF> | ||
1052 | 97 | <cc:Work | ||
1053 | 98 | rdf:about=""> | ||
1054 | 99 | <dc:format>image/svg+xml</dc:format> | ||
1055 | 100 | <dc:type | ||
1056 | 101 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
1057 | 102 | <dc:title /> | ||
1058 | 103 | </cc:Work> | ||
1059 | 104 | </rdf:RDF> | ||
1060 | 105 | </metadata> | ||
1061 | 106 | <g | ||
1062 | 107 | inkscape:label="Layer 1" | ||
1063 | 108 | inkscape:groupmode="layer" | ||
1064 | 109 | id="layer1" | ||
1065 | 110 | transform="translate(0,-1036.3622)"> | ||
1066 | 111 | <path | ||
1067 | 112 | style="font-size:14.31169891000000050px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold" | ||
1068 | 113 | id="path3985-0" | ||
1069 | 114 | inkscape:connector-curvature="0" | ||
1070 | 115 | d="m 2.7826087,1036.3622 0,0.9459 c -0.7529165,0.09 -1.5021567,0.3288 -2.0869567,0.9325 -0.839346,0.8065 -0.899303,2.4015 -0.282609,3.4054 0.596284,0.8995 1.504156,1.3234 2.3695657,1.7297 l 0,2.4189 C 1.817663,1045.6966 0.876806,1045.3676 0,1044.8757 l 0,2.0406 c 0.877615,0.4629 1.828574,0.6795 2.7826087,0.7027 l 0,1.7162 0.6956522,0 0,-1.7703 c 0.5839829,-0.065 1.2981342,-0.1977 1.8152174,-0.5405 0.7183307,-0.4385 1.2275965,-1.3673 1.1956521,-2.3379 0.00292,-0.4692 -0.1236354,-0.922 -0.3478261,-1.3108 -0.5997095,-0.9949 -1.7582431,-1.4248 -2.6630434,-1.8784 l 0,-2.3108 c 0.7173843,0.073 1.5627078,0.28 2.2282608,0.6081 l 0.6086957,-1.8108 c -0.8498685,-0.4526 -1.9104059,-0.6553 -2.8369565,-0.7027 l 0,-0.9189 -0.6956522,0 z m 0,2.8514 0,1.8513 c -0.3652591,-0.1997 -0.8970487,-0.4566 -0.8804347,-1.027 -0.01709,-0.5385 0.5106695,-0.7726 0.8804347,-0.8243 z m 0.6956522,4.5946 c 0.3622528,0.2197 1.0135742,0.4002 1.0217391,0.9729 0.020817,0.5845 -0.6116438,0.8645 -1.0217391,0.9325 l 0,-1.9054 z m 5.2173913,6.3918 0,2.1622 7.3043478,0 0,-2.1622 -7.3043478,0 z" /> | ||
1071 | 116 | </g> | ||
1072 | 117 | </svg> | ||
1073 | 0 | 118 | ||
1074 | === added file 'data/6.svg' | |||
1075 | --- data/6.svg 1970-01-01 00:00:00 +0000 | |||
1076 | +++ data/6.svg 2015-04-17 22:11:56 +0000 | |||
1077 | @@ -0,0 +1,131 @@ | |||
1078 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
1079 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
1080 | 3 | |||
1081 | 4 | <svg | ||
1082 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
1083 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
1084 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
1085 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
1086 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
1087 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
1088 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
1089 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
1090 | 13 | width="16" | ||
1091 | 14 | height="16" | ||
1092 | 15 | id="svg6179" | ||
1093 | 16 | version="1.1" | ||
1094 | 17 | inkscape:version="0.48.4 r9939" | ||
1095 | 18 | sodipodi:docname="6.svg"> | ||
1096 | 19 | <defs | ||
1097 | 20 | id="defs6181"> | ||
1098 | 21 | <linearGradient | ||
1099 | 22 | inkscape:collect="always" | ||
1100 | 23 | xlink:href="#linearGradient5803-6-2" | ||
1101 | 24 | id="linearGradient3324" | ||
1102 | 25 | gradientUnits="userSpaceOnUse" | ||
1103 | 26 | gradientTransform="matrix(0.4265442,0,0,0.41469579,-54.439253,2.5228637)" | ||
1104 | 27 | x1="167.98311" | ||
1105 | 28 | y1="13.398731" | ||
1106 | 29 | x2="167.98311" | ||
1107 | 30 | y2="54.780239" /> | ||
1108 | 31 | <linearGradient | ||
1109 | 32 | id="linearGradient5803-6-2"> | ||
1110 | 33 | <stop | ||
1111 | 34 | id="stop5805-7-1" | ||
1112 | 35 | style="stop-color:#ffffff;stop-opacity:1;" | ||
1113 | 36 | offset="0" /> | ||
1114 | 37 | <stop | ||
1115 | 38 | id="stop5807-8-5" | ||
1116 | 39 | style="stop-color:#e6f4f8;stop-opacity:1;" | ||
1117 | 40 | offset="1" /> | ||
1118 | 41 | </linearGradient> | ||
1119 | 42 | </defs> | ||
1120 | 43 | <sodipodi:namedview | ||
1121 | 44 | id="base" | ||
1122 | 45 | pagecolor="#ffffff" | ||
1123 | 46 | bordercolor="#666666" | ||
1124 | 47 | borderopacity="1.0" | ||
1125 | 48 | inkscape:pageopacity="0.0" | ||
1126 | 49 | inkscape:pageshadow="2" | ||
1127 | 50 | inkscape:zoom="11.313708" | ||
1128 | 51 | inkscape:cx="19.592793" | ||
1129 | 52 | inkscape:cy="1.191976" | ||
1130 | 53 | inkscape:document-units="px" | ||
1131 | 54 | inkscape:current-layer="layer1" | ||
1132 | 55 | showgrid="true" | ||
1133 | 56 | inkscape:showpageshadow="false" | ||
1134 | 57 | inkscape:snap-page="true" | ||
1135 | 58 | inkscape:window-width="1600" | ||
1136 | 59 | inkscape:window-height="845" | ||
1137 | 60 | inkscape:window-x="0" | ||
1138 | 61 | inkscape:window-y="30" | ||
1139 | 62 | inkscape:window-maximized="1" | ||
1140 | 63 | inkscape:snap-bbox="true" | ||
1141 | 64 | inkscape:bbox-nodes="true"> | ||
1142 | 65 | <inkscape:grid | ||
1143 | 66 | type="xygrid" | ||
1144 | 67 | id="grid6187" | ||
1145 | 68 | empspacing="5" | ||
1146 | 69 | visible="true" | ||
1147 | 70 | enabled="true" | ||
1148 | 71 | snapvisiblegridlinesonly="true" /> | ||
1149 | 72 | </sodipodi:namedview> | ||
1150 | 73 | <metadata | ||
1151 | 74 | id="metadata6184"> | ||
1152 | 75 | <rdf:RDF> | ||
1153 | 76 | <cc:Work | ||
1154 | 77 | rdf:about=""> | ||
1155 | 78 | <dc:format>image/svg+xml</dc:format> | ||
1156 | 79 | <dc:type | ||
1157 | 80 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
1158 | 81 | <dc:title /> | ||
1159 | 82 | </cc:Work> | ||
1160 | 83 | </rdf:RDF> | ||
1161 | 84 | </metadata> | ||
1162 | 85 | <g | ||
1163 | 86 | inkscape:label="Layer 1" | ||
1164 | 87 | inkscape:groupmode="layer" | ||
1165 | 88 | id="layer1" | ||
1166 | 89 | transform="translate(0,-1036.3622)"> | ||
1167 | 90 | <g | ||
1168 | 91 | id="g7007" | ||
1169 | 92 | transform="translate(0,1.7382813e-5)" | ||
1170 | 93 | style="fill:#ffffff"> | ||
1171 | 94 | <rect | ||
1172 | 95 | transform="translate(0,1036.3622)" | ||
1173 | 96 | y="0" | ||
1174 | 97 | x="0" | ||
1175 | 98 | height="16" | ||
1176 | 99 | width="16" | ||
1177 | 100 | id="rect7005" | ||
1178 | 101 | style="opacity:0;color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1179 | 102 | <rect | ||
1180 | 103 | ry="1" | ||
1181 | 104 | rx="1" | ||
1182 | 105 | y="1037.3622" | ||
1183 | 106 | x="0" | ||
1184 | 107 | height="6" | ||
1185 | 108 | width="8" | ||
1186 | 109 | id="rect6231" | ||
1187 | 110 | style="color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1188 | 111 | <rect | ||
1189 | 112 | style="color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
1190 | 113 | id="rect6233" | ||
1191 | 114 | width="7" | ||
1192 | 115 | height="5.0000172" | ||
1193 | 116 | x="9" | ||
1194 | 117 | y="1038.3622" | ||
1195 | 118 | rx="1.0000174" | ||
1196 | 119 | ry="1.0000174" /> | ||
1197 | 120 | <rect | ||
1198 | 121 | ry="1.0000174" | ||
1199 | 122 | rx="1.0000174" | ||
1200 | 123 | y="1044.3622" | ||
1201 | 124 | x="3" | ||
1202 | 125 | height="7.0000415" | ||
1203 | 126 | width="10" | ||
1204 | 127 | id="rect7003" | ||
1205 | 128 | style="color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1206 | 129 | </g> | ||
1207 | 130 | </g> | ||
1208 | 131 | </svg> | ||
1209 | 0 | 132 | ||
1210 | === added file 'data/7.svg' | |||
1211 | --- data/7.svg 1970-01-01 00:00:00 +0000 | |||
1212 | +++ data/7.svg 2015-04-17 22:11:56 +0000 | |||
1213 | @@ -0,0 +1,131 @@ | |||
1214 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
1215 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
1216 | 3 | |||
1217 | 4 | <svg | ||
1218 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
1219 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
1220 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
1221 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
1222 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
1223 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
1224 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
1225 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
1226 | 13 | width="16" | ||
1227 | 14 | height="16" | ||
1228 | 15 | id="svg6179" | ||
1229 | 16 | version="1.1" | ||
1230 | 17 | inkscape:version="0.48.4 r9939" | ||
1231 | 18 | sodipodi:docname="6.svg"> | ||
1232 | 19 | <defs | ||
1233 | 20 | id="defs6181"> | ||
1234 | 21 | <linearGradient | ||
1235 | 22 | inkscape:collect="always" | ||
1236 | 23 | xlink:href="#linearGradient5803-6-2" | ||
1237 | 24 | id="linearGradient3324" | ||
1238 | 25 | gradientUnits="userSpaceOnUse" | ||
1239 | 26 | gradientTransform="matrix(0.4265442,0,0,0.41469579,-54.439253,2.5228637)" | ||
1240 | 27 | x1="167.98311" | ||
1241 | 28 | y1="13.398731" | ||
1242 | 29 | x2="167.98311" | ||
1243 | 30 | y2="54.780239" /> | ||
1244 | 31 | <linearGradient | ||
1245 | 32 | id="linearGradient5803-6-2"> | ||
1246 | 33 | <stop | ||
1247 | 34 | id="stop5805-7-1" | ||
1248 | 35 | style="stop-color:#ffffff;stop-opacity:1;" | ||
1249 | 36 | offset="0" /> | ||
1250 | 37 | <stop | ||
1251 | 38 | id="stop5807-8-5" | ||
1252 | 39 | style="stop-color:#e6f4f8;stop-opacity:1;" | ||
1253 | 40 | offset="1" /> | ||
1254 | 41 | </linearGradient> | ||
1255 | 42 | </defs> | ||
1256 | 43 | <sodipodi:namedview | ||
1257 | 44 | id="base" | ||
1258 | 45 | pagecolor="#ffffff" | ||
1259 | 46 | bordercolor="#666666" | ||
1260 | 47 | borderopacity="1.0" | ||
1261 | 48 | inkscape:pageopacity="0.0" | ||
1262 | 49 | inkscape:pageshadow="2" | ||
1263 | 50 | inkscape:zoom="11.313708" | ||
1264 | 51 | inkscape:cx="19.592793" | ||
1265 | 52 | inkscape:cy="1.191976" | ||
1266 | 53 | inkscape:document-units="px" | ||
1267 | 54 | inkscape:current-layer="layer1" | ||
1268 | 55 | showgrid="true" | ||
1269 | 56 | inkscape:showpageshadow="false" | ||
1270 | 57 | inkscape:snap-page="true" | ||
1271 | 58 | inkscape:window-width="1600" | ||
1272 | 59 | inkscape:window-height="845" | ||
1273 | 60 | inkscape:window-x="0" | ||
1274 | 61 | inkscape:window-y="30" | ||
1275 | 62 | inkscape:window-maximized="1" | ||
1276 | 63 | inkscape:snap-bbox="true" | ||
1277 | 64 | inkscape:bbox-nodes="true"> | ||
1278 | 65 | <inkscape:grid | ||
1279 | 66 | type="xygrid" | ||
1280 | 67 | id="grid6187" | ||
1281 | 68 | empspacing="5" | ||
1282 | 69 | visible="true" | ||
1283 | 70 | enabled="true" | ||
1284 | 71 | snapvisiblegridlinesonly="true" /> | ||
1285 | 72 | </sodipodi:namedview> | ||
1286 | 73 | <metadata | ||
1287 | 74 | id="metadata6184"> | ||
1288 | 75 | <rdf:RDF> | ||
1289 | 76 | <cc:Work | ||
1290 | 77 | rdf:about=""> | ||
1291 | 78 | <dc:format>image/svg+xml</dc:format> | ||
1292 | 79 | <dc:type | ||
1293 | 80 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
1294 | 81 | <dc:title /> | ||
1295 | 82 | </cc:Work> | ||
1296 | 83 | </rdf:RDF> | ||
1297 | 84 | </metadata> | ||
1298 | 85 | <g | ||
1299 | 86 | inkscape:label="Layer 1" | ||
1300 | 87 | inkscape:groupmode="layer" | ||
1301 | 88 | id="layer1" | ||
1302 | 89 | transform="translate(0,-1036.3622)"> | ||
1303 | 90 | <g | ||
1304 | 91 | id="g7007" | ||
1305 | 92 | transform="translate(0,1.7382813e-5)" | ||
1306 | 93 | style="fill:#ffffff"> | ||
1307 | 94 | <rect | ||
1308 | 95 | transform="translate(0,1036.3622)" | ||
1309 | 96 | y="0" | ||
1310 | 97 | x="0" | ||
1311 | 98 | height="16" | ||
1312 | 99 | width="16" | ||
1313 | 100 | id="rect7005" | ||
1314 | 101 | style="opacity:0;color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1315 | 102 | <rect | ||
1316 | 103 | ry="1" | ||
1317 | 104 | rx="1" | ||
1318 | 105 | y="1037.3622" | ||
1319 | 106 | x="0" | ||
1320 | 107 | height="6" | ||
1321 | 108 | width="8" | ||
1322 | 109 | id="rect6231" | ||
1323 | 110 | style="color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1324 | 111 | <rect | ||
1325 | 112 | style="color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
1326 | 113 | id="rect6233" | ||
1327 | 114 | width="7" | ||
1328 | 115 | height="5.0000172" | ||
1329 | 116 | x="9" | ||
1330 | 117 | y="1038.3622" | ||
1331 | 118 | rx="1.0000174" | ||
1332 | 119 | ry="1.0000174" /> | ||
1333 | 120 | <rect | ||
1334 | 121 | ry="1.0000174" | ||
1335 | 122 | rx="1.0000174" | ||
1336 | 123 | y="1044.3622" | ||
1337 | 124 | x="3" | ||
1338 | 125 | height="7.0000415" | ||
1339 | 126 | width="10" | ||
1340 | 127 | id="rect7003" | ||
1341 | 128 | style="color:black;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1342 | 129 | </g> | ||
1343 | 130 | </g> | ||
1344 | 131 | </svg> | ||
1345 | 0 | 132 | ||
1346 | === added file 'data/button.svg' | |||
1347 | --- data/button.svg 1970-01-01 00:00:00 +0000 | |||
1348 | +++ data/button.svg 2015-04-17 22:11:56 +0000 | |||
1349 | @@ -0,0 +1,250 @@ | |||
1350 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
1351 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
1352 | 3 | |||
1353 | 4 | <svg | ||
1354 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
1355 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
1356 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
1357 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
1358 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
1359 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
1360 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
1361 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
1362 | 13 | width="60" | ||
1363 | 14 | height="60" | ||
1364 | 15 | id="svg14656" | ||
1365 | 16 | version="1.1" | ||
1366 | 17 | inkscape:version="0.48.4 r9939" | ||
1367 | 18 | sodipodi:docname="button.svg"> | ||
1368 | 19 | <defs | ||
1369 | 20 | id="defs14658"> | ||
1370 | 21 | <radialGradient | ||
1371 | 22 | inkscape:collect="always" | ||
1372 | 23 | xlink:href="#linearGradient14616" | ||
1373 | 24 | id="radialGradient14622" | ||
1374 | 25 | cx="431.02756" | ||
1375 | 26 | cy="229.22406" | ||
1376 | 27 | fx="431.02756" | ||
1377 | 28 | fy="229.22406" | ||
1378 | 29 | r="23.49752" | ||
1379 | 30 | gradientUnits="userSpaceOnUse" | ||
1380 | 31 | gradientTransform="matrix(0,2.18863,-1,-5.9483293e-6,660.25162,-714.13442)" /> | ||
1381 | 32 | <linearGradient | ||
1382 | 33 | inkscape:collect="always" | ||
1383 | 34 | id="linearGradient14616"> | ||
1384 | 35 | <stop | ||
1385 | 36 | style="stop-color:#fafaf7;stop-opacity:1;" | ||
1386 | 37 | offset="0" | ||
1387 | 38 | id="stop14618" /> | ||
1388 | 39 | <stop | ||
1389 | 40 | style="stop-color:#fafaf7;stop-opacity:0;" | ||
1390 | 41 | offset="1" | ||
1391 | 42 | id="stop14620" /> | ||
1392 | 43 | </linearGradient> | ||
1393 | 44 | <radialGradient | ||
1394 | 45 | inkscape:collect="always" | ||
1395 | 46 | xlink:href="#linearGradient14602" | ||
1396 | 47 | id="radialGradient14608" | ||
1397 | 48 | cx="426.38193" | ||
1398 | 49 | cy="238.05771" | ||
1399 | 50 | fx="426.38193" | ||
1400 | 51 | fy="238.05771" | ||
1401 | 52 | r="22.98163" | ||
1402 | 53 | gradientUnits="userSpaceOnUse" | ||
1403 | 54 | gradientTransform="matrix(1.3634541,0.7871906,-0.90254772,1.5632585,59.407613,-469.83866)" /> | ||
1404 | 55 | <linearGradient | ||
1405 | 56 | inkscape:collect="always" | ||
1406 | 57 | id="linearGradient14602"> | ||
1407 | 58 | <stop | ||
1408 | 59 | id="stop14606" | ||
1409 | 60 | offset="0" | ||
1410 | 61 | style="stop-color:#4fd32b;stop-opacity:1" /> | ||
1411 | 62 | <stop | ||
1412 | 63 | id="stop14604" | ||
1413 | 64 | offset="1" | ||
1414 | 65 | style="stop-color:#45a221;stop-opacity:1" /> | ||
1415 | 66 | </linearGradient> | ||
1416 | 67 | <radialGradient | ||
1417 | 68 | r="22.98163" | ||
1418 | 69 | fy="238.05771" | ||
1419 | 70 | fx="426.38193" | ||
1420 | 71 | cy="238.05771" | ||
1421 | 72 | cx="426.38193" | ||
1422 | 73 | gradientTransform="matrix(1.3634541,0.7871906,-0.90254772,1.5632585,59.407613,-469.83866)" | ||
1423 | 74 | gradientUnits="userSpaceOnUse" | ||
1424 | 75 | id="radialGradient14654" | ||
1425 | 76 | xlink:href="#linearGradient14602" | ||
1426 | 77 | inkscape:collect="always" /> | ||
1427 | 78 | <radialGradient | ||
1428 | 79 | inkscape:collect="always" | ||
1429 | 80 | xlink:href="#linearGradient14616-0" | ||
1430 | 81 | id="radialGradient14622-1" | ||
1431 | 82 | cx="431.02756" | ||
1432 | 83 | cy="229.22406" | ||
1433 | 84 | fx="431.02756" | ||
1434 | 85 | fy="229.22406" | ||
1435 | 86 | r="23.49752" | ||
1436 | 87 | gradientUnits="userSpaceOnUse" | ||
1437 | 88 | gradientTransform="matrix(0,2.18863,-1,-5.9483293e-6,660.25162,-714.13442)" /> | ||
1438 | 89 | <linearGradient | ||
1439 | 90 | inkscape:collect="always" | ||
1440 | 91 | id="linearGradient14616-0"> | ||
1441 | 92 | <stop | ||
1442 | 93 | style="stop-color:#fafaf7;stop-opacity:1;" | ||
1443 | 94 | offset="0" | ||
1444 | 95 | id="stop14618-6" /> | ||
1445 | 96 | <stop | ||
1446 | 97 | style="stop-color:#fafaf7;stop-opacity:0;" | ||
1447 | 98 | offset="1" | ||
1448 | 99 | id="stop14620-3" /> | ||
1449 | 100 | </linearGradient> | ||
1450 | 101 | <filter | ||
1451 | 102 | color-interpolation-filters="sRGB" | ||
1452 | 103 | inkscape:collect="always" | ||
1453 | 104 | id="filter14628-0"> | ||
1454 | 105 | <feGaussianBlur | ||
1455 | 106 | inkscape:collect="always" | ||
1456 | 107 | stdDeviation="0.77575123" | ||
1457 | 108 | id="feGaussianBlur14630-1" /> | ||
1458 | 109 | </filter> | ||
1459 | 110 | <radialGradient | ||
1460 | 111 | inkscape:collect="always" | ||
1461 | 112 | xlink:href="#linearGradient14602-6" | ||
1462 | 113 | id="radialGradient14608-6" | ||
1463 | 114 | cx="426.38193" | ||
1464 | 115 | cy="238.05771" | ||
1465 | 116 | fx="426.38193" | ||
1466 | 117 | fy="238.05771" | ||
1467 | 118 | r="22.98163" | ||
1468 | 119 | gradientUnits="userSpaceOnUse" | ||
1469 | 120 | gradientTransform="matrix(1.3634541,0.7871906,-0.90254772,1.5632585,59.407613,-469.83866)" /> | ||
1470 | 121 | <linearGradient | ||
1471 | 122 | inkscape:collect="always" | ||
1472 | 123 | id="linearGradient14602-6"> | ||
1473 | 124 | <stop | ||
1474 | 125 | id="stop14606-3" | ||
1475 | 126 | offset="0" | ||
1476 | 127 | style="stop-color:#4fd32b;stop-opacity:1" /> | ||
1477 | 128 | <stop | ||
1478 | 129 | id="stop14604-8" | ||
1479 | 130 | offset="1" | ||
1480 | 131 | style="stop-color:#45a221;stop-opacity:1" /> | ||
1481 | 132 | </linearGradient> | ||
1482 | 133 | <filter | ||
1483 | 134 | color-interpolation-filters="sRGB" | ||
1484 | 135 | inkscape:collect="always" | ||
1485 | 136 | id="filter14893"> | ||
1486 | 137 | <feGaussianBlur | ||
1487 | 138 | inkscape:collect="always" | ||
1488 | 139 | stdDeviation="1.449292" | ||
1489 | 140 | id="feGaussianBlur14895" /> | ||
1490 | 141 | </filter> | ||
1491 | 142 | <radialGradient | ||
1492 | 143 | inkscape:collect="always" | ||
1493 | 144 | xlink:href="#linearGradient14602-6" | ||
1494 | 145 | id="radialGradient14962" | ||
1495 | 146 | gradientUnits="userSpaceOnUse" | ||
1496 | 147 | gradientTransform="matrix(1.3634541,0.7871906,-0.90254772,1.5632585,59.407613,-469.83866)" | ||
1497 | 148 | cx="426.38193" | ||
1498 | 149 | cy="238.05771" | ||
1499 | 150 | fx="426.38193" | ||
1500 | 151 | fy="238.05771" | ||
1501 | 152 | r="22.98163" /> | ||
1502 | 153 | <radialGradient | ||
1503 | 154 | inkscape:collect="always" | ||
1504 | 155 | xlink:href="#linearGradient14616-0" | ||
1505 | 156 | id="radialGradient14964" | ||
1506 | 157 | gradientUnits="userSpaceOnUse" | ||
1507 | 158 | gradientTransform="matrix(0,2.18863,-1,-5.9483293e-6,660.25162,-714.13442)" | ||
1508 | 159 | cx="431.02756" | ||
1509 | 160 | cy="229.22406" | ||
1510 | 161 | fx="431.02756" | ||
1511 | 162 | fy="229.22406" | ||
1512 | 163 | r="23.49752" /> | ||
1513 | 164 | </defs> | ||
1514 | 165 | <sodipodi:namedview | ||
1515 | 166 | id="base" | ||
1516 | 167 | pagecolor="#ffffff" | ||
1517 | 168 | bordercolor="#666666" | ||
1518 | 169 | borderopacity="1.0" | ||
1519 | 170 | inkscape:pageopacity="0.0" | ||
1520 | 171 | inkscape:pageshadow="2" | ||
1521 | 172 | inkscape:zoom="15.839192" | ||
1522 | 173 | inkscape:cx="39.545896" | ||
1523 | 174 | inkscape:cy="14.200556" | ||
1524 | 175 | inkscape:document-units="px" | ||
1525 | 176 | inkscape:current-layer="layer1" | ||
1526 | 177 | showgrid="true" | ||
1527 | 178 | inkscape:showpageshadow="false" | ||
1528 | 179 | fit-margin-top="0" | ||
1529 | 180 | fit-margin-left="0" | ||
1530 | 181 | fit-margin-right="0" | ||
1531 | 182 | fit-margin-bottom="0" | ||
1532 | 183 | inkscape:window-width="1600" | ||
1533 | 184 | inkscape:window-height="845" | ||
1534 | 185 | inkscape:window-x="0" | ||
1535 | 186 | inkscape:window-y="30" | ||
1536 | 187 | inkscape:window-maximized="1"> | ||
1537 | 188 | <inkscape:grid | ||
1538 | 189 | type="xygrid" | ||
1539 | 190 | id="grid14695" | ||
1540 | 191 | empspacing="5" | ||
1541 | 192 | visible="true" | ||
1542 | 193 | enabled="true" | ||
1543 | 194 | snapvisiblegridlinesonly="true" | ||
1544 | 195 | originx="2.6625228px" | ||
1545 | 196 | originy="4.3894395px" /> | ||
1546 | 197 | </sodipodi:namedview> | ||
1547 | 198 | <metadata | ||
1548 | 199 | id="metadata14661"> | ||
1549 | 200 | <rdf:RDF> | ||
1550 | 201 | <cc:Work | ||
1551 | 202 | rdf:about=""> | ||
1552 | 203 | <dc:format>image/svg+xml</dc:format> | ||
1553 | 204 | <dc:type | ||
1554 | 205 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
1555 | 206 | <dc:title /> | ||
1556 | 207 | </cc:Work> | ||
1557 | 208 | </rdf:RDF> | ||
1558 | 209 | </metadata> | ||
1559 | 210 | <g | ||
1560 | 211 | inkscape:label="Layer 1" | ||
1561 | 212 | inkscape:groupmode="layer" | ||
1562 | 213 | id="layer1" | ||
1563 | 214 | transform="translate(-227.47933,-603.74626)"> | ||
1564 | 215 | <g | ||
1565 | 216 | id="g14957" | ||
1566 | 217 | transform="matrix(1.2120396,0,0,1.2120396,-137.94486,-182.03628)"> | ||
1567 | 218 | <path | ||
1568 | 219 | sodipodi:type="arc" | ||
1569 | 220 | style="opacity:0.3669725;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.9867841;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter14893);enable-background:accumulate" | ||
1570 | 221 | id="path14879" | ||
1571 | 222 | sodipodi:cx="431.11078" | ||
1572 | 223 | sodipodi:cy="254.11467" | ||
1573 | 224 | sodipodi:rx="22.98163" | ||
1574 | 225 | sodipodi:ry="22.98163" | ||
1575 | 226 | d="m 454.09241,254.11467 c 0,12.6924 -10.28923,22.98163 -22.98163,22.98163 -12.69241,0 -22.98163,-10.28923 -22.98163,-22.98163 0,-12.6924 10.28922,-22.98163 22.98163,-22.98163 12.6924,0 22.98163,10.28923 22.98163,22.98163 z" | ||
1576 | 227 | transform="matrix(1.0133929,0,0,1.0133929,-110.57985,416.64571)" /> | ||
1577 | 228 | <path | ||
1578 | 229 | transform="matrix(1.0133929,0,0,1.0133929,-110.57985,414.64571)" | ||
1579 | 230 | d="m 454.09241,254.11467 c 0,12.6924 -10.28923,22.98163 -22.98163,22.98163 -12.69241,0 -22.98163,-10.28923 -22.98163,-22.98163 0,-12.6924 10.28922,-22.98163 22.98163,-22.98163 12.6924,0 22.98163,10.28923 22.98163,22.98163 z" | ||
1580 | 231 | sodipodi:ry="22.98163" | ||
1581 | 232 | sodipodi:rx="22.98163" | ||
1582 | 233 | sodipodi:cy="254.11467" | ||
1583 | 234 | sodipodi:cx="431.11078" | ||
1584 | 235 | id="path14592" | ||
1585 | 236 | style="color:#000000;fill:url(#radialGradient14962);fill-opacity:1;stroke:#379313;stroke-width:0.9867841;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
1586 | 237 | sodipodi:type="arc" /> | ||
1587 | 238 | <path | ||
1588 | 239 | sodipodi:type="arc" | ||
1589 | 240 | style="opacity:0.69098666;color:#000000;fill:none;stroke:url(#radialGradient14964);stroke-width:1.05115008;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter14628-0);enable-background:accumulate" | ||
1590 | 241 | id="path14612" | ||
1591 | 242 | sodipodi:cx="431.11078" | ||
1592 | 243 | sodipodi:cy="254.11467" | ||
1593 | 244 | sodipodi:rx="22.98163" | ||
1594 | 245 | sodipodi:ry="22.98163" | ||
1595 | 246 | d="m 454.09241,254.11467 c 0,12.6924 -10.28923,22.98163 -22.98163,22.98163 -12.69241,0 -22.98163,-10.28923 -22.98163,-22.98163 0,-12.6924 10.28922,-22.98163 22.98163,-22.98163 12.6924,0 22.98163,10.28923 22.98163,22.98163 z" | ||
1596 | 247 | transform="matrix(0.95133877,0,0,0.95133877,-83.827446,430.41457)" /> | ||
1597 | 248 | </g> | ||
1598 | 249 | </g> | ||
1599 | 250 | </svg> | ||
1600 | 0 | 251 | ||
1601 | === added file 'data/display.svg' | |||
1602 | --- data/display.svg 1970-01-01 00:00:00 +0000 | |||
1603 | +++ data/display.svg 2015-04-17 22:11:56 +0000 | |||
1604 | @@ -0,0 +1,220 @@ | |||
1605 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
1606 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
1607 | 3 | |||
1608 | 4 | <svg | ||
1609 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
1610 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
1611 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
1612 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
1613 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
1614 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
1615 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
1616 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
1617 | 13 | width="490" | ||
1618 | 14 | height="333" | ||
1619 | 15 | id="svg13953" | ||
1620 | 16 | version="1.1" | ||
1621 | 17 | inkscape:version="0.48.4 r9939" | ||
1622 | 18 | sodipodi:docname="display.svg"> | ||
1623 | 19 | <defs | ||
1624 | 20 | id="defs13955"> | ||
1625 | 21 | <linearGradient | ||
1626 | 22 | gradientTransform="translate(427.70904,-139.65646)" | ||
1627 | 23 | inkscape:collect="always" | ||
1628 | 24 | xlink:href="#linearGradient14513" | ||
1629 | 25 | id="linearGradient14519" | ||
1630 | 26 | x1="-183.60603" | ||
1631 | 27 | y1="357.91989" | ||
1632 | 28 | x2="-183.60603" | ||
1633 | 29 | y2="598.4118" | ||
1634 | 30 | gradientUnits="userSpaceOnUse" /> | ||
1635 | 31 | <linearGradient | ||
1636 | 32 | inkscape:collect="always" | ||
1637 | 33 | id="linearGradient14513"> | ||
1638 | 34 | <stop | ||
1639 | 35 | style="stop-color:#fafaf7;stop-opacity:1;" | ||
1640 | 36 | offset="0" | ||
1641 | 37 | id="stop14515" /> | ||
1642 | 38 | <stop | ||
1643 | 39 | style="stop-color:#fafaf7;stop-opacity:0;" | ||
1644 | 40 | offset="1" | ||
1645 | 41 | id="stop14517" /> | ||
1646 | 42 | </linearGradient> | ||
1647 | 43 | <radialGradient | ||
1648 | 44 | inkscape:collect="always" | ||
1649 | 45 | xlink:href="#linearGradient13988" | ||
1650 | 46 | id="radialGradient13994" | ||
1651 | 47 | cx="-272.18756" | ||
1652 | 48 | cy="333.45459" | ||
1653 | 49 | fx="-272.18756" | ||
1654 | 50 | fy="333.45459" | ||
1655 | 51 | r="190" | ||
1656 | 52 | gradientTransform="matrix(1.3349797,0.35770673,-0.23322348,0.87040189,165.59173,190.85596)" | ||
1657 | 53 | gradientUnits="userSpaceOnUse" /> | ||
1658 | 54 | <linearGradient | ||
1659 | 55 | inkscape:collect="always" | ||
1660 | 56 | id="linearGradient13988"> | ||
1661 | 57 | <stop | ||
1662 | 58 | id="stop13992" | ||
1663 | 59 | offset="0" | ||
1664 | 60 | style="stop-color:#5fbbe6;stop-opacity:1" /> | ||
1665 | 61 | <stop | ||
1666 | 62 | id="stop13990" | ||
1667 | 63 | offset="1" | ||
1668 | 64 | style="stop-color:#5a94db;stop-opacity:1;" /> | ||
1669 | 65 | </linearGradient> | ||
1670 | 66 | <radialGradient | ||
1671 | 67 | r="190" | ||
1672 | 68 | fy="333.45459" | ||
1673 | 69 | fx="-272.18756" | ||
1674 | 70 | cy="333.45459" | ||
1675 | 71 | cx="-272.18756" | ||
1676 | 72 | gradientTransform="matrix(1.3349797,0.35770673,-0.23322348,0.87040189,593.30077,51.199499)" | ||
1677 | 73 | gradientUnits="userSpaceOnUse" | ||
1678 | 74 | id="radialGradient14542" | ||
1679 | 75 | xlink:href="#linearGradient13988" | ||
1680 | 76 | inkscape:collect="always" /> | ||
1681 | 77 | <radialGradient | ||
1682 | 78 | inkscape:collect="always" | ||
1683 | 79 | xlink:href="#linearGradient13988-9" | ||
1684 | 80 | id="radialGradient13994-2" | ||
1685 | 81 | cx="-272.18756" | ||
1686 | 82 | cy="333.45459" | ||
1687 | 83 | fx="-272.18756" | ||
1688 | 84 | fy="333.45459" | ||
1689 | 85 | r="190" | ||
1690 | 86 | gradientTransform="matrix(1.3349797,0.35770673,-0.23322348,0.87040189,165.59173,190.85596)" | ||
1691 | 87 | gradientUnits="userSpaceOnUse" /> | ||
1692 | 88 | <linearGradient | ||
1693 | 89 | inkscape:collect="always" | ||
1694 | 90 | id="linearGradient13988-9"> | ||
1695 | 91 | <stop | ||
1696 | 92 | id="stop13992-5" | ||
1697 | 93 | offset="0" | ||
1698 | 94 | style="stop-color:#5fbbe6;stop-opacity:1" /> | ||
1699 | 95 | <stop | ||
1700 | 96 | id="stop13990-0" | ||
1701 | 97 | offset="1" | ||
1702 | 98 | style="stop-color:#5a94db;stop-opacity:1;" /> | ||
1703 | 99 | </linearGradient> | ||
1704 | 100 | <linearGradient | ||
1705 | 101 | inkscape:collect="always" | ||
1706 | 102 | xlink:href="#linearGradient14513-6" | ||
1707 | 103 | id="linearGradient14519-2" | ||
1708 | 104 | x1="-183.60603" | ||
1709 | 105 | y1="357.91989" | ||
1710 | 106 | x2="-183.60603" | ||
1711 | 107 | y2="598.4118" | ||
1712 | 108 | gradientUnits="userSpaceOnUse" /> | ||
1713 | 109 | <linearGradient | ||
1714 | 110 | inkscape:collect="always" | ||
1715 | 111 | id="linearGradient14513-6"> | ||
1716 | 112 | <stop | ||
1717 | 113 | style="stop-color:#fafaf7;stop-opacity:1;" | ||
1718 | 114 | offset="0" | ||
1719 | 115 | id="stop14515-2" /> | ||
1720 | 116 | <stop | ||
1721 | 117 | style="stop-color:#fafaf7;stop-opacity:0;" | ||
1722 | 118 | offset="1" | ||
1723 | 119 | id="stop14517-4" /> | ||
1724 | 120 | </linearGradient> | ||
1725 | 121 | <linearGradient | ||
1726 | 122 | inkscape:collect="always" | ||
1727 | 123 | xlink:href="#linearGradient14513-6" | ||
1728 | 124 | id="linearGradient3033" | ||
1729 | 125 | gradientUnits="userSpaceOnUse" | ||
1730 | 126 | x1="-183.60603" | ||
1731 | 127 | y1="357.91989" | ||
1732 | 128 | x2="-183.60603" | ||
1733 | 129 | y2="598.4118" | ||
1734 | 130 | gradientTransform="matrix(1.2894737,0,0,1.4734513,497.71155,-365.85158)" /> | ||
1735 | 131 | <radialGradient | ||
1736 | 132 | inkscape:collect="always" | ||
1737 | 133 | xlink:href="#linearGradient13988-9" | ||
1738 | 134 | id="radialGradient3037" | ||
1739 | 135 | gradientUnits="userSpaceOnUse" | ||
1740 | 136 | gradientTransform="matrix(1.7214212,0.52706345,-0.30073554,1.2824948,711.23773,-84.634614)" | ||
1741 | 137 | cx="-272.18756" | ||
1742 | 138 | cy="333.45459" | ||
1743 | 139 | fx="-272.18756" | ||
1744 | 140 | fy="333.45459" | ||
1745 | 141 | r="190" /> | ||
1746 | 142 | </defs> | ||
1747 | 143 | <sodipodi:namedview | ||
1748 | 144 | id="base" | ||
1749 | 145 | pagecolor="#ffffff" | ||
1750 | 146 | bordercolor="#666666" | ||
1751 | 147 | borderopacity="1.0" | ||
1752 | 148 | inkscape:pageopacity="0.0" | ||
1753 | 149 | inkscape:pageshadow="2" | ||
1754 | 150 | inkscape:zoom="0.7" | ||
1755 | 151 | inkscape:cx="303.33216" | ||
1756 | 152 | inkscape:cy="42.332147" | ||
1757 | 153 | inkscape:document-units="px" | ||
1758 | 154 | inkscape:current-layer="layer1" | ||
1759 | 155 | showgrid="false" | ||
1760 | 156 | fit-margin-top="0" | ||
1761 | 157 | fit-margin-left="0" | ||
1762 | 158 | fit-margin-right="0" | ||
1763 | 159 | fit-margin-bottom="0" | ||
1764 | 160 | inkscape:showpageshadow="false" | ||
1765 | 161 | inkscape:snap-page="true" | ||
1766 | 162 | inkscape:snap-nodes="false" | ||
1767 | 163 | inkscape:snap-bbox="true" | ||
1768 | 164 | inkscape:window-width="1600" | ||
1769 | 165 | inkscape:window-height="845" | ||
1770 | 166 | inkscape:window-x="0" | ||
1771 | 167 | inkscape:window-y="30" | ||
1772 | 168 | inkscape:window-maximized="1"> | ||
1773 | 169 | <inkscape:grid | ||
1774 | 170 | type="xygrid" | ||
1775 | 171 | id="grid13968" | ||
1776 | 172 | empspacing="5" | ||
1777 | 173 | visible="true" | ||
1778 | 174 | enabled="true" | ||
1779 | 175 | snapvisiblegridlinesonly="true" | ||
1780 | 176 | originx="0px" | ||
1781 | 177 | originy="0px" /> | ||
1782 | 178 | </sodipodi:namedview> | ||
1783 | 179 | <metadata | ||
1784 | 180 | id="metadata13958"> | ||
1785 | 181 | <rdf:RDF> | ||
1786 | 182 | <cc:Work | ||
1787 | 183 | rdf:about=""> | ||
1788 | 184 | <dc:format>image/svg+xml</dc:format> | ||
1789 | 185 | <dc:type | ||
1790 | 186 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
1791 | 187 | </cc:Work> | ||
1792 | 188 | </rdf:RDF> | ||
1793 | 189 | </metadata> | ||
1794 | 190 | <g | ||
1795 | 191 | inkscape:label="Layer 1" | ||
1796 | 192 | inkscape:groupmode="layer" | ||
1797 | 193 | id="layer1" | ||
1798 | 194 | transform="translate(4.1875,-118.09375)"> | ||
1799 | 195 | <g | ||
1800 | 196 | id="g3005" | ||
1801 | 197 | transform="translate(55.044461,-53.452473)"> | ||
1802 | 198 | <rect | ||
1803 | 199 | y="172.33047" | ||
1804 | 200 | x="-58.542763" | ||
1805 | 201 | height="331.52655" | ||
1806 | 202 | width="488.71054" | ||
1807 | 203 | id="rect13940" | ||
1808 | 204 | style="color:#000000;fill:url(#radialGradient3037);fill-opacity:1;stroke:#4875b9;stroke-width:1.37839639;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1809 | 205 | <path | ||
1810 | 206 | sodipodi:nodetypes="ccccc" | ||
1811 | 207 | inkscape:connector-curvature="0" | ||
1812 | 208 | id="rect13998" | ||
1813 | 209 | d="m -57.88793,173.05201 487.40086,0 0,102.94808 -487.40086,112.36888 z" | ||
1814 | 210 | style="opacity:0.03999999;color:#000000;fill:#fafaf7;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
1815 | 211 | <rect | ||
1816 | 212 | style="color:#000000;fill:none;stroke:url(#linearGradient3033);stroke-width:1.37839639;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12972975;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
1817 | 213 | id="rect14003" | ||
1818 | 214 | width="486.10129" | ||
1819 | 215 | height="328.57635" | ||
1820 | 216 | x="-57.243176" | ||
1821 | 217 | y="173.80028" /> | ||
1822 | 218 | </g> | ||
1823 | 219 | </g> | ||
1824 | 220 | </svg> | ||
1825 | 0 | 221 | ||
1826 | === removed file 'data/hotcornerdisplay.png' | |||
1827 | 1 | Binary files data/hotcornerdisplay.png 2012-08-07 08:42:42 +0000 and data/hotcornerdisplay.png 1970-01-01 00:00:00 +0000 differ | 222 | Binary files data/hotcornerdisplay.png 2012-08-07 08:42:42 +0000 and data/hotcornerdisplay.png 1970-01-01 00:00:00 +0000 differ |
1828 | === modified file 'src/CMakeLists.txt' | |||
1829 | --- src/CMakeLists.txt 2015-03-31 06:23:29 +0000 | |||
1830 | +++ src/CMakeLists.txt 2015-04-17 22:11:56 +0000 | |||
1831 | @@ -17,6 +17,7 @@ | |||
1832 | 17 | Dock.vala | 17 | Dock.vala |
1833 | 18 | desktop-plug.vala | 18 | desktop-plug.vala |
1834 | 19 | GalaSettings.vala | 19 | GalaSettings.vala |
1835 | 20 | Hotcorners.vala | ||
1836 | 20 | Wallpaper.vala | 21 | Wallpaper.vala |
1837 | 21 | SlingshotSettings.vala | 22 | SlingshotSettings.vala |
1838 | 22 | Cache.vala | 23 | Cache.vala |
1839 | 23 | 24 | ||
1840 | === added file 'src/Hotcorners.vala' | |||
1841 | --- src/Hotcorners.vala 1970-01-01 00:00:00 +0000 | |||
1842 | +++ src/Hotcorners.vala 2015-04-17 22:11:56 +0000 | |||
1843 | @@ -0,0 +1,526 @@ | |||
1844 | 1 | /*** | ||
1845 | 2 | Copyright (C) 2014 Peter Arnold | ||
1846 | 3 | |||
1847 | 4 | This program is free software: you can redistribute it and/or modify | ||
1848 | 5 | it under the terms of the GNU General Public License as published by | ||
1849 | 6 | the Free Software Foundation, either version 3 of the License, or | ||
1850 | 7 | (at your option) any later version. | ||
1851 | 8 | |||
1852 | 9 | This program is distributed in the hope that it will be useful, | ||
1853 | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1854 | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1855 | 12 | GNU General Public License for more details. | ||
1856 | 13 | |||
1857 | 14 | You should have received a copy of the GNU General Public License | ||
1858 | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1859 | 16 | ***/ | ||
1860 | 17 | |||
1861 | 18 | public class Hotcorners : Gtk.Grid { | ||
1862 | 19 | |||
1863 | 20 | public Hotcorners () { | ||
1864 | 21 | column_spacing = 12; | ||
1865 | 22 | margin = 32; | ||
1866 | 23 | margin_top = 15; | ||
1867 | 24 | column_homogeneous = true; | ||
1868 | 25 | |||
1869 | 26 | Gtk.Overlay overlay; | ||
1870 | 27 | var hotcorners = new HotcornerWidget (out overlay); | ||
1871 | 28 | hotcorners.set_halign (Gtk.Align.CENTER); | ||
1872 | 29 | attach (overlay, 1, 0, 1, 1); | ||
1873 | 30 | } | ||
1874 | 31 | |||
1875 | 32 | /** | ||
1876 | 33 | * Methods to get and set hotcorner selection | ||
1877 | 34 | **/ | ||
1878 | 35 | |||
1879 | 36 | public static void set_custom_command (string corner_string, string command) { | ||
1880 | 37 | var line = BehaviorSettings.get_default ().hotcorner_custom_command; | ||
1881 | 38 | var parts = line.split (";;"); | ||
1882 | 39 | var temp_line = ""; | ||
1883 | 40 | bool exist = false; | ||
1884 | 41 | |||
1885 | 42 | foreach (var part in parts){ | ||
1886 | 43 | var details = part.split (":"); | ||
1887 | 44 | if (corner_string == details[0]){ | ||
1888 | 45 | details[1] = command; | ||
1889 | 46 | exist = true; | ||
1890 | 47 | } | ||
1891 | 48 | if (details.length > 1) | ||
1892 | 49 | temp_line += details[0]+":"+details[1]+";;"; | ||
1893 | 50 | } | ||
1894 | 51 | if (!exist) | ||
1895 | 52 | temp_line += corner_string+":"+command+";;"; | ||
1896 | 53 | |||
1897 | 54 | BehaviorSettings.get_default ().hotcorner_custom_command = temp_line; | ||
1898 | 55 | } | ||
1899 | 56 | |||
1900 | 57 | public static string get_custom_command (string corner_string) { | ||
1901 | 58 | var line = BehaviorSettings.get_default ().hotcorner_custom_command; | ||
1902 | 59 | var parts = line.split (";;"); | ||
1903 | 60 | foreach (var part in parts){ | ||
1904 | 61 | var details = part.split (":"); | ||
1905 | 62 | if (details.length == 1) | ||
1906 | 63 | return part; | ||
1907 | 64 | if (corner_string == details[0]) | ||
1908 | 65 | return details [1]; | ||
1909 | 66 | } | ||
1910 | 67 | return ""; | ||
1911 | 68 | } | ||
1912 | 69 | |||
1913 | 70 | public static int get_selection (string corner) { | ||
1914 | 71 | return BehaviorSettings.get_default ().schema.get_enum (corner); | ||
1915 | 72 | } | ||
1916 | 73 | |||
1917 | 74 | public static void choose_hotcorner (string corner, int command) { | ||
1918 | 75 | BehaviorSettings.get_default ().schema.set_enum (corner, command); | ||
1919 | 76 | } | ||
1920 | 77 | } | ||
1921 | 78 | |||
1922 | 79 | |||
1923 | 80 | public class HotcornerWidget : Gtk.DrawingArea { | ||
1924 | 81 | // gala corner names | ||
1925 | 82 | private const string[] corner_string = { "hotcorner-topleft", | ||
1926 | 83 | "hotcorner-topright", | ||
1927 | 84 | "hotcorner-bottomleft", | ||
1928 | 85 | "hotcorner-bottomright" }; | ||
1929 | 86 | |||
1930 | 87 | // names of the hotcorner commands, the corresponding icon is named with "id.png" | ||
1931 | 88 | // position in the array is the id of the command | ||
1932 | 89 | private string[] hotcorner_commands = { _("Do Nothing"), _("Multitasking View"), | ||
1933 | 90 | _("Maximize Current Window"), _("Minimize Current Window"), | ||
1934 | 91 | _("Show Applications Menu"), _("Execute Custom Command"), | ||
1935 | 92 | _("Window Overview"), _("Show All Windows") }; | ||
1936 | 93 | |||
1937 | 94 | private Gdk.Pixbuf[] hotcorner_icons; | ||
1938 | 95 | private Gdk.Pixbuf button_icon; | ||
1939 | 96 | private Gdk.Pixbuf back_image; | ||
1940 | 97 | // calculate topleft, topright, bottomleft, bottomright corner points | ||
1941 | 98 | private int[,] corners = {{delta_pic[0] + delta_border, delta_pic[1] + delta_border}, | ||
1942 | 99 | {background_width + delta_pic[0] - delta_border, delta_pic[1] + delta_border}, | ||
1943 | 100 | {delta_pic[0] + delta_border, background_height + delta_pic[1] - delta_border}, | ||
1944 | 101 | {background_width + delta_pic[0] - delta_border, | ||
1945 | 102 | background_height + delta_pic[1] - delta_border}}; | ||
1946 | 103 | |||
1947 | 104 | // status if corner is hoovered | ||
1948 | 105 | private bool[] hoovered_corner = {false, false, false, false}; | ||
1949 | 106 | // bool if popover is shown | ||
1950 | 107 | private bool pop_mode = false; | ||
1951 | 108 | // selection if hovered over a menu entry | ||
1952 | 109 | private int hover_selection = -1; | ||
1953 | 110 | |||
1954 | 111 | private Gtk.Overlay overlay; | ||
1955 | 112 | private HotcornerWidget background; | ||
1956 | 113 | private Gtk.Popover popover; | ||
1957 | 114 | |||
1958 | 115 | // pixel size of the background picture | ||
1959 | 116 | private const int background_width = 490; | ||
1960 | 117 | private const int background_height = 333; | ||
1961 | 118 | // radius of the quarter circles in the corner | ||
1962 | 119 | private const int radius = 50; | ||
1963 | 120 | // x, y of delta top left corner of the background image | ||
1964 | 121 | // big free x area to support closing popup when clicking grey area | ||
1965 | 122 | private const int[] delta_pic = {275, 40}; | ||
1966 | 123 | private const int delta_border = 2; | ||
1967 | 124 | // radius of the green button | ||
1968 | 125 | private const int button_size = 30; | ||
1969 | 126 | // y distance of the label from background image | ||
1970 | 127 | private const int draw_text_dy = 16; | ||
1971 | 128 | // values per corner | ||
1972 | 129 | private const double[] angle_begin = {0 * (Math.PI / 180.0), 90 * (Math.PI / 180.0), | ||
1973 | 130 | 270 * (Math.PI / 180.0), 180 * (Math.PI / 180.0)}; | ||
1974 | 131 | private const double[] angle_end = {90 * (Math.PI / 180.0), 180 * (Math.PI / 180.0), | ||
1975 | 132 | 360 * (Math.PI / 180.0), 270 * (Math.PI / 180.0)}; | ||
1976 | 133 | private const int[] delta_x = {radius, 0, 0, -radius}; | ||
1977 | 134 | private const int[] delta_y = {0, radius, -radius, 0}; | ||
1978 | 135 | private const int[] delta_button_x = {-10, -50, -10, -50}; | ||
1979 | 136 | private const int[] delta_button_y = {-8, -8, -48, -48}; | ||
1980 | 137 | |||
1981 | 138 | public HotcornerWidget (out Gtk.Overlay overlay) { | ||
1982 | 139 | overlay = new Gtk.Overlay (); | ||
1983 | 140 | this.overlay = overlay; | ||
1984 | 141 | this.overlay.add (this); | ||
1985 | 142 | add_events (Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK | ||
1986 | 143 | | Gdk.EventMask.POINTER_MOTION_MASK); | ||
1987 | 144 | set_size_request (background_width + (delta_pic[0] * 2), background_height + (delta_pic[1] * 2)); | ||
1988 | 145 | this.background = this; | ||
1989 | 146 | for (int i = 0; i < hotcorner_commands.length; i++) { | ||
1990 | 147 | try { | ||
1991 | 148 | this.hotcorner_icons += new Gdk.Pixbuf.from_file_at_size ("%s/%d.svg".printf(Constants.PKGDATADIR, i), | ||
1992 | 149 | 16, 16); | ||
1993 | 150 | } catch (Error e) { | ||
1994 | 151 | critical (e.message); | ||
1995 | 152 | } | ||
1996 | 153 | } | ||
1997 | 154 | try { | ||
1998 | 155 | this.button_icon = new Gdk.Pixbuf.from_file_at_size (Constants.PKGDATADIR + "/button.svg", | ||
1999 | 156 | 2 * button_size, 2 * button_size); | ||
2000 | 157 | } catch (Error e) { | ||
2001 | 158 | critical (e.message); | ||
2002 | 159 | } | ||
2003 | 160 | try { | ||
2004 | 161 | this.back_image = new Gdk.Pixbuf.from_file_at_size (Constants.PKGDATADIR + "/display.svg", | ||
2005 | 162 | background_width, background_height); | ||
2006 | 163 | } catch (Error e) { | ||
2007 | 164 | critical (e.message); | ||
2008 | 165 | } | ||
2009 | 166 | } | ||
2010 | 167 | |||
2011 | 168 | public override bool draw (Cairo.Context context) { | ||
2012 | 169 | //draw background | ||
2013 | 170 | Gdk.cairo_set_source_pixbuf (context, back_image, delta_pic[0], delta_pic[1]); | ||
2014 | 171 | context.paint (); | ||
2015 | 172 | for (int i = 0; i < 4; i++) { | ||
2016 | 173 | int x = corners[i,0]; | ||
2017 | 174 | int y = corners[i,1]; | ||
2018 | 175 | int selection = Hotcorners.get_selection (corner_string[i]); | ||
2019 | 176 | // if this corner is hoovered | ||
2020 | 177 | if (hoovered_corner[i]) { | ||
2021 | 178 | if (selection == 0 || pop_mode) { | ||
2022 | 179 | draw_green_button (context, selection, i, x, y); | ||
2023 | 180 | } else { | ||
2024 | 181 | draw_quarter_circle (context, selection, i, x, y, true); | ||
2025 | 182 | draw_label (context, selection, i, x, y); | ||
2026 | 183 | } | ||
2027 | 184 | } else { | ||
2028 | 185 | // draw quarter corner circle with the associated command icon | ||
2029 | 186 | draw_quarter_circle (context, selection, i, x, y, false); | ||
2030 | 187 | } | ||
2031 | 188 | } | ||
2032 | 189 | return true; | ||
2033 | 190 | } | ||
2034 | 191 | |||
2035 | 192 | private void draw_quarter_circle (Cairo.Context context, int selection, int i, int x, int y, bool highlight) { | ||
2036 | 193 | Cairo.ImageSurface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, background_width + (delta_pic[0] * 2), | ||
2037 | 194 | background_height + (delta_pic[1] * 2)); | ||
2038 | 195 | Cairo.Context context2 = new Cairo.Context (surface); | ||
2039 | 196 | // inner quarter circle | ||
2040 | 197 | if (highlight) | ||
2041 | 198 | context2.set_source_rgba (1, 1, 1, 1); | ||
2042 | 199 | else | ||
2043 | 200 | context2.set_source_rgba (1, 1, 1, 0.8); | ||
2044 | 201 | context2.move_to (x, y); | ||
2045 | 202 | context2.line_to (x + delta_x[i], y + delta_y[i]); | ||
2046 | 203 | context2.arc (x, y, radius, angle_begin[i], angle_end[i]); | ||
2047 | 204 | context2.close_path (); | ||
2048 | 205 | context2.fill (); | ||
2049 | 206 | context2.stroke (); | ||
2050 | 207 | // outter quarter circle | ||
2051 | 208 | context2.set_source_rgba (1, 1, 1, 0.4); | ||
2052 | 209 | context2.set_line_width (6); | ||
2053 | 210 | context2.arc (x, y, radius + 3, angle_begin[i], angle_end[i]); | ||
2054 | 211 | context2.stroke (); | ||
2055 | 212 | context.set_operator (Cairo.Operator.OVER); | ||
2056 | 213 | context.set_source_surface (context2.get_target (), 0, 0); | ||
2057 | 214 | context.paint_with_alpha (0.5); | ||
2058 | 215 | // draw icon of actual selection | ||
2059 | 216 | if (selection == 0) | ||
2060 | 217 | return; | ||
2061 | 218 | var icon = hotcorner_icons[selection]; | ||
2062 | 219 | Gdk.cairo_set_source_pixbuf (context, icon, x + delta_button_x[i] + button_size - icon.get_width () / 2, | ||
2063 | 220 | y + delta_button_y[i] + button_size - icon.get_height () / 2); | ||
2064 | 221 | context.paint (); | ||
2065 | 222 | } | ||
2066 | 223 | |||
2067 | 224 | private void draw_green_button (Cairo.Context context, int selection, int i, int x, int y) { | ||
2068 | 225 | // context.set_source_surface (button_icon, x + delta_button_x[i], y + delta_button_y[i]); | ||
2069 | 226 | Gdk.cairo_set_source_pixbuf (context, button_icon, x + delta_button_x[i], y + delta_button_y[i]); | ||
2070 | 227 | context.paint (); | ||
2071 | 228 | Cairo.ImageSurface surface2 = new Cairo.ImageSurface (Cairo.Format.ARGB32, button_size * 2, button_size * 2); | ||
2072 | 229 | Cairo.Context context2 = new Cairo.Context (surface2); | ||
2073 | 230 | context.set_operator (Cairo.Operator.OVER); | ||
2074 | 231 | Gdk.Pixbuf icon; | ||
2075 | 232 | if (hover_selection == -1) | ||
2076 | 233 | icon = hotcorner_icons[selection]; | ||
2077 | 234 | else { | ||
2078 | 235 | if (hover_selection == 0) | ||
2079 | 236 | return; | ||
2080 | 237 | icon = hotcorner_icons[hover_selection]; | ||
2081 | 238 | } | ||
2082 | 239 | Gdk.cairo_set_source_pixbuf (context2, icon, button_size - icon.get_width () / 2, | ||
2083 | 240 | button_size - icon.get_height () / 2); | ||
2084 | 241 | context2.paint (); | ||
2085 | 242 | context.set_source_surface (context2.get_target (), x + delta_button_x[i], y + delta_button_y[i]); | ||
2086 | 243 | context.paint (); | ||
2087 | 244 | } | ||
2088 | 245 | |||
2089 | 246 | private void draw_label (Cairo.Context context, int selection, int i, int x, int y) { | ||
2090 | 247 | // get text length | ||
2091 | 248 | context.set_font_size (14); | ||
2092 | 249 | Cairo.TextExtents extents; | ||
2093 | 250 | context.text_extents (hotcorner_commands[selection], out extents); | ||
2094 | 251 | // set and calculate sizes of the box | ||
2095 | 252 | int box_dx_text = 2; | ||
2096 | 253 | int box_height = 24; | ||
2097 | 254 | int box_width = ((int) extents.width) + box_height + 2 * box_dx_text; | ||
2098 | 255 | Cairo.ImageSurface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, box_width, box_height); | ||
2099 | 256 | Cairo.Context context2 = new Cairo.Context (surface); | ||
2100 | 257 | // draw box | ||
2101 | 258 | context2.set_source_rgba (0, 0, 0, 0.6); | ||
2102 | 259 | context2.move_to (box_height / 2, 0); | ||
2103 | 260 | context2.line_to (box_height / 2, box_height); | ||
2104 | 261 | context2.arc (box_height / 2, box_height/2, box_height / 2, 90 * Math.PI / 180, 270 * Math.PI / 180); | ||
2105 | 262 | context2.fill (); | ||
2106 | 263 | context2.stroke (); | ||
2107 | 264 | context2.move_to (box_height / 2, 0); | ||
2108 | 265 | context2.rectangle (box_height / 2, 0, box_width - box_height, box_height); | ||
2109 | 266 | context2.fill (); | ||
2110 | 267 | context2.stroke (); | ||
2111 | 268 | context2.move_to (box_width - box_height / 2, 0); | ||
2112 | 269 | context2.line_to (box_width - box_height / 2, box_height); | ||
2113 | 270 | context2.arc (box_width - box_height / 2, box_height / 2, box_height / 2, | ||
2114 | 271 | 270 * Math.PI / 180, 90 * Math.PI / 180); | ||
2115 | 272 | context2.fill (); | ||
2116 | 273 | context2.stroke (); | ||
2117 | 274 | context2.move_to (box_height / 2 + box_dx_text, box_height - 7); | ||
2118 | 275 | //draw text | ||
2119 | 276 | context2.set_source_rgba (1, 1, 1, 1); | ||
2120 | 277 | context2.set_font_size (14); | ||
2121 | 278 | context2.show_text (hotcorner_commands[selection]); | ||
2122 | 279 | int draw_text_x = x - box_width / 2 + button_size + delta_button_x[i]; | ||
2123 | 280 | int draw_text_y; | ||
2124 | 281 | if (i == 0 || i == 1) | ||
2125 | 282 | draw_text_y = y - box_height - draw_text_dy; | ||
2126 | 283 | else | ||
2127 | 284 | draw_text_y = y + draw_text_dy; | ||
2128 | 285 | context.set_operator (Cairo.Operator.OVER); | ||
2129 | 286 | context.set_source_surface (context2.get_target (), draw_text_x, draw_text_y); | ||
2130 | 287 | context.paint (); | ||
2131 | 288 | } | ||
2132 | 289 | |||
2133 | 290 | public void close_popover () { | ||
2134 | 291 | if (pop_mode){ | ||
2135 | 292 | pop_mode = false; | ||
2136 | 293 | popover.hide (); | ||
2137 | 294 | popover = null; | ||
2138 | 295 | hover_selection = -1; | ||
2139 | 296 | for (int j = 0; j < 4; j++) { | ||
2140 | 297 | hoovered_corner[j] = false; | ||
2141 | 298 | } | ||
2142 | 299 | background.queue_draw (); | ||
2143 | 300 | } | ||
2144 | 301 | } | ||
2145 | 302 | |||
2146 | 303 | public override bool button_press_event (Gdk.EventButton event) { | ||
2147 | 304 | // if popover is open close it | ||
2148 | 305 | if (pop_mode){ | ||
2149 | 306 | close_popover (); | ||
2150 | 307 | return true; | ||
2151 | 308 | } | ||
2152 | 309 | // check if a corner is hoovered and show popover in that case | ||
2153 | 310 | for (int i = 0; i < 4; i++) { | ||
2154 | 311 | if (hoovered_corner[i]) { | ||
2155 | 312 | make_popover (i); | ||
2156 | 313 | break; | ||
2157 | 314 | } | ||
2158 | 315 | } | ||
2159 | 316 | return true; | ||
2160 | 317 | } | ||
2161 | 318 | |||
2162 | 319 | // checks if mouse is hovered over a corner | ||
2163 | 320 | public override bool motion_notify_event (Gdk.EventMotion evt) { | ||
2164 | 321 | if (pop_mode) { | ||
2165 | 322 | return true; | ||
2166 | 323 | } | ||
2167 | 324 | for (int i = 0; i < 4; i++) { | ||
2168 | 325 | int x = corners[i,0]; | ||
2169 | 326 | int y = corners[i,1]; | ||
2170 | 327 | if (check_in_quarter_radius (evt, x, y, radius, i)) { | ||
2171 | 328 | if (!hoovered_corner[i]) { | ||
2172 | 329 | hoovered_corner[i] = true; | ||
2173 | 330 | queue_draw (); | ||
2174 | 331 | } | ||
2175 | 332 | break; | ||
2176 | 333 | }else if (hoovered_corner[i]) { | ||
2177 | 334 | hoovered_corner[i] = false; | ||
2178 | 335 | queue_draw (); | ||
2179 | 336 | } | ||
2180 | 337 | } | ||
2181 | 338 | return true; | ||
2182 | 339 | } | ||
2183 | 340 | |||
2184 | 341 | public override bool leave_notify_event (Gdk.EventCrossing event) { | ||
2185 | 342 | if (pop_mode) return true; | ||
2186 | 343 | for (int i = 0; i < 4; i++) { | ||
2187 | 344 | hoovered_corner[i] = false; | ||
2188 | 345 | } | ||
2189 | 346 | queue_draw (); | ||
2190 | 347 | return true; | ||
2191 | 348 | } | ||
2192 | 349 | |||
2193 | 350 | // computational optimize check if point is inside quarter circle | ||
2194 | 351 | private bool check_in_quarter_radius (Gdk.EventMotion evt, int x, int y, int r, int corner) { | ||
2195 | 352 | var dx = evt.x - x; | ||
2196 | 353 | var dy = evt.y - y; | ||
2197 | 354 | if (Math.fabs (dx) > r) return false; | ||
2198 | 355 | if (Math.fabs (dy) > r) return false; | ||
2199 | 356 | if ((corner == 0 || corner == 1) && dy < 0) return false; | ||
2200 | 357 | if ((corner == 2 || corner == 3) && dy > 0) return false; | ||
2201 | 358 | if ((corner == 0 || corner == 2) && dx < 0) return false; | ||
2202 | 359 | if ((corner == 1 || corner == 3) && dx > 0) return false; | ||
2203 | 360 | if ((Math.fabs (dx) + Math.fabs (dy)) <= r) return true; | ||
2204 | 361 | if (((dx*dx) + (dy*dy)) <= (r*r)) return true; | ||
2205 | 362 | else return false; | ||
2206 | 363 | } | ||
2207 | 364 | |||
2208 | 365 | private void make_popover (int i) { | ||
2209 | 366 | pop_mode = true; | ||
2210 | 367 | int x = corners[i,0]; | ||
2211 | 368 | int y = corners[i,1]; | ||
2212 | 369 | popover = new Gtk.Popover (background); | ||
2213 | 370 | popover.get_style_context ().add_class (Gtk.STYLE_CLASS_MENU); | ||
2214 | 371 | popover.set_position (Gtk.PositionType.BOTTOM); | ||
2215 | 372 | var rect = Gdk.Rectangle (); | ||
2216 | 373 | // position of the popover arrow | ||
2217 | 374 | switch (i) { | ||
2218 | 375 | case 0: | ||
2219 | 376 | rect.x = x + 20; | ||
2220 | 377 | rect.y = y + 52; | ||
2221 | 378 | break; | ||
2222 | 379 | case 1: | ||
2223 | 380 | rect.x = x - 19; | ||
2224 | 381 | rect.y = y + 52; | ||
2225 | 382 | break; | ||
2226 | 383 | case 2: | ||
2227 | 384 | rect.x = x + 20; | ||
2228 | 385 | rect.y = y - 49; | ||
2229 | 386 | popover.set_position (Gtk.PositionType.TOP); | ||
2230 | 387 | break; | ||
2231 | 388 | case 3: | ||
2232 | 389 | rect.x = x - 19; | ||
2233 | 390 | rect.y = y - 49; | ||
2234 | 391 | popover.set_position (Gtk.PositionType.TOP); | ||
2235 | 392 | break; | ||
2236 | 393 | } | ||
2237 | 394 | popover.set_pointing_to (rect); | ||
2238 | 395 | popover.hide.connect (() => { | ||
2239 | 396 | close_popover (); | ||
2240 | 397 | }); | ||
2241 | 398 | popover.add (create_hotcorner_menu (i)); | ||
2242 | 399 | // use modal false otherwise popover closes when switching stack | ||
2243 | 400 | // closing must be handled manually then | ||
2244 | 401 | popover.set_modal (false); | ||
2245 | 402 | // because of modal false register own esc key listener | ||
2246 | 403 | popover.key_press_event.connect ((evt) => { | ||
2247 | 404 | if (evt.keyval == Gdk.Key.Escape) | ||
2248 | 405 | close_popover (); | ||
2249 | 406 | return true; | ||
2250 | 407 | }); | ||
2251 | 408 | overlay.add_overlay (popover); | ||
2252 | 409 | popover.show_all (); | ||
2253 | 410 | // because of modal false grab focus | ||
2254 | 411 | popover.grab_focus (); | ||
2255 | 412 | background.queue_draw (); | ||
2256 | 413 | } | ||
2257 | 414 | |||
2258 | 415 | private Gtk.Stack create_hotcorner_menu (int corner_id) { | ||
2259 | 416 | var stack = new Gtk.Stack (); | ||
2260 | 417 | stack.set_homogeneous (false); | ||
2261 | 418 | |||
2262 | 419 | // custom command box | ||
2263 | 420 | var custom = new Gtk.Box (Gtk.Orientation.VERTICAL,10); | ||
2264 | 421 | var custom_command = new Gtk.Entry (); | ||
2265 | 422 | custom_command.text = Hotcorners.get_custom_command (corner_string [corner_id]); | ||
2266 | 423 | var ok_button = new Gtk.Button.with_label (hotcorner_commands[5]); | ||
2267 | 424 | ok_button.clicked.connect (() => { | ||
2268 | 425 | var text = custom_command.text; | ||
2269 | 426 | Hotcorners.choose_hotcorner (corner_string [corner_id], 5); | ||
2270 | 427 | Hotcorners.set_custom_command (corner_string[corner_id], text); | ||
2271 | 428 | close_popover (); | ||
2272 | 429 | }); | ||
2273 | 430 | // set command on Enter | ||
2274 | 431 | custom_command.key_press_event.connect ((evt) => { | ||
2275 | 432 | if (evt.keyval == Gdk.Key.Return) { | ||
2276 | 433 | var text = custom_command.text; | ||
2277 | 434 | Hotcorners.choose_hotcorner (corner_string [corner_id], 5); | ||
2278 | 435 | Hotcorners.set_custom_command (corner_string[corner_id], text); | ||
2279 | 436 | close_popover (); | ||
2280 | 437 | return true; | ||
2281 | 438 | } | ||
2282 | 439 | return false; | ||
2283 | 440 | }); | ||
2284 | 441 | custom.pack_start (ok_button); | ||
2285 | 442 | custom.pack_start (custom_command); | ||
2286 | 443 | // align custom command box | ||
2287 | 444 | Gtk.Alignment alignment2 = new Gtk.Alignment (0f, 0.5f, 0f, 0f); | ||
2288 | 445 | alignment2.right_padding = 14; | ||
2289 | 446 | alignment2.left_padding = 14; | ||
2290 | 447 | alignment2.top_padding = 15; | ||
2291 | 448 | alignment2.bottom_padding = 15; | ||
2292 | 449 | alignment2.add (custom); | ||
2293 | 450 | |||
2294 | 451 | // command entries box | ||
2295 | 452 | var box = new Gtk.Box (Gtk.Orientation.VERTICAL,0); | ||
2296 | 453 | for (int i = 0; i < hotcorner_commands.length; i++) { | ||
2297 | 454 | if (i == 5) continue; | ||
2298 | 455 | var button = create_menu_entry (i); | ||
2299 | 456 | int enum_value = i; | ||
2300 | 457 | button.clicked.connect (() => { | ||
2301 | 458 | close_popover (); | ||
2302 | 459 | Hotcorners.choose_hotcorner (corner_string [corner_id], enum_value); | ||
2303 | 460 | }); | ||
2304 | 461 | button.add_events (Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.ENTER_NOTIFY_MASK | ||
2305 | 462 | | Gdk.EventMask.LEAVE_NOTIFY_MASK ); | ||
2306 | 463 | button.enter_notify_event.connect ((evt) => { | ||
2307 | 464 | // fix width because there is a issue with resizing on hover with the menuitem style class | ||
2308 | 465 | button.width_request = button.get_allocated_width (); | ||
2309 | 466 | hover_selection = enum_value; | ||
2310 | 467 | background.queue_draw (); | ||
2311 | 468 | return false; | ||
2312 | 469 | }); | ||
2313 | 470 | button.leave_notify_event.connect ((evt) => { | ||
2314 | 471 | hover_selection = -1; | ||
2315 | 472 | background.queue_draw (); | ||
2316 | 473 | return false; | ||
2317 | 474 | }); | ||
2318 | 475 | box.pack_start (button); | ||
2319 | 476 | } | ||
2320 | 477 | // custom command (index = 5) comes last and has a different behavior | ||
2321 | 478 | var button = create_menu_entry (5); | ||
2322 | 479 | button.clicked.connect (() => { | ||
2323 | 480 | stack.transition_type = Gtk.StackTransitionType.NONE; | ||
2324 | 481 | stack.set_visible_child_name ("custom"); | ||
2325 | 482 | custom_command.grab_focus (); | ||
2326 | 483 | }); | ||
2327 | 484 | button.add_events (button.get_events () | Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK); | ||
2328 | 485 | button.enter_notify_event.connect ((evt) => { | ||
2329 | 486 | // fix width because there is a issue with resizing on hover with the menuitem style class | ||
2330 | 487 | button.width_request = button.get_allocated_width (); | ||
2331 | 488 | hover_selection = 5; | ||
2332 | 489 | background.queue_draw (); | ||
2333 | 490 | return false; | ||
2334 | 491 | }); | ||
2335 | 492 | button.leave_notify_event.connect ((evt) => { | ||
2336 | 493 | // if because this method is called when stack is switched | ||
2337 | 494 | if (stack.get_visible_child_name () == "box") | ||
2338 | 495 | hover_selection = -1; | ||
2339 | 496 | background.queue_draw (); | ||
2340 | 497 | return false; | ||
2341 | 498 | }); | ||
2342 | 499 | box.pack_start (button); | ||
2343 | 500 | |||
2344 | 501 | Gtk.Alignment alignment = new Gtk.Alignment (0f, 1f, 0f, 0f); | ||
2345 | 502 | alignment.top_padding = 10; | ||
2346 | 503 | alignment.bottom_padding = 10; | ||
2347 | 504 | alignment.add (box); | ||
2348 | 505 | |||
2349 | 506 | stack.add_named (alignment, "box"); | ||
2350 | 507 | stack.add_named (alignment2, "custom"); | ||
2351 | 508 | return stack; | ||
2352 | 509 | } | ||
2353 | 510 | |||
2354 | 511 | private Gtk.Button create_menu_entry (int index) { | ||
2355 | 512 | var button = new Gtk.Button(); | ||
2356 | 513 | button.get_style_context ().add_class (Gtk.STYLE_CLASS_MENUITEM); | ||
2357 | 514 | button.set_relief (Gtk.ReliefStyle.NONE); | ||
2358 | 515 | var grid = new Gtk.Grid (); | ||
2359 | 516 | |||
2360 | 517 | var label_widget = new Gtk.Label.with_mnemonic (hotcorner_commands[index]); | ||
2361 | 518 | label_widget.margin_left = 17; | ||
2362 | 519 | label_widget.margin_right = 17; | ||
2363 | 520 | label_widget.justify = Gtk.Justification.LEFT; | ||
2364 | 521 | label_widget.set_alignment (0, 0); | ||
2365 | 522 | grid.attach (label_widget, 1, 0, 1, 1); | ||
2366 | 523 | button.add (grid); | ||
2367 | 524 | return button; | ||
2368 | 525 | } | ||
2369 | 526 | } | ||
2370 | 0 | \ No newline at end of file | 527 | \ No newline at end of file |
2371 | 1 | 528 | ||
2372 | === modified file 'src/desktop-plug.vala' | |||
2373 | --- src/desktop-plug.vala 2014-12-15 23:16:48 +0000 | |||
2374 | +++ src/desktop-plug.vala 2015-04-17 22:11:56 +0000 | |||
2375 | @@ -47,7 +47,9 @@ | |||
2376 | 47 | stack.add_titled (dock, "dock", _("Dock")); | 47 | stack.add_titled (dock, "dock", _("Dock")); |
2377 | 48 | 48 | ||
2378 | 49 | /*hot corners*/ | 49 | /*hot corners*/ |
2380 | 50 | build_hotcorners_panel (); | 50 | var hotcorners = new Hotcorners (); |
2381 | 51 | hotcorners.expand = true; | ||
2382 | 52 | stack.add_titled (hotcorners, "hotc", _("Hot Corners")); | ||
2383 | 51 | 53 | ||
2384 | 52 | main_grid.attach (stack_switcher, 0, 0, 1, 1); | 54 | main_grid.attach (stack_switcher, 0, 0, 1, 1); |
2385 | 53 | main_grid.attach (stack, 0, 1, 1, 1); | 55 | main_grid.attach (stack, 0, 1, 1, 1); |
2386 | @@ -57,75 +59,6 @@ | |||
2387 | 57 | return main_grid; | 59 | return main_grid; |
2388 | 58 | } | 60 | } |
2389 | 59 | 61 | ||
2390 | 60 | private void build_hotcorners_panel () { | ||
2391 | 61 | var hotc_grid = new Gtk.Grid (); | ||
2392 | 62 | hotc_grid.expand = true; | ||
2393 | 63 | hotc_grid.column_spacing = 12; | ||
2394 | 64 | hotc_grid.margin = 32; | ||
2395 | 65 | hotc_grid.margin_top = 48; | ||
2396 | 66 | |||
2397 | 67 | var expl = new Gtk.Label (_("When the cursor enters the corner of the display:")); | ||
2398 | 68 | expl.set_halign (Gtk.Align.START); | ||
2399 | 69 | expl.margin_bottom = 10; | ||
2400 | 70 | expl.set_hexpand (true); | ||
2401 | 71 | |||
2402 | 72 | var topleft = create_hotcorner (); | ||
2403 | 73 | topleft.active_id = BehaviorSettings.get_default ().schema.get_enum ("hotcorner-topleft").to_string (); | ||
2404 | 74 | topleft.changed.connect (() => BehaviorSettings.get_default ().schema.set_enum ("hotcorner-topleft", int.parse (topleft.active_id))); | ||
2405 | 75 | topleft.valign = Gtk.Align.START; | ||
2406 | 76 | var topright = create_hotcorner (); | ||
2407 | 77 | topright.active_id = BehaviorSettings.get_default ().schema.get_enum ("hotcorner-topright").to_string (); | ||
2408 | 78 | topright.changed.connect (() => BehaviorSettings.get_default ().schema.set_enum ("hotcorner-topright", int.parse (topright.active_id))); | ||
2409 | 79 | topright.valign = Gtk.Align.START; | ||
2410 | 80 | var bottomleft = create_hotcorner (); | ||
2411 | 81 | bottomleft.active_id = BehaviorSettings.get_default ().schema.get_enum ("hotcorner-bottomleft").to_string (); | ||
2412 | 82 | bottomleft.changed.connect (() => BehaviorSettings.get_default ().schema.set_enum ("hotcorner-bottomleft", int.parse (bottomleft.active_id))); | ||
2413 | 83 | bottomleft.valign = Gtk.Align.END; | ||
2414 | 84 | var bottomright = create_hotcorner (); | ||
2415 | 85 | bottomright.active_id = BehaviorSettings.get_default ().schema.get_enum ("hotcorner-bottomright").to_string (); | ||
2416 | 86 | bottomright.changed.connect (() => BehaviorSettings.get_default ().schema.set_enum ("hotcorner-bottomright", int.parse (bottomright.active_id))); | ||
2417 | 87 | bottomright.valign = Gtk.Align.END; | ||
2418 | 88 | |||
2419 | 89 | var icon = new Gtk.Image.from_file (Constants.PKGDATADIR + "/hotcornerdisplay.png"); | ||
2420 | 90 | var custom_command = new Gtk.Entry (); | ||
2421 | 91 | custom_command.text = BehaviorSettings.get_default ().hotcorner_custom_command; | ||
2422 | 92 | custom_command.changed.connect (() => BehaviorSettings.get_default ().hotcorner_custom_command = custom_command.text ); | ||
2423 | 93 | |||
2424 | 94 | var cc_label = new Gtk.Label (_("Custom Command:")); | ||
2425 | 95 | cc_label.set_halign (Gtk.Align.START); | ||
2426 | 96 | |||
2427 | 97 | var cc_grid = new Gtk.Grid (); | ||
2428 | 98 | cc_grid.expand = true; | ||
2429 | 99 | cc_grid.set_column_spacing (12); | ||
2430 | 100 | cc_grid.set_margin_top (48); | ||
2431 | 101 | cc_grid.attach (cc_label, 0, 0, 1, 1); | ||
2432 | 102 | cc_grid.attach (custom_command, 1, 0, 1, 1); | ||
2433 | 103 | |||
2434 | 104 | hotc_grid.attach (expl, 0, 0, 3, 1); | ||
2435 | 105 | hotc_grid.attach (icon, 1, 1, 1, 3); | ||
2436 | 106 | hotc_grid.attach (topleft, 0, 1, 1, 1); | ||
2437 | 107 | hotc_grid.attach (topright, 2, 1, 1, 1); | ||
2438 | 108 | hotc_grid.attach (bottomleft, 0, 3, 1, 1); | ||
2439 | 109 | hotc_grid.attach (bottomright, 2, 3, 1, 1); | ||
2440 | 110 | hotc_grid.attach (cc_grid, 0, 4, 2, 1); | ||
2441 | 111 | |||
2442 | 112 | stack.add_titled (hotc_grid, "hotc", _("Hot Corners")); | ||
2443 | 113 | } | ||
2444 | 114 | |||
2445 | 115 | private Gtk.ComboBoxText create_hotcorner () { | ||
2446 | 116 | var box = new Gtk.ComboBoxText (); | ||
2447 | 117 | box.append ("0", _("Do Nothing")); | ||
2448 | 118 | box.append ("1", _("Multitasking View")); | ||
2449 | 119 | box.append ("2", _("Maximize Current Window")); | ||
2450 | 120 | box.append ("3", _("Minimize Current Window")); | ||
2451 | 121 | box.append ("4", _("Show Applications Menu")); | ||
2452 | 122 | box.append ("6", _("Window Overview")); | ||
2453 | 123 | box.append ("7", _("Show All Windows")); | ||
2454 | 124 | box.append ("5", _("Execute Custom Command")); | ||
2455 | 125 | |||
2456 | 126 | return box; | ||
2457 | 127 | } | ||
2458 | 128 | |||
2459 | 129 | public override void shown () { | 62 | public override void shown () { |
2460 | 130 | 63 | ||
2461 | 131 | } | 64 | } |
To me it doesn't look immediate for the user, also those big green buttons and the whole screen image looks blurry.