dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

need to set docked_iface->get_preview to NULL explicitly now that the 

2003-10-18  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpitemtreeview.c
	(gimp_item_tree_view_docked_iface_init): need to set
	docked_iface->get_preview to NULL explicitly now that the
	interface vtable inheriting is fixed (the layers, channels and
	paths dialogs can't show preview tabs because they don't always
	have a container).

	* app/widgets/gimpimagedock.c (gimp_image_dock_get_aux_info):
	fixed typo: s/auctive/active/. Added #defines for the magic
	aux-info identifiers to avoid bugs like that.

	* app/widgets/gimpcoloreditor.c
	* app/widgets/gimpdataeditor.c
	* app/widgets/gimppaletteeditor.c. addef #defines for aux-info
	identifiers here, too.
This commit is contained in:
Michael Natterer 2003-10-18 17:10:36 +00:00 committed by Michael Natterer
parent f68d05c9ce
commit 2e9f3fb92c
7 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2003-10-18 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpitemtreeview.c
(gimp_item_tree_view_docked_iface_init): need to set
docked_iface->get_preview to NULL explicitly now that the
interface vtable inheriting is fixed (the layers, channels and
paths dialogs can't show preview tabs because they don't always
have a container).
* app/widgets/gimpimagedock.c (gimp_image_dock_get_aux_info):
fixed typo: s/auctive/active/. Added #defines for the magic
aux-info identifiers to avoid bugs like that.
* app/widgets/gimpcoloreditor.c
* app/widgets/gimpdataeditor.c
* app/widgets/gimppaletteeditor.c. addef #defines for aux-info
identifiers here, too.
2003-10-18 Sven Neumann <sven@gimp.org>
* app/gui/templates-commands.[ch] (templates_new_template_dialog):

6
app/widgets/gimpcoloreditor.c
View File

