also destroy the <Image> factory's "Tools" submenu because menu shortcuts

2004-02-02  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpimagedock.c (gimp_image_dock_constructor):
	also destroy the <Image> factory's "Tools" submenu because menu
	shortcuts with no or <shift> modifier prevent this key to be
	entered in text entries. This really badly baldy cries for
	GTK+ 2.4's GtkActions...
This commit is contained in:
Michael Natterer 2004-02-02 12:27:18 +00:00 committed by Michael Natterer
parent 437324eebf
commit 528bb75cf0
3 changed files with 48 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2004-02-02 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpimagedock.c (gimp_image_dock_constructor):
also destroy the <Image> factory's "Tools" submenu because menu
shortcuts with no or <shift> modifier prevent this key to be
entered in text entries. This really badly baldy cries for
GTK+ 2.4's GtkActions...
2004-02-01 Michael Natterer <mitch@gimp.org>
* app/config/gimpconfig-path.c (gimp_config_path_expand_only):

View file

@ -2,7 +2,7 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpimagedock.c
* Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
* Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -25,6 +25,7 @@
#include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
@ -33,6 +34,7 @@
#include "core/gimpcontext.h"
#include "core/gimpimage.h"
#include "core/gimplist.h"
#include "core/gimptoolinfo.h"
#include "gimpdialogfactory.h"
#include "gimpimagedock.h"
@ -223,6 +225,7 @@ gimp_image_dock_constructor (GType type,
GimpImageDock *dock;
GimpMenuFactory *menu_factory;
GtkItemFactory *item_factory;
GList *list;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
@ -274,6 +277,22 @@ gimp_image_dock_constructor (GType type,
DESTROY ("/Layer/Stack/Layer to Top");
DESTROY ("/Layer/Stack/Layer to Bottom");
DESTROY ("/Tools/Toolbox");
DESTROY ("/Tools/Default Colors");
DESTROY ("/Tools/Swap Colors");
for (list = GIMP_LIST (GIMP_DOCK (dock)->context->gimp->tool_info_list)->list;
list;
list = g_list_next (list))
{
GimpToolInfo *tool_info = list->data;
gchar *menu_path;
menu_path = gimp_strip_uline (tool_info->menu_path);
DESTROY (menu_path);
g_free (menu_path);
}
#undef DESTROY
gtk_window_add_accel_group (GTK_WINDOW (object),

View file

@ -2,7 +2,7 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpimagedock.c
* Copyright (C) 2001 Michael Natterer <mitch@gimp.org>
* Copyright (C) 2001-2004 Michael Natterer <mitch@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -25,6 +25,7 @@
#include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
@ -33,6 +34,7 @@
#include "core/gimpcontext.h"
#include "core/gimpimage.h"
#include "core/gimplist.h"
#include "core/gimptoolinfo.h"
#include "gimpdialogfactory.h"
#include "gimpimagedock.h"
@ -223,6 +225,7 @@ gimp_image_dock_constructor (GType type,
GimpImageDock *dock;
GimpMenuFactory *menu_factory;
GtkItemFactory *item_factory;
GList *list;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
@ -274,6 +277,22 @@ gimp_image_dock_constructor (GType type,
DESTROY ("/Layer/Stack/Layer to Top");
DESTROY ("/Layer/Stack/Layer to Bottom");
DESTROY ("/Tools/Toolbox");
DESTROY ("/Tools/Default Colors");
DESTROY ("/Tools/Swap Colors");
for (list = GIMP_LIST (GIMP_DOCK (dock)->context->gimp->tool_info_list)->list;
list;
list = g_list_next (list))
{
GimpToolInfo *tool_info = list->data;
gchar *menu_path;
menu_path = gimp_strip_uline (tool_info->menu_path);
DESTROY (menu_path);
g_free (menu_path);
}
#undef DESTROY
gtk_window_add_accel_group (GTK_WINDOW (object),