Codebase list colord / c2892dd
Add defines and calibration attach image for the ColorMunki Smile Richard Hughes 11 years ago
6 changed file(s) with 246 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all
+2
-0
contrib/session-helper/cd-main.c less more
197197 return "spyder3-attach.svg";
198198 case CD_SENSOR_KIND_SPYDER4:
199199 return "spyder4-attach.svg";
200 case CD_SENSOR_KIND_COLOR_MUNKI_SMILE:
201 return "color-munki-smile-attach.svg";
200202 default:
201203 break;
202204 }
+1
-0
data/figures/Makefile.am less more
66 i1-display3-attach.svg \
77 i1-monitor-attach.svg \
88 i1-pro-attach.svg \
9 color-munki-smile-attach.svg \
910 color-munki-photo-ambient.svg \
1011 color-munki-photo-attach.svg \
1112 color-munki-photo-calibrate.svg \
+226
-0
data/figures/color-munki-smile-attach.svg less more
0 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
1 <!-- Created with Inkscape (http://www.inkscape.org/) -->
2
3 <svg
4 xmlns:dc="http://purl.org/dc/elements/1.1/"
5 xmlns:cc="http://creativecommons.org/ns#"
6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 xmlns:svg="http://www.w3.org/2000/svg"
8 xmlns="http://www.w3.org/2000/svg"
9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 id="svg7384"
12 sodipodi:docname="color-munki-smile.svg"
13 version="1.1"
14 inkscape:version="0.48.4 r9939"
15 height="300"
16 width="300">
17 <metadata
18 id="metadata90">
19 <rdf:RDF>
20 <cc:Work
21 rdf:about="">
22 <dc:format>image/svg+xml</dc:format>
23 <dc:type
24 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
25 <dc:title>Gnome Symbolic Icon Theme</dc:title>
26 </cc:Work>
27 </rdf:RDF>
28 </metadata>
29 <sodipodi:namedview
30 inkscape:cy="120.7552"
31 pagecolor="#e5e6e4"
32 borderopacity="1"
33 showborder="false"
34 inkscape:bbox-paths="false"
35 guidetolerance="10"
36 inkscape:object-paths="true"
37 inkscape:window-width="1600"
38 showguides="true"
39 inkscape:object-nodes="true"
40 inkscape:snap-bbox="true"
41 inkscape:pageshadow="2"
42 inkscape:guide-bbox="true"
43 inkscape:snap-nodes="true"
44 bordercolor="#666666"
45 objecttolerance="10"
46 id="namedview88"
47 showgrid="false"
48 inkscape:window-maximized="1"
49 inkscape:window-x="0"
50 inkscape:snap-global="true"
51 inkscape:window-y="582"
52 gridtolerance="10"
53 inkscape:window-height="845"
54 inkscape:snap-others="false"
55 inkscape:snap-to-guides="true"
56 inkscape:current-layer="layer12"
57 inkscape:snap-bbox-midpoints="false"
58 inkscape:zoom="2"
59 inkscape:cx="299.24814"
60 inkscape:snap-grids="true"
61 inkscape:pageopacity="1">
62 <inkscape:grid
63 spacingx="1px"
64 spacingy="1px"
65 id="grid4866"
66 empspacing="2"
67 enabled="true"
68 type="xygrid"
69 snapvisiblegridlinesonly="true"
70 visible="true" />
71 </sodipodi:namedview>
72 <title
73 id="title9167">Gnome Symbolic Icon Theme</title>
74 <defs
75 id="defs7386" />
76 <g
77 inkscape:label="figures"
78 transform="translate(-241.00018,-243)"
79 inkscape:groupmode="layer"
80 id="layer12"
81 style="display:inline">
82 <rect
83 inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
84 x="241.00018"
85 y="243"
86 id="rect5985-4-9-7"
87 inkscape:export-ydpi="90"
88 height="300"
89 inkscape:export-xdpi="90"
90 width="300"
91 style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
92 <rect
93 inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
94 x="261.00018"
95 y="263"
96 id="rect5985-4-4-6-8"
97 rx="4"
98 inkscape:export-ydpi="90"
99 height="260"
100 ry="4"
101 inkscape:export-xdpi="90"
102 width="260"
103 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
104 <path
105 inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
106 inkscape:connector-curvature="0"
107 d="m 388.0002,247.00002 0,68.7812 6,4 0,-68.7812 z"
108 id="rect3883-1-8-5-1-8-6-1"
109 sodipodi:nodetypes="ccccc"
110 inkscape:export-ydpi="90"
111 inkscape:export-xdpi="90"
112 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
113 <path
114 inkscape:connector-curvature="0"
115 d="m 391.0002,291.00002 c -55.54856,0 -74.96875,74.6354 -74.96875,125.5 0,52.9858 46.99736,71.5 74.96875,71.5 27.97139,0 74.96875,-18.5142 74.96875,-71.5 0,-50.8646 -19.42019,-125.5 -74.96875,-125.5 z"
116 id="path4121-7"
117 style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:4;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:new" />
118 <path
119 inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
120 inkscape:connector-curvature="0"
121 d="m 388.0002,247.00002 0,68.7812 6,4 0,-68.7812 z"
122 id="rect3883-1-8-5-1-3-5"
123 sodipodi:nodetypes="ccccc"
124 inkscape:export-ydpi="90"
125 inkscape:export-xdpi="90"
126 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
127 <path
128 inkscape:connector-curvature="0"
129 d="m 391.0002,291.00002 c -55.54856,0 -74.96875,74.6354 -74.96875,125.5 0,52.9858 46.99736,71.5 74.96875,71.5 27.97139,0 74.96875,-18.5142 74.96875,-71.5 0,-50.8646 -19.42019,-125.5 -74.96875,-125.5 z"
130 id="path4121"
131 style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
132 <g
133 transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,965.1549,-761.65134)"
134 id="g4210">
135 <rect
136 x="442"
137 y="1267.3622"
138 id="rect4132"
139 rx="0"
140 ry="0"
141 height="3.9999974"
142 width="2"
143 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
144 <rect
145 transform="matrix(0,1,-1,0,0,0)"
146 x="1272.3622"
147 y="-441"
148 id="rect4132-9"
149 rx="0"
150 ry="0"
151 height="3.999999"
152 width="2"
153 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
154 <rect
155 x="442"
156 y="1275.3622"
157 id="rect4132-4"
158 rx="0"
159 ry="0"
160 height="4.0000014"
161 width="2"
162 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
163 <rect
164 transform="matrix(0,1,-1,0,0,0)"
165 x="1272.3622"
166 y="-449"
167 id="rect4132-9-8"
168 rx="0"
169 ry="0"
170 height="3.999999"
171 width="2"
172 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
173 </g>
174 <text
175 transform="scale(0.99909433,1.0009065)"
176 x="387.30267"
177 y="454.99619"
178 id="text4188"
179 xml:space="preserve"
180 sodipodi:linespacing="125%"
181 style="font-size:12.26223755px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#babdb6;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"><tspan
182 x="387.30267"
183 y="454.99619"
184 sodipodi:role="line"
185 id="tspan4190"
186 style="font-weight:normal;fill:#babdb6;-inkscape-font-specification:Cantarell">x-lite</tspan></text>
187 <path
188 inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
189 inkscape:connector-curvature="0"
190 d="m 388.0002,243.00002 0,1.7812 6,4 0,-1.7812 z"
191 id="rect3883-1-8-5-0-5-0"
192 sodipodi:nodetypes="ccccc"
193 inkscape:export-ydpi="90"
194 inkscape:export-xdpi="90"
195 style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
196 <text
197 transform="scale(0.99625014,1.003764)"
198 x="346.53009"
199 y="372.95001"
200 id="text4188-7"
201 xml:space="preserve"
202 sodipodi:linespacing="125%"
203 style="font-size:18.21458054px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#babdb6;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"><tspan
204 x="346.53009"
205 y="372.95001"
206 sodipodi:role="line"
207 id="tspan4190-7"
208 style="font-weight:normal;fill:#babdb6;-inkscape-font-specification:Cantarell">color<tspan
209 style="font-weight:bold"
210 id="tspan3116">hunki</tspan></tspan></text>
211 <text
212 transform="scale(0.92141184,1.085291)"
213 x="372.73282"
214 y="377.34094"
215 id="text4188-7-9"
216 xml:space="preserve"
217 sodipodi:linespacing="125%"
218 style="font-size:39.26428986px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#babdb6;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"><tspan
219 x="372.73282"
220 y="377.34094"
221 sodipodi:role="line"
222 id="tspan4190-7-1"
223 style="font-weight:normal;fill:#babdb6;-inkscape-font-specification:Cantarell">Smirk</tspan></text>
224 </g>
225 </svg>
+2
-0
libcolord/cd-enum.c less more
427427 return CD_SENSOR_KIND_COLORHUG;
428428 if (g_strcmp0 (sensor_kind, "colorhug-spectro") == 0)
429429 return CD_SENSOR_KIND_COLORHUG_SPECTRO;
430 if (g_strcmp0 (sensor_kind, "color-munki-smile") == 0)
431 return CD_SENSOR_KIND_COLOR_MUNKI_SMILE;
430432 return CD_SENSOR_KIND_UNKNOWN;
431433 }
432434
+12
-11
libcolord/cd-enum.h less more
142142 CD_SENSOR_KIND_DUMMY,
143143 CD_SENSOR_KIND_HUEY,
144144 CD_SENSOR_KIND_COLOR_MUNKI_PHOTO,
145 CD_SENSOR_KIND_SPYDER, /* not used since 0.1.16 */
145 CD_SENSOR_KIND_SPYDER, /* not used since 0.1.16 */
146146 CD_SENSOR_KIND_DTP20,
147147 CD_SENSOR_KIND_DTP22,
148148 CD_SENSOR_KIND_DTP41,
151151 CD_SENSOR_KIND_SPECTRO_SCAN,
152152 CD_SENSOR_KIND_I1_PRO,
153153 CD_SENSOR_KIND_COLORIMTRE_HCFR,
154 CD_SENSOR_KIND_I1_DISPLAY3, /* Since: 0.1.14 */
155 CD_SENSOR_KIND_COLORHUG, /* Since: 0.1.15 */
156 CD_SENSOR_KIND_SPYDER2, /* Since: 0.1.16 */
157 CD_SENSOR_KIND_SPYDER3, /* Since: 0.1.16 */
158 CD_SENSOR_KIND_COLORHUG_SPECTRO,/* Since: 0.1.24 */
159 CD_SENSOR_KIND_I1_DISPLAY1, /* Since: 0.1.25 */
160 CD_SENSOR_KIND_I1_DISPLAY2, /* Since: 0.1.25 */
161 CD_SENSOR_KIND_DTP92, /* Since: 0.1.25 */
162 CD_SENSOR_KIND_I1_MONITOR, /* Since: 0.1.25 */
163 CD_SENSOR_KIND_SPYDER4, /* Since: 0.1.26 */
154 CD_SENSOR_KIND_I1_DISPLAY3, /* Since: 0.1.14 */
155 CD_SENSOR_KIND_COLORHUG, /* Since: 0.1.15 */
156 CD_SENSOR_KIND_SPYDER2, /* Since: 0.1.16 */
157 CD_SENSOR_KIND_SPYDER3, /* Since: 0.1.16 */
158 CD_SENSOR_KIND_COLORHUG_SPECTRO, /* Since: 0.1.24 */
159 CD_SENSOR_KIND_I1_DISPLAY1, /* Since: 0.1.25 */
160 CD_SENSOR_KIND_I1_DISPLAY2, /* Since: 0.1.25 */
161 CD_SENSOR_KIND_DTP92, /* Since: 0.1.25 */
162 CD_SENSOR_KIND_I1_MONITOR, /* Since: 0.1.25 */
163 CD_SENSOR_KIND_SPYDER4, /* Since: 0.1.26 */
164 CD_SENSOR_KIND_COLOR_MUNKI_SMILE, /* Since: 0.1.27 */
164165 CD_SENSOR_KIND_LAST
165166 } CdSensorKind;
166167
+3
-0
rules/69-cd-sensors.rules.in less more
4949 # i1Display3
5050 ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5020", ENV{COLORD_SENSOR}="1", ENV{COLORD_SENSOR_KIND}="i1-display3", ENV{COLORD_SENSOR_CAP_LCD}="1", ENV{COLORD_SENSOR_CAP_PROJECTOR}="1", ENV{COLORD_SENSOR_CAP_CRT}="1", ENV{COLORD_SENSOR_CAP_AMBIENT}="1"
5151
52 # ColorMunki Smile
53 ATTRS{idVendor}=="0765", ATTRS{idProduct}=="6003", ENV{COLORD_SENSOR}="1", ENV{COLORD_SENSOR_KIND}="color-munki-smile", ENV{COLORD_SENSOR_CAP_LCD}="1"
54
5255 # ColorMunki Photo
5356 ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2007", ENV{COLORD_SENSOR}="1", ENV{COLORD_SENSOR_KIND}="color-munki-photo", ENV{COLORD_SENSOR_CAP_LCD}="1", ENV{COLORD_SENSOR_CAP_CRT}="1", ENV{COLORD_SENSOR_CAP_PROJECTOR}="1", ENV{COLORD_SENSOR_CAP_PRINTER}="1", ENV{COLORD_SENSOR_CAP_SPOT}="1", ENV{COLORD_SENSOR_CAP_AMBIENT}="1"
5457