Merge lp:~kokoto-java/kazam/symbolics-for-webcam-and-broadcast into lp:kazam

Proposed by George Karavasilev
Status: Merged
Approved by: David Klasinc
Approved revision: 139
Merge reported by: David Klasinc
Merged at revision: not available
Proposed branch: lp:~kokoto-java/kazam/symbolics-for-webcam-and-broadcast
Merge into: lp:kazam
Diff against target: 263 lines (+254/-0)
2 files modified
data/icons/scalable/kazam-broadcast-symbolic.svg (+137/-0)
data/icons/scalable/kazam-webcam-symbolic.svg (+117/-0)
To merge this branch: bzr merge lp:~kokoto-java/kazam/symbolics-for-webcam-and-broadcast
Reviewer Review Type Date Requested Status
Kazam Team Pending
Review via email: mp+223253@code.launchpad.net

Description of the change

Skrijnšot:
http://i.imgur.com/JoEr2oo.png
I ne sam Gorgi.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/icons/scalable/kazam-broadcast-symbolic.svg'
2--- data/icons/scalable/kazam-broadcast-symbolic.svg 1970-01-01 00:00:00 +0000
3+++ data/icons/scalable/kazam-broadcast-symbolic.svg 2014-06-16 14:31:37 +0000
4@@ -0,0 +1,137 @@
5+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
6+<!-- Created with Inkscape (http://www.inkscape.org/) -->
7+
8+<svg
9+ xmlns:dc="http://purl.org/dc/elements/1.1/"
10+ xmlns:cc="http://creativecommons.org/ns#"
11+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
12+ xmlns:svg="http://www.w3.org/2000/svg"
13+ xmlns="http://www.w3.org/2000/svg"
14+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
15+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
16+ width="24"
17+ height="24"
18+ id="svg27665"
19+ version="1.1"
20+ inkscape:version="0.48.4 r9939"
21+ sodipodi:docname="kazam-broadcast-symbolic.svg"
22+ inkscape:export-filename="area-24.png"
23+ inkscape:export-xdpi="90"
24+ inkscape:export-ydpi="90">
25+ <defs
26+ id="defs27667" />
27+ <sodipodi:namedview
28+ id="base"
29+ pagecolor="#ffffff"
30+ bordercolor="#666666"
31+ borderopacity="1.0"
32+ inkscape:pageopacity="0.0"
33+ inkscape:pageshadow="2"
34+ inkscape:zoom="27.860798"
35+ inkscape:cx="11.53803"
36+ inkscape:cy="13.316516"
37+ inkscape:document-units="px"
38+ inkscape:current-layer="layer1"
39+ showgrid="true"
40+ inkscape:window-width="1366"
41+ inkscape:window-height="740"
42+ inkscape:window-x="0"
43+ inkscape:window-y="28"
44+ inkscape:window-maximized="1"
45+ inkscape:snap-bbox="true"
46+ inkscape:bbox-paths="true"
47+ inkscape:bbox-nodes="true"
48+ inkscape:snap-bbox-edge-midpoints="true"
49+ inkscape:snap-bbox-midpoints="true"
50+ inkscape:object-paths="true"
51+ inkscape:snap-intersection-paths="true"
52+ inkscape:object-nodes="true"
53+ inkscape:snap-smooth-nodes="true"
54+ inkscape:snap-midpoints="true"
55+ inkscape:snap-object-midpoints="true"
56+ inkscape:snap-center="true"
57+ inkscape:snap-global="true"
58+ showguides="true"
59+ inkscape:guide-bbox="true"
60+ fit-margin-top="0"
61+ fit-margin-left="0"
62+ fit-margin-right="0"
63+ fit-margin-bottom="0"
64+ inkscape:showpageshadow="false">
65+ <inkscape:grid
66+ empspacing="5"
67+ visible="true"
68+ enabled="true"
69+ snapvisiblegridlinesonly="true"
70+ type="xygrid"
71+ id="grid2983" />
72+ </sodipodi:namedview>
73+ <metadata
74+ id="metadata27670">
75+ <rdf:RDF>
76+ <cc:Work
77+ rdf:about="">
78+ <dc:format>image/svg+xml</dc:format>
79+ <dc:type
80+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
81+ <dc:title></dc:title>
82+ </cc:Work>
83+ </rdf:RDF>
84+ </metadata>
85+ <g
86+ inkscape:label="Sloj 1"
87+ inkscape:groupmode="layer"
88+ id="layer1"
89+ transform="translate(3162.1675,-1405.2535)">
90+ <path
91+ sodipodi:type="arc"
92+ style="fill:#bebebe;fill-opacity:1;stroke:none"
93+ id="path3031"
94+ sodipodi:cx="-17"
95+ sodipodi:cy="8.5"
96+ sodipodi:rx="4"
97+ sodipodi:ry="1.5"
98+ d="m -13,8.5 a 4,1.5 0 1 1 -8,0 4,1.5 0 1 1 8,0 z"
99+ transform="matrix(1.25,0,0,1.35,-3128.9175,1414.7535)" />
100+ <path
101+ sodipodi:type="arc"
102+ style="fill:#bebebe;fill-opacity:1;stroke:none"
103+ id="path3033"
104+ sodipodi:cx="-17"
105+ sodipodi:cy="3"
106+ sodipodi:rx="1"
107+ sodipodi:ry="1"
108+ d="m -16,3 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
109+ transform="matrix(2,0,0,2,-3116.1675,1409.2535)" />
110+ <path
111+ style="fill:#bebebe;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
112+ d="m 11,10 0,11 2,0 0,-11 z"
113+ id="path3035"
114+ inkscape:connector-curvature="0"
115+ transform="translate(-3162.1675,1405.2535)" />
116+ <path
117+ style="fill:#bebebe;fill-opacity:1;stroke:none"
118+ d="m -3153.1675,1410.2535 c -2.6129,3 -2.5962,7 -0.01,10 l -2.0209,0 c -2.524,-3.0221 -2.6775,-6.9779 0,-10 z"
119+ id="path3839"
120+ inkscape:connector-curvature="0"
121+ sodipodi:nodetypes="ccccc" />
122+ <path
123+ sodipodi:nodetypes="ccccc"
124+ inkscape:connector-curvature="0"
125+ id="path3851"
126+ d="m -3156.1675,1408.2535 c -4,3 -4,11 0,14 l -2.0209,0 c -3.9791,-3 -3.9791,-11 -0.01,-14 z"
127+ style="fill:#bebebe;fill-opacity:1;stroke:none" />
128+ <path
129+ sodipodi:nodetypes="ccccc"
130+ inkscape:connector-curvature="0"
131+ id="path3853"
132+ d="m -3147.174,1410.2535 c 2.6129,3 2.5962,7 0.01,10 l 2.0209,0 c 2.524,-3.0221 2.6775,-6.9779 0,-10 z"
133+ style="fill:#bebebe;fill-opacity:1;stroke:none" />
134+ <path
135+ style="fill:#bebebe;fill-opacity:1;stroke:none"
136+ d="m -3144.174,1408.2535 c 4,3 4,11 0,14 l 2.0209,0 c 3.9791,-3 3.9791,-11 0.01,-14 z"
137+ id="path3855"
138+ inkscape:connector-curvature="0"
139+ sodipodi:nodetypes="ccccc" />
140+ </g>
141+</svg>
142
143=== added file 'data/icons/scalable/kazam-webcam-symbolic.svg'
144--- data/icons/scalable/kazam-webcam-symbolic.svg 1970-01-01 00:00:00 +0000
145+++ data/icons/scalable/kazam-webcam-symbolic.svg 2014-06-16 14:31:37 +0000
146@@ -0,0 +1,117 @@
147+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
148+<!-- Created with Inkscape (http://www.inkscape.org/) -->
149+
150+<svg
151+ xmlns:dc="http://purl.org/dc/elements/1.1/"
152+ xmlns:cc="http://creativecommons.org/ns#"
153+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
154+ xmlns:svg="http://www.w3.org/2000/svg"
155+ xmlns="http://www.w3.org/2000/svg"
156+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
157+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
158+ width="24"
159+ height="24"
160+ id="svg27665"
161+ version="1.1"
162+ inkscape:version="0.48.4 r9939"
163+ sodipodi:docname="kazam-webcam-symbolic.svg"
164+ inkscape:export-filename="fullscreen-24.png"
165+ inkscape:export-xdpi="90"
166+ inkscape:export-ydpi="90">
167+ <defs
168+ id="defs27667" />
169+ <sodipodi:namedview
170+ id="base"
171+ pagecolor="#ffffff"
172+ bordercolor="#666666"
173+ borderopacity="1.0"
174+ inkscape:pageopacity="0.0"
175+ inkscape:pageshadow="2"
176+ inkscape:zoom="19.686996"
177+ inkscape:cx="11.463077"
178+ inkscape:cy="10.906821"
179+ inkscape:document-units="px"
180+ inkscape:current-layer="layer1"
181+ showgrid="true"
182+ inkscape:window-width="1366"
183+ inkscape:window-height="740"
184+ inkscape:window-x="0"
185+ inkscape:window-y="28"
186+ inkscape:window-maximized="1"
187+ inkscape:snap-bbox="true"
188+ inkscape:bbox-paths="true"
189+ inkscape:bbox-nodes="true"
190+ inkscape:snap-bbox-edge-midpoints="true"
191+ inkscape:snap-bbox-midpoints="true"
192+ inkscape:object-paths="true"
193+ inkscape:snap-intersection-paths="true"
194+ inkscape:object-nodes="true"
195+ inkscape:snap-smooth-nodes="true"
196+ inkscape:snap-midpoints="true"
197+ inkscape:snap-object-midpoints="true"
198+ inkscape:snap-center="true"
199+ inkscape:snap-global="true"
200+ showguides="true"
201+ inkscape:guide-bbox="true"
202+ fit-margin-top="0"
203+ fit-margin-left="0"
204+ fit-margin-right="0"
205+ fit-margin-bottom="0"
206+ inkscape:showpageshadow="false">
207+ <inkscape:grid
208+ empspacing="5"
209+ visible="true"
210+ enabled="true"
211+ snapvisiblegridlinesonly="true"
212+ type="xygrid"
213+ id="grid2983" />
214+ </sodipodi:namedview>
215+ <metadata
216+ id="metadata27670">
217+ <rdf:RDF>
218+ <cc:Work
219+ rdf:about="">
220+ <dc:format>image/svg+xml</dc:format>
221+ <dc:type
222+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
223+ <dc:title></dc:title>
224+ </cc:Work>
225+ </rdf:RDF>
226+ </metadata>
227+ <g
228+ inkscape:label="Sloj 1"
229+ inkscape:groupmode="layer"
230+ id="layer1"
231+ transform="translate(3162.1675,-1405.2535)">
232+ <path
233+ style="fill:#bebebe;fill-opacity:1;stroke:none"
234+ d="m 7,22 3,-3 2,-1 2,1 3,3 -5,1 z"
235+ id="path3812"
236+ inkscape:connector-curvature="0"
237+ sodipodi:nodetypes="ccccccc"
238+ transform="translate(-3162.1675,1405.2535)" />
239+ <rect
240+ style="fill:#bebebe;fill-opacity:1;stroke:none"
241+ id="rect3790"
242+ width="10"
243+ height="1"
244+ x="-3155.1675"
245+ y="1427.2535" />
246+ <path
247+ style="fill:#bebebe;fill-opacity:1;stroke:none"
248+ d="m -3153.1675,1422.2535 6,0 -1,2 -4,0 z"
249+ id="rect3796"
250+ inkscape:connector-curvature="0"
251+ sodipodi:nodetypes="ccccc" />
252+ <path
253+ style="fill:#bebebe;fill-opacity:1;stroke:none"
254+ d="m -3150.1675,1410.2535 c -2.7614,0 -5,2.2386 -5,5 0,2.7614 2.2386,5 5,5 2.7614,0 5,-2.2386 5,-5 0,-2.7614 -2.2386,-5 -5,-5 z m 0,2 c 1.6569,0 3,1.3431 3,3 0,1.6569 -1.3431,3 -3,3 -1.6569,0 -3,-1.3431 -3,-3 0,-1.6569 1.3431,-3 3,-3 z"
255+ id="path3802"
256+ inkscape:connector-curvature="0" />
257+ <path
258+ style="fill:#bebebe;fill-opacity:1;stroke:none"
259+ d="m -3150.1675,1407.2535 c -4.4183,0 -8,3.5817 -8,8 0,4.4183 3.5817,8 8,8 4.4183,0 8,-3.5817 8,-8 0,-4.4183 -3.5817,-8 -8,-8 z m 0,2 c 3.3137,0 6,2.6863 6,6 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-3.3137 2.6863,-6 6,-6 z"
260+ id="path3807"
261+ inkscape:connector-curvature="0" />
262+ </g>
263+</svg>

Subscribers

People subscribed via source and target branches

to all changes: