From eaedd11a3a03b01d14d2ded0eec579b2fccfa30f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 3 Jan 2007 10:15:59 +0000 Subject: [PATCH] plug-ins/imagemap/images/Makefile.am 2007-01-03 Sven Neumann * 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 --- ChangeLog | 12 +++++++++++ plug-ins/imagemap/images/Makefile.am | 1 - plug-ins/imagemap/images/stock-map-info.png | Bin 374 -> 0 bytes plug-ins/imagemap/imap_default_dialog.c | 4 +--- plug-ins/imagemap/imap_main.c | 3 +++ plug-ins/imagemap/imap_menu.c | 10 +++++----- plug-ins/imagemap/imap_stock.c | 5 ----- plug-ins/imagemap/imap_stock.h | 21 ++++++++++---------- 8 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 plug-ins/imagemap/images/stock-map-info.png diff --git a/ChangeLog b/ChangeLog index 0fc933f79f..3a8909a4cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-01-03 Sven Neumann + + * 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 * plug-ins/common/lcms.c (run): Fix mixup in retrieving the diff --git a/plug-ins/imagemap/images/Makefile.am b/plug-ins/imagemap/images/Makefile.am index 4c106661c9..9cf0b285af 100644 --- a/plug-ins/imagemap/images/Makefile.am +++ b/plug-ins/imagemap/images/Makefile.am @@ -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 \ diff --git a/plug-ins/imagemap/images/stock-map-info.png b/plug-ins/imagemap/images/stock-map-info.png deleted file mode 100644 index e9182956d5db7ef3245dbd2b00420ebd3eb1cd2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmV-+0g3*JP)(pa9C9cO z0u+Xl5guSmwz?L{yydD zwA;<+pFtY3-j>V7!nOg9N6(wh0CZi`6y@0pA-s;oib@0I6~{@EWdN*#2q9GT%|WDF z(C>G$<7}?DvPm{a$|lwKWJeMIEw)uIo6%A%JDkIEs=aO+N$VCESAR^>zzG zo`^Ze*!ROw^frkZSgq*rF=0%>Y6r+q`Q_sKLBQAA0S1F!&op_=TG480nyQKe2oK?8 zG9Gt2Jhm(f!~ocg)CLemah#?+#+a6Vv)OLXXYmTu_7s;X{|@}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); diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c index 6a1b33225d..301191d3b9 100644 --- a/plug-ins/imagemap/imap_main.c +++ b/plug-ins/imagemap/imap_main.c @@ -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", diff --git a/plug-ins/imagemap/imap_menu.c b/plug-ins/imagemap/imap_menu.c index 4d7d055d44..3f97b286e5 100644 --- a/plug-ins/imagemap/imap_menu.c +++ b/plug-ins/imagemap/imap_menu.c @@ -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, diff --git a/plug-ins/imagemap/imap_stock.c b/plug-ins/imagemap/imap_stock.c index da9b0ae764..17e5080c61 100644 --- a/plug-ins/imagemap/imap_stock.c +++ b/plug-ins/imagemap/imap_stock.c @@ -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); diff --git a/plug-ins/imagemap/imap_stock.h b/plug-ins/imagemap/imap_stock.h index b796b0b161..afae0710a0 100644 --- a/plug-ins/imagemap/imap_stock.h +++ b/plug-ins/imagemap/imap_stock.h @@ -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);