graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved rulers out of the scrolled window and update them when the scroll

Browse source 
2006-06-23  Sven Neumann  <sven@gimp.org>

	* plug-ins/imagemap/imap_preview.[ch]: moved rulers out of the
	scrolled window and update them when the scroll adjustments
	change. Fixes bug #341149.

	* plug-ins/imagemap/imap_about.c
	* plug-ins/imagemap/imap_menu.c: unrelated cleanups.
This commit is contained in:
Sven Neumann 2006-06-23 12:05:13 +00:00 committed by Sven Neumann
parent a91c2c7394
commit 8a6a538036
5 changed files with 61 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-06-23 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/imap_preview.[ch]: moved rulers out of the
scrolled window and update them when the scroll adjustments
change. Fixes bug #341149.
* plug-ins/imagemap/imap_about.c
* plug-ins/imagemap/imap_menu.c: unrelated cleanups.
2006-06-23 Sven Neumann <sven@gimp.org>
* plug-ins/print/print.c: the name of the binary is "print".

2
plug-ins/imagemap/imap_about.c
View file

@ -42,7 +42,7 @@ do_about_dialog(void)
"Image Map Plug-In");
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (dialog), "2.3");
gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (dialog),
_("Copyright(c) 1999-2005 by Maurits Rijk"));
_("Copyright © 1999-2005 by Maurits Rijk"));
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (dialog), authors);
gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog),
_("Released under the GNU General Public License"));

2
plug-ins/imagemap/imap_menu.c
View file

@ -222,7 +222,7 @@ static GtkActionEntry entries[] = {
{ "HelpMenu", NULL, "_Help" },
{ "Contents", GTK_STOCK_HELP, "_Contents", NULL, NULL, imap_help},
{ "About", GTK_STOCK_ABOUT, "_About Image Map...", NULL, NULL,
{ "About", GTK_STOCK_ABOUT, NULL, NULL, NULL,
do_about_dialog},
{ "ZoomMenu", NULL, "_Zoom" },

80
plug-ins/imagemap/imap_preview.c
View file

@ -369,7 +369,7 @@ preview_set_cursor(Preview_t *preview, GdkCursorType cursor_type)
return prev_cursor;
}
static GtkTargetEntry target_table[] = {
static const GtkTargetEntry target_table[] = {
{"STRING", 0, 1 },
{"text/plain", 0, 2 }
};
@ -401,13 +401,20 @@ preview_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
gpointer preview_void)
{
Preview_t * preview;
preview = (Preview_t *)preview_void;
Preview_t * preview = preview_void;
render_preview(preview, &preview->src_rgn);
}
static void
scroll_adj_changed (GtkAdjustment *adj,
GtkRuler *ruler)
{
gtk_ruler_set_range (ruler,
adj->value, adj->value + adj->page_size,
G_MAXDOUBLE, adj->page_size);
}
Preview_t*
make_preview(GimpDrawable *drawable)
{
@ -416,7 +423,6 @@ make_preview(GimpDrawable *drawable)
GtkWidget *window;
GtkWidget *button, *arrow;
GtkWidget *ruler;
GtkWidget *frame;
GtkWidget *table;
gint width, height;
@ -443,23 +449,10 @@ make_preview(GimpDrawable *drawable)
gtk_widget_set_size_request (preview, data->widget_width,
data->widget_height);
data->window = window = gtk_scrolled_window_new(NULL, NULL);
width = (data->width > 600) ? 600 : data->width;
height = (data->height > 400) ? 400 : data->height;
gtk_widget_set_size_request(window, width, height);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_show(window);
data->frame = frame = gtk_frame_new(NULL);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window), frame);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
/* The main table */
table = gtk_table_new(3, 3, FALSE);
gtk_table_attach(GTK_TABLE(table), preview, 1, 2, 1, 2, GTK_FILL, GTK_FILL,
0, 0);
gtk_container_add(GTK_CONTAINER(frame), table);
data->window = table = gtk_table_new(2, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 1);
/* Create button with arrow */
button = gtk_button_new();
@ -478,32 +471,59 @@ make_preview(GimpDrawable *drawable)
/* Create horizontal ruler */
data->hruler = ruler = gtk_hruler_new();
gtk_ruler_set_range(GTK_RULER(ruler), 0, data->width, 0, PREVIEW_SIZE);
g_signal_connect_swapped(preview, "motion-notify-event",
G_CALLBACK(GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event),
ruler);
gtk_table_attach(GTK_TABLE(table), ruler, 1, 2, 0, 1, GTK_FILL, GTK_FILL,
0, 0);
gtk_table_attach(GTK_TABLE(table), ruler, 1, 2, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show(ruler);
/* Create vertical ruler */
data->vruler = ruler = gtk_vruler_new();
gtk_ruler_set_range(GTK_RULER(ruler), 0, data->height, 0, PREVIEW_SIZE);
g_signal_connect_swapped(preview, "motion-notify-event",
G_CALLBACK(GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event),
ruler);
gtk_table_attach(GTK_TABLE(table), ruler, 0, 1, 1, 2, GTK_FILL, GTK_FILL,
0, 0);
gtk_table_attach(GTK_TABLE(table), ruler, 0, 1, 1, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show(ruler);
window = gtk_scrolled_window_new(NULL, NULL);
width = (data->width > 600) ? 600 : data->width;
height = (data->height > 400) ? 400 : data->height;
gtk_widget_set_size_request(window, width, height);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_table_attach(GTK_TABLE(table), window, 1, 2, 1, 2, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show(window);
g_signal_connect (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (window)),
"changed",
G_CALLBACK (scroll_adj_changed),
data->hruler);
g_signal_connect (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (window)),
"value-changed",
G_CALLBACK (scroll_adj_changed),
data->hruler);
g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (window)),
"changed",
G_CALLBACK (scroll_adj_changed),
data->vruler);
g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (window)),
"value-changed",
G_CALLBACK (scroll_adj_changed),
data->vruler);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window), preview);
gtk_widget_show (preview);
gimp_pixel_rgn_init(&data->src_rgn, drawable, 0, 0, data->width,
data->height, FALSE, FALSE);
render_preview(data, &data->src_rgn);
gtk_widget_show(preview);
gtk_widget_show(frame);
gtk_widget_show(table);
return data;

1
plug-ins/imagemap/imap_preview.h
View file

@ -29,7 +29,6 @@
typedef struct {
GimpDrawable *drawable;
GtkWidget *window;
GtkWidget *frame;
GtkWidget *preview;
GtkWidget *hruler;
GtkWidget *vruler;