dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpwidgets: rename gimp_color_config_get_printer_color_profile() 

to gimp_color_config_get_simulation_color_profile(), along with
various internal "printer" strings. Also reduce the number of
user-visible "print" stuff from the preferences color management page.
This commit is contained in:
Michael Natterer 2016-06-05 18:00:24 +02:00
parent b4f34375b7
commit fcf5b708e5
6 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/dialogs/preferences-dialog.c
View File

@ -1397,8 +1397,8 @@ prefs_dialog_new (Gimp *gimp,
prefs_profile_combo_box_add (color_config, prefs_profile_combo_box_add (color_config,
"printer-profile", "printer-profile",
store, store,
_("Select Printer Color Profile"), _("Select Simulation (Softproofing) Color Profile"),
_("_Print simulation profile:"), _("_Simulation profile:"),
GTK_TABLE (table), row++, size_group); GTK_TABLE (table), row++, size_group);
prefs_enum_combo_box_add (color_config, prefs_enum_combo_box_add (color_config,

23
libgimpconfig/gimpcolorconfig.c
View File

@ -70,7 +70,7 @@
#define CMYK_PROFILE_BLURB \ #define CMYK_PROFILE_BLURB \
_("The CMYK color profile used to convert between RGB and CMYK.") _("The CMYK color profile used to convert between RGB and CMYK.")
#define PRINTER_PROFILE_BLURB \ #define SIMULATION_PROFILE_BLURB \
_("The color profile to use for soft proofing from your image's " \ _("The color profile to use for soft proofing from your image's " \
"color space to some other color space, including " \ "color space to some other color space, including " \
"soft proofing to a printer or other output device profile. ") "soft proofing to a printer or other output device profile. ")
@ -112,7 +112,7 @@ enum
PROP_CMYK_PROFILE, PROP_CMYK_PROFILE,
PROP_DISPLAY_PROFILE, PROP_DISPLAY_PROFILE,
PROP_DISPLAY_PROFILE_FROM_GDK, PROP_DISPLAY_PROFILE_FROM_GDK,
PROP_PRINTER_PROFILE, PROP_SIMULATION_PROFILE,
PROP_DISPLAY_RENDERING_INTENT, PROP_DISPLAY_RENDERING_INTENT,
PROP_DISPLAY_USE_BPC, PROP_DISPLAY_USE_BPC,
PROP_SIMULATION_RENDERING_INTENT, PROP_SIMULATION_RENDERING_INTENT,
@ -145,7 +145,7 @@ static void gimp_color_config_set_cmyk_profile (GimpColorConfig *config,
static void gimp_color_config_set_display_profile (GimpColorConfig *config, static void gimp_color_config_set_display_profile (GimpColorConfig *config,
const gchar *filename, const gchar *filename,
GError **error); GError **error);
static void gimp_color_config_set_printer_profile (GimpColorConfig *config, static void gimp_color_config_set_simulation_profile (GimpColorConfig *config,
const gchar *filename, const gchar *filename,
GError **error); GError **error);
@ -213,10 +213,11 @@ gimp_color_config_class_init (GimpColorConfigClass *klass)
FALSE, FALSE,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_PATH (object_class, PROP_PRINTER_PROFILE, GIMP_CONFIG_PROP_PATH (object_class, PROP_SIMULATION_PROFILE,
/* FIXME: 3.0: change to simulation-profile */
"printer-profile", "printer-profile",
_("Print simulation profile"), _("Simulation profile for softproofing"),
PRINTER_PROFILE_BLURB, SIMULATION_PROFILE_BLURB,
GIMP_CONFIG_PATH_FILE, NULL, GIMP_CONFIG_PATH_FILE, NULL,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
@ -339,8 +340,8 @@ gimp_color_config_set_property (GObject *object,
case PROP_DISPLAY_PROFILE_FROM_GDK: case PROP_DISPLAY_PROFILE_FROM_GDK:
color_config->display_profile_from_gdk = g_value_get_boolean (value); color_config->display_profile_from_gdk = g_value_get_boolean (value);
break; break;
case PROP_PRINTER_PROFILE: case PROP_SIMULATION_PROFILE:
gimp_color_config_set_printer_profile (color_config, gimp_color_config_set_simulation_profile (color_config,
g_value_get_string (value), g_value_get_string (value),
&error); &error);
break; break;
@ -407,7 +408,7 @@ gimp_color_config_get_property (GObject *object,
case PROP_DISPLAY_PROFILE_FROM_GDK: case PROP_DISPLAY_PROFILE_FROM_GDK:
g_value_set_boolean (value, color_config->display_profile_from_gdk); g_value_set_boolean (value, color_config->display_profile_from_gdk);
break; break;
case PROP_PRINTER_PROFILE: case PROP_SIMULATION_PROFILE:
g_value_set_string (value, color_config->printer_profile); g_value_set_string (value, color_config->printer_profile);
break; break;
case PROP_DISPLAY_RENDERING_INTENT: case PROP_DISPLAY_RENDERING_INTENT:
@ -552,7 +553,7 @@ gimp_color_config_get_display_color_profile (GimpColorConfig *config,
} }
GimpColorProfile * GimpColorProfile *
gimp_color_config_get_printer_color_profile (GimpColorConfig *config, gimp_color_config_get_simulation_color_profile (GimpColorConfig *config,
GError **error) GError **error)
{ {
GimpColorProfile *profile = NULL; GimpColorProfile *profile = NULL;
@ -731,7 +732,7 @@ gimp_color_config_set_display_profile (GimpColorConfig *config,
} }
static void static void
gimp_color_config_set_printer_profile (GimpColorConfig *config, gimp_color_config_set_simulation_profile (GimpColorConfig *config,
const gchar *filename, const gchar *filename,
GError **error) GError **error)
{ {

2
libgimpconfig/gimpcolorconfig.h
View File

@ -88,7 +88,7 @@ GimpColorProfile * gimp_color_config_get_cmyk_color_profile (GimpColorConfig
GError **error); GError **error);
GimpColorProfile * gimp_color_config_get_display_color_profile (GimpColorConfig *config, GimpColorProfile * gimp_color_config_get_display_color_profile (GimpColorConfig *config,
GError **error); GError **error);
GimpColorProfile * gimp_color_config_get_printer_color_profile (GimpColorConfig *config, GimpColorProfile * gimp_color_config_get_simulation_color_profile (GimpColorConfig *config,
GError **error); GError **error);

2
libgimpconfig/gimpconfig.def
View File

@ -2,8 +2,8 @@ EXPORTS
gimp_color_config_get_cmyk_color_profile gimp_color_config_get_cmyk_color_profile
gimp_color_config_get_display_color_profile gimp_color_config_get_display_color_profile
gimp_color_config_get_gray_color_profile gimp_color_config_get_gray_color_profile
gimp_color_config_get_printer_color_profile
gimp_color_config_get_rgb_color_profile gimp_color_config_get_rgb_color_profile
gimp_color_config_get_simulation_color_profile
gimp_color_config_get_type gimp_color_config_get_type
gimp_color_management_mode_get_type gimp_color_management_mode_get_type
gimp_color_rendering_intent_get_type gimp_color_rendering_intent_get_type

3
libgimpwidgets/gimpwidgetsutils.c
View File

@ -711,7 +711,8 @@ gimp_widget_get_color_transform (GtkWidget *widget,
return NULL; return NULL;
case GIMP_COLOR_MANAGEMENT_SOFTPROOF: case GIMP_COLOR_MANAGEMENT_SOFTPROOF:
proof_profile = gimp_color_config_get_printer_color_profile (config, NULL); proof_profile = gimp_color_config_get_simulation_color_profile (config,
NULL);
/* fallthru */ /* fallthru */
case GIMP_COLOR_MANAGEMENT_DISPLAY: case GIMP_COLOR_MANAGEMENT_DISPLAY:

2
modules/display-filter-lcms.c
View File

@ -347,7 +347,7 @@ cdisplay_lcms_update_profile_label (CdisplayLcms *lcms,
} }
else if (strcmp (name, "printer-profile") == 0) else if (strcmp (name, "printer-profile") == 0)
{ {
profile = gimp_color_config_get_printer_color_profile (config, NULL); profile = gimp_color_config_get_simulation_color_profile (config, NULL);
} }
else else
{ {