callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins/imagemap/images/Makefile.am

Browse Source 
2007-01-03  Sven Neumann  <sven@gimp.org>

	* plug-ins/imagemap/images/Makefile.am
	* plug-ins/imagemap/images/stock-map-info.png
	* plug-ins/imagemap/imap_stock.[ch]: removed custom info icon.

	* plug-ins/imagemap/imap_menu.c: use GTK_STOCK_INFO instead.

	* plug-ins/imagemap/imap_main.c
	* plug-ins/imagemap/imap_default_dialog.c: make dialogs 
transient
	to the main window and the main window transient to the image 
window.


svn path=/trunk/; revision=21628
This commit is contained in:
Sven Neumann
2007-01-03 10:15:59 +00:00
committed by Sven Neumann
parent 3f937b1778
commit eaedd11a3a
8 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-01-03 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/images/Makefile.am
* plug-ins/imagemap/images/stock-map-info.png
* plug-ins/imagemap/imap_stock.[ch]: removed custom info icon.
* plug-ins/imagemap/imap_menu.c: use GTK_STOCK_INFO instead.
* plug-ins/imagemap/imap_main.c
* plug-ins/imagemap/imap_default_dialog.c: make dialogs transient
to the main window and the main window transient to the image window.
2007-01-03 Tor Lillqvist <tml@novell.com>
* plug-ins/common/lcms.c (run): Fix mixup in retrieving the

1
plug-ins/imagemap/images/Makefile.am
View File

@ -5,7 +5,6 @@ STOCK_IMAGES = \
stock-coord.png \
stock-dimension.png \
stock-java.png \
stock-map-info.png \
stock-polygon.png \
stock-rectangle.png \
stock-to-back.png \

BIN
plug-ins/imagemap/images/stock-map-info.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 374 B

4
plug-ins/imagemap/imap_default_dialog.c
View File

@ -93,7 +93,7 @@ make_default_dialog (const gchar *title)
data->cancel_cb = NULL;
data->dialog = gimp_dialog_new (title, "imagemap",
NULL, 0,
get_dialog(), GTK_DIALOG_DESTROY_WITH_PARENT,
/* gimp_standard_help_func,
"plug-in-imagemap", */
gimp_standard_help_func, NULL,
@ -114,8 +114,6 @@ make_default_dialog (const gchar *title)
GTK_RESPONSE_CANCEL,
-1);
gimp_window_set_transient (GTK_WINDOW (data->dialog));
g_signal_connect (data->dialog, "response",
G_CALLBACK (dialog_response),
data);

3
plug-ins/imagemap/imap_main.c
View File

