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

app/widgets/gimpchannellistview.c kindof fixed the channel dialog's 

2002-05-27  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpchannellistview.c
	* app/widgets/gimpcomponentlistitem.c: kindof fixed the channel
	dialog's component items. Had to disable keyboard navigation
	because GtkList is horribly broken with GTK_SELECTION_MULTIPLE.
	Left in lots of #if 0'ed stuff because this is not the final
	solution...
This commit is contained in:
Michael Natterer 2002-05-27 12:15:29 +00:00 committed by Michael Natterer
parent 9ba70e461f
commit c8a87aae03
4 changed files with 151 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-05-27 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpchannellistview.c
* app/widgets/gimpcomponentlistitem.c: kindof fixed the channel
dialog's component items. Had to disable keyboard navigation
because GtkList is horribly broken with GTK_SELECTION_MULTIPLE.
Left in lots of #if 0'ed stuff because this is not the final
solution...
2002-05-27 Sven Neumann <sven@gimp.org>
* app/core/gimpimagefile.c: "%lld" is not a portable format string,

47
app/widgets/gimpchannellistview.c
View File

@ -148,6 +148,13 @@ gimp_channel_list_view_init (GimpChannelListView *view)
/* don't show */
view->component_list = gtk_list_new ();
/* FIXME: disable keyboard navigation because as of gtk+-2.0.3,
* GtkList kb navogation with is h-o-r-r-i-b-l-y broken with
* GTK_SELECTION_MULTIPLE --mitch 05/27/2002
*/
GTK_WIDGET_UNSET_FLAGS (view->component_list, GTK_CAN_FOCUS);
gtk_list_set_selection_mode (GTK_LIST (view->component_list),
GTK_SELECTION_MULTIPLE);
gtk_container_add (GTK_CONTAINER (view->component_frame),
@ -155,11 +162,11 @@ gimp_channel_list_view_init (GimpChannelListView *view)
gtk_widget_show (view->component_list);
g_signal_connect (G_OBJECT (view->component_list), "select_child",
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
g_signal_connect (G_OBJECT (view->component_list), "unselect_child",
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
/* To Selection button */
@ -378,8 +385,16 @@ gimp_channel_list_view_create_components (GimpChannelListView *view)
list = g_list_append (list, list_item);
}
g_signal_handlers_block_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gtk_list_insert_items (GTK_LIST (view->component_list), list, 0);
g_signal_handlers_unblock_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gtk_widget_queue_resize (GTK_WIDGET (view->component_frame));
}
@ -419,18 +434,28 @@ gimp_channel_list_view_component_toggle (GtkList *list,
GimpChannelListView *view)
{
GimpComponentListItem *component_item;
GimpImage *gimage;
gboolean active;
component_item = GIMP_COMPONENT_LIST_ITEM (child);
gimage = GIMP_ITEM_LIST_VIEW (view)->gimage;
#if 0
g_print ("gimp_channel_list_view_component_toggle: channel: %d selected: %d\n",
component_item->channel, child->state == GTK_STATE_SELECTED);
#endif
active = gimp_image_get_component_active (gimage, component_item->channel);
g_signal_handlers_block_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gimp_channel_list_view_component_toggle,
view);
gimp_image_set_component_active (GIMP_ITEM_LIST_VIEW (view)->gimage,
component_item->channel,
child->state == GTK_STATE_SELECTED);
gimp_image_set_component_active (gimage,
component_item->channel,
! active);
g_signal_handlers_unblock_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gimp_channel_list_view_component_toggle,
view);
}

47
app/widgets/gimpchanneltreeview.c
View File

@ -148,6 +148,13 @@ gimp_channel_list_view_init (GimpChannelListView *view)
/* don't show */
view->component_list = gtk_list_new ();
/* FIXME: disable keyboard navigation because as of gtk+-2.0.3,
* GtkList kb navogation with is h-o-r-r-i-b-l-y broken with
* GTK_SELECTION_MULTIPLE --mitch 05/27/2002
*/
GTK_WIDGET_UNSET_FLAGS (view->component_list, GTK_CAN_FOCUS);
gtk_list_set_selection_mode (GTK_LIST (view->component_list),
GTK_SELECTION_MULTIPLE);
gtk_container_add (GTK_CONTAINER (view->component_frame),
@ -155,11 +162,11 @@ gimp_channel_list_view_init (GimpChannelListView *view)
gtk_widget_show (view->component_list);
g_signal_connect (G_OBJECT (view->component_list), "select_child",
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
g_signal_connect (G_OBJECT (view->component_list), "unselect_child",
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
G_CALLBACK (gimp_channel_list_view_component_toggle),
view);
/* To Selection button */
@ -378,8 +385,16 @@ gimp_channel_list_view_create_components (GimpChannelListView *view)
list = g_list_append (list, list_item);
}
g_signal_handlers_block_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gtk_list_insert_items (GTK_LIST (view->component_list), list, 0);
g_signal_handlers_unblock_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gtk_widget_queue_resize (GTK_WIDGET (view->component_frame));
}
@ -419,18 +434,28 @@ gimp_channel_list_view_component_toggle (GtkList *list,
GimpChannelListView *view)
{
GimpComponentListItem *component_item;
GimpImage *gimage;
gboolean active;
component_item = GIMP_COMPONENT_LIST_ITEM (child);
gimage = GIMP_ITEM_LIST_VIEW (view)->gimage;
#if 0
g_print ("gimp_channel_list_view_component_toggle: channel: %d selected: %d\n",
component_item->channel, child->state == GTK_STATE_SELECTED);
#endif
active = gimp_image_get_component_active (gimage, component_item->channel);
g_signal_handlers_block_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gimp_channel_list_view_component_toggle,
view);
gimp_image_set_component_active (GIMP_ITEM_LIST_VIEW (view)->gimage,
component_item->channel,
child->state == GTK_STATE_SELECTED);
gimp_image_set_component_active (gimage,
component_item->channel,
! active);
g_signal_handlers_unblock_by_func (G_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gimp_channel_list_view_component_toggle,
view);
}

