[gimp] app: rename indexed conversion dither option variables and parameters
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename indexed conversion dither option variables and parameters
- Date: Tue, 27 Sep 2016 20:49:18 +0000 (UTC)
commit d5f34e7ce573e5e315df17f012dad5896a31e447
Author: Michael Natterer <mitch gimp org>
Date: Tue Sep 27 22:47:06 2016 +0200
app: rename indexed conversion dither option variables and parameters
app/actions/image-commands.c | 44 +++++++++++++++++-----------------
app/dialogs/convert-indexed-dialog.c | 40 +++++++++++++++---------------
app/dialogs/convert-indexed-dialog.h | 8 +++---
3 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index 435326f..3af84e6 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -83,8 +83,8 @@ static void image_convert_indexed_callback (GtkWidget *dialog,
GimpImage *image,
gint n_colors,
GimpConvertDitherType dither_type,
- gboolean alpha_dither,
- gboolean text_layer_dither,
+ gboolean dither_alpha,
+ gboolean dither_text_layers,
gboolean remove_dups,
GimpConvertPaletteType palette_type,
GimpPalette *custom_palette,
@@ -142,13 +142,13 @@ static GimpUnit image_resize_unit = GIMP_UNIT_PIXEL;
static GimpUnit image_scale_unit = GIMP_UNIT_PIXEL;
static GimpInterpolationType image_scale_interp = -1;
-static gint image_convert_indexed_n_colors = 256;
-static GimpConvertDitherType image_convert_indexed_dither_type = GIMP_NO_DITHER;
-static gboolean image_convert_indexed_alpha_dither = FALSE;
-static gboolean image_convert_indexed_text_layer_dither = FALSE;
-static gboolean image_convert_indexed_remove_dups = TRUE;
-static GimpConvertPaletteType image_convert_indexed_palette_type = GIMP_MAKE_PALETTE;
-static GimpPalette *image_convert_indexed_custom_palette = NULL;
+static gint image_convert_indexed_n_colors = 256;
+static GimpConvertDitherType image_convert_indexed_dither_type = GIMP_NO_DITHER;
+static gboolean image_convert_indexed_dither_alpha = FALSE;
+static gboolean image_convert_indexed_dither_text_layers = FALSE;
+static gboolean image_convert_indexed_remove_dups = TRUE;
+static GimpConvertPaletteType image_convert_indexed_palette_type = GIMP_MAKE_PALETTE;
+static GimpPalette *image_convert_indexed_custom_palette = NULL;
/* public functions */
@@ -264,8 +264,8 @@ image_convert_base_type_cmd_callback (GtkAction *action,
widget,
image_convert_indexed_n_colors,
image_convert_indexed_dither_type,
- image_convert_indexed_alpha_dither,
- image_convert_indexed_text_layer_dither,
+ image_convert_indexed_dither_alpha,
+ image_convert_indexed_dither_text_layers,
image_convert_indexed_remove_dups,
image_convert_indexed_palette_type,
image_convert_indexed_custom_palette,
@@ -924,8 +924,8 @@ image_convert_indexed_callback (GtkWidget *dialog,
GimpImage *image,
gint n_colors,
GimpConvertDitherType dither_type,
- gboolean alpha_dither,
- gboolean text_layer_dither,
+ gboolean dither_alpha,
+ gboolean dither_text_layers,
gboolean remove_dups,
GimpConvertPaletteType palette_type,
GimpPalette *custom_palette,
@@ -939,13 +939,13 @@ image_convert_indexed_callback (GtkWidget *dialog,
g_object_remove_weak_pointer (G_OBJECT (image_convert_indexed_custom_palette),
(gpointer) &image_convert_indexed_custom_palette);
- image_convert_indexed_n_colors = n_colors;
- image_convert_indexed_dither_type = dither_type;
- image_convert_indexed_alpha_dither = alpha_dither;
- image_convert_indexed_text_layer_dither = text_layer_dither;
- image_convert_indexed_remove_dups = remove_dups;
- image_convert_indexed_palette_type = palette_type;
- image_convert_indexed_custom_palette = custom_palette;
+ image_convert_indexed_n_colors = n_colors;
+ image_convert_indexed_dither_type = dither_type;
+ image_convert_indexed_dither_alpha = dither_alpha;
+ image_convert_indexed_dither_text_layers = dither_text_layers;
+ image_convert_indexed_remove_dups = remove_dups;
+ image_convert_indexed_palette_type = palette_type;
+ image_convert_indexed_custom_palette = custom_palette;
if (image_convert_indexed_custom_palette)
g_object_add_weak_pointer (G_OBJECT (image_convert_indexed_custom_palette),
@@ -957,8 +957,8 @@ image_convert_indexed_callback (GtkWidget *dialog,
if (! gimp_image_convert_indexed (image,
image_convert_indexed_n_colors,
image_convert_indexed_dither_type,
- image_convert_indexed_alpha_dither,
- image_convert_indexed_text_layer_dither,
+ image_convert_indexed_dither_alpha,
+ image_convert_indexed_dither_text_layers,
image_convert_indexed_remove_dups,
image_convert_indexed_palette_type,
image_convert_indexed_custom_palette,
diff --git a/app/dialogs/convert-indexed-dialog.c b/app/dialogs/convert-indexed-dialog.c
index 22d19e3..15ccf4c 100644
--- a/app/dialogs/convert-indexed-dialog.c
+++ b/app/dialogs/convert-indexed-dialog.c
@@ -47,8 +47,8 @@ typedef struct
GimpImage *image;
gint n_colors;
GimpConvertDitherType dither_type;
- gboolean alpha_dither;
- gboolean text_layer_dither;
+ gboolean dither_alpha;
+ gboolean dither_text_layers;
gboolean remove_dups;
GimpConvertPaletteType palette_type;
GimpPalette *custom_palette;
@@ -81,8 +81,8 @@ convert_indexed_dialog_new (GimpImage *image,
GtkWidget *parent,
gint n_colors,
GimpConvertDitherType dither_type,
- gboolean alpha_dither,
- gboolean text_layer_dither,
+ gboolean dither_alpha,
+ gboolean dither_text_layers,
gboolean remove_dups,
GimpConvertPaletteType palette_type,
GimpPalette *custom_palette,
@@ -112,16 +112,16 @@ convert_indexed_dialog_new (GimpImage *image,
private = g_slice_new0 (IndexedDialog);
- private->image = image;
- private->n_colors = n_colors;
- private->dither_type = dither_type;
- private->alpha_dither = alpha_dither;
- private->text_layer_dither = text_layer_dither;
- private->remove_dups = remove_dups;
- private->palette_type = palette_type;
- private->custom_palette = custom_palette;
- private->callback = callback;
- private->user_data = user_data;
+ private->image = image;
+ private->n_colors = n_colors;
+ private->dither_type = dither_type;
+ private->dither_alpha = dither_alpha;
+ private->dither_text_layers = dither_text_layers;
+ private->remove_dups = remove_dups;
+ private->palette_type = palette_type;
+ private->custom_palette = custom_palette;
+ private->callback = callback;
+ private->user_data = user_data;
private->dialog = dialog =
gimp_viewable_dialog_new (GIMP_VIEWABLE (image), context,
@@ -265,25 +265,25 @@ convert_indexed_dialog_new (GimpImage *image,
toggle =
gtk_check_button_new_with_mnemonic (_("Enable dithering of _transparency"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- private->alpha_dither);
+ private->dither_alpha);
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
- &private->alpha_dither);
+ &private->dither_alpha);
toggle =
gtk_check_button_new_with_mnemonic (_("Enable dithering of text layers"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- private->text_layer_dither);
+ private->dither_text_layers);
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
- &private->text_layer_dither);
+ &private->dither_text_layers);
gimp_help_set_help_data (toggle,
_("Dithering text layers will make them uneditable"),
@@ -306,8 +306,8 @@ convert_dialog_response (GtkWidget *dialog,
private->image,
private->n_colors,
private->dither_type,
- private->alpha_dither,
- private->text_layer_dither,
+ private->dither_alpha,
+ private->dither_text_layers,
private->remove_dups,
private->palette_type,
private->custom_palette,
diff --git a/app/dialogs/convert-indexed-dialog.h b/app/dialogs/convert-indexed-dialog.h
index dbdde2d..14ca627 100644
--- a/app/dialogs/convert-indexed-dialog.h
+++ b/app/dialogs/convert-indexed-dialog.h
@@ -23,8 +23,8 @@ typedef void (* GimpConvertIndexedCallback) (GtkWidget *dialog,
GimpImage *image,
gint n_colors,
GimpConvertDitherType dither_type,
- gboolean alpha_dither,
- gboolean text_layer_dither,
+ gboolean dither_alpha,
+ gboolean dither_text_layers,
gboolean remove_dups,
GimpConvertPaletteType palette_type,
GimpPalette *custom_palette,
@@ -36,8 +36,8 @@ GtkWidget * convert_indexed_dialog_new (GimpImage *image,
GtkWidget *parent,
gint n_colors,
GimpConvertDitherType dither_type,
- gboolean alpha_dither,
- gboolean text_layer_dither,
+ gboolean dither_alpha,
+ gboolean dither_text_layers,
gboolean remove_dups,
GimpConvertPaletteType palette_type,
GimpPalette *custom_palette,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