@ -1243,6 +1243,9 @@ dialog(GimpDrawable *drawable)
gimp_help_connect (dlg, gimp_standard_help_func, "plug-in-imagemap", NULL);
gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_MOUSE);
gimp_window_set_transient (GTK_WINDOW (dlg));
g_signal_connect(dlg, "delete-event",
G_CALLBACK(close_callback), NULL);
g_signal_connect(dlg, "key-press-event",

10
plug-ins/imagemap/imap_menu.c
View File

@ -218,7 +218,7 @@ static const GtkActionEntry entries[] = {
{ "ZoomToMenu", NULL, "_Zoom To" },
{ "MappingMenu", NULL, "_Mapping" },
{ "EditMapInfo", IMAP_STOCK_MAP_INFO, "Edit Map Info...", NULL, NULL,
{ "EditMapInfo", GTK_STOCK_INFO, "Edit Map Info...", NULL, NULL,
do_settings_dialog},
{ "ToolsMenu", NULL, "_Tools" },
@ -425,11 +425,11 @@ make_menu(GtkWidget *main_vbox, GtkWidget *window)
gtk_action_group_add_toggle_actions (action_group, toggle_entries,
G_N_ELEMENTS (toggle_entries), window);
gtk_action_group_add_radio_actions (action_group, color_entries,
G_N_ELEMENTS (color_entries), 0,
gtk_action_group_add_radio_actions (action_group, color_entries,
G_N_ELEMENTS (color_entries), 0,
G_CALLBACK (set_preview_color), NULL);
gtk_action_group_add_radio_actions (action_group, zoom_entries,
G_N_ELEMENTS (zoom_entries), 0,
gtk_action_group_add_radio_actions (action_group, zoom_entries,
G_N_ELEMENTS (zoom_entries), 0,
G_CALLBACK (set_zoom_factor), NULL);
gtk_action_group_add_radio_actions (action_group, mapping_entries,
G_N_ELEMENTS (mapping_entries), 0,

5
plug-ins/imagemap/imap_stock.c
View File

@ -29,8 +29,6 @@
#include "images/imap-stock-pixbufs.h"
#include "libgimp/stdplugins-intl.h"
static GtkIconFactory *imap_icon_factory = NULL;
static GtkStockItem imap_stock_items[] =
@ -39,8 +37,6 @@ static GtkStockItem imap_stock_items[] =
{ IMAP_STOCK_COORD, NULL, 0, 0, NULL },
{ IMAP_STOCK_DIMENSION, NULL, 0, 0, NULL },
{ IMAP_STOCK_JAVA, NULL, 0, 0, NULL },
{ IMAP_STOCK_MAP_INFO,
N_("Edit Map Info..."), 0, 0, GETTEXT_PACKAGE "-std-plug-ins" },
{ IMAP_STOCK_POLYGON, NULL, 0, 0, NULL },
{ IMAP_STOCK_RECTANGLE, NULL, 0, 0, NULL },
{ IMAP_STOCK_TO_BACK, NULL, 0, 0, NULL },
@ -83,7 +79,6 @@ init_stock_icons (void)
add_stock_icon (IMAP_STOCK_COORD, stock_coord);
add_stock_icon (IMAP_STOCK_DIMENSION, stock_dimension);
add_stock_icon (IMAP_STOCK_JAVA, stock_java);
add_stock_icon (IMAP_STOCK_MAP_INFO, stock_map_info);
add_stock_icon (IMAP_STOCK_POLYGON, stock_polygon);
add_stock_icon (IMAP_STOCK_RECTANGLE, stock_rectangle);
add_stock_icon (IMAP_STOCK_TO_BACK, stock_to_back);

21
plug-ins/imagemap/imap_stock.h
View File

@ -24,17 +24,16 @@
#ifndef _IMAP_STOCK_H
#define _IMAP_STOCK_H
#define IMAP_STOCK_ARROW "imap-arrow"
#define IMAP_STOCK_CIRCLE "imap-circle"
#define IMAP_STOCK_COORD "imap-coord"
#define IMAP_STOCK_DIMENSION "imap-dimension"
#define IMAP_STOCK_JAVA "imap-java"
#define IMAP_STOCK_LINK "imap-link"
#define IMAP_STOCK_MAP_INFO "imap-map-info"
#define IMAP_STOCK_POLYGON "imap-polygon"
#define IMAP_STOCK_RECTANGLE "imap-rectangle"
#define IMAP_STOCK_TO_BACK "imap-to-back"
#define IMAP_STOCK_TO_FRONT "imap-to-front"
#define IMAP_STOCK_ARROW "imap-arrow"
#define IMAP_STOCK_CIRCLE "imap-circle"
#define IMAP_STOCK_COORD "imap-coord"
#define IMAP_STOCK_DIMENSION "imap-dimension"
#define IMAP_STOCK_JAVA "imap-java"
#define IMAP_STOCK_LINK "imap-link"
#define IMAP_STOCK_POLYGON "imap-polygon"
#define IMAP_STOCK_RECTANGLE "imap-rectangle"
#define IMAP_STOCK_TO_BACK "imap-to-back"
#define IMAP_STOCK_TO_FRONT "imap-to-front"
void init_stock_icons(void);