Commit 65f23289 authored by Sven Neumann's avatar Sven Neumann

do not ignore the mask of the tool icons


--Sven
parent def214fa
Sun Feb 20 03:46:12 CET 2000 Sven Neumann <sven@gimp.org>
* app/devices.c
* app/gimpdnd.c
* app/info_window.c
* app/interface.c
* app/tools.[ch]: do not ignore the mask of the tool icons
Sat Feb 19 20:34:43 CET 2000 Sven Neumann <sven@gimp.org>
* plug-ins/common/pnm.c: Load files in the pbm ascii format even
......
......@@ -814,7 +814,8 @@ device_status_create (void)
deviceD->eventboxes[i] = gtk_event_box_new();
deviceD->tools[i] = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT), NULL);
deviceD->tools[i] = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT),
tool_get_mask (RECT_SELECT));
gtk_drag_source_set (deviceD->eventboxes[i],
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
......@@ -1020,7 +1021,7 @@ device_status_update (guint32 deviceid)
gtk_pixmap_set (GTK_PIXMAP (deviceD->tools[i]),
tool_get_pixmap (gimp_context_get_tool (device_info->context)),
NULL);
tool_get_mask (gimp_context_get_tool (device_info->context)));
gtk_widget_draw (deviceD->tools[i], NULL);
gtk_widget_show (deviceD->tools[i]);
......
......@@ -152,7 +152,8 @@ info_window_create_extended (InfoDialog *info_win)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER), NULL);
pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER),
tool_get_mask (COLOR_PICKER));
gtk_table_attach (GTK_TABLE (table), pixmap, 0, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (pixmap);
......
......@@ -324,12 +324,14 @@ create_tool_pixmaps (GtkWidget *parent)
for (i = 0; i < num_tools; i++)
{
if (tool_info[i].icon_data)
tool_info[i].icon_pixmap = create_pixmap (parent->window, NULL,
tool_info[i].icon_pixmap = create_pixmap (parent->window,
&tool_info[i].icon_mask,
tool_info[i].icon_data,
22, 22);
else
tool_info[i].icon_pixmap = create_pixmap (parent->window, NULL,
tool_info[i].icon_pixmap = create_pixmap (parent->window,
&tool_info[i].icon_mask,
dialog_bits,
22, 22);
}
......@@ -372,7 +374,8 @@ create_tools (GtkWidget *parent)
gtk_container_set_border_width (GTK_CONTAINER (alignment), 0);
gtk_container_add (GTK_CONTAINER (button), alignment);
pixmap = gtk_pixmap_new (tool_get_pixmap ((ToolType)j), NULL);
pixmap = gtk_pixmap_new (tool_get_pixmap ((ToolType)j),
tool_get_mask ((ToolType)j));
gtk_container_add (GTK_CONTAINER (alignment), pixmap);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
......
......@@ -324,12 +324,14 @@ create_tool_pixmaps (GtkWidget *parent)
for (i = 0; i < num_tools; i++)
{
if (tool_info[i].icon_data)
tool_info[i].icon_pixmap = create_pixmap (parent->window, NULL,
tool_info[i].icon_pixmap = create_pixmap (parent->window,
&tool_info[i].icon_mask,
tool_info[i].icon_data,
22, 22);
else
tool_info[i].icon_pixmap = create_pixmap (parent->window, NULL,
tool_info[i].icon_pixmap = create_pixmap (parent->window,
&tool_info[i].icon_mask,
dialog_bits,
22, 22);
}
......@@ -372,7 +374,8 @@ create_tools (GtkWidget *parent)
gtk_container_set_border_width (GTK_CONTAINER (alignment), 0);
gtk_container_add (GTK_CONTAINER (button), alignment);
pixmap = gtk_pixmap_new (tool_get_pixmap ((ToolType)j), NULL);
pixmap = gtk_pixmap_new (tool_get_pixmap ((ToolType)j),
tool_get_mask ((ToolType)j));
gtk_container_add (GTK_CONTAINER (alignment), pixmap);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
......
......@@ -948,7 +948,8 @@ gimp_dnd_get_tool_icon (GtkWidget *widget,
if (((gint) tool_type < 0) || ((gint) tool_type >= num_tools))
return NULL;
tool_icon = gtk_pixmap_new (tool_get_pixmap (tool_type), NULL);
tool_icon = gtk_pixmap_new (tool_get_pixmap (tool_type),
tool_get_mask (tool_type));
return tool_icon;
}
......
......@@ -814,7 +814,8 @@ device_status_create (void)
deviceD->eventboxes[i] = gtk_event_box_new();
deviceD->tools[i] = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT), NULL);
deviceD->tools[i] = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT),
tool_get_mask (RECT_SELECT));
gtk_drag_source_set (deviceD->eventboxes[i],
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
......@@ -1020,7 +1021,7 @@ device_status_update (guint32 deviceid)
gtk_pixmap_set (GTK_PIXMAP (deviceD->tools[i]),
tool_get_pixmap (gimp_context_get_tool (device_info->context)),
NULL);
tool_get_mask (gimp_context_get_tool (device_info->context)));
gtk_widget_draw (deviceD->tools[i], NULL);
gtk_widget_show (deviceD->tools[i]);
......
......@@ -152,7 +152,8 @@ info_window_create_extended (InfoDialog *info_win)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER), NULL);
pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER),
tool_get_mask (COLOR_PICKER));
gtk_table_attach (GTK_TABLE (table), pixmap, 0, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (pixmap);
......
......@@ -814,7 +814,8 @@ device_status_create (void)
deviceD->eventboxes[i] = gtk_event_box_new();
deviceD->tools[i] = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT), NULL);
deviceD->tools[i] = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT),
tool_get_mask (RECT_SELECT));
gtk_drag_source_set (deviceD->eventboxes[i],
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
......@@ -1020,7 +1021,7 @@ device_status_update (guint32 deviceid)
gtk_pixmap_set (GTK_PIXMAP (deviceD->tools[i]),
tool_get_pixmap (gimp_context_get_tool (device_info->context)),
NULL);
tool_get_mask (gimp_context_get_tool (device_info->context)));
gtk_widget_draw (deviceD->tools[i], NULL);
gtk_widget_show (deviceD->tools[i]);
......
......@@ -152,7 +152,8 @@ info_window_create_extended (InfoDialog *info_win)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER), NULL);
pixmap = gtk_pixmap_new (tool_get_pixmap (COLOR_PICKER),
tool_get_mask (COLOR_PICKER));
gtk_table_attach (GTK_TABLE (table), pixmap, 0, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (pixmap);
......
......@@ -324,12 +324,14 @@ create_tool_pixmaps (GtkWidget *parent)
for (i = 0; i < num_tools; i++)
{
if (tool_info[i].icon_data)
tool_info[i].icon_pixmap = create_pixmap (parent->window, NULL,
tool_info[i].icon_pixmap = create_pixmap (parent->window,
&tool_info[i].icon_mask,
tool_info[i].icon_data,
22, 22);
else
tool_info[i].icon_pixmap = create_pixmap (parent->window, NULL,
tool_info[i].icon_pixmap = create_pixmap (parent->window,
&tool_info[i].icon_mask,
dialog_bits,
22, 22);
}
......@@ -372,7 +374,8 @@ create_tools (GtkWidget *parent)
gtk_container_set_border_width (GTK_CONTAINER (alignment), 0);
gtk_container_add (GTK_CONTAINER (button), alignment);
pixmap = gtk_pixmap_new (tool_get_pixmap ((ToolType)j), NULL);
pixmap = gtk_pixmap_new (tool_get_pixmap ((ToolType)j),
tool_get_mask ((ToolType)j));
gtk_container_add (GTK_CONTAINER (alignment), pixmap);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
......
......@@ -90,6 +90,7 @@ ToolInfo tool_info[] =
"R",
(char **) rect_bits,
NULL,
NULL,
N_("Select rectangular regions"),
"tools/rect_select.html",
RECT_SELECT,
......@@ -107,6 +108,7 @@ ToolInfo tool_info[] =
"E",
(char **) circ_bits,
NULL,
NULL,
N_("Select elliptical regions"),
"tools/ellipse_select.html",
ELLIPSE_SELECT,
......@@ -124,6 +126,7 @@ ToolInfo tool_info[] =
"F",
(char **) free_bits,
NULL,
NULL,
N_("Select hand-drawn regions"),
"tools/free_select.html",
FREE_SELECT,
......@@ -141,6 +144,7 @@ ToolInfo tool_info[] =
"Z",
(char **) fuzzy_bits,
NULL,
NULL,
N_("Select contiguous regions"),
"tools/fuzzy_select.html",
FUZZY_SELECT,
......@@ -158,6 +162,7 @@ ToolInfo tool_info[] =
"B",
(char **) bezier_bits,
NULL,
NULL,
N_("Select regions using Bezier curves"),
"tools/bezier_select.html",
BEZIER_SELECT,
......@@ -175,6 +180,7 @@ ToolInfo tool_info[] =
"I",
(char **) iscissors_bits,
NULL,
NULL,
N_("Select shapes from image"),
"tools/intelligent_scissors.html",
ISCISSORS,
......@@ -192,6 +198,7 @@ ToolInfo tool_info[] =
"M",
(char **) move_bits,
NULL,
NULL,
N_("Move layers & selections"),
"tools/move.html",
MOVE,
......@@ -209,6 +216,7 @@ ToolInfo tool_info[] =
"<shift>M",
(char **) magnify_bits,
NULL,
NULL,
N_("Zoom in & out"),
"tools/magnify.html",
MAGNIFY,
......@@ -226,6 +234,7 @@ ToolInfo tool_info[] =
"<shift>C",
(char **) crop_bits,
NULL,
NULL,
N_("Crop or resize the image"),
"tools/crop.html",
CROP,
......@@ -243,6 +252,7 @@ ToolInfo tool_info[] =
"<shift>T",
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
ROTATE,
......@@ -260,6 +270,7 @@ ToolInfo tool_info[] =
NULL,
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
SCALE,
......@@ -277,6 +288,7 @@ ToolInfo tool_info[] =
NULL,
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
SHEAR,
......@@ -294,6 +306,7 @@ ToolInfo tool_info[] =
NULL,
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
PERSPECTIVE,
......@@ -311,6 +324,7 @@ ToolInfo tool_info[] =
"<shift>F",
(char **) flip_bits,
NULL,
NULL,
N_("Flip the layer or selection"),
"tools/flip.html",
FLIP,
......@@ -328,6 +342,7 @@ ToolInfo tool_info[] =
"T",
(char **) text_bits,
NULL,
NULL,
N_("Add text to the image"),
"tools/text.html",
TEXT,
......@@ -345,6 +360,7 @@ ToolInfo tool_info[] =
"O",
(char **) colorpicker_bits,
NULL,
NULL,
N_("Pick colors from the image"),
"tools/color_picker.html",
COLOR_PICKER,
......@@ -362,6 +378,7 @@ ToolInfo tool_info[] =
"<shift>B",
(char **) fill_bits,
NULL,
NULL,
N_("Fill with a color or pattern"),
"tools/bucket_fill.html",
BUCKET_FILL,
......@@ -379,6 +396,7 @@ ToolInfo tool_info[] =
"L",
(char **) gradient_bits,
NULL,
NULL,
N_("Fill with a color gradient"),
"tools/blend.html",
BLEND,
......@@ -396,6 +414,7 @@ ToolInfo tool_info[] =
"<shift>P",
(char **) pencil_bits,
NULL,
NULL,
N_("Draw sharp pencil strokes"),
"tools/pencil.html",
PENCIL,
......@@ -413,6 +432,7 @@ ToolInfo tool_info[] =
"P",
(char **) paint_bits,
NULL,
NULL,
N_("Paint fuzzy brush strokes"),
"tools/paintbrush.html",
PAINTBRUSH,
......@@ -430,6 +450,7 @@ ToolInfo tool_info[] =
"<shift>E",
(char **) erase_bits,
NULL,
NULL,
N_("Erase to background or transparency"),
"tools/eraser.html",
ERASER,
......@@ -447,6 +468,7 @@ ToolInfo tool_info[] =
"A",
(char **) airbrush_bits,
NULL,
NULL,
N_("Airbrush with variable pressure"),
"tools/airbrush.html",
AIRBRUSH,
......@@ -464,6 +486,7 @@ ToolInfo tool_info[] =
"C",
(char **) clone_bits,
NULL,
NULL,
N_("Paint using patterns or image regions"),
"tools/clone.html",
CLONE,
......@@ -481,6 +504,7 @@ ToolInfo tool_info[] =
"V",
(char **) blur_bits,
NULL,
NULL,
N_("Blur or sharpen"),
"tools/convolve.html",
CONVOLVE,
......@@ -498,6 +522,7 @@ ToolInfo tool_info[] =
"K",
(char **) ink_bits,
NULL,
NULL,
N_("Draw in ink"),
"tools/ink.html",
INK,
......@@ -515,6 +540,7 @@ ToolInfo tool_info[] =
"<shift>D",
(char **) dodge_bits,
NULL,
NULL,
N_("Dodge or Burn"),
"tools/dodgeburn.html",
DODGEBURN,
......@@ -532,6 +558,7 @@ ToolInfo tool_info[] =
"<shift>S",
(char **) smudge_bits,
NULL,
NULL,
N_("Smudge"),
"tools/smudge.html",
SMUDGE,
......@@ -550,6 +577,7 @@ ToolInfo tool_info[] =
"<shift>A",
(char **) xinput_airbrush_bits,
NULL,
NULL,
N_("Natural Airbrush"),
"tools/xinput_airbrush.html",
XINPUT_AIRBRUSH,
......@@ -568,6 +596,7 @@ ToolInfo tool_info[] =
"",
(char **) measure_bits,
NULL,
NULL,
N_("Measure distances and angles"),
"tools/measure.html",
MEASURE,
......@@ -586,6 +615,7 @@ ToolInfo tool_info[] =
"",
(char **) path_tool_bits,
NULL,
NULL,
N_("Manipulate paths"),
"tools/path.html",
PATH_TOOL,
......@@ -605,6 +635,7 @@ ToolInfo tool_info[] =
NULL,
(char **) by_color_select_bits,
NULL,
NULL,
N_("Select regions by color"),
"tools/by_color_select.html",
BY_COLOR_SELECT,
......@@ -622,6 +653,7 @@ ToolInfo tool_info[] =
NULL,
(char **) adjustment_bits,
NULL,
NULL,
N_("Adjust color balance"),
"tools/color_balance.html",
COLOR_BALANCE,
......@@ -639,6 +671,7 @@ ToolInfo tool_info[] =
NULL,
(char **) adjustment_bits,
NULL,
NULL,
N_("Adjust brightness and contrast"),
"tools/brightness_contrast.html",
BRIGHTNESS_CONTRAST,
......@@ -656,6 +689,7 @@ ToolInfo tool_info[] =
NULL,
(char **) adjustment_bits,
NULL,
NULL,
N_("Adjust hue and saturation"),
"tools/hue_saturation.html",
HUE_SATURATION,
......@@ -673,6 +707,7 @@ ToolInfo tool_info[] =
NULL,
(char **) adjustment_bits,
NULL,
NULL,
N_("Reduce image to a fixed numer of colors"),
"tools/posterize.html",
POSTERIZE,
......@@ -690,6 +725,7 @@ ToolInfo tool_info[] =
NULL,
(char **) levels_bits,
NULL,
NULL,
N_("Reduce image to two colors using a threshold"),
"tools/threshold.html",
THRESHOLD,
......@@ -707,6 +743,7 @@ ToolInfo tool_info[] =
NULL,
(char **) curves_bits,
NULL,
NULL,
N_("Adjust color curves"),
"tools/curves.html",
CURVES,
......@@ -724,6 +761,7 @@ ToolInfo tool_info[] =
NULL,
(char **) levels_bits,
NULL,
NULL,
N_("Adjust color levels"),
"tools/levels.html",
LEVELS,
......@@ -741,6 +779,7 @@ ToolInfo tool_info[] =
NULL,
(char **) histogram_bits,
NULL,
NULL,
N_("View image histogram"),
"tools/histogram.html",
HISTOGRAM,
......@@ -1019,7 +1058,7 @@ tools_register (ToolType tool_type,
gtk_label_set_text (GTK_LABEL (options_label), tool_options->title);
gtk_pixmap_set (GTK_PIXMAP (options_pixmap),
tool_get_pixmap (tool_type), NULL);
tool_get_pixmap (tool_type), tool_get_mask (tool_type));
gtk_widget_queue_draw (options_pixmap);
......@@ -1082,7 +1121,7 @@ tool_options_dialog_new (void)
gtk_container_add (GTK_CONTAINER (options_eventbox), hbox);
gtk_widget_show (hbox);
options_pixmap = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT), NULL);
options_pixmap = gtk_pixmap_new (tool_get_pixmap (RECT_SELECT), tool_get_mask (RECT_SELECT));
gtk_box_pack_start (GTK_BOX (hbox), options_pixmap, FALSE, FALSE, 0);
gtk_widget_show (options_pixmap);
......@@ -1146,7 +1185,7 @@ tool_options_show (ToolType tool_type)
tool_info[tool_type].tool_options->title);
gtk_pixmap_set (GTK_PIXMAP (options_pixmap),
tool_get_pixmap (tool_type), NULL);
tool_get_pixmap (tool_type), tool_get_mask (tool_type));
gtk_widget_queue_draw (options_pixmap);
......@@ -1259,3 +1298,9 @@ tool_get_pixmap (ToolType type)
{
return (tool_info[type].icon_pixmap);
}
GdkPixmap *
tool_get_mask (ToolType type)
{
return (tool_info[type].icon_mask);
}
......@@ -95,6 +95,7 @@ struct _ToolInfo
gchar **icon_data;
GdkPixmap *icon_pixmap;
GdkBitmap *icon_mask;
gchar *tool_desc;
gchar *private_tip;
......@@ -136,8 +137,9 @@ void tool_options_dialog_free (void);
gchar * tool_active_PDB_string (void);
/* don't unref this pixmap, it is static! */
/* don't unref this pixmaps, they are static! */
GdkPixmap * tool_get_pixmap (ToolType tool_type);
GdkBitmap * tool_get_mask (ToolType tool_type);
#endif /* __TOOLS_H__ */
......
......@@ -90,6 +90,7 @@ ToolInfo tool_info[] =
"R",
(char **) rect_bits,
NULL,
NULL,
N_("Select rectangular regions"),
"tools/rect_select.html",
RECT_SELECT,
......@@ -107,6 +108,7 @@ ToolInfo tool_info[] =
"E",
(char **) circ_bits,
NULL,
NULL,
N_("Select elliptical regions"),
"tools/ellipse_select.html",
ELLIPSE_SELECT,
......@@ -124,6 +126,7 @@ ToolInfo tool_info[] =
"F",
(char **) free_bits,
NULL,
NULL,
N_("Select hand-drawn regions"),
"tools/free_select.html",
FREE_SELECT,
......@@ -141,6 +144,7 @@ ToolInfo tool_info[] =
"Z",
(char **) fuzzy_bits,
NULL,
NULL,
N_("Select contiguous regions"),
"tools/fuzzy_select.html",
FUZZY_SELECT,
......@@ -158,6 +162,7 @@ ToolInfo tool_info[] =
"B",
(char **) bezier_bits,
NULL,
NULL,
N_("Select regions using Bezier curves"),
"tools/bezier_select.html",
BEZIER_SELECT,
......@@ -175,6 +180,7 @@ ToolInfo tool_info[] =
"I",
(char **) iscissors_bits,
NULL,
NULL,
N_("Select shapes from image"),
"tools/intelligent_scissors.html",
ISCISSORS,
......@@ -192,6 +198,7 @@ ToolInfo tool_info[] =
"M",
(char **) move_bits,
NULL,
NULL,
N_("Move layers & selections"),
"tools/move.html",
MOVE,
......@@ -209,6 +216,7 @@ ToolInfo tool_info[] =
"<shift>M",
(char **) magnify_bits,
NULL,
NULL,
N_("Zoom in & out"),
"tools/magnify.html",
MAGNIFY,
......@@ -226,6 +234,7 @@ ToolInfo tool_info[] =
"<shift>C",
(char **) crop_bits,
NULL,
NULL,
N_("Crop or resize the image"),
"tools/crop.html",
CROP,
......@@ -243,6 +252,7 @@ ToolInfo tool_info[] =
"<shift>T",
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
ROTATE,
......@@ -260,6 +270,7 @@ ToolInfo tool_info[] =
NULL,
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
SCALE,
......@@ -277,6 +288,7 @@ ToolInfo tool_info[] =
NULL,
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
SHEAR,
......@@ -294,6 +306,7 @@ ToolInfo tool_info[] =
NULL,
(char **) scale_bits,
NULL,
NULL,
N_("Rotation, scaling, shearing, perspective."),
"tools/transform.html",
PERSPECTIVE,
......@@ -311,6 +324,7 @@ ToolInfo tool_info[] =
"<shift>F",
(char **) flip_bits,
NULL,
NULL,
N_("Flip the layer or selection"),
"tools/flip.html",
FLIP,
......@@ -328,6 +342,7 @@ ToolInfo tool_info[] =
"T",
(char **) text_bits,
NULL,
NULL,
N_("Add text to the image"),
"tools/text.html",
TEXT,
......@@ -345,6 +360,7 @@ ToolInfo tool_info[] =
"O",
(char **) colorpicker_bits,
NULL,
NULL,
N_("Pick colors from the image"),
"tools/color_picker.html",
COLOR_PICKER,
......@@ -362,6 +378,7 @@ ToolInfo tool_info[] =
"<shift>B",
(char **) fill_bits,
NULL,
NULL,
N_("Fill with a color or pattern"),
"tools/bucket_fill.html",
BUCKET_FILL,
......@@ -379,6 +396,7 @@ ToolInfo tool_info[] =
"L",
(char **) gradient_bits,
NULL,
NULL,
N_("Fill with a color gradient"),
"tools/blend.html",
BLEND,
......@@ -396,6 +414,7 @@ ToolInfo tool_info[] =
"<shift>P",
(char **) pencil_bits,
NULL,
NULL,
N_("Draw sharp pencil strokes"),
"tools/pencil.html",
PENCIL,
......@@ -413,6 +432,7 @@ ToolInfo tool_info[] =
"P",
(char **) paint_bits,
NULL,
NULL,
N_("Paint fuzzy brush strokes"),
"tools/paintbrush.html",
PAINTBRUSH,
......@@ -430,6 +450,7 @@ ToolInfo tool_info[] =
"<shift>E",
(char **) erase_bits,
NULL,
NULL,
N_("Erase to background or transparency"),
"tools/eraser.html",
ERASER,
......@@ -447,6 +468,7 @@ ToolInfo tool_info[] =
"A",
(char **) airbrush_bits,
NULL,
NULL,
N_("Airbrush with variable pressure"),
"tools/airbrush.html",
AIRBRUSH,
......@@ -464,6 +486,7 @@ ToolInfo tool_info[] =
"C",
(char **) clone_bits,
NULL,
NULL,
N_("Paint using patterns or image regions"),
"tools/clone.html",
CLONE,
......@@ -481,6 +504,7 @@ ToolInfo tool_info[] =
"V",
(char **) blur_bits,
NULL,
NULL,
N_("Blur or sharpen"),
"tools/convolve.html",
CONVOLVE,
......@@ -498,6 +522,7 @@ ToolInfo tool_info[] =
"K",
(char **) ink_bits,
NULL,
NULL,
N_("Draw in ink"),
"tools/ink.html",
INK,
......@@ -515,6 +540,7 @@ ToolInfo tool_info[] =
"<shift>D",
(char **) dodge_bits,
NULL,
NULL,
N_("Dodge or Burn"),
"tools/dodgeburn.html",
DODGEBURN,
......@@ -532,6 +558,7 @@ ToolInfo tool_info[] =
"<shift>S",
(char **) smudge_bits,
NULL,
NULL,
N_("Smudge"),
"tools/smudge.html",
SMUDGE,
......@@ -550,6 +577,7 @@ ToolInfo tool_info[] =
"<shift>A",
(char **) xinput_airbrush_bits,
NULL,
NULL,
N_("Natural Airbrush"),
"tools/xinput_airbrush.html",
XINPUT_AIRBRUSH,
......@@ -568,6 +596,7 @@ ToolInfo tool_info[] =
"",
(char **) measure_bits,
NULL,
NULL,
N_("Measure distances and angles"),
"tools/measure.html",
MEASURE,
......@@ -586,6 +615,7 @@ ToolInfo tool_info[] =
"",
(char **) path_tool_bits,
NULL,
NULL,
N_("Manipulate paths"),
"tools/path.html",
PATH_TOOL,
......@@ -605,6 +635,7 @@ ToolInfo tool_info[] =
NULL,
(char **) by_color_select_bits,
NULL,
NULL,
N_("Select regions by color"),
"tools/by_color_select.html",
BY_COLOR_SELECT,
......@@ -622,6 +653,7 @@ ToolInfo tool_info[] =
NULL,
(char **) adjustment_bits,
NULL,
NULL,