79
app/widgets/gimpcomponentlistitem.c
View File

@ -46,6 +46,10 @@ static void gimp_component_list_item_set_viewable (GimpListItem *list_item
static void gimp_component_list_item_eye_toggled (GtkWidget *widget,
gpointer data);
#if 0
static void gimp_component_list_item_toggled (GtkWidget *widget,
gpointer data);
#endif
static void gimp_component_list_item_visibility_changed
(GimpImage *gimage,
@ -110,6 +114,12 @@ gimp_component_list_item_init (GimpComponentListItem *list_item)
GtkWidget *abox;
GtkWidget *image;
/* FIXME: disable keyboard navigation because as of gtk+-2.0.3,
* GtkList kb navogation with is h-o-r-r-i-b-l-y broken with
* GTK_SELECTION_MULTIPLE --mitch 05/27/2002
*/
GTK_WIDGET_UNSET_FLAGS (list_item, GTK_CAN_FOCUS);
list_item->channel = 0;
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
@ -169,15 +179,14 @@ gimp_component_list_item_set_viewable (GimpListItem *list_item,
gboolean active;
gint pixel;
component_item = GIMP_COMPONENT_LIST_ITEM (list_item);
if (GIMP_LIST_ITEM_CLASS (parent_class)->set_viewable)
GIMP_LIST_ITEM_CLASS (parent_class)->set_viewable (list_item, viewable);
component_item = GIMP_COMPONENT_LIST_ITEM (list_item);
gimage = GIMP_IMAGE (GIMP_PREVIEW (list_item->preview)->viewable);
visible = gimp_image_get_component_visible (gimage,
component_item->channel);
active = gimp_image_get_component_active (gimage,
component_item->channel);
gimage = GIMP_IMAGE (GIMP_PREVIEW (list_item->preview)->viewable);
visible = gimp_image_get_component_visible (gimage, component_item->channel);
active = gimp_image_get_component_active (gimage, component_item->channel);
switch (component_item->channel)
{
@ -217,15 +226,27 @@ gimp_component_list_item_set_viewable (GimpListItem *list_item,
G_CALLBACK (gimp_component_list_item_eye_toggled),
list_item);
g_signal_connect_object (G_OBJECT (viewable), "component_visibility_changed",
g_signal_connect_object (G_OBJECT (gimage), "component_visibility_changed",
G_CALLBACK (gimp_component_list_item_visibility_changed),
G_OBJECT (list_item),
0);
g_signal_connect_object (G_OBJECT (viewable), "component_active_changed",
g_signal_connect_object (G_OBJECT (gimage), "component_active_changed",
G_CALLBACK (gimp_component_list_item_active_changed),
G_OBJECT (list_item),
0);
#if 0
g_signal_connect_after (G_OBJECT (list_item), "select",
G_CALLBACK (gimp_component_list_item_toggled),
NULL);
g_signal_connect_after (G_OBJECT (list_item), "deselect",
G_CALLBACK (gimp_component_list_item_toggled),
NULL);
g_signal_connect_after (G_OBJECT (list_item), "toggle",
G_CALLBACK (gimp_component_list_item_toggled),
NULL);
#endif
}
static void
@ -273,6 +294,41 @@ gimp_component_list_item_eye_toggled (GtkWidget *widget,
}
}
#if 0
static void
gimp_component_list_item_toggled (GtkWidget *widget,
gpointer data)
{
GimpComponentListItem *component_item;
GimpListItem *list_item;
GimpImage *gimage;
gboolean active;
component_item = GIMP_COMPONENT_LIST_ITEM (widget);
list_item = GIMP_LIST_ITEM (widget);
gimage = GIMP_IMAGE (GIMP_PREVIEW (list_item->preview)->viewable);
active = (widget->state == GTK_STATE_SELECTED);
if (active != gimp_image_get_component_active (gimage,
component_item->channel))
{
g_signal_handlers_block_by_func (G_OBJECT (gimage),
gimp_component_list_item_active_changed,
list_item);
gimp_image_set_component_active (gimage, component_item->channel,
active);
g_signal_handlers_unblock_by_func (G_OBJECT (gimage),
gimp_component_list_item_active_changed,
list_item);
gimp_image_flush (gimage);
}
}
#endif
static void
gimp_component_list_item_visibility_changed (GimpImage *gimage,
GimpChannelType channel,
@ -335,6 +391,11 @@ gimp_component_list_item_active_changed (GimpImage *gimage,
active = gimp_image_get_component_active (gimage, component_item->channel);
#if 0
g_print ("gimp_component_list_item_active_changed: channel: %d active: %d\n",
channel, active);
#endif
if (active)
gtk_item_select (GTK_ITEM (data));
else
@ -361,7 +422,7 @@ gimp_component_list_item_get_name (GtkWidget *widget,
case GIMP_INDEXED_CHANNEL: return g_strdup (_("Indexed")); break;
case GIMP_ALPHA_CHANNEL: return g_strdup (_("Alpha")); break;
default:
default:
return g_strdup (_("EEEEK"));
}
}