[gnome-color-manager] trivial: don't show the user scanner specific instructions when they are profiling a camera
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] trivial: don't show the user scanner specific instructions when they are profiling a camera
- Date: Mon, 22 Feb 2010 09:58:19 +0000 (UTC)
commit 91815791d7ea3bd786666ce94e5366255fa173d9
Author: Richard Hughes <richard hughsie com>
Date: Mon Feb 22 09:57:40 2010 +0000
trivial: don't show the user scanner specific instructions when they are profiling a camera
src/gcm-calibrate.c | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index b123fd7..ee95abe 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -57,6 +57,7 @@ struct _GcmCalibratePrivate
GcmCalibrateDeviceKind device_kind;
GcmColorimeterKind colorimeter_kind;
GcmCalibrateDialog *calibrate_dialog;
+ GcmDeviceTypeEnum device_type;
gchar *output_name;
gchar *filename_source;
gchar *filename_reference;
@@ -79,6 +80,7 @@ enum {
PROP_MANUFACTURER,
PROP_REFERENCE_KIND,
PROP_DEVICE_KIND,
+ PROP_DEVICE_TYPE,
PROP_COLORIMETER_KIND,
PROP_OUTPUT_NAME,
PROP_FILENAME_SOURCE,
@@ -225,6 +227,7 @@ gcm_calibrate_set_from_device (GcmCalibrate *calibrate, GcmDevice *device, GErro
/* set the proper values */
g_object_set (calibrate,
+ "device-type", type,
"model", model,
"description", description,
"manufacturer", manufacturer,
@@ -724,11 +727,20 @@ gcm_calibrate_device (GcmCalibrate *calibrate, GtkWindow *window, GError **error
/* TRANSLATORS: dialog message, preface */
g_string_append_printf (string, "%s\n", _("Before calibrating the device, you have to manually capture an image of a calibrated target and save it as a TIFF image file."));
- /* TRANSLATORS: dialog message, preface */
- g_string_append_printf (string, "%s\n", _("Ensure that the contrast and brightness are not changed and color correction profiles are not applied."));
+ /* scanner specific options */
+ if (priv->device_type == GCM_DEVICE_TYPE_ENUM_SCANNER) {
+ /* TRANSLATORS: dialog message, preface */
+ g_string_append_printf (string, "%s\n", _("Ensure that the contrast and brightness are not changed and color correction profiles are not applied."));
- /* TRANSLATORS: dialog message, suffix */
- g_string_append_printf (string, "%s\n", _("The device sensor should have been cleaned prior to scanning and the output file resolution should be at least 200dpi."));
+ /* TRANSLATORS: dialog message, suffix */
+ g_string_append_printf (string, "%s\n", _("The device sensor should have been cleaned prior to scanning and the output file resolution should be at least 200dpi."));
+ }
+
+ /* camera specific options */
+ if (priv->device_type == GCM_DEVICE_TYPE_ENUM_CAMERA) {
+ /* TRANSLATORS: dialog message, preface */
+ g_string_append_printf (string, "%s\n", _("Ensure that the white-balance has not been modified by the camera and that the lens is clean."));
+ }
/* TRANSLATORS: dialog message, suffix */
g_string_append_printf (string, "\n%s\n", _("For best results, the reference target should also be less than two years old."));
@@ -832,6 +844,9 @@ gcm_calibrate_get_property (GObject *object, guint prop_id, GValue *value, GPara
case PROP_DEVICE_KIND:
g_value_set_uint (value, priv->device_kind);
break;
+ case PROP_DEVICE_TYPE:
+ g_value_set_uint (value, priv->device_type);
+ break;
case PROP_COLORIMETER_KIND:
g_value_set_uint (value, priv->colorimeter_kind);
break;
@@ -948,6 +963,9 @@ gcm_calibrate_set_property (GObject *object, guint prop_id, const GValue *value,
g_free (priv->manufacturer);
priv->manufacturer = g_strdup (g_value_get_string (value));
break;
+ case PROP_DEVICE_TYPE:
+ priv->device_type = g_value_get_uint (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -983,6 +1001,14 @@ gcm_calibrate_class_init (GcmCalibrateClass *klass)
g_object_class_install_property (object_class, PROP_DEVICE_KIND, pspec);
/**
+ * GcmCalibrate:device-type:
+ */
+ pspec = g_param_spec_uint ("device-type", NULL, NULL,
+ 0, G_MAXUINT, 0,
+ G_PARAM_READWRITE);
+ g_object_class_install_property (object_class, PROP_DEVICE_TYPE, pspec);
+
+ /**
* GcmCalibrate:colorimeter-kind:
*/
pspec = g_param_spec_uint ("colorimeter-kind", NULL, NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]