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
=== added file 'data/icons/scalable/kazam-broadcast-symbolic.svg'
--- data/icons/scalable/kazam-broadcast-symbolic.svg 1970-01-01 00:00:00 +0000
+++ data/icons/scalable/kazam-broadcast-symbolic.svg 2014-06-16 14:31:37 +0000
@@ -0,0 +1,137 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="24"
13 height="24"
14 id="svg27665"
15 version="1.1"
16 inkscape:version="0.48.4 r9939"
17 sodipodi:docname="kazam-broadcast-symbolic.svg"
18 inkscape:export-filename="area-24.png"
19 inkscape:export-xdpi="90"
20 inkscape:export-ydpi="90">
21 <defs
22 id="defs27667" />
23 <sodipodi:namedview
24 id="base"
25 pagecolor="#ffffff"
26 bordercolor="#666666"
27 borderopacity="1.0"
28 inkscape:pageopacity="0.0"
29 inkscape:pageshadow="2"
30 inkscape:zoom="27.860798"
31 inkscape:cx="11.53803"
32 inkscape:cy="13.316516"
33 inkscape:document-units="px"
34 inkscape:current-layer="layer1"
35 showgrid="true"
36 inkscape:window-width="1366"
37 inkscape:window-height="740"
38 inkscape:window-x="0"
39 inkscape:window-y="28"
40 inkscape:window-maximized="1"
41 inkscape:snap-bbox="true"
42 inkscape:bbox-paths="true"
43 inkscape:bbox-nodes="true"
44 inkscape:snap-bbox-edge-midpoints="true"
45 inkscape:snap-bbox-midpoints="true"
46 inkscape:object-paths="true"
47 inkscape:snap-intersection-paths="true"
48 inkscape:object-nodes="true"
49 inkscape:snap-smooth-nodes="true"
50 inkscape:snap-midpoints="true"
51 inkscape:snap-object-midpoints="true"
52 inkscape:snap-center="true"
53 inkscape:snap-global="true"
54 showguides="true"
55 inkscape:guide-bbox="true"
56 fit-margin-top="0"
57 fit-margin-left="0"
58 fit-margin-right="0"
59 fit-margin-bottom="0"
60 inkscape:showpageshadow="false">
61 <inkscape:grid
62 empspacing="5"
63 visible="true"
64 enabled="true"
65 snapvisiblegridlinesonly="true"
66 type="xygrid"
67 id="grid2983" />
68 </sodipodi:namedview>
69 <metadata
70 id="metadata27670">
71 <rdf:RDF>
72 <cc:Work
73 rdf:about="">
74 <dc:format>image/svg+xml</dc:format>
75 <dc:type
76 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
77 <dc:title></dc:title>
78 </cc:Work>
79 </rdf:RDF>
80 </metadata>
81 <g
82 inkscape:label="Sloj 1"
83 inkscape:groupmode="layer"
84 id="layer1"
85 transform="translate(3162.1675,-1405.2535)">
86 <path
87 sodipodi:type="arc"
88 style="fill:#bebebe;fill-opacity:1;stroke:none"
89 id="path3031"
90 sodipodi:cx="-17"
91 sodipodi:cy="8.5"
92 sodipodi:rx="4"
93 sodipodi:ry="1.5"
94 d="m -13,8.5 a 4,1.5 0 1 1 -8,0 4,1.5 0 1 1 8,0 z"
95 transform="matrix(1.25,0,0,1.35,-3128.9175,1414.7535)" />
96 <path
97 sodipodi:type="arc"
98 style="fill:#bebebe;fill-opacity:1;stroke:none"
99 id="path3033"
100 sodipodi:cx="-17"
101 sodipodi:cy="3"
102 sodipodi:rx="1"
103 sodipodi:ry="1"
104 d="m -16,3 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
105 transform="matrix(2,0,0,2,-3116.1675,1409.2535)" />
106 <path
107 style="fill:#bebebe;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
108 d="m 11,10 0,11 2,0 0,-11 z"
109 id="path3035"
110 inkscape:connector-curvature="0"
111 transform="translate(-3162.1675,1405.2535)" />
112 <path
113 style="fill:#bebebe;fill-opacity:1;stroke:none"
114 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"
115 id="path3839"
116 inkscape:connector-curvature="0"
117 sodipodi:nodetypes="ccccc" />
118 <path
119 sodipodi:nodetypes="ccccc"
120 inkscape:connector-curvature="0"
121 id="path3851"
122 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"
123 style="fill:#bebebe;fill-opacity:1;stroke:none" />
124 <path
125 sodipodi:nodetypes="ccccc"
126 inkscape:connector-curvature="0"
127 id="path3853"
128 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"
129 style="fill:#bebebe;fill-opacity:1;stroke:none" />
130 <path
131 style="fill:#bebebe;fill-opacity:1;stroke:none"
132 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"
133 id="path3855"
134 inkscape:connector-curvature="0"
135 sodipodi:nodetypes="ccccc" />
136 </g>
137</svg>
0138
=== added file 'data/icons/scalable/kazam-webcam-symbolic.svg'
--- data/icons/scalable/kazam-webcam-symbolic.svg 1970-01-01 00:00:00 +0000
+++ data/icons/scalable/kazam-webcam-symbolic.svg 2014-06-16 14:31:37 +0000
@@ -0,0 +1,117 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
4<svg
5 xmlns:dc="http://purl.org/dc/elements/1.1/"
6 xmlns:cc="http://creativecommons.org/ns#"
7 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8 xmlns:svg="http://www.w3.org/2000/svg"
9 xmlns="http://www.w3.org/2000/svg"
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12 width="24"
13 height="24"
14 id="svg27665"
15 version="1.1"
16 inkscape:version="0.48.4 r9939"
17 sodipodi:docname="kazam-webcam-symbolic.svg"
18 inkscape:export-filename="fullscreen-24.png"
19 inkscape:export-xdpi="90"
20 inkscape:export-ydpi="90">
21 <defs
22 id="defs27667" />
23 <sodipodi:namedview
24 id="base"
25 pagecolor="#ffffff"
26 bordercolor="#666666"
27 borderopacity="1.0"
28 inkscape:pageopacity="0.0"
29 inkscape:pageshadow="2"
30 inkscape:zoom="19.686996"
31 inkscape:cx="11.463077"
32 inkscape:cy="10.906821"
33 inkscape:document-units="px"
34 inkscape:current-layer="layer1"
35 showgrid="true"
36 inkscape:window-width="1366"
37 inkscape:window-height="740"
38 inkscape:window-x="0"
39 inkscape:window-y="28"
40 inkscape:window-maximized="1"
41 inkscape:snap-bbox="true"
42 inkscape:bbox-paths="true"
43 inkscape:bbox-nodes="true"
44 inkscape:snap-bbox-edge-midpoints="true"
45 inkscape:snap-bbox-midpoints="true"
46 inkscape:object-paths="true"
47 inkscape:snap-intersection-paths="true"
48 inkscape:object-nodes="true"
49 inkscape:snap-smooth-nodes="true"
50 inkscape:snap-midpoints="true"
51 inkscape:snap-object-midpoints="true"
52 inkscape:snap-center="true"
53 inkscape:snap-global="true"
54 showguides="true"
55 inkscape:guide-bbox="true"
56 fit-margin-top="0"
57 fit-margin-left="0"
58 fit-margin-right="0"
59 fit-margin-bottom="0"
60 inkscape:showpageshadow="false">
61 <inkscape:grid
62 empspacing="5"
63 visible="true"
64 enabled="true"
65 snapvisiblegridlinesonly="true"
66 type="xygrid"
67 id="grid2983" />
68 </sodipodi:namedview>
69 <metadata
70 id="metadata27670">
71 <rdf:RDF>
72 <cc:Work
73 rdf:about="">
74 <dc:format>image/svg+xml</dc:format>
75 <dc:type
76 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
77 <dc:title></dc:title>
78 </cc:Work>
79 </rdf:RDF>
80 </metadata>
81 <g
82 inkscape:label="Sloj 1"
83 inkscape:groupmode="layer"
84 id="layer1"
85 transform="translate(3162.1675,-1405.2535)">
86 <path
87 style="fill:#bebebe;fill-opacity:1;stroke:none"
88 d="m 7,22 3,-3 2,-1 2,1 3,3 -5,1 z"
89 id="path3812"
90 inkscape:connector-curvature="0"
91 sodipodi:nodetypes="ccccccc"
92 transform="translate(-3162.1675,1405.2535)" />
93 <rect
94 style="fill:#bebebe;fill-opacity:1;stroke:none"
95 id="rect3790"
96 width="10"
97 height="1"
98 x="-3155.1675"
99 y="1427.2535" />
100 <path
101 style="fill:#bebebe;fill-opacity:1;stroke:none"
102 d="m -3153.1675,1422.2535 6,0 -1,2 -4,0 z"
103 id="rect3796"
104 inkscape:connector-curvature="0"
105 sodipodi:nodetypes="ccccc" />
106 <path
107 style="fill:#bebebe;fill-opacity:1;stroke:none"
108 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"
109 id="path3802"
110 inkscape:connector-curvature="0" />
111 <path
112 style="fill:#bebebe;fill-opacity:1;stroke:none"
113 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"
114 id="path3807"
115 inkscape:connector-curvature="0" />
116 </g>
117</svg>

Subscribers

People subscribed via source and target branches

to all changes: