diff --git a/ChangeLog b/ChangeLog index 52827910d96f368cb1048834114bf76a1d118c9b..936392feeea2b7bcf4e2f7ee480f3570fdd99b45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2005-09-25 Sven Neumann + + * libgimpwidgets/gimpwidgetsenums.[ch]: removed GimpZoomWidgetType. + + * libgimpwidgets/gimpzoommodel.[ch]: removed gimp_zoom_widget_new() + in favor of gimp_zoom_button_new(). + + * libgimp/gimpzoompreview.c: changed accordingly. + + * libgimpwidgets/gimpwidgets.def: updated. + + * plug-ins/MapObject/mapobject_main.[ch] + * plug-ins/MapObject/mapobject_preview.c + * plug-ins/MapObject/mapobject_ui.c: use a GimpZoomModel and let + it create the zoom buttons. + + * plug-ins/MapObject/mapobject_apply.c + * plug-ins/MapObject/mapobject_image.c + * plug-ins/MapObject/mapobject_shade.c: include "gimp/gimpui.h". + 2005-09-25 Michael Natterer * plug-ins/help/Makefile.am (gimp_help_lookup_LDADD): link diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 6b0e345c47ec1438712cfbed6a4dc374814e00a8..ff2a3d1a4d8c496e6f4c07d6a44461782f655af4 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,9 @@ +2005-09-25 Sven Neumann + + * libgimpwidgets/libgimpwidgets-sections.txt + * libgimpwidgets/tmpl/gimpstock.sgml + * libgimpwidgets/tmpl/gimpzoommodel.sgml: updated. + 2005-09-25 Sven Neumann * libgimpwidgets/libgimpwidgets-sections.txt diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 0333993b1d8b51056b8f304ef94646736598cac6..cb30c8e2c4d9e7dd86689ba757979ed38d21e1af 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -569,8 +569,8 @@ GIMP_STOCK_PASTE_AS_NEW GIMP_STOCK_PASTE_INTO GIMP_STOCK_PATH_STROKE GIMP_STOCK_PLUGIN -GIMP_STOCK_QMASK_OFF -GIMP_STOCK_QMASK_ON +GIMP_STOCK_QUICK_MASK_OFF +GIMP_STOCK_QUICK_MASK_ON GIMP_STOCK_HISTOGRAM GIMP_STOCK_HISTOGRAM_LINEAR GIMP_STOCK_HISTOGRAM_LOGARITHMIC @@ -694,6 +694,7 @@ GIMP_STOCK_TOOL_DODGE GIMP_STOCK_TOOL_ELLIPSE_SELECT GIMP_STOCK_TOOL_ERASER GIMP_STOCK_TOOL_FLIP +GIMP_STOCK_TOOL_FOREGROUND_SELECT GIMP_STOCK_TOOL_FREE_SELECT GIMP_STOCK_TOOL_FUZZY_SELECT GIMP_STOCK_TOOL_HUE_SATURATION @@ -1018,11 +1019,13 @@ GIMP_SCROLLED_PREVIEW_GET_CLASS gimpzoommodel GimpZoomModel GimpZoomModel +GimpZoomType gimp_zoom_model_new gimp_zoom_model_set_range +gimp_zoom_model_zoom gimp_zoom_model_get_factor gimp_zoom_model_get_fraction -gimp_zoom_widget_new +gimp_zoom_button_new gimp_zoom_model_zoom_step GimpZoomModelClass @@ -1033,6 +1036,8 @@ gimp_zoom_model_get_type GIMP_ZOOM_MODEL_CLASS GIMP_IS_ZOOM_MODEL_CLASS GIMP_ZOOM_MODEL_GET_CLASS +GIMP_TYPE_ZOOM_TYPE +gimp_zoom_type_get_type
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index c11ae341f85d4e177a5d998256e6e61e987d1e3c..bf287f598d40f594f66158591e9caf31a16f9d9d 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -156,16 +156,16 @@ RTL variant - + - + - + - + @@ -1102,6 +1102,14 @@ RTL variant + + + + + + + + diff --git a/devel-docs/libgimpwidgets/tmpl/gimpzoommodel.sgml b/devel-docs/libgimpwidgets/tmpl/gimpzoommodel.sgml index 343bccbb1ef5cf764193018a2e5bbd4bd9155015..6640eb8a915e467ae999a77d73ae482735e10e74 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpzoommodel.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpzoommodel.sgml @@ -48,6 +48,19 @@ GimpZoomModel + + + + + +@GIMP_ZOOM_IN: +@GIMP_ZOOM_OUT: +@GIMP_ZOOM_IN_MORE: +@GIMP_ZOOM_OUT_MORE: +@GIMP_ZOOM_IN_MAX: +@GIMP_ZOOM_OUT_MAX: +@GIMP_ZOOM_TO: + @@ -66,6 +79,16 @@ GimpZoomModel @max: + + + + + +@model: +@zoom_type: +@scale: + + @@ -80,18 +103,19 @@ GimpZoomModel -@zoom_factor: +@model: @numerator: @denominator: - + @model: -@type: +@zoom_type: +@icon_size: @Returns: diff --git a/libgimp/gimpzoompreview.c b/libgimp/gimpzoompreview.c index 746687fe1fc87d32a78f49c93ad7cfbbccda20f2..e37ac6489b53bb5dedd58d10f1ea7b027e9aefe8 100644 --- a/libgimp/gimpzoompreview.c +++ b/libgimp/gimpzoompreview.c @@ -108,15 +108,15 @@ gimp_zoom_preview_init (GimpZoomPreview *preview) gtk_widget_show (button_bar); /* zoom out */ - button = gimp_zoom_widget_new (priv->zoom, GIMP_ZOOM_OUT_BUTTON); - gtk_box_pack_start (GTK_BOX (button_bar), button, - FALSE, FALSE, 0); + button = gimp_zoom_button_new (priv->zoom, + GIMP_ZOOM_OUT, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_box_pack_start (GTK_BOX (button_bar), button, FALSE, FALSE, 0); gtk_widget_show (button); /* zoom in */ - button = gimp_zoom_widget_new (priv->zoom, GIMP_ZOOM_IN_BUTTON); - gtk_box_pack_start (GTK_BOX (button_bar), button, - FALSE, FALSE, 0); + button = gimp_zoom_button_new (priv->zoom, + GIMP_ZOOM_IN, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_box_pack_start (GTK_BOX (button_bar), button, FALSE, FALSE, 0); gtk_widget_show (button); /* label */ diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def index d2af001c7d08d978ebe3b72eb7d75d5c2a87ef62..ef5d17ae8cfbf4d90166bda33a3e5709312aa259 100644 --- a/libgimpwidgets/gimpwidgets.def +++ b/libgimpwidgets/gimpwidgets.def @@ -328,6 +328,7 @@ EXPORTS gimp_unit_menu_set_unit gimp_unit_menu_update gimp_widgets_init + gimp_zoom_button_new gimp_zoom_model_get_factor gimp_zoom_model_get_fraction gimp_zoom_model_get_type @@ -335,6 +336,5 @@ EXPORTS gimp_zoom_model_set_range gimp_zoom_model_zoom gimp_zoom_model_zoom_step - gimp_zoom_widget_new gimp_zoom_type_get_type diff --git a/libgimpwidgets/gimpwidgetsenums.c b/libgimpwidgets/gimpwidgetsenums.c index b30f08f0f364d62ca36007c148b224ac6c96f7b5..7e3e0ecc3554e9ffc7654299d1bbc16e1a1cc348 100644 --- a/libgimpwidgets/gimpwidgetsenums.c +++ b/libgimpwidgets/gimpwidgetsenums.c @@ -171,35 +171,6 @@ gimp_size_entry_update_policy_get_type (void) return type; } -GType -gimp_zoom_widget_type_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_ZOOM_IN_BUTTON, "GIMP_ZOOM_IN_BUTTON", "in-button" }, - { GIMP_ZOOM_OUT_BUTTON, "GIMP_ZOOM_OUT_BUTTON", "out-button" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_ZOOM_IN_BUTTON, "GIMP_ZOOM_IN_BUTTON", NULL }, - { GIMP_ZOOM_OUT_BUTTON, "GIMP_ZOOM_OUT_BUTTON", NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpZoomWidgetType", values); - gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_zoom_type_get_type (void) { diff --git a/libgimpwidgets/gimpwidgetsenums.h b/libgimpwidgets/gimpwidgetsenums.h index fc2365ded3592b5316caa802d60f90dfef1d78fa..caf2bc8dd1fcca5e8f48e8547aba32a2ffbf55ab 100644 --- a/libgimpwidgets/gimpwidgetsenums.h +++ b/libgimpwidgets/gimpwidgetsenums.h @@ -90,16 +90,6 @@ typedef enum } GimpSizeEntryUpdatePolicy; -#define GIMP_TYPE_ZOOM_WIDGET_TYPE (gimp_zoom_model_widget_type_get_type ()) - -GType gimp_zoom_widget_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_ZOOM_IN_BUTTON, - GIMP_ZOOM_OUT_BUTTON -} GimpZoomWidgetType; - #define GIMP_TYPE_ZOOM_TYPE (gimp_zoom_type_get_type ()) GType gimp_zoom_type_get_type (void) G_GNUC_CONST; diff --git a/libgimpwidgets/gimpzoommodel.c b/libgimpwidgets/gimpzoommodel.c index 66dcacdeff7b6816e3ef177ec623f8bb65b78b85..ad203427e8e7d7e39860a340972f37f0fbcd6c21 100644 --- a/libgimpwidgets/gimpzoommodel.c +++ b/libgimpwidgets/gimpzoommodel.c @@ -409,58 +409,76 @@ gimp_zoom_model_get_fraction (GimpZoomModel *model, } } +static GtkWidget * +zoom_button_new (const gchar *stock_id, + GtkIconSize icon_size) +{ + GtkWidget *button; + + if (icon_size > 0) + { + GtkWidget *image; + + button = gtk_button_new (); + image = gtk_image_new_from_stock (stock_id, icon_size); + gtk_container_add (GTK_CONTAINER (button), image); + gtk_widget_show (image); + } + else + { + button = gtk_button_new_from_stock (stock_id); + } + + return button; +} + /** - * gimp_zoom_widget_new: - * @model: a #GimpZoomModel - * @type: the type of widget to create - * - * Creates a new widget to interact with the #GimpZoomModel. + * gimp_zoom_button_new: + * @model: a #GimpZoomModel + * @zoom_type: + * @icon_size: use 0 for a button with text labels * - * Return value: a new #GtkWidget. + * Return value: a newly created GtkButton * * Since GIMP 2.4 **/ GtkWidget * -gimp_zoom_widget_new (GimpZoomModel *model, - GimpZoomWidgetType type) +gimp_zoom_button_new (GimpZoomModel *model, + GimpZoomType zoom_type, + GtkIconSize icon_size) { - GtkWidget *button; - GtkWidget *image; + GtkWidget *button = NULL; g_return_val_if_fail (GIMP_IS_ZOOM_MODEL (model), NULL); - switch (type) + switch (zoom_type) { - case GIMP_ZOOM_IN_BUTTON: - button = gtk_button_new (); - image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, - GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_widget_show (image); + case GIMP_ZOOM_IN: + button = zoom_button_new (GTK_STOCK_ZOOM_IN, icon_size); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gimp_zoom_model_zoom_in), model); - return button; + break; - case GIMP_ZOOM_OUT_BUTTON: - button = gtk_button_new (); - image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, - GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_widget_show (image); + case GIMP_ZOOM_OUT: + button = zoom_button_new (GTK_STOCK_ZOOM_OUT, icon_size); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gimp_zoom_model_zoom_out), model); - return button; + break; + + default: + g_warning ("sorry, no button for this zoom type (%d)", zoom_type); + break; } - return NULL; + return button; } /** * gimp_zoom_model_zoom_step: * @zoom_type: - * @scale: ignored unless @zoom_type == %GIMP_ZOOM_TO + * @scale: ignored unless @zoom_type == %GIMP_ZOOM_TO * * Utility function to calculate a new scale factor. * diff --git a/libgimpwidgets/gimpzoommodel.h b/libgimpwidgets/gimpzoommodel.h index ccdbe1e8dddbf985d4658365873a25586b85a55b..c8f15c90112a97985072f2321924688523ee2707 100644 --- a/libgimpwidgets/gimpzoommodel.h +++ b/libgimpwidgets/gimpzoommodel.h @@ -2,7 +2,7 @@ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpzoommodel.h - * Copyright (C) 2005 David Odin + * Copyright (C) 2005 David Odin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,8 +67,9 @@ void gimp_zoom_model_get_fraction (GimpZoomModel *model, gint *numerator, gint *denominator); -GtkWidget * gimp_zoom_widget_new (GimpZoomModel *model, - GimpZoomWidgetType type); +GtkWidget * gimp_zoom_button_new (GimpZoomModel *model, + GimpZoomType zoom_type, + GtkIconSize icon_size); gdouble gimp_zoom_model_zoom_step (GimpZoomType zoom_type, gdouble scale); diff --git a/plug-ins/MapObject/mapobject_apply.c b/plug-ins/MapObject/mapobject_apply.c index 56018bbfa1c1df3d795808f637b806a5074c616a..f04d81f5586f007f502db5d9c1bcd6574f4409fd 100644 --- a/plug-ins/MapObject/mapobject_apply.c +++ b/plug-ins/MapObject/mapobject_apply.c @@ -9,6 +9,7 @@ #include #include +#include #include "mapobject_main.h" #include "mapobject_image.h" diff --git a/plug-ins/MapObject/mapobject_image.c b/plug-ins/MapObject/mapobject_image.c index 0d458aebedf1707a3a38c01832be44ff64fcb21c..e306441966409d39b4fe90ba44b91d69d46ee4b6 100644 --- a/plug-ins/MapObject/mapobject_image.c +++ b/plug-ins/MapObject/mapobject_image.c @@ -14,6 +14,7 @@ #include #include +#include #include "mapobject_main.h" #include "mapobject_preview.h" diff --git a/plug-ins/MapObject/mapobject_main.c b/plug-ins/MapObject/mapobject_main.c index a3429c5d76d240f7db13b41418624e3df504374b..69198e101ff8704c606c0bf8df0c50cf76597865 100644 --- a/plug-ins/MapObject/mapobject_main.c +++ b/plug-ins/MapObject/mapobject_main.c @@ -74,7 +74,8 @@ set_default_settings (void) mapvals.cylinder_radius = 0.25; mapvals.cylinder_length = 1.0; - mapvals.preview_zoom_factor = 0; + mapvals.zoom_model = gimp_zoom_model_new (); + gimp_zoom_model_set_range (mapvals.zoom_model, 0.25, 1.0); mapvals.lightsource.type = POINT_LIGHT; diff --git a/plug-ins/MapObject/mapobject_main.h b/plug-ins/MapObject/mapobject_main.h index 6a4571dbf7281d43e7fb67b5d3dbbace660f394a..b879df10cfb61c851e35c0845ad3a90cb1a48210 100644 --- a/plug-ins/MapObject/mapobject_main.h +++ b/plug-ins/MapObject/mapobject_main.h @@ -63,7 +63,7 @@ typedef struct gint showgrid; gint showcaps; - glong preview_zoom_factor; + GimpZoomModel *zoom_model; gdouble alpha,beta,gamma; gdouble maxdepth; @@ -74,7 +74,7 @@ typedef struct gint32 boxmap_id[6]; gint32 cylindermap_id[2]; - + } MapObjectValues; /* Externally visible variables */ diff --git a/plug-ins/MapObject/mapobject_preview.c b/plug-ins/MapObject/mapobject_preview.c index dde54d038f81d07976dc5e4498a9160b2fa37e48..cdc003089582a479e7844aaded44a67cf751a7ad 100644 --- a/plug-ins/MapObject/mapobject_preview.c +++ b/plug-ins/MapObject/mapobject_preview.c @@ -7,6 +7,7 @@ #include #include +#include #include "mapobject_main.h" #include "mapobject_ui.h" @@ -394,12 +395,13 @@ void update_light (gint xpos, gint ypos) { - gint startx, starty, pw, ph; + gint startx, starty, pw, ph; + gdouble zoom = gimp_zoom_model_get_factor (mapvals.zoom_model); - pw = PREVIEW_WIDTH >> mapvals.preview_zoom_factor; - ph = PREVIEW_HEIGHT >> mapvals.preview_zoom_factor; - startx = (PREVIEW_WIDTH - pw) >> 1; - starty = (PREVIEW_HEIGHT - ph) >> 1; + pw = PREVIEW_WIDTH * zoom; + ph = PREVIEW_HEIGHT * zoom; + startx = (PREVIEW_WIDTH - pw) / 2; + starty = (PREVIEW_HEIGHT - ph) / 2; gimp_vector_2d_to_3d (startx, starty, pw, ph, xpos, ypos, &mapvals.viewpoint, &mapvals.lightsource.position); @@ -414,6 +416,7 @@ void draw_preview_image (gint docompute) { gint startx, starty, pw, ph; + gdouble zoom; GdkColor color; color.red = 0x0; @@ -429,10 +432,12 @@ draw_preview_image (gint docompute) gdk_gc_set_function (gc, GDK_COPY); linetab[0].x1 = -1; - pw = PREVIEW_WIDTH >> mapvals.preview_zoom_factor; - ph = PREVIEW_HEIGHT >> mapvals.preview_zoom_factor; - startx = (PREVIEW_WIDTH - pw) >> 1; - starty = (PREVIEW_HEIGHT - ph) >> 1; + zoom = gimp_zoom_model_get_factor (mapvals.zoom_model); + + pw = PREVIEW_WIDTH * zoom; + ph = PREVIEW_HEIGHT * zoom; + startx = (PREVIEW_WIDTH - pw) / 2; + starty = (PREVIEW_HEIGHT - ph) / 2; if (docompute == TRUE) { @@ -471,6 +476,7 @@ void draw_preview_wireframe (void) { gint startx, starty, pw, ph; + gdouble zoom; GdkColor color; color.red = 0x0; @@ -485,10 +491,12 @@ draw_preview_wireframe (void) gdk_gc_set_function (gc, GDK_INVERT); - pw = PREVIEW_WIDTH >> mapvals.preview_zoom_factor; - ph = PREVIEW_HEIGHT >> mapvals.preview_zoom_factor; - startx = (PREVIEW_WIDTH - pw) >> 1; - starty = (PREVIEW_HEIGHT - ph) >> 1; + zoom = gimp_zoom_model_get_factor (mapvals.zoom_model); + + pw = PREVIEW_WIDTH * zoom; + ph = PREVIEW_HEIGHT * zoom; + startx = (PREVIEW_WIDTH - pw) / 2; + starty = (PREVIEW_HEIGHT - ph) / 2; clear_wireframe (); draw_wireframe (startx, starty, pw, ph); diff --git a/plug-ins/MapObject/mapobject_shade.c b/plug-ins/MapObject/mapobject_shade.c index fdedb4226f883aa003a9605bc566ed8af9670207..efa5ec782591f347a94ebdf47deaa710d93ebaeb 100644 --- a/plug-ins/MapObject/mapobject_shade.c +++ b/plug-ins/MapObject/mapobject_shade.c @@ -7,6 +7,7 @@ #include #include +#include #include "mapobject_apply.h" #include "mapobject_main.h" diff --git a/plug-ins/MapObject/mapobject_ui.c b/plug-ins/MapObject/mapobject_ui.c index 14ab81c29e81dc936b8d6c21dedf4ceac8328bcf..ace33548257bf67da253c878b3d682c8d52721ed 100644 --- a/plug-ins/MapObject/mapobject_ui.c +++ b/plug-ins/MapObject/mapobject_ui.c @@ -299,38 +299,12 @@ preview_callback (GtkWidget *widget, linetab[0].x1 = -1; } -/*********************************************/ -/* Main window "-" (zoom in) button callback */ -/*********************************************/ - static void -zoomout_callback (GtkWidget *widget, - gpointer data) +zoom_notify_callback (GObject *model) { - if (mapvals.preview_zoom_factor < 2) - { - mapvals.preview_zoom_factor++; - if (linetab[0].x1 != -1) - clear_wireframe (); - draw_preview_image (TRUE); - } -} - -/**********************************************/ -/* Main window "+" (zoom out) button callback */ -/**********************************************/ - -static void -zoomin_callback (GtkWidget *widget, - gpointer data) -{ - if (mapvals.preview_zoom_factor > 0) - { - mapvals.preview_zoom_factor--; - if (linetab[0].x1 != -1) - clear_wireframe (); - draw_preview_image (TRUE); - } + if (linetab[0].x1 != -1) + clear_wireframe (); + draw_preview_image (TRUE); } /**********************************************/ @@ -1361,7 +1335,6 @@ main_dialog (GimpDrawable *drawable) GtkWidget *hbox; GtkWidget *frame; GtkWidget *button; - GtkWidget *image; GtkWidget *toggle; gboolean run = FALSE; @@ -1431,34 +1404,20 @@ main_dialog (GimpDrawable *drawable) gimp_help_set_help_data (button, _("Recompute preview image"), NULL); - button = gtk_button_new (); + button = gimp_zoom_button_new (mapvals.zoom_model, + GIMP_ZOOM_IN, GTK_ICON_SIZE_MENU); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_widget_show (button); - image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_widget_show (image); - - g_signal_connect (button, "clicked", - G_CALLBACK (zoomout_callback), - NULL); - - gimp_help_set_help_data (button, _("Zoom out (make image smaller)"), NULL); - - button = gtk_button_new (); + button = gimp_zoom_button_new (mapvals.zoom_model, + GIMP_ZOOM_OUT, GTK_ICON_SIZE_MENU); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_widget_show (button); - image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_widget_show (image); - - g_signal_connect (button, "clicked", - G_CALLBACK (zoomin_callback), + g_signal_connect (mapvals.zoom_model, "notify::value", + G_CALLBACK (zoom_notify_callback), NULL); - gimp_help_set_help_data (button, _("Zoom in (make image bigger)"), NULL); - toggle = gtk_check_button_new_with_mnemonic (_("Show preview _wireframe")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.showgrid); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); @@ -1468,8 +1427,6 @@ main_dialog (GimpDrawable *drawable) G_CALLBACK (togglegrid_update), &mapvals.showgrid); - gimp_help_set_help_data (toggle, _("Show/hide preview wireframe"), NULL); - create_main_notebook (main_hbox); /* Endmarkers for line table */