Merge lp:~jorge/charms/precise/vsftpd/add-icon into lp:charms/vsftpd

Proposed by Jorge Castro
Status: Merged
Merged at revision: 16
Proposed branch: lp:~jorge/charms/precise/vsftpd/add-icon
Merge into: lp:charms/vsftpd
Diff against target: 312 lines (+294/-0)
2 files modified
config.yaml (+2/-0)
icon.svg (+292/-0)
To merge this branch: bzr merge lp:~jorge/charms/precise/vsftpd/add-icon
Reviewer Review Type Date Requested Status
José Antonio Rey (community) Approve
Review via email: mp+234034@code.launchpad.net

Description of the change

Add icon, add default values to pass charm proof.

To post a comment you must log in.
17. By Jorge Castro

Forgot to add the actual icon.

Revision history for this message
José Antonio Rey (jose) wrote :

+1 LGTM! Thanks, Jorge!

Another charmer will follow along in order to authorize the merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2012-05-03 23:38:59 +0000
3+++ config.yaml 2014-09-10 17:25:59 +0000
4@@ -13,9 +13,11 @@
5 description: Speed throttle in bytes/sec
6 ftp_user:
7 type: string
8+ default:
9 description: User to sign in
10 ftp_passwd:
11 type: string
12+ default:
13 description: Password to sign in with
14 delete_departed:
15 type: boolean
16
17=== added file 'icon.svg'
18--- icon.svg 1970-01-01 00:00:00 +0000
19+++ icon.svg 2014-09-10 17:25:59 +0000
20@@ -0,0 +1,292 @@
21+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22+<!-- Created with Inkscape (http://www.inkscape.org/) -->
23+
24+<svg
25+ xmlns:dc="http://purl.org/dc/elements/1.1/"
26+ xmlns:cc="http://creativecommons.org/ns#"
27+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
28+ xmlns:svg="http://www.w3.org/2000/svg"
29+ xmlns="http://www.w3.org/2000/svg"
30+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
31+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
32+ width="96"
33+ height="96"
34+ id="svg6517"
35+ version="1.1"
36+ inkscape:version="0.48.4 r9939"
37+ sodipodi:docname="juju-icon-placeholder-v.svg">
38+ <defs
39+ id="defs6519">
40+ <linearGradient
41+ id="Background">
42+ <stop
43+ id="stop4178"
44+ offset="0"
45+ style="stop-color:#b8b8b8;stop-opacity:1" />
46+ <stop
47+ id="stop4180"
48+ offset="1"
49+ style="stop-color:#c9c9c9;stop-opacity:1" />
50+ </linearGradient>
51+ <filter
52+ style="color-interpolation-filters:sRGB;"
53+ inkscape:label="Inner Shadow"
54+ id="filter1121">
55+ <feFlood
56+ flood-opacity="0.59999999999999998"
57+ flood-color="rgb(0,0,0)"
58+ result="flood"
59+ id="feFlood1123" />
60+ <feComposite
61+ in="flood"
62+ in2="SourceGraphic"
63+ operator="out"
64+ result="composite1"
65+ id="feComposite1125" />
66+ <feGaussianBlur
67+ in="composite1"
68+ stdDeviation="1"
69+ result="blur"
70+ id="feGaussianBlur1127" />
71+ <feOffset
72+ dx="0"
73+ dy="2"
74+ result="offset"
75+ id="feOffset1129" />
76+ <feComposite
77+ in="offset"
78+ in2="SourceGraphic"
79+ operator="atop"
80+ result="composite2"
81+ id="feComposite1131" />
82+ </filter>
83+ <filter
84+ style="color-interpolation-filters:sRGB;"
85+ inkscape:label="Drop Shadow"
86+ id="filter950">
87+ <feFlood
88+ flood-opacity="0.25"
89+ flood-color="rgb(0,0,0)"
90+ result="flood"
91+ id="feFlood952" />
92+ <feComposite
93+ in="flood"
94+ in2="SourceGraphic"
95+ operator="in"
96+ result="composite1"
97+ id="feComposite954" />
98+ <feGaussianBlur
99+ in="composite1"
100+ stdDeviation="1"
101+ result="blur"
102+ id="feGaussianBlur956" />
103+ <feOffset
104+ dx="0"
105+ dy="1"
106+ result="offset"
107+ id="feOffset958" />
108+ <feComposite
109+ in="SourceGraphic"
110+ in2="offset"
111+ operator="over"
112+ result="composite2"
113+ id="feComposite960" />
114+ <feBlend
115+ blend="normal"
116+ id="feBlend3895"
117+ in2="composite2" />
118+ </filter>
119+ <clipPath
120+ clipPathUnits="userSpaceOnUse"
121+ id="clipPath873">
122+ <g
123+ transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
124+ id="g875"
125+ inkscape:label="Layer 1"
126+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
127+ <path
128+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
129+ d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
130+ id="path877"
131+ inkscape:connector-curvature="0"
132+ sodipodi:nodetypes="sssssssss" />
133+ </g>
134+ </clipPath>
135+ <filter
136+ inkscape:collect="always"
137+ id="filter891"
138+ inkscape:label="Badge Shadow">
139+ <feGaussianBlur
140+ inkscape:collect="always"
141+ stdDeviation="0.71999962"
142+ id="feGaussianBlur893" />
143+ </filter>
144+ </defs>
145+ <sodipodi:namedview
146+ id="base"
147+ pagecolor="#ffffff"
148+ bordercolor="#666666"
149+ borderopacity="1.0"
150+ inkscape:pageopacity="0.0"
151+ inkscape:pageshadow="2"
152+ inkscape:zoom="8.1490724"
153+ inkscape:cx="6.3116087"
154+ inkscape:cy="46.975739"
155+ inkscape:document-units="px"
156+ inkscape:current-layer="layer3"
157+ showgrid="true"
158+ fit-margin-top="0"
159+ fit-margin-left="0"
160+ fit-margin-right="0"
161+ fit-margin-bottom="0"
162+ inkscape:window-width="1849"
163+ inkscape:window-height="1218"
164+ inkscape:window-x="123"
165+ inkscape:window-y="68"
166+ inkscape:window-maximized="0"
167+ showborder="true"
168+ showguides="true"
169+ inkscape:guide-bbox="true"
170+ inkscape:showpageshadow="false">
171+ <inkscape:grid
172+ type="xygrid"
173+ id="grid821" />
174+ <sodipodi:guide
175+ orientation="1,0"
176+ position="16,48"
177+ id="guide823" />
178+ <sodipodi:guide
179+ orientation="0,1"
180+ position="64,80"
181+ id="guide825" />
182+ <sodipodi:guide
183+ orientation="1,0"
184+ position="80,40"
185+ id="guide827" />
186+ <sodipodi:guide
187+ orientation="0,1"
188+ position="64,16"
189+ id="guide829" />
190+ </sodipodi:namedview>
191+ <metadata
192+ id="metadata6522">
193+ <rdf:RDF>
194+ <cc:Work
195+ rdf:about="">
196+ <dc:format>image/svg+xml</dc:format>
197+ <dc:type
198+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
199+ <dc:title />
200+ </cc:Work>
201+ </rdf:RDF>
202+ </metadata>
203+ <g
204+ inkscape:label="BACKGROUND"
205+ inkscape:groupmode="layer"
206+ id="layer1"
207+ transform="translate(268,-635.29076)"
208+ style="display:inline">
209+ <path
210+ style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7"
211+ d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
212+ id="path6455"
213+ inkscape:connector-curvature="0"
214+ sodipodi:nodetypes="sssssssss" />
215+ </g>
216+ <g
217+ inkscape:groupmode="layer"
218+ id="layer3"
219+ inkscape:label="PLACEHOLDER LETTER"
220+ style="display:inline">
221+ <text
222+ xml:space="preserve"
223+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter950);font-family:Sans"
224+ x="33.271999"
225+ y="62.644001"
226+ id="text3891"
227+ sodipodi:linespacing="125%"><tspan
228+ sodipodi:role="line"
229+ id="tspan3893"
230+ x="33.271999"
231+ y="62.644001"
232+ style="font-size:56px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">v</tspan></text>
233+ <rect
234+ style="opacity:0.69999999999999996;fill:none;stroke:none"
235+ id="rect3021"
236+ width="64"
237+ height="64"
238+ x="16"
239+ y="16" />
240+ </g>
241+ <g
242+ inkscape:groupmode="layer"
243+ id="layer2"
244+ inkscape:label="BADGE"
245+ style="display:none"
246+ sodipodi:insensitive="true">
247+ <g
248+ style="display:inline"
249+ transform="translate(-340.00001,-581)"
250+ id="g4394"
251+ clip-path="none">
252+ <g
253+ id="g855">
254+ <g
255+ inkscape:groupmode="maskhelper"
256+ id="g870"
257+ clip-path="url(#clipPath873)"
258+ style="opacity:0.6;filter:url(#filter891)">
259+ <path
260+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
261+ d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
262+ sodipodi:ry="12"
263+ sodipodi:rx="12"
264+ sodipodi:cy="552.36218"
265+ sodipodi:cx="252"
266+ id="path844"
267+ style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
268+ sodipodi:type="arc" />
269+ </g>
270+ <g
271+ id="g862">
272+ <path
273+ sodipodi:type="arc"
274+ style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
275+ id="path4398"
276+ sodipodi:cx="252"
277+ sodipodi:cy="552.36218"
278+ sodipodi:rx="12"
279+ sodipodi:ry="12"
280+ d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
281+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
282+ <path
283+ transform="matrix(1.25,0,0,1.25,33,-100.45273)"
284+ d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
285+ sodipodi:ry="12"
286+ sodipodi:rx="12"
287+ sodipodi:cy="552.36218"
288+ sodipodi:cx="252"
289+ id="path4400"
290+ style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
291+ sodipodi:type="arc" />
292+ <path
293+ sodipodi:type="star"
294+ style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
295+ id="path4459"
296+ sodipodi:sides="5"
297+ sodipodi:cx="666.19574"
298+ sodipodi:cy="589.50385"
299+ sodipodi:r1="7.2431178"
300+ sodipodi:r2="4.3458705"
301+ sodipodi:arg1="1.0471976"
302+ sodipodi:arg2="1.6755161"
303+ inkscape:flatsided="false"
304+ inkscape:rounded="0.1"
305+ inkscape:randomized="0"
306+ d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
307+ transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
308+ </g>
309+ </g>
310+ </g>
311+ </g>
312+</svg>

Subscribers

People subscribed via source and target branches

to all changes: