From 3f885c7fa057af0dd2525fbea0b12e56b9195a3f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 12 Sep 2003 15:14:02 +0000 Subject: [PATCH] app/core/gimpselection.c app/gui/images-menus.c string fixes. 2003-09-12 Sven Neumann * app/core/gimpselection.c * app/gui/images-menus.c * app/gui/session.c: string fixes. * app/gui/images-commands.[ch]: changed the function names accordingly.. --- ChangeLog | 9 +++++++++ app/actions/images-commands.c | 20 +++++++------------- app/actions/images-commands.h | 12 ++++++------ app/core/gimpselection.c | 4 ++-- app/gui/images-commands.c | 20 +++++++------------- app/gui/images-commands.h | 12 ++++++------ app/gui/images-menu.c | 12 ++++++------ app/gui/session.c | 10 +++++----- 8 files changed, 48 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index e46584924f..78365af933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-09-12 Sven Neumann + + * app/core/gimpselection.c + * app/gui/images-menus.c + * app/gui/session.c: string fixes. + + * app/gui/images-commands.[ch]: changed the function names + accordingly.. + 2003-09-12 Christian Neumair * app/gui/dialogs-menu.c: added missing ngettext calls to MENU_BRANCH diff --git a/app/actions/images-commands.c b/app/actions/images-commands.c index b2f225b765..c80a29fb88 100644 --- a/app/actions/images-commands.c +++ b/app/actions/images-commands.c @@ -30,23 +30,19 @@ /* public functionss */ void -images_raise_displays_cmd_callback (GtkWidget *widget, - gpointer data) +images_raise_views_cmd_callback (GtkWidget *widget, + gpointer data) { - GimpImageView *view; - - view = GIMP_IMAGE_VIEW (data); + GimpImageView *view = GIMP_IMAGE_VIEW (data); gtk_button_clicked (GTK_BUTTON (view->raise_button)); } void -images_new_display_cmd_callback (GtkWidget *widget, - gpointer data) +images_new_view_cmd_callback (GtkWidget *widget, + gpointer data) { - GimpImageView *view; - - view = GIMP_IMAGE_VIEW (data); + GimpImageView *view = GIMP_IMAGE_VIEW (data); gtk_button_clicked (GTK_BUTTON (view->new_button)); } @@ -55,9 +51,7 @@ void images_delete_image_cmd_callback (GtkWidget *widget, gpointer data) { - GimpImageView *view; - - view = GIMP_IMAGE_VIEW (data); + GimpImageView *view = GIMP_IMAGE_VIEW (data); gtk_button_clicked (GTK_BUTTON (view->delete_button)); } diff --git a/app/actions/images-commands.h b/app/actions/images-commands.h index 4e1f3a0837..2e96077fcb 100644 --- a/app/actions/images-commands.h +++ b/app/actions/images-commands.h @@ -20,12 +20,12 @@ #define __IMAGES_COMMANDS_H__ -void images_raise_displays_cmd_callback (GtkWidget *widget, - gpointer data); -void images_new_display_cmd_callback (GtkWidget *widget, - gpointer data); -void images_delete_image_cmd_callback (GtkWidget *widget, - gpointer data); +void images_raise_views_cmd_callback (GtkWidget *widget, + gpointer data); +void images_new_view_cmd_callback (GtkWidget *widget, + gpointer data); +void images_delete_image_cmd_callback (GtkWidget *widget, + gpointer data); #endif /* __IMAGES_COMMANDS_H__ */ diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c index 5eb2dbedaa..ee40ba0d38 100644 --- a/app/core/gimpselection.c +++ b/app/core/gimpselection.c @@ -348,7 +348,7 @@ gimp_selection_invalidate_boundary (GimpDrawable *drawable) GIMP_ITEM (layer)->height); /* invalidate the preview */ - drawable->preview_valid = FALSE; + drawable->preview_valid = FALSE; } static gboolean @@ -622,7 +622,7 @@ gimp_selection_load (GimpChannel *selection, g_return_if_fail (src_item->width == dest_item->width); g_return_if_fail (src_item->height == dest_item->height); - gimp_channel_push_undo (selection, _("Selection from Channel")); + gimp_channel_push_undo (selection, _("Channel to Selection")); /* copy the channel to the mask */ pixel_region_init (&srcPR, GIMP_DRAWABLE (channel)->tiles, diff --git a/app/gui/images-commands.c b/app/gui/images-commands.c index b2f225b765..c80a29fb88 100644 --- a/app/gui/images-commands.c +++ b/app/gui/images-commands.c @@ -30,23 +30,19 @@ /* public functionss */ void -images_raise_displays_cmd_callback (GtkWidget *widget, - gpointer data) +images_raise_views_cmd_callback (GtkWidget *widget, + gpointer data) { - GimpImageView *view; - - view = GIMP_IMAGE_VIEW (data); + GimpImageView *view = GIMP_IMAGE_VIEW (data); gtk_button_clicked (GTK_BUTTON (view->raise_button)); } void -images_new_display_cmd_callback (GtkWidget *widget, - gpointer data) +images_new_view_cmd_callback (GtkWidget *widget, + gpointer data) { - GimpImageView *view; - - view = GIMP_IMAGE_VIEW (data); + GimpImageView *view = GIMP_IMAGE_VIEW (data); gtk_button_clicked (GTK_BUTTON (view->new_button)); } @@ -55,9 +51,7 @@ void images_delete_image_cmd_callback (GtkWidget *widget, gpointer data) { - GimpImageView *view; - - view = GIMP_IMAGE_VIEW (data); + GimpImageView *view = GIMP_IMAGE_VIEW (data); gtk_button_clicked (GTK_BUTTON (view->delete_button)); } diff --git a/app/gui/images-commands.h b/app/gui/images-commands.h index 4e1f3a0837..2e96077fcb 100644 --- a/app/gui/images-commands.h +++ b/app/gui/images-commands.h @@ -20,12 +20,12 @@ #define __IMAGES_COMMANDS_H__ -void images_raise_displays_cmd_callback (GtkWidget *widget, - gpointer data); -void images_new_display_cmd_callback (GtkWidget *widget, - gpointer data); -void images_delete_image_cmd_callback (GtkWidget *widget, - gpointer data); +void images_raise_views_cmd_callback (GtkWidget *widget, + gpointer data); +void images_new_view_cmd_callback (GtkWidget *widget, + gpointer data); +void images_delete_image_cmd_callback (GtkWidget *widget, + gpointer data); #endif /* __IMAGES_COMMANDS_H__ */ diff --git a/app/gui/images-menu.c b/app/gui/images-menu.c index b99935dba7..c3ae8602c3 100644 --- a/app/gui/images-menu.c +++ b/app/gui/images-menu.c @@ -39,12 +39,12 @@ GimpItemFactoryEntry images_menu_entries[] = { - { { N_("/_Raise Displays"), "", - images_raise_displays_cmd_callback, 0, + { { N_("/_Raise Views"), "", + images_raise_views_cmd_callback, 0, "", GTK_STOCK_GOTO_TOP }, NULL, NULL, NULL }, - { { N_("/_New Display"), "", - images_new_display_cmd_callback, 0, + { { N_("/_New View"), "", + images_new_view_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, NULL, NULL }, { { N_("/_Delete Image"), "", @@ -70,8 +70,8 @@ images_menu_update (GtkItemFactory *factory, #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/Raise Displays", image); - SET_SENSITIVE ("/New Display", image); + SET_SENSITIVE ("/Raise Viewss", image); + SET_SENSITIVE ("/New View", image); SET_SENSITIVE ("/Delete Image", image && image->disp_count == 0); #undef SET_SENSITIVE diff --git a/app/gui/session.c b/app/gui/session.c index 014731d11c..6d16a24b0e 100644 --- a/app/gui/session.c +++ b/app/gui/session.c @@ -211,12 +211,12 @@ session_save (Gimp *gimp) "GIMP sessionrc\n\n" "This file takes session-specific info " "(that is info, you want to keep between " - "two gimp-sessions). You are not supposed " + "two GIMP sessions). You are not supposed " "to edit it manually, but of course you " - "can do.\n" - "This file will be entirely rewritten " - "every time you quit the gimp. If this " - "file isn't found, defaults are used.", + "can do. The sessionrc will be entirely " + "rewritten every time you quit The GIMP. " + "If this file isn't found, defaults are " + "used.", NULL); g_free (filename);