[gimp/soc/2022/cmyk] Fixing menu order
- From: Alx Sa <sawyeralex src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc/2022/cmyk] Fixing menu order
- Date: Mon, 20 Jun 2022 22:00:46 +0000 (UTC)
commit 29ea17946b57d6f028da100c3cb02627c267a1ec
Author: Alx Sa <cmyk student gmail com>
Date: Mon Jun 20 22:00:45 2022 +0000
Fixing menu order
app/actions/image-actions.c | 25 -------
app/actions/image-commands.c | 64 +-----------------
app/actions/image-commands.h | 151 +++++++++++++++++++++----------------------
app/actions/view-actions.c | 26 +++++++-
app/actions/view-commands.c | 59 +++++++++++++++++
app/actions/view-commands.h | 4 ++
6 files changed, 161 insertions(+), 168 deletions(-)
---
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index 9287053c15..7ef19056e9 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -199,26 +199,11 @@ static const GimpToggleActionEntry image_toggle_actions[] =
TRUE,
GIMP_HELP_IMAGE_COLOR_PROFILE_USE_SRGB },
- { "image-color-management-softproof", NULL,
- NC_("image-action", "_Proof Colors"), NULL,
- NC_("image-action", "Use simulation profile for soft-proofing"),
- image_color_management_softproof_cmd_callback,
- FALSE,
- GIMP_HELP_VIEW_COLOR_MANAGEMENT },
-
{ "image-softproof-black-point-compensation", NULL,
NC_("image-action", "_Black Point Compensation"), NULL,
NC_("image-action", "Use black point compensation for soft-proofing"),
image_softproof_bpc_cmd_callback,
TRUE,
- GIMP_HELP_VIEW_COLOR_MANAGEMENT },
-
- { "image-softproof-gamut-check", NULL,
- NC_("image-action", "_Mark Out Of Gamut Colors"), NULL,
- NC_("image-action", "When soft-proofing, mark colors which cannot "
- "be represented in the target color space"),
- image_softproof_gamut_check_cmd_callback,
- FALSE,
GIMP_HELP_VIEW_COLOR_MANAGEMENT }
};
@@ -438,9 +423,7 @@ image_actions_update (GimpActionGroup *group,
gboolean profile_srgb = FALSE;
gboolean profile_hidden = FALSE;
gboolean profile = FALSE;
- gboolean sp = FALSE;
gboolean s_bpc = FALSE;
- gboolean gammut = FALSE;
#define SET_LABEL(action,label) \
gimp_action_group_set_action_label (group, action, (label))
@@ -526,9 +509,6 @@ image_actions_update (GimpActionGroup *group,
shell = gimp_display_get_shell (display);
color_config = gimp_display_shell_get_color_config (shell);
- if (gimp_color_config_get_mode (color_config) == GIMP_COLOR_MANAGEMENT_SOFTPROOF)
- sp = (image != NULL);
-
switch (gimp_color_config_get_simulation_intent (color_config))
{
case GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL:
@@ -551,7 +531,6 @@ image_actions_update (GimpActionGroup *group,
gimp_action_group_set_action_active (group, action, TRUE);
s_bpc = gimp_color_config_get_simulation_bpc (color_config);
- gammut = gimp_color_config_get_simulation_gamut_check (color_config);
}
}
else
@@ -580,8 +559,6 @@ image_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("image-convert-grayscale", image);
SET_SENSITIVE ("image-convert-indexed", image && !groups && is_u8_gamma);
- SET_SENSITIVE ("image-color-management-softproof", image);
- SET_ACTIVE ("image-color-management-softproof", sp);
SET_SENSITIVE ("image-softproof-profile", image);
SET_SENSITIVE ("image-softproof-intent-perceptual", image);
SET_SENSITIVE ("image-softproof-intent-relative-colorimetric", image);
@@ -589,8 +566,6 @@ image_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("image-softproof-intent-absolute-colorimetric", image);
SET_SENSITIVE ("image-softproof-black-point-compensation", image);
SET_ACTIVE ("image-softproof-black-point-compensation", s_bpc);
- SET_SENSITIVE ("image-softproof-gamut-check", sp);
- SET_ACTIVE ("image-softproof-gamut-check", gammut);
SET_SENSITIVE ("image-convert-u8", image);
SET_SENSITIVE ("image-convert-u16", image && !is_indexed);
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index d65ce45a9f..019b727ce2 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -182,6 +182,7 @@ static void image_softproof_profile_callback (GtkWidget *dialo
gpointer user_data);
+
/* private variables */
static GimpUnit image_resize_unit = GIMP_UNIT_PIXEL;
@@ -1573,46 +1574,6 @@ image_merge_layers_callback (GtkWidget *dialog,
g_clear_pointer (&dialog, gtk_widget_destroy);
}
-void
-image_color_management_softproof_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data)
-{
- GimpImage *image;
- GimpDisplayShell *shell;
- GimpColorConfig *color_config;
- GimpColorManagementMode mode;
- gboolean active;
- return_if_no_image (image, data);
- return_if_no_shell (shell, data);
-
- color_config = gimp_display_shell_get_color_config (shell);
-
- active = g_variant_get_boolean (value);
-
- mode = gimp_color_config_get_mode (color_config);
-
- if (active)
- {
- mode = GIMP_COLOR_MANAGEMENT_SOFTPROOF;
- }
- else
- {
- if (mode != GIMP_COLOR_MANAGEMENT_OFF)
- mode = GIMP_COLOR_MANAGEMENT_DISPLAY;
- }
-
- if (mode != gimp_color_config_get_mode (color_config))
- {
- g_object_set (color_config,
- "mode", mode,
- NULL);
- shell->color_config_set = TRUE;
- }
-
- gimp_image_flush (image);
-}
-
void
image_softproof_profile_cmd_callback (GimpAction *action,
GVariant *value,
@@ -1725,26 +1686,3 @@ image_softproof_bpc_cmd_callback (GimpAction *action,
shell->color_config_set = TRUE;
}
}
-
-void
-image_softproof_gamut_check_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data)
-{
- GimpDisplayShell *shell;
- GimpColorConfig *color_config;
- gboolean active;
- return_if_no_shell (shell, data);
-
- color_config = gimp_display_shell_get_color_config (shell);
-
- active = g_variant_get_boolean (value);
-
- if (active != gimp_color_config_get_simulation_gamut_check (color_config))
- {
- g_object_set (color_config,
- "simulation-gamut-check", active,
- NULL);
- shell->color_config_set = TRUE;
- }
-}
diff --git a/app/actions/image-commands.h b/app/actions/image-commands.h
index caf35233ee..0cc6f5abc7 100644
--- a/app/actions/image-commands.h
+++ b/app/actions/image-commands.h
@@ -19,87 +19,84 @@
#define __IMAGE_COMMANDS_H__
-void image_new_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_duplicate_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
+void image_new_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_duplicate_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
-void image_convert_base_type_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_convert_precision_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_convert_trc_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
+void image_convert_base_type_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_convert_precision_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_convert_trc_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
-void image_color_profile_use_srgb_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_color_profile_assign_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_color_profile_convert_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_color_profile_discard_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_color_profile_save_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
+void image_color_profile_use_srgb_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_color_profile_assign_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_color_profile_convert_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_color_profile_discard_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_color_profile_save_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
-void image_resize_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_resize_to_layers_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_resize_to_selection_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_print_size_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_scale_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_flip_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_rotate_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_crop_to_selection_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_crop_to_content_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
+void image_resize_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_resize_to_layers_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_resize_to_selection_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_print_size_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_scale_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_flip_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_rotate_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_crop_to_selection_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_crop_to_content_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
-void image_merge_layers_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_merge_layers_last_vals_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_flatten_image_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
+void image_merge_layers_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_merge_layers_last_vals_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_flatten_image_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
-void image_configure_grid_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-void image_properties_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
+void image_configure_grid_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+void image_properties_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
-void image_color_management_softproof_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
void image_softproof_profile_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
@@ -109,9 +106,5 @@ void image_softproof_intent_cmd_callback (GimpAction *action,
void image_softproof_bpc_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-void image_softproof_gamut_check_cmd_callback (GimpAction *action,
- GVariant *value,
- gpointer data);
-
#endif /* __IMAGE_COMMANDS_H__ */
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index 6d2c46e6eb..e738ca90b5 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -199,6 +199,13 @@ static const GimpToggleActionEntry view_toggle_actions[] =
TRUE,
GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+ { "view-color-management-softproof", NULL,
+ NC_("view-action", "_Proof Colors"), NULL,
+ NC_("view-action", "Use this view for soft-proofing"),
+ view_color_management_softproof_cmd_callback,
+ FALSE,
+ GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
{ "view-display-black-point-compensation", NULL,
NC_("view-action", "_Black Point Compensation"), NULL,
NC_("view-action", "Use black point compensation for image display"),
@@ -206,6 +213,14 @@ static const GimpToggleActionEntry view_toggle_actions[] =
TRUE,
GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+ { "view-softproof-gamut-check", NULL,
+ NC_("view-action", "_Mark Out Of Gamut Colors"), NULL,
+ NC_("view-action", "When soft-proofing, mark colors which cannot "
+ "be represented in the target color space"),
+ view_softproof_gamut_check_cmd_callback,
+ FALSE,
+ GIMP_HELP_VIEW_COLOR_MANAGEMENT },
+
{ "view-show-selection", NULL,
NC_("view-action", "Show _Selection"), "<primary>T",
NC_("view-action", "Display the selection outline"),
@@ -778,8 +793,9 @@ view_actions_update (GimpActionGroup *group,
gboolean flip_horizontally = FALSE;
gboolean flip_vertically = FALSE;
gboolean cm = FALSE;
+ gboolean sp = FALSE;
gboolean d_bpc = FALSE;
- gboolean gammut = FALSE;
+ gboolean gamut = FALSE;
if (display)
{
@@ -810,8 +826,12 @@ view_actions_update (GimpActionGroup *group,
break;
case GIMP_COLOR_MANAGEMENT_DISPLAY:
+ cm = (image != NULL);
+ break;
+
case GIMP_COLOR_MANAGEMENT_SOFTPROOF:
cm = (image != NULL);
+ sp = (image != NULL);
break;
}
@@ -837,6 +857,7 @@ view_actions_update (GimpActionGroup *group,
gimp_action_group_set_action_active (group, action, TRUE);
d_bpc = gimp_color_config_get_display_bpc (color_config);
+ gamut = gimp_color_config_get_simulation_gamut_check (color_config);
}
#define SET_ACTIVE(action,condition) \
@@ -930,12 +951,15 @@ view_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("view-color-management-enable", image);
SET_ACTIVE ("view-color-management-enable", cm);
+ SET_SENSITIVE ("view-color-management-softproof", image);
+ SET_ACTIVE ("view-color-management-softproof", sp);
SET_SENSITIVE ("view-display-intent-perceptual", cm);
SET_SENSITIVE ("view-display-intent-relative-colorimetric", cm);
SET_SENSITIVE ("view-display-intent-saturation", cm);
SET_SENSITIVE ("view-display-intent-absolute-colorimetric", cm);
SET_SENSITIVE ("view-display-black-point-compensation", cm);
SET_ACTIVE ("view-display-black-point-compensation", d_bpc);
+ SET_ACTIVE ("view-softproof-gamut-check", gamut);
SET_SENSITIVE ("view-color-management-reset", image);
SET_SENSITIVE ("view-show-selection", image);
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index 7d97228054..ecb0f4a129 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -648,6 +648,42 @@ view_color_management_enable_cmd_callback (GimpAction *action,
}
}
+void
+view_color_management_softproof_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data)
+{
+ GimpDisplayShell *shell;
+ GimpColorConfig *color_config;
+ GimpColorManagementMode mode;
+ gboolean active;
+ return_if_no_shell (shell, data);
+
+ color_config = gimp_display_shell_get_color_config (shell);
+
+ active = g_variant_get_boolean (value);
+
+ mode = gimp_color_config_get_mode (color_config);
+
+ if (active)
+ {
+ mode = GIMP_COLOR_MANAGEMENT_SOFTPROOF;
+ }
+ else
+ {
+ if (mode != GIMP_COLOR_MANAGEMENT_OFF)
+ mode = GIMP_COLOR_MANAGEMENT_DISPLAY;
+ }
+
+ if (mode != gimp_color_config_get_mode (color_config))
+ {
+ g_object_set (color_config,
+ "mode", mode,
+ NULL);
+ shell->color_config_set = TRUE;
+ }
+}
+
void
view_display_intent_cmd_callback (GimpAction *action,
GVariant *value,
@@ -694,6 +730,29 @@ view_display_bpc_cmd_callback (GimpAction *action,
}
}
+void
+view_softproof_gamut_check_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data)
+{
+ GimpDisplayShell *shell;
+ GimpColorConfig *color_config;
+ gboolean active;
+ return_if_no_shell (shell, data);
+
+ color_config = gimp_display_shell_get_color_config (shell);
+
+ active = g_variant_get_boolean (value);
+
+ if (active != gimp_color_config_get_simulation_gamut_check (color_config))
+ {
+ g_object_set (color_config,
+ "simulation-gamut-check", active,
+ NULL);
+ shell->color_config_set = TRUE;
+ }
+}
+
void
view_toggle_selection_cmd_callback (GimpAction *action,
GVariant *value,
diff --git a/app/actions/view-commands.h b/app/actions/view-commands.h
index 244b35cd0d..51af901bb7 100644
--- a/app/actions/view-commands.h
+++ b/app/actions/view-commands.h
@@ -114,6 +114,10 @@ void view_display_intent_cmd_callback (GimpAction *action,
void view_display_bpc_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
+void view_softproof_gamut_check_cmd_callback (GimpAction *action,
+ GVariant *value,
+ gpointer data);
+
void view_toggle_selection_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
