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

fixed capitalization, removed trailing whitespace. 

2005-05-26  Sven Neumann  <sven@gimp.org>

	* app/dialogs/channel-options-dialog.c: fixed capitalization,
	removed trailing whitespace.

	* app/actions/channels-commands.c (channels_new_channel_response):
	also set the channel color if creating the channel by duplicating
	the selection.

	* app/actions/channels-commands.c
	* app/actions/qmask-commands.c: added mnemonics.
This commit is contained in:
Sven Neumann 2005-05-26 10:01:04 +00:00 committed by Sven Neumann
parent 0eebee4a6b
commit cbd446ee56
5 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,10 +1,22 @@
2005-05-26 Sven Neumann <sven@gimp.org>
* app/dialogs/channel-options-dialog.c: fixed capitalization,
removed trailing whitespace.
* app/actions/channels-commands.c (channels_new_channel_response):
also set the channel color if creating the channel by duplicating
the selection.
* app/actions/channels-commands.c
* app/actions/qmask-commands.c: added mnemonics.
2005-05-26 Nathan Summers <rock@gimp.org> 2005-05-26 Nathan Summers <rock@gimp.org>
* app/dialogs/channel-options-dialog.[ch]: added an "initialize from * app/dialogs/channel-options-dialog.[ch]: added an "initialize from
selection" option to the new channel dialog selection" option to the new channel dialog.
* app/actions/channels-commands.c * app/actions/channels-commands.c
* app/actions/qmask-commands.c: modified accordingly * app/actions/qmask-commands.c: modified accordingly.
2005-05-26 Sven Neumann <sven@gimp.org> 2005-05-26 Sven Neumann <sven@gimp.org>

18
app/actions/channels-commands.c
View File

@ -89,7 +89,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
_("Edit Channel Attributes"), _("Edit Channel Attributes"),
GIMP_HELP_CHANNEL_EDIT, GIMP_HELP_CHANNEL_EDIT,
_("Edit Channel Color"), _("Edit Channel Color"),
_("Fill Opacity:"), _("_Fill Opacity:"),
FALSE); FALSE);
g_signal_connect (options->dialog, "response", g_signal_connect (options->dialog, "response",
@ -122,7 +122,7 @@ channels_new_cmd_callback (GtkAction *action,
_("New Channel Options"), _("New Channel Options"),
GIMP_HELP_CHANNEL_NEW, GIMP_HELP_CHANNEL_NEW,
_("New Channel Color"), _("New Channel Color"),
_("Fill Opacity:"), _("_Fill Opacity:"),
TRUE); TRUE);
g_signal_connect (options->dialog, "response", g_signal_connect (options->dialog, "response",
@ -337,15 +337,15 @@ channels_new_channel_response (GtkWidget *widget,
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (options->save_sel_checkbutton))) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (options->save_sel_checkbutton)))
{ {
GimpChannel *selection; GimpChannel *selection = gimp_image_get_mask (options->gimage);
selection = gimp_image_get_mask(options->gimage); new_channel =
GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection),
new_channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection), GIMP_TYPE_CHANNEL,
GIMP_TYPE_CHANNEL, FALSE));
FALSE));
gimp_object_set_name (GIMP_OBJECT (new_channel), channel_name); gimp_object_set_name (GIMP_OBJECT (new_channel), channel_name);
gimp_channel_set_color (new_channel, &channel_color, FALSE);
} }
else else
{ {
@ -354,7 +354,7 @@ channels_new_channel_response (GtkWidget *widget,
options->gimage->height, options->gimage->height,
channel_name, channel_name,
&channel_color); &channel_color);
gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel), gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
options->context, options->context,
GIMP_TRANSPARENT_FILL); GIMP_TRANSPARENT_FILL);

2
app/actions/qmask-commands.c
View File

@ -109,7 +109,7 @@ qmask_configure_cmd_callback (GtkAction *action,
_("Edit Quick Mask Attributes"), _("Edit Quick Mask Attributes"),
GIMP_HELP_QMASK_EDIT, GIMP_HELP_QMASK_EDIT,
_("Edit Quick Mask Color"), _("Edit Quick Mask Color"),
_("Mask Opacity:"), _("_Mask Opacity:"),
FALSE); FALSE);
g_signal_connect (options->dialog, "response", g_signal_connect (options->dialog, "response",

2
app/actions/quick-mask-commands.c
View File

@ -109,7 +109,7 @@ qmask_configure_cmd_callback (GtkAction *action,
_("Edit Quick Mask Attributes"), _("Edit Quick Mask Attributes"),
GIMP_HELP_QMASK_EDIT, GIMP_HELP_QMASK_EDIT,
_("Edit Quick Mask Color"), _("Edit Quick Mask Color"),
_("Mask Opacity:"), _("_Mask Opacity:"),
FALSE); FALSE);
g_signal_connect (options->dialog, "response", g_signal_connect (options->dialog, "response",

13
app/dialogs/channel-options-dialog.c
View File

@ -141,13 +141,14 @@ channel_options_dialog_new (GimpImage *gimage,
options->name_entry = gtk_entry_new (); options->name_entry = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (options->name_entry), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (options->name_entry), TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Channel Name:"), 0.0, 0.5, _("Channel _Name:"), 0.0, 0.5,
options->name_entry, 2, FALSE); options->name_entry, 2, FALSE);
gtk_entry_set_text (GTK_ENTRY (options->name_entry), channel_name); gtk_entry_set_text (GTK_ENTRY (options->name_entry), channel_name);
} }
opacity_adj = gimp_scale_entry_new (GTK_TABLE (table), 0, channel_name ? 1 : 0, opacity_adj = gimp_scale_entry_new (GTK_TABLE (table),
0, channel_name ? 1 : 0,
opacity_label, 100, -1, opacity_label, 100, -1,
channel_color->a * 100.0, channel_color->a * 100.0,
0.0, 100.0, 1.0, 10.0, 1, 0.0, 100.0, 1.0, 10.0, 1,
@ -168,14 +169,14 @@ channel_options_dialog_new (GimpImage *gimage,
if (show_from_sel) if (show_from_sel)
{ {
options->save_sel_checkbutton = gtk_check_button_new_with_mnemonic (_("_Initialize From Selection")); options->save_sel_checkbutton =
gtk_check_button_new_with_mnemonic (_("Initialize from _selection"));
gtk_box_pack_start (GTK_BOX (vbox), options->save_sel_checkbutton, gtk_box_pack_start (GTK_BOX (vbox), options->save_sel_checkbutton,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_widget_show (options->save_sel_checkbutton); gtk_widget_show (options->save_sel_checkbutton);
} }
else
options->save_sel_checkbutton = NULL;
return options; return options;
} }