@ -302,6 +302,8 @@ gimp_color_editor_docked_iface_init (GimpDockedInterface *docked_iface)
docked_iface->set_context = gimp_color_editor_set_docked_context;
}
#define AUX_INFO_CURRENT_PAGE "current-page"
static void
gimp_color_editor_set_aux_info (GimpDocked *docked,
GList *aux_info)
@ -314,7 +316,7 @@ gimp_color_editor_set_aux_info (GimpDocked *docked,
{
GimpSessionInfoAux *aux = list->data;
if (! strcmp (aux->name, "current-page"))
if (! strcmp (aux->name, AUX_INFO_CURRENT_PAGE))
{
GList *children;
GList *child;
@ -353,7 +355,7 @@ gimp_color_editor_get_aux_info (GimpDocked *docked)
{
GimpSessionInfoAux *aux;
aux = gimp_session_info_aux_new ("current-page",
aux = gimp_session_info_aux_new (AUX_INFO_CURRENT_PAGE,
G_OBJECT_TYPE_NAME (notebook->cur_page));
aux_info = g_list_append (aux_info, aux);
}

6
app/widgets/gimpdataeditor.c
View File

@ -169,6 +169,8 @@ gimp_data_editor_docked_iface_init (GimpDockedInterface *docked_iface)
docked_iface->get_aux_info = gimp_data_editor_get_aux_info;
}
#define AUX_INFO_CURRENT_DATA "current-data"
static void
gimp_data_editor_set_aux_info (GimpDocked *docked,
GList *aux_info)
@ -180,7 +182,7 @@ gimp_data_editor_set_aux_info (GimpDocked *docked,
{
GimpSessionInfoAux *aux = list->data;
if (! strcmp (aux->name, "current-data"))
if (! strcmp (aux->name, AUX_INFO_CURRENT_DATA))
{
GimpData *data;
@ -207,7 +209,7 @@ gimp_data_editor_get_aux_info (GimpDocked *docked)
value = gimp_object_get_name (GIMP_OBJECT (editor->data));
aux = gimp_session_info_aux_new ("current-data", value);
aux = gimp_session_info_aux_new (AUX_INFO_CURRENT_DATA, value);
aux_info = g_list_append (aux_info, aux);
}

11
app/widgets/gimpimagedock.c
View File

@ -291,6 +291,9 @@ gimp_image_dock_setup (GimpDock *dock,
}
}
#define AUX_INFO_SHOW_IMAGE_MENU "show-image-menu"
#define AUX_INFO_FOLLOW_ACTIVE_IMAGE "follow-active-image"
static void
gimp_image_dock_set_aux_info (GimpDock *dock,
GList *aux_info)
@ -304,11 +307,11 @@ gimp_image_dock_set_aux_info (GimpDock *dock,
{
GimpSessionInfoAux *aux = list->data;
if (! strcmp (aux->name, "show-image-menu"))
if (! strcmp (aux->name, AUX_INFO_SHOW_IMAGE_MENU))
{
menu_shown = ! g_ascii_strcasecmp (aux->value, "true");
}
else if (! strcmp (aux->name, "follow-active-image"))
else if (! strcmp (aux->name, AUX_INFO_FOLLOW_ACTIVE_IMAGE))
{
auto_follow = ! g_ascii_strcasecmp (aux->value, "true");
}
@ -328,12 +331,12 @@ gimp_image_dock_get_aux_info (GimpDock *dock)
GList *aux_info = NULL;
GimpSessionInfoAux *aux;
aux = gimp_session_info_aux_new ("show-image-menu",
aux = gimp_session_info_aux_new (AUX_INFO_SHOW_IMAGE_MENU,
image_dock->show_image_menu ?
"true" : "false");
aux_info = g_list_append (aux_info, aux);
aux = gimp_session_info_aux_new ("follow-auctive-image",
aux = gimp_session_info_aux_new (AUX_INFO_FOLLOW_ACTIVE_IMAGE,
image_dock->auto_follow_active ?
"true" : "false");
aux_info = g_list_append (aux_info, aux);

1
app/widgets/gimpitemtreeview.c
View File

@ -367,6 +367,7 @@ gimp_item_tree_view_init (GimpItemTreeView *view,
static void
gimp_item_tree_view_docked_iface_init (GimpDockedInterface *docked_iface)
{
docked_iface->get_preview = NULL;
docked_iface->set_context = gimp_item_tree_view_set_docked_context;
}

11
app/widgets/gimpmenudock.c
View File

@ -291,6 +291,9 @@ gimp_image_dock_setup (GimpDock *dock,
}
}
#define AUX_INFO_SHOW_IMAGE_MENU "show-image-menu"
#define AUX_INFO_FOLLOW_ACTIVE_IMAGE "follow-active-image"
static void
gimp_image_dock_set_aux_info (GimpDock *dock,
GList *aux_info)
@ -304,11 +307,11 @@ gimp_image_dock_set_aux_info (GimpDock *dock,
{
GimpSessionInfoAux *aux = list->data;
if (! strcmp (aux->name, "show-image-menu"))
if (! strcmp (aux->name, AUX_INFO_SHOW_IMAGE_MENU))
{
menu_shown = ! g_ascii_strcasecmp (aux->value, "true");
}
else if (! strcmp (aux->name, "follow-active-image"))
else if (! strcmp (aux->name, AUX_INFO_FOLLOW_ACTIVE_IMAGE))
{
auto_follow = ! g_ascii_strcasecmp (aux->value, "true");
}
@ -328,12 +331,12 @@ gimp_image_dock_get_aux_info (GimpDock *dock)
GList *aux_info = NULL;
GimpSessionInfoAux *aux;
aux = gimp_session_info_aux_new ("show-image-menu",
aux = gimp_session_info_aux_new (AUX_INFO_SHOW_IMAGE_MENU,
image_dock->show_image_menu ?
"true" : "false");
aux_info = g_list_append (aux_info, aux);
aux = gimp_session_info_aux_new ("follow-auctive-image",
aux = gimp_session_info_aux_new (AUX_INFO_FOLLOW_ACTIVE_IMAGE,
image_dock->auto_follow_active ?
"true" : "false");
aux_info = g_list_append (aux_info, aux);

6
app/widgets/gimppaletteeditor.c
View File

@ -376,6 +376,8 @@ gimp_palette_editor_docked_iface_init (GimpDockedInterface *docked_iface)
docked_iface->get_aux_info = gimp_palette_editor_get_aux_info;
}
#define AUX_INFO_ZOOM_FACTOR "zoom-factor"
static void
gimp_palette_editor_set_aux_info (GimpDocked *docked,
GList *aux_info)
@ -390,7 +392,7 @@ gimp_palette_editor_set_aux_info (GimpDocked *docked,
{
GimpSessionInfoAux *aux = list->data;
if (! strcmp (aux->name, "zoom-factor"))
if (! strcmp (aux->name, AUX_INFO_ZOOM_FACTOR))
{
gdouble zoom_factor;
@ -417,7 +419,7 @@ gimp_palette_editor_get_aux_info (GimpDocked *docked)
g_ascii_formatd (value, sizeof (value), "%.2f", editor->zoom_factor);
aux = gimp_session_info_aux_new ("zoom-factor", value);
aux = gimp_session_info_aux_new (AUX_INFO_ZOOM_FACTOR, value);
aux_info = g_list_append (aux_info, aux);
}