diff --git a/ChangeLog b/ChangeLog index e7ded6c2f6..adda969df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2004-07-17 Sven Neumann + + * app/actions/file-actions.c (file_actions): use GIMP_STOCK_WEB + for "file-open-location". + + * app/widgets/gimpfiledialog.c: create the scrolled window with + shadow_type GTK_SHADOW_IN. + + * app/widgets/gimpfileprocview.c (gimp_file_proc_view_new): skip + procedures that register a prefix (the URL loader). + + * app/widgets/gimphelp-ids.h: removed help IDs that used to be + used from the file-open and file-save menus. + + * plug-ins/common/xwd.c (query): "X window dump" seems to be more + appropriate than "X window image". + 2004-07-17 Sven Neumann * app/actions/Makefile.am diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c index 12dda25bf6..b2255ae247 100644 --- a/app/actions/file-actions.c +++ b/app/actions/file-actions.c @@ -76,7 +76,7 @@ static GimpActionEntry file_actions[] = G_CALLBACK (file_open_from_image_cmd_callback), GIMP_HELP_FILE_OPEN }, - { "file-open-location", NULL, + { "file-open-location", GIMP_STOCK_WEB, N_("_Open Location..."), NULL, NULL, G_CALLBACK (file_open_location_cmd_callback), GIMP_HELP_FILE_OPEN_LOCATION }, diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c index 8bf9d918bb..af6058648d 100644 --- a/app/widgets/gimpfiledialog.c +++ b/app/widgets/gimpfiledialog.c @@ -348,23 +348,25 @@ gimp_file_dialog_add_proc_selection (GimpFileDialog *dialog, GSList *file_procs, const gchar *automatic) { - GtkWidget *scrolled; + GtkWidget *scrolled_window; dialog->proc_expander = gtk_expander_new_with_mnemonic (NULL); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), dialog->proc_expander); gtk_widget_show (dialog->proc_expander); - scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (dialog->proc_expander), scrolled); - gtk_widget_show (scrolled); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (dialog->proc_expander), scrolled_window); + gtk_widget_show (scrolled_window); - gtk_widget_set_size_request (scrolled, -1, 200); + gtk_widget_set_size_request (scrolled_window, -1, 200); dialog->proc_view = gimp_file_proc_view_new (gimp, file_procs, automatic); - gtk_container_add (GTK_CONTAINER (scrolled), dialog->proc_view); + gtk_container_add (GTK_CONTAINER (scrolled_window), dialog->proc_view); gtk_widget_show (dialog->proc_view); g_signal_connect (dialog->proc_view, "changed", diff --git a/app/widgets/gimpfileprocview.c b/app/widgets/gimpfileprocview.c index 168978ba31..c7f3a7a5d5 100644 --- a/app/widgets/gimpfileprocview.c +++ b/app/widgets/gimpfileprocview.c @@ -131,29 +131,33 @@ gimp_file_proc_view_new (Gimp *gimp, for (list = procedures; list; list = g_slist_next (list)) { - PlugInProcDef *proc = list->data; - const gchar *domain = plug_ins_locale_domain (gimp, - proc->prog, NULL); - gchar *label = plug_in_proc_def_get_label (proc, domain); - const gchar *stock_id = plug_in_proc_def_get_stock_id (proc); - GdkPixbuf *pixbuf = plug_in_proc_def_get_pixbuf (proc); + PlugInProcDef *proc = list->data; - if (label) + if (! proc->prefixes_list) /* skip URL loaders */ { - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COLUMN_PROC, proc, - COLUMN_LABEL, label, - COLUMN_EXTENSIONS, proc->extensions, - COLUMN_STOCK_ID, stock_id, - COLUMN_PIXBUF, pixbuf, - -1); + const gchar *domain = plug_ins_locale_domain (gimp, + proc->prog, NULL); + gchar *label = plug_in_proc_def_get_label (proc, domain); + const gchar *stock_id = plug_in_proc_def_get_stock_id (proc); + GdkPixbuf *pixbuf = plug_in_proc_def_get_pixbuf (proc); - g_free (label); + if (label) + { + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + COLUMN_PROC, proc, + COLUMN_LABEL, label, + COLUMN_EXTENSIONS, proc->extensions, + COLUMN_STOCK_ID, stock_id, + COLUMN_PIXBUF, pixbuf, + -1); + + g_free (label); + } + + if (pixbuf) + g_object_unref (pixbuf); } - - if (pixbuf) - g_object_unref (pixbuf); } if (automatic) diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index aaff007a6b..d32e1f8c43 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -29,15 +29,11 @@ #define GIMP_HELP_FILE_NEW_CONFIRM "gimp-file-new-confirm" #define GIMP_HELP_FILE_OPEN "gimp-file-open" #define GIMP_HELP_FILE_OPEN_LOCATION "gimp-file-open-location" -#define GIMP_HELP_FILE_OPEN_BY_EXTENSION "gimp-file-open-by-extension" -#define GIMP_HELP_FILE_OPEN_XCF "gimp-file-open-xcf" #define GIMP_HELP_FILE_OPEN_RECENT "gimp-file-open-recent" #define GIMP_HELP_FILE_SAVE "gimp-file-save" #define GIMP_HELP_FILE_SAVE_AS "gimp-file-save-as" #define GIMP_HELP_FILE_SAVE_A_COPY "gimp-file-save-a-copy" #define GIMP_HELP_FILE_SAVE_AS_TEMPLATE "gimp-file-save-as-template" -#define GIMP_HELP_FILE_SAVE_BY_EXTENSION "gimp-file-save-by-extension" -#define GIMP_HELP_FILE_SAVE_XCF "gimp-file-save-xcf" #define GIMP_HELP_FILE_SAVE_OVERWRITE "gimp-file-save-overwrite" #define GIMP_HELP_FILE_REVERT "gimp-file-revert" #define GIMP_HELP_FILE_CLOSE "gimp-file-close" diff --git a/plug-ins/common/xwd.c b/plug-ins/common/xwd.c index 5af22a342c..03d464a143 100644 --- a/plug-ins/common/xwd.c +++ b/plug-ins/common/xwd.c @@ -238,7 +238,7 @@ query (void) "Peter Kirchgessner", "Peter Kirchgessner", "1996", - N_("X window image"), + N_("X window dump"), NULL, GIMP_PLUGIN, G_N_ELEMENTS (load_args), @@ -259,7 +259,7 @@ those with alpha channels.", "Peter Kirchgessner", "Peter Kirchgessner", "1996", - N_("X window image"), + N_("X window dump"), "RGB, GRAY, INDEXED", GIMP_PLUGIN, G_N_ELEMENTS (save_args), 0,