[gnome-color-manager] trivial: show the correct spyder figure for the hardware
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] trivial: show the correct spyder figure for the hardware
- Date: Mon, 12 Dec 2011 15:45:56 +0000 (UTC)
commit 6b91c736d20bfe910b3f8f27a441dfb2ce476377
Author: Richard Hughes <richard hughsie com>
Date: Mon Dec 12 15:45:14 2011 +0000
trivial: show the correct spyder figure for the hardware
data/figures/Makefile.am | 22 ++++++++++---------
...ne-monitor-attach.svg => i1-monitor-attach.svg} | 0
.../{spyder-attach.svg => spyder2-attach.svg} | 0
src/gcm-calibrate.c | 8 ++++++-
4 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/data/figures/Makefile.am b/data/figures/Makefile.am
index 2b14fb2..a42cbab 100644
--- a/data/figures/Makefile.am
+++ b/data/figures/Makefile.am
@@ -7,24 +7,26 @@ figures_DATA = \
iconsdir = $(datadir)/gnome-color-manager/icons
icons_DATA = \
- clock.svg \
- calibration-short.svg \
- calibration-normal.svg \
calibration-long.svg \
- scan-target.svg \
- scan-target-good.svg \
- scan-target-bad.svg \
- i1-pro-attach.svg \
- huey-attach.svg \
+ calibration-normal.svg \
+ calibration-short.svg \
+ clock.svg \
dtp94-attach.svg \
hcfr-attach.svg \
- spyder-attach.svg \
+ huey-attach.svg \
i1-display3-attach.svg \
+ i1-monitor-attach.svg \
+ i1-pro-attach.svg \
munki-ambient.svg \
munki-attach.svg \
munki-calibrate.svg \
munki-projector.svg \
- munki-screen.svg
+ munki-screen.svg \
+ scan-target-bad.svg \
+ scan-target-good.svg \
+ scan-target.svg \
+ spyder2-attach.svg \
+ spyder3-attach.svg
EXTRA_DIST = \
$(icons_DATA) \
diff --git a/data/figures/eye-one-monitor-attach.svg b/data/figures/i1-monitor-attach.svg
similarity index 100%
rename from data/figures/eye-one-monitor-attach.svg
rename to data/figures/i1-monitor-attach.svg
diff --git a/data/figures/spyder-attach.svg b/data/figures/spyder2-attach.svg
similarity index 100%
rename from data/figures/spyder-attach.svg
rename to data/figures/spyder2-attach.svg
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 30a0b2a..43aa619 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -358,7 +358,7 @@ gcm_calibrate_get_sensor_image_attach (GcmCalibrate *calibrate)
case CD_SENSOR_KIND_COLOR_MUNKI:
return "munki-attach.svg";
case CD_SENSOR_KIND_SPYDER:
- return "spyder-attach.svg";
+ return "spyder2-attach.svg";
case CD_SENSOR_KIND_COLORIMTRE_HCFR:
return "hcfr-attach.svg";
case CD_SENSOR_KIND_I1_PRO:
@@ -369,6 +369,12 @@ gcm_calibrate_get_sensor_image_attach (GcmCalibrate *calibrate)
case CD_SENSOR_KIND_I1_DISPLAY3:
return "i1-display3-attach.svg";
#endif
+#if CD_CHECK_VERSION(0,1,16)
+ case CD_SENSOR_KIND_SPYDER2:
+ return "spyder2-attach.svg";
+ case CD_SENSOR_KIND_SPYDER3:
+ return "spyder3-attach.svg";
+#endif
default:
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]