Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/widgets/gimphelp-ids.h * app/display/gimpdisplayshell-scale.[ch] * app/display/gimpnavigationeditor.[ch] * app/actions/view-commands.[ch] * app/actions/view-commands.c: Changed "Fit Image to Window" to "Fill Window", and changed "fit-to" to "fill" in all the related things. Fixes bug #490364. svn path=/trunk/; revision=24370
This commit is contained in:
14
ChangeLog
14
ChangeLog
@ -1,4 +1,16 @@
|
|||||||
2007-12-14 Bill Skaggs <weskaggs@primate.ucdavis.edu>
|
2007-12-15 Bill Skaggs <weskaggs@primate.ucdavis.edu>
|
||||||
|
|
||||||
|
* app/widgets/gimphelp-ids.h
|
||||||
|
* app/display/gimpdisplayshell-scale.[ch]
|
||||||
|
* app/display/gimpnavigationeditor.[ch]
|
||||||
|
* app/actions/view-commands.[ch]
|
||||||
|
* app/actions/view-commands.c:
|
||||||
|
|
||||||
|
Changed "Fit Image to Window" to "Fill Window", and changed
|
||||||
|
"fit-to" to "fill" in all the related things. Fixes
|
||||||
|
bug #490364.
|
||||||
|
|
||||||
|
2007-12-15 Bill Skaggs <weskaggs@primate.ucdavis.edu>
|
||||||
|
|
||||||
* plug-ins/common/mapcolor.c: removed
|
* plug-ins/common/mapcolor.c: removed
|
||||||
* plug-ins/common/plugin-defs.pl
|
* plug-ins/common/plugin-defs.pl
|
||||||
|
@ -89,11 +89,11 @@ static const GimpActionEntry view_actions[] =
|
|||||||
G_CALLBACK (view_zoom_fit_in_cmd_callback),
|
G_CALLBACK (view_zoom_fit_in_cmd_callback),
|
||||||
GIMP_HELP_VIEW_ZOOM_FIT_IN },
|
GIMP_HELP_VIEW_ZOOM_FIT_IN },
|
||||||
|
|
||||||
{ "view-zoom-fit-to", GTK_STOCK_ZOOM_FIT,
|
{ "view-zoom-fill", GTK_STOCK_ZOOM_FIT,
|
||||||
N_("Fit Image _to Window"), NULL,
|
N_("Fi_ll Window"), NULL,
|
||||||
N_("Adjust the zoom ratio so that the window is used optimally"),
|
N_("Adjust the zoom ratio so that the entire window is used"),
|
||||||
G_CALLBACK (view_zoom_fit_to_cmd_callback),
|
G_CALLBACK (view_zoom_fill_cmd_callback),
|
||||||
GIMP_HELP_VIEW_ZOOM_FIT_TO },
|
GIMP_HELP_VIEW_ZOOM_FILL },
|
||||||
|
|
||||||
{ "view-zoom-revert", NULL,
|
{ "view-zoom-revert", NULL,
|
||||||
N_("Re_vert Zoom"), "grave",
|
N_("Re_vert Zoom"), "grave",
|
||||||
@ -578,7 +578,7 @@ view_actions_update (GimpActionGroup *group,
|
|||||||
SET_SENSITIVE ("view-zoom-out", display);
|
SET_SENSITIVE ("view-zoom-out", display);
|
||||||
SET_SENSITIVE ("view-zoom-in", display);
|
SET_SENSITIVE ("view-zoom-in", display);
|
||||||
SET_SENSITIVE ("view-zoom-fit-in", display);
|
SET_SENSITIVE ("view-zoom-fit-in", display);
|
||||||
SET_SENSITIVE ("view-zoom-fit-to", display);
|
SET_SENSITIVE ("view-zoom-fill", display);
|
||||||
|
|
||||||
SET_SENSITIVE ("view-zoom-16-1", display);
|
SET_SENSITIVE ("view-zoom-16-1", display);
|
||||||
SET_SENSITIVE ("view-zoom-8-1", display);
|
SET_SENSITIVE ("view-zoom-8-1", display);
|
||||||
|
@ -100,13 +100,13 @@ view_zoom_fit_in_cmd_callback (GtkAction *action,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
view_zoom_fit_to_cmd_callback (GtkAction *action,
|
view_zoom_fill_cmd_callback (GtkAction *action,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
GimpDisplay *display;
|
GimpDisplay *display;
|
||||||
return_if_no_display (display, data);
|
return_if_no_display (display, data);
|
||||||
|
|
||||||
gimp_display_shell_scale_fit_to (GIMP_DISPLAY_SHELL (display->shell));
|
gimp_display_shell_scale_fill (GIMP_DISPLAY_SHELL (display->shell));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -25,7 +25,7 @@ void view_new_cmd_callback (GtkAction *action,
|
|||||||
|
|
||||||
void view_zoom_fit_in_cmd_callback (GtkAction *action,
|
void view_zoom_fit_in_cmd_callback (GtkAction *action,
|
||||||
gpointer data);
|
gpointer data);
|
||||||
void view_zoom_fit_to_cmd_callback (GtkAction *action,
|
void view_zoom_fill_cmd_callback (GtkAction *action,
|
||||||
gpointer data);
|
gpointer data);
|
||||||
void view_zoom_revert_cmd_callback (GtkAction *action,
|
void view_zoom_revert_cmd_callback (GtkAction *action,
|
||||||
gpointer data);
|
gpointer data);
|
||||||
|
@ -418,14 +418,14 @@ gimp_display_shell_scale_fit_in (GimpDisplayShell *shell)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gimp_display_shell_scale_fit_to:
|
* gimp_display_shell_scale_fill:
|
||||||
* @shell: the #GimpDisplayShell
|
* @shell: the #GimpDisplayShell
|
||||||
*
|
*
|
||||||
* Sets the scale such that the entire display area is precisely filled by the
|
* Sets the scale such that the entire display area is precisely filled by the
|
||||||
* image.
|
* image.
|
||||||
**/
|
**/
|
||||||
void
|
void
|
||||||
gimp_display_shell_scale_fit_to (GimpDisplayShell *shell)
|
gimp_display_shell_scale_fill (GimpDisplayShell *shell)
|
||||||
{
|
{
|
||||||
GimpImage *image;
|
GimpImage *image;
|
||||||
gint image_width;
|
gint image_width;
|
||||||
|
@ -37,7 +37,7 @@ void gimp_display_shell_scale_to (GimpDisplayShell *shell,
|
|||||||
gdouble x,
|
gdouble x,
|
||||||
gdouble y);
|
gdouble y);
|
||||||
void gimp_display_shell_scale_fit_in (GimpDisplayShell *shell);
|
void gimp_display_shell_scale_fit_in (GimpDisplayShell *shell);
|
||||||
void gimp_display_shell_scale_fit_to (GimpDisplayShell *shell);
|
void gimp_display_shell_scale_fill (GimpDisplayShell *shell);
|
||||||
void gimp_display_shell_scale_by_values (GimpDisplayShell *shell,
|
void gimp_display_shell_scale_by_values (GimpDisplayShell *shell,
|
||||||
gdouble scale,
|
gdouble scale,
|
||||||
gint offset_x,
|
gint offset_x,
|
||||||
|
@ -373,9 +373,9 @@ gimp_navigation_editor_new_private (GimpMenuFactory *menu_factory,
|
|||||||
gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
|
gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
|
||||||
"view-zoom-fit-in", NULL);
|
"view-zoom-fit-in", NULL);
|
||||||
|
|
||||||
editor->zoom_fit_to_button =
|
editor->zoom_fill_button =
|
||||||
gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
|
gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
|
||||||
"view-zoom-fit-to", NULL);
|
"view-zoom-fill", NULL);
|
||||||
|
|
||||||
editor->shrink_wrap_button =
|
editor->shrink_wrap_button =
|
||||||
gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
|
gimp_editor_add_action_button (GIMP_EDITOR (editor), "view",
|
||||||
|
@ -54,7 +54,7 @@ struct _GimpNavigationEditor
|
|||||||
GtkWidget *zoom_in_button;
|
GtkWidget *zoom_in_button;
|
||||||
GtkWidget *zoom_100_button;
|
GtkWidget *zoom_100_button;
|
||||||
GtkWidget *zoom_fit_in_button;
|
GtkWidget *zoom_fit_in_button;
|
||||||
GtkWidget *zoom_fit_to_button;
|
GtkWidget *zoom_fill_button;
|
||||||
GtkWidget *shrink_wrap_button;
|
GtkWidget *shrink_wrap_button;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
#define GIMP_HELP_VIEW_ZOOM_IN "gimp-view-zoom-in"
|
#define GIMP_HELP_VIEW_ZOOM_IN "gimp-view-zoom-in"
|
||||||
#define GIMP_HELP_VIEW_ZOOM_100 "gimp-view-zoom-100"
|
#define GIMP_HELP_VIEW_ZOOM_100 "gimp-view-zoom-100"
|
||||||
#define GIMP_HELP_VIEW_ZOOM_FIT_IN "gimp-view-zoom-fit-in"
|
#define GIMP_HELP_VIEW_ZOOM_FIT_IN "gimp-view-zoom-fit-in"
|
||||||
#define GIMP_HELP_VIEW_ZOOM_FIT_TO "gimp-view-zoom-fit-to"
|
#define GIMP_HELP_VIEW_ZOOM_FILL "gimp-view-zoom-fill"
|
||||||
#define GIMP_HELP_VIEW_ZOOM_OTHER "gimp-view-zoom-other"
|
#define GIMP_HELP_VIEW_ZOOM_OTHER "gimp-view-zoom-other"
|
||||||
#define GIMP_HELP_VIEW_SHOW_SELECTION "gimp-view-show-selection"
|
#define GIMP_HELP_VIEW_SHOW_SELECTION "gimp-view-show-selection"
|
||||||
#define GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY "gimp-view-show-layer-boundary"
|
#define GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY "gimp-view-show-layer-boundary"
|
||||||
|
Reference in New Issue
Block a user