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

autoscroll in the layers dialog, a few cosmetic changes 

and a german plug-in po-file


--Sven
This commit is contained in:
Sven Neumann 1999-10-24 20:16:48 +00:00
parent 2df06061bd
commit eb26d8e07e
10 changed files with 2187 additions and 1785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Oct 24 22:10:16 MEST 1999 Sven Neumann <sven@gimp.org>
* app/channels_dialog.c
* app/layers_dialog.c
* app/lc_dialogP.h
* app/paths_dialog.c: some cosmetic changes. The layers dialog now
automatically scrolls to keep the active layer in view. This is
disabled in the channels dialog until I figure out why it doesn't
work there.
Sun Oct 24 15:24:15 MEST 1999 Sven Neumann <sven@gimp.org> Sun Oct 24 15:24:15 MEST 1999 Sven Neumann <sven@gimp.org>
* libgimp/gimpexport.c: get rid of remaining (invisible) layers * libgimp/gimpexport.c: get rid of remaining (invisible) layers

77
app/channels_dialog.c
View File

@ -50,19 +50,6 @@
#include "channel_pvt.h" #include "channel_pvt.h"
#define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK
#define BUTTON_EVENT_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK | \
GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK
#define CHANNEL_LIST_WIDTH 200
#define CHANNEL_LIST_HEIGHT 150
#define NORMAL 0
#define SELECTED 1
#define INSENSITIVE 2
#define COMPONENT_BASE_ID 0x10000000 #define COMPONENT_BASE_ID 0x10000000
typedef struct _ChannelsDialog ChannelsDialog; typedef struct _ChannelsDialog ChannelsDialog;
@ -71,6 +58,7 @@ struct _ChannelsDialog
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *channel_list; GtkWidget *channel_list;
GtkWidget *scrolled_win;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *ops_menu; GtkWidget *ops_menu;
GtkAccelGroup *accel_group; GtkAccelGroup *accel_group;
@ -113,6 +101,7 @@ struct _ChannelWidget
/* channels dialog widget routines */ /* channels dialog widget routines */
static void channels_dialog_preview_extents (void); static void channels_dialog_preview_extents (void);
static void channels_dialog_set_menu_sensitivity (void); static void channels_dialog_set_menu_sensitivity (void);
static void channels_dialog_scroll_index (gint index);
static void channels_dialog_set_channel (ChannelWidget *); static void channels_dialog_set_channel (ChannelWidget *);
static void channels_dialog_unset_channel (ChannelWidget *); static void channels_dialog_unset_channel (ChannelWidget *);
static void channels_dialog_position_channel (Channel *, gint); static void channels_dialog_position_channel (Channel *, gint);
@ -248,7 +237,6 @@ GtkWidget *
channels_dialog_create () channels_dialog_create ()
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *listbox;
GtkWidget *button_box; GtkWidget *button_box;
if (channelsD) if (channelsD)
@ -272,18 +260,18 @@ channels_dialog_create ()
channelsD->vbox = vbox = gtk_vbox_new (FALSE, 1); channelsD->vbox = vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
/* The layers commands pulldown menu */ /* The channels commands pulldown menu */
menus_get_channels_menu (&channelsD->ops_menu, &channelsD->accel_group); menus_get_channels_menu (&channelsD->ops_menu, &channelsD->accel_group);
/* The channels listbox */ /* The channels listbox */
listbox = gtk_scrolled_window_new (NULL, NULL); channelsD->scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (channelsD->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_set_usize (listbox, CHANNEL_LIST_WIDTH, CHANNEL_LIST_HEIGHT); gtk_widget_set_usize (channelsD->scrolled_win, LIST_WIDTH, LIST_HEIGHT);
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), channelsD->scrolled_win, TRUE, TRUE, 2);
channelsD->channel_list = gtk_list_new (); channelsD->channel_list = gtk_list_new ();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (channelsD->scrolled_win),
channelsD->channel_list); channelsD->channel_list);
gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list), gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list),
GTK_SELECTION_MULTIPLE); GTK_SELECTION_MULTIPLE);
@ -291,12 +279,12 @@ channels_dialog_create ()
(GtkSignalFunc) channel_list_events, (GtkSignalFunc) channel_list_events,
channelsD); channelsD);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list), gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox))); gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (channelsD->scrolled_win)));
GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (channelsD->scrolled_win)->vscrollbar,
GTK_CAN_FOCUS); GTK_CAN_FOCUS);
gtk_widget_show (channelsD->channel_list); gtk_widget_show (channelsD->channel_list);
gtk_widget_show (listbox); gtk_widget_show (channelsD->scrolled_win);
/* The ops buttons */ /* The ops buttons */
button_box = ops_button_box_new (lc_dialog->shell, tool_tips, button_box = ops_button_box_new (lc_dialog->shell, tool_tips,
@ -650,6 +638,27 @@ channels_dialog_set_menu_sensitivity ()
#undef SET_SENSITIVE #undef SET_SENSITIVE
} }
static void
channels_dialog_scroll_index (gint index)
{
GtkAdjustment *adj;
gint item_height;
item_height = 6 + (preview_size ? preview_size : channel_height);
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (channelsD->scrolled_win));
if (index * item_height < adj->value)
{
adj->value = index * item_height;
gtk_adjustment_value_changed (adj);
}
else if ((index + 1) * item_height > adj->value + adj->page_size)
{
adj->value = (index + 1) * item_height - adj->page_size;
gtk_adjustment_value_changed (adj);
}
}
static void static void
channels_dialog_set_channel (ChannelWidget *channel_widget) channels_dialog_set_channel (ChannelWidget *channel_widget)
{ {
@ -678,6 +687,7 @@ channels_dialog_set_channel (ChannelWidget *channel_widget)
index + channelsD->num_components); index + channelsD->num_components);
gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item), gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item),
channel_widget); channel_widget);
/* channels_dialog_scroll_index (index + channelsD->num_components); */
} }
} }
else else
@ -705,6 +715,7 @@ channels_dialog_set_channel (ChannelWidget *channel_widget)
gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item), gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item),
channel_widget); channel_widget);
/* channels_dialog_scroll_index (0); */
} }
} }
suspend_gimage_notify--; suspend_gimage_notify--;
@ -802,6 +813,10 @@ channels_dialog_position_channel (Channel *channel,
g_slist_insert (channelsD->channel_widgets, channel_widget, g_slist_insert (channelsD->channel_widgets, channel_widget,
new_index + channelsD->num_components); new_index + channelsD->num_components);
/* channels_dialog_scroll_index (new_index > 0 ? */
/* new_index + channelsD->num_components + 1 : */
/* channelsD->num_components); */
suspend_gimage_notify--; suspend_gimage_notify--;
} }
@ -855,7 +870,6 @@ channel_list_events (GtkWidget *widget,
GdkEvent *event) GdkEvent *event)
{ {
ChannelWidget *channel_widget; ChannelWidget *channel_widget;
GdkEventKey *kevent;
GdkEventButton *bevent; GdkEventButton *bevent;
GtkWidget *event_widget; GtkWidget *event_widget;
@ -884,21 +898,6 @@ channel_list_events (GtkWidget *widget,
} }
break; break;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Up:
/* g_print ("up arrow\n"); */
break;
case GDK_Down:
/* g_print ("down arrow\n"); */
break;
default:
return FALSE;
}
return FALSE;
default: default:
break; break;
} }

77
app/gui/channels-dialog.c
View File

@ -50,19 +50,6 @@
#include "channel_pvt.h" #include "channel_pvt.h"
#define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK
#define BUTTON_EVENT_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK | \
GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK
#define CHANNEL_LIST_WIDTH 200
#define CHANNEL_LIST_HEIGHT 150
#define NORMAL 0
#define SELECTED 1
#define INSENSITIVE 2
#define COMPONENT_BASE_ID 0x10000000 #define COMPONENT_BASE_ID 0x10000000
typedef struct _ChannelsDialog ChannelsDialog; typedef struct _ChannelsDialog ChannelsDialog;
@ -71,6 +58,7 @@ struct _ChannelsDialog
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *channel_list; GtkWidget *channel_list;
GtkWidget *scrolled_win;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *ops_menu; GtkWidget *ops_menu;
GtkAccelGroup *accel_group; GtkAccelGroup *accel_group;
@ -113,6 +101,7 @@ struct _ChannelWidget
/* channels dialog widget routines */ /* channels dialog widget routines */
static void channels_dialog_preview_extents (void); static void channels_dialog_preview_extents (void);
static void channels_dialog_set_menu_sensitivity (void); static void channels_dialog_set_menu_sensitivity (void);
static void channels_dialog_scroll_index (gint index);
static void channels_dialog_set_channel (ChannelWidget *); static void channels_dialog_set_channel (ChannelWidget *);
static void channels_dialog_unset_channel (ChannelWidget *); static void channels_dialog_unset_channel (ChannelWidget *);
static void channels_dialog_position_channel (Channel *, gint); static void channels_dialog_position_channel (Channel *, gint);
@ -248,7 +237,6 @@ GtkWidget *
channels_dialog_create () channels_dialog_create ()
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *listbox;
GtkWidget *button_box; GtkWidget *button_box;
if (channelsD) if (channelsD)
@ -272,18 +260,18 @@ channels_dialog_create ()
channelsD->vbox = vbox = gtk_vbox_new (FALSE, 1); channelsD->vbox = vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
/* The layers commands pulldown menu */ /* The channels commands pulldown menu */
menus_get_channels_menu (&channelsD->ops_menu, &channelsD->accel_group); menus_get_channels_menu (&channelsD->ops_menu, &channelsD->accel_group);
/* The channels listbox */ /* The channels listbox */
listbox = gtk_scrolled_window_new (NULL, NULL); channelsD->scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (channelsD->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_set_usize (listbox, CHANNEL_LIST_WIDTH, CHANNEL_LIST_HEIGHT); gtk_widget_set_usize (channelsD->scrolled_win, LIST_WIDTH, LIST_HEIGHT);
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), channelsD->scrolled_win, TRUE, TRUE, 2);
channelsD->channel_list = gtk_list_new (); channelsD->channel_list = gtk_list_new ();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (channelsD->scrolled_win),
channelsD->channel_list); channelsD->channel_list);
gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list), gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list),
GTK_SELECTION_MULTIPLE); GTK_SELECTION_MULTIPLE);
@ -291,12 +279,12 @@ channels_dialog_create ()
(GtkSignalFunc) channel_list_events, (GtkSignalFunc) channel_list_events,
channelsD); channelsD);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list), gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox))); gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (channelsD->scrolled_win)));
GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (channelsD->scrolled_win)->vscrollbar,
GTK_CAN_FOCUS); GTK_CAN_FOCUS);
gtk_widget_show (channelsD->channel_list); gtk_widget_show (channelsD->channel_list);
gtk_widget_show (listbox); gtk_widget_show (channelsD->scrolled_win);
/* The ops buttons */ /* The ops buttons */
button_box = ops_button_box_new (lc_dialog->shell, tool_tips, button_box = ops_button_box_new (lc_dialog->shell, tool_tips,
@ -650,6 +638,27 @@ channels_dialog_set_menu_sensitivity ()
#undef SET_SENSITIVE #undef SET_SENSITIVE
} }
static void
channels_dialog_scroll_index (gint index)
{
GtkAdjustment *adj;
gint item_height;
item_height = 6 + (preview_size ? preview_size : channel_height);
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (channelsD->scrolled_win));
if (index * item_height < adj->value)
{
adj->value = index * item_height;
gtk_adjustment_value_changed (adj);
}
else if ((index + 1) * item_height > adj->value + adj->page_size)
{
adj->value = (index + 1) * item_height - adj->page_size;
gtk_adjustment_value_changed (adj);
}
}
static void static void
channels_dialog_set_channel (ChannelWidget *channel_widget) channels_dialog_set_channel (ChannelWidget *channel_widget)
{ {
@ -678,6 +687,7 @@ channels_dialog_set_channel (ChannelWidget *channel_widget)
index + channelsD->num_components); index + channelsD->num_components);
gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item), gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item),
channel_widget); channel_widget);
/* channels_dialog_scroll_index (index + channelsD->num_components); */
} }
} }
else else
@ -705,6 +715,7 @@ channels_dialog_set_channel (ChannelWidget *channel_widget)
gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item), gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item),
channel_widget); channel_widget);
/* channels_dialog_scroll_index (0); */
} }
} }
suspend_gimage_notify--; suspend_gimage_notify--;
@ -802,6 +813,10 @@ channels_dialog_position_channel (Channel *channel,
g_slist_insert (channelsD->channel_widgets, channel_widget, g_slist_insert (channelsD->channel_widgets, channel_widget,
new_index + channelsD->num_components); new_index + channelsD->num_components);
/* channels_dialog_scroll_index (new_index > 0 ? */
/* new_index + channelsD->num_components + 1 : */
/* channelsD->num_components); */
suspend_gimage_notify--; suspend_gimage_notify--;
} }
@ -855,7 +870,6 @@ channel_list_events (GtkWidget *widget,
GdkEvent *event) GdkEvent *event)
{ {
ChannelWidget *channel_widget; ChannelWidget *channel_widget;
GdkEventKey *kevent;
GdkEventButton *bevent; GdkEventButton *bevent;
GtkWidget *event_widget; GtkWidget *event_widget;
@ -884,21 +898,6 @@ channel_list_events (GtkWidget *widget,
} }
break; break;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Up:
/* g_print ("up arrow\n"); */
break;
case GDK_Down:
/* g_print ("down arrow\n"); */
break;
default:
return FALSE;
}
return FALSE;
default: default:
break; break;
} }

106
app/gui/layers-dialog.c
View File

@ -59,23 +59,10 @@
#include "layer_pvt.h" #include "layer_pvt.h"
#define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK
#define BUTTON_EVENT_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK | \
GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK
#define LAYER_LIST_WIDTH 200
#define LAYER_LIST_HEIGHT 150
#define LAYER_PREVIEW 0 #define LAYER_PREVIEW 0
#define MASK_PREVIEW 1 #define MASK_PREVIEW 1
#define FS_PREVIEW 2 #define FS_PREVIEW 2
#define NORMAL 0
#define SELECTED 1
#define INSENSITIVE 2
typedef struct _LayersDialog LayersDialog; typedef struct _LayersDialog LayersDialog;
struct _LayersDialog struct _LayersDialog
@ -83,6 +70,7 @@ struct _LayersDialog
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *mode_option_menu; GtkWidget *mode_option_menu;
GtkWidget *layer_list; GtkWidget *layer_list;
GtkWidget *scrolled_win;
GtkWidget *preserve_trans; GtkWidget *preserve_trans;
GtkWidget *mode_box; GtkWidget *mode_box;
GtkWidget *opacity_box; GtkWidget *opacity_box;
@ -137,6 +125,7 @@ struct _LayerWidget
/* layers dialog widget routines */ /* layers dialog widget routines */
static void layers_dialog_preview_extents (void); static void layers_dialog_preview_extents (void);
static void layers_dialog_set_menu_sensitivity (void); static void layers_dialog_set_menu_sensitivity (void);
static void layers_dialog_scroll_index (gint index);
static void layers_dialog_set_active_layer (Layer *); static void layers_dialog_set_active_layer (Layer *);
static void layers_dialog_unset_layer (Layer *); static void layers_dialog_unset_layer (Layer *);
static void layers_dialog_position_layer (Layer *, gint); static void layers_dialog_position_layer (Layer *, gint);
@ -149,22 +138,22 @@ static void paint_mode_menu_callback (GtkWidget *, gpointer);
static gint paint_mode_menu_get_position (gint); static gint paint_mode_menu_get_position (gint);
static void opacity_scale_update (GtkAdjustment *, gpointer); static void opacity_scale_update (GtkAdjustment *, gpointer);
static void preserve_trans_update (GtkWidget *, gpointer); static void preserve_trans_update (GtkWidget *, gpointer);
static gint layer_list_events (GtkWidget *, GdkEvent *); static gint layer_list_events (GtkWidget *, GdkEvent *, gpointer);
/* for (un)installing the menu accelarators */ /* for (un)installing the menu accelarators */
static void layers_dialog_map_callback (GtkWidget *, gpointer); static void layers_dialog_map_callback (GtkWidget *, gpointer);
static void layers_dialog_unmap_callback (GtkWidget *, gpointer); static void layers_dialog_unmap_callback (GtkWidget *, gpointer);
/* ops buttons dnd callbacks */ /* ops buttons dnd callbacks */
static gboolean layers_dialog_drag_new_layer_callback (GtkWidget *, static gboolean layers_dialog_drag_new_layer_callback (GtkWidget *,
GdkDragContext *, GdkDragContext *,
gint, gint, guint); gint, gint, guint);
static gboolean layers_dialog_drag_duplicate_layer_callback (GtkWidget *, static gboolean layers_dialog_drag_duplicate_layer_callback (GtkWidget *,
GdkDragContext *, GdkDragContext *,
gint, gint, guint); gint, gint, guint);
static gboolean layers_dialog_drag_trashcan_callback (GtkWidget *, static gboolean layers_dialog_drag_trashcan_callback (GtkWidget *,
GdkDragContext *, GdkDragContext *,
gint, gint, guint); gint, gint, guint);
/* layer widget function prototypes */ /* layer widget function prototypes */
static LayerWidget *layer_widget_get_ID (Layer *); static LayerWidget *layer_widget_get_ID (Layer *);
@ -324,8 +313,7 @@ layers_dialog_create ()
GtkWidget *label; GtkWidget *label;
GtkWidget *menu; GtkWidget *menu;
GtkWidget *slider; GtkWidget *slider;
GtkWidget *listbox;
if (layersD) if (layersD)
return layersD->vbox; return layersD->vbox;
@ -401,27 +389,27 @@ layers_dialog_create ()
gtk_widget_show (util_box); gtk_widget_show (util_box);
/* The layers listbox */ /* The layers listbox */
listbox = gtk_scrolled_window_new (NULL, NULL); layersD->scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (layersD->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_set_usize (listbox, LAYER_LIST_WIDTH, LAYER_LIST_HEIGHT); gtk_widget_set_usize (layersD->scrolled_win, LIST_WIDTH, LIST_HEIGHT);
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), layersD->scrolled_win, TRUE, TRUE, 2);
layersD->layer_list = gtk_list_new (); layersD->layer_list = gtk_list_new ();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (layersD->scrolled_win),
layersD->layer_list); layersD->layer_list);
gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list), gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list),
GTK_SELECTION_BROWSE); GTK_SELECTION_BROWSE);
gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event", gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event",
(GtkSignalFunc) layer_list_events, (GtkSignalFunc) layer_list_events,
layersD); layersD);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list), gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox))); gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (layersD->scrolled_win)));
GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (layersD->scrolled_win)->vscrollbar,
GTK_CAN_FOCUS); GTK_CAN_FOCUS);
gtk_widget_show (layersD->layer_list); gtk_widget_show (layersD->layer_list);
gtk_widget_show (listbox); gtk_widget_show (layersD->scrolled_win);
/* The ops buttons */ /* The ops buttons */
button_box = ops_button_box_new (lc_dialog->shell, tool_tips, button_box = ops_button_box_new (lc_dialog->shell, tool_tips,
@ -1058,6 +1046,27 @@ layers_dialog_set_menu_sensitivity ()
gtk_widget_set_sensitive (layersD->mode_box, lp); gtk_widget_set_sensitive (layersD->mode_box, lp);
} }
static void
layers_dialog_scroll_index (gint index)
{
GtkAdjustment *adj;
gint item_height;
item_height = 6 + (preview_size ? preview_size : layer_height);
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (layersD->scrolled_win));
if (index * item_height < adj->value)
{
adj->value = index * item_height;
gtk_adjustment_value_changed (adj);
}
else if ((index + 1) * item_height > adj->value + adj->page_size)
{
adj->value = (index + 1) * item_height - adj->page_size;
gtk_adjustment_value_changed (adj);
}
}
static void static void
layers_dialog_set_active_layer (Layer *layer) layers_dialog_set_active_layer (Layer *layer)
{ {
@ -1079,6 +1088,8 @@ layers_dialog_set_active_layer (Layer *layer)
gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), NULL); gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), NULL);
gtk_list_select_item (GTK_LIST (layersD->layer_list), index); gtk_list_select_item (GTK_LIST (layersD->layer_list), index);
gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), layer_widget); gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), layer_widget);
layers_dialog_scroll_index (index);
} }
suspend_gimage_notify--; suspend_gimage_notify--;
@ -1137,6 +1148,10 @@ layers_dialog_position_layer (Layer *layer,
gtk_list_insert_items (GTK_LIST (layersD->layer_list), list, new_index); gtk_list_insert_items (GTK_LIST (layersD->layer_list), list, new_index);
layersD->layer_widgets = g_slist_insert (layersD->layer_widgets, layersD->layer_widgets = g_slist_insert (layersD->layer_widgets,
layer_widget, new_index); layer_widget, new_index);
/* Adjust the scrollbar so the layer is visible */
layers_dialog_scroll_index (new_index > 0 ? new_index + 1: 0);
suspend_gimage_notify--; suspend_gimage_notify--;
} }
@ -1314,20 +1329,21 @@ preserve_trans_update (GtkWidget *widget,
layer->preserve_trans = FALSE; layer->preserve_trans = FALSE;
} }
/********************************/ /********************************/
/* layer list events callback */ /* layer list events callback */
/********************************/ /********************************/
static gint static gint
layer_list_events (GtkWidget *widget, layer_list_events (GtkWidget *widget,
GdkEvent *event) GdkEvent *event,
gpointer data)
{ {
GdkEventKey *kevent;
GdkEventButton *bevent; GdkEventButton *bevent;
GtkWidget *event_widget; GtkWidget *event_widget;
LayerWidget *layer_widget; LayerWidget *layer_widget;
event_widget = gtk_get_event_widget (event); event_widget = gtk_get_event_widget (event);
if (GTK_IS_LIST_ITEM (event_widget)) if (GTK_IS_LIST_ITEM (event_widget))
{ {
@ -1347,27 +1363,11 @@ layer_list_events (GtkWidget *widget,
return TRUE; return TRUE;
} }
break; break;
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
layers_dialog_edit_layer_query (layer_widget); layers_dialog_edit_layer_query (layer_widget);
return TRUE; return TRUE;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Up:
/* g_print ("up arrow\n"); */
break;
case GDK_Down:
/* g_print ("down arrow\n"); */
break;
default:
return FALSE;
}
return FALSE;
default: default:
break; break;
} }

335
app/gui/paths-dialog.c
View File

@ -70,12 +70,6 @@
#include "pixmaps/path.xbm" #include "pixmaps/path.xbm"
#include "pixmaps/locked.xbm" #include "pixmaps/locked.xbm"
#define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK
#define PATHS_LIST_WIDTH 200
#define PATHS_LIST_HEIGHT 150
typedef struct { typedef struct {
GtkWidget *paths_list; GtkWidget *paths_list;
GtkWidget *vbox; GtkWidget *vbox;
@ -125,29 +119,29 @@ typedef struct {
static gchar * unique_name(GimpImage *,gchar *); static gchar * unique_name(GimpImage *,gchar *);
/* static gint path_widget_preview_events (GtkWidget *, GdkEvent *); */ /* static gint path_widget_preview_events (GtkWidget *, GdkEvent *); */
static void paths_dialog_realized (GtkWidget *widget); static void paths_dialog_realized (GtkWidget *widget);
static void paths_select_row (GtkWidget *widget, gint row, gint column, static void paths_select_row (GtkWidget *widget, gint row, gint column,
GdkEventButton *event, gpointer data); GdkEventButton *event, gpointer data);
static void paths_unselect_row (GtkWidget *widget, gint row, gint column, static void paths_unselect_row (GtkWidget *widget, gint row, gint column,
GdkEventButton *event, gpointer data); GdkEventButton *event, gpointer data);
static gint paths_list_events (GtkWidget *widget,GdkEvent *event); static gint paths_list_events (GtkWidget *widget, GdkEvent *event);
static void paths_dialog_map_callback (GtkWidget *w,gpointer client_data); static void paths_dialog_map_callback (GtkWidget *w, gpointer client_data);
static void paths_dialog_unmap_callback (GtkWidget *w,gpointer client_data); static void paths_dialog_unmap_callback (GtkWidget *w, gpointer client_data);
static void paths_dialog_destroy_cb (GimpImage *image); static void paths_dialog_destroy_cb (GimpImage *image);
static void paths_update_paths (gpointer data,gint row); static void paths_update_paths (gpointer data, gint row);
static GSList * pathpoints_copy (GSList *list); static GSList * pathpoints_copy (GSList *list);
static void pathpoints_free (GSList *list); static void pathpoints_free (GSList *list);
static void paths_update_preview (BezierSelect *bezier_sel); static void paths_update_preview (BezierSelect *bezier_sel);
static void paths_dialog_preview_extents (void); static void paths_dialog_preview_extents (void);
static void paths_dialog_new_point_callback (GtkWidget *, gpointer); static void paths_dialog_new_point_callback (GtkWidget *, gpointer);
static void paths_dialog_add_point_callback (GtkWidget *, gpointer); static void paths_dialog_add_point_callback (GtkWidget *, gpointer);
static void paths_dialog_delete_point_callback (GtkWidget *, gpointer); static void paths_dialog_delete_point_callback (GtkWidget *, gpointer);
static void paths_dialog_edit_point_callback (GtkWidget *, gpointer); static void paths_dialog_edit_point_callback (GtkWidget *, gpointer);
static void paths_dialog_sel_to_path_callback (GtkWidget *, gpointer); static void paths_dialog_sel_to_path_callback (GtkWidget *, gpointer);
static void paths_dialog_advanced_to_path_callback (GtkWidget *, gpointer); static void paths_dialog_advanced_to_path_callback (GtkWidget *, gpointer);
static void paths_dialog_null_callback (GtkWidget *, gpointer); static void paths_dialog_null_callback (GtkWidget *, gpointer);
static void path_close(PATHP); static void path_close (PATHP);
#define NEW_PATH_BUTTON 1 #define NEW_PATH_BUTTON 1
#define DUP_PATH_BUTTON 2 #define DUP_PATH_BUTTON 2
@ -230,14 +224,14 @@ paths_ops_button_set_sensitive (gint but,
} }
void void
paths_dialog_set_default_op() paths_dialog_set_default_op ()
{ {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(point_ops_buttons[0].widget), gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(point_ops_buttons[0].widget), TRUE);
TRUE);
} }
static void static void
point_ops_button_set_sensitive(gint but,gboolean sensitive) point_ops_button_set_sensitive (gint but,
gboolean sensitive)
{ {
switch(but) switch(but)
{ {
@ -265,7 +259,8 @@ paths_list_destroy (GtkWidget *w)
paths_dialog = NULL; paths_dialog = NULL;
} }
GtkWidget * paths_dialog_create() GtkWidget*
paths_dialog_create ()
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *paths_list; GtkWidget *paths_list;
@ -282,9 +277,7 @@ GtkWidget * paths_dialog_create()
/* The point operations */ /* The point operations */
button_box = ops_button_box_new (lc_dialog->shell, tool_tips, button_box = ops_button_box_new (lc_dialog->shell, tool_tips,
point_ops_buttons, OPS_BUTTON_RADIO); point_ops_buttons, OPS_BUTTON_RADIO);
/* gtk_container_set_border_width (GTK_CONTAINER (button_box), 2); */
gtk_container_set_border_width(GTK_CONTAINER(button_box),7);
gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, TRUE, 2);
gtk_widget_show (button_box); gtk_widget_show (button_box);
@ -294,22 +287,21 @@ GtkWidget * paths_dialog_create()
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS); GTK_POLICY_ALWAYS);
gtk_widget_set_usize (scrolled_win, PATHS_LIST_WIDTH, PATHS_LIST_HEIGHT); gtk_widget_set_usize (scrolled_win, LIST_WIDTH, LIST_HEIGHT);
gtk_box_pack_start(GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 2); gtk_box_pack_start(GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 2);
paths_dialog->paths_list = paths_list = gtk_clist_new (2); paths_dialog->paths_list = paths_list = gtk_clist_new (2);
gtk_signal_connect (GTK_OBJECT (vbox), "destroy", gtk_signal_connect (GTK_OBJECT (vbox), "destroy",
(GtkSignalFunc) paths_list_destroy, NULL); (GtkSignalFunc) paths_list_destroy, NULL);
/* gtk_clist_set_column_title(GTK_CLIST(paths_list), 0, _("Locked")); */ gtk_clist_set_selection_mode (GTK_CLIST (paths_list), GTK_SELECTION_BROWSE);
/* gtk_clist_set_column_title(GTK_CLIST(paths_list), 1, _("Path")); */ gtk_clist_set_reorderable (GTK_CLIST (paths_list), FALSE);
/* gtk_clist_column_titles_show(GTK_CLIST(paths_list)); */ gtk_clist_set_column_width (GTK_CLIST (paths_list), 0, locked_width);
/* gtk_clist_columns_autosize(GTK_CLIST(paths_list)); */ gtk_clist_set_column_min_width (GTK_CLIST (paths_list), 1,
gtk_clist_set_column_width (GTK_CLIST(paths_list),0,locked_width); LIST_WIDTH - locked_width - 4);
gtk_clist_set_column_auto_resize (GTK_CLIST (paths_list), 1, TRUE);
gtk_container_add (GTK_CONTAINER (scrolled_win), paths_list); gtk_container_add (GTK_CONTAINER (scrolled_win), paths_list);
gtk_clist_set_selection_mode (GTK_CLIST (paths_list), GTK_SELECTION_BROWSE);
gtk_signal_connect (GTK_OBJECT (paths_list), "event", gtk_signal_connect (GTK_OBJECT (paths_list), "event",
(GtkSignalFunc) paths_list_events, (GtkSignalFunc) paths_list_events,
paths_dialog); paths_dialog);
@ -367,7 +359,8 @@ GtkWidget * paths_dialog_create()
return paths_dialog->vbox; return paths_dialog->vbox;
} }
static void paths_dialog_realized(GtkWidget *widget) static void
paths_dialog_realized (GtkWidget *widget)
{ {
GdkColormap *colormap; GdkColormap *colormap;
gchar dash_list[2]= {3,3}; gchar dash_list[2]= {3,3};
@ -387,7 +380,7 @@ static void paths_dialog_realized(GtkWidget *widget)
/* Clears out row when list element is deleted/destroyed */ /* Clears out row when list element is deleted/destroyed */
static void static void
clear_pathwidget(gpointer data) clear_pathwidget (gpointer data)
{ {
PATHWIDGETP pwidget = data; PATHWIDGETP pwidget = data;
@ -398,14 +391,16 @@ clear_pathwidget(gpointer data)
} }
static void static void
pathpoint_free(gpointer data,gpointer user_data) pathpoint_free (gpointer data,
gpointer user_data)
{ {
PATHPOINTP pathpoint = data; PATHPOINTP pathpoint = data;
g_free(pathpoint); g_free(pathpoint);
} }
static void static void
path_free(gpointer data,gpointer user_data) path_free (gpointer data,
gpointer user_data)
{ {
PATHP bzp = data; PATHP bzp = data;
g_return_if_fail(bzp != NULL); g_return_if_fail(bzp != NULL);
@ -415,7 +410,9 @@ path_free(gpointer data,gpointer user_data)
} }
static PATHP static PATHP
path_dialog_new(GimpImage *gimage,gint name_seed, gpointer udata) path_dialog_new (GimpImage *gimage,
gint name_seed,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
GString *s = g_string_new (NULL); GString *s = g_string_new (NULL);
@ -437,7 +434,7 @@ path_dialog_new(GimpImage *gimage,gint name_seed, gpointer udata)
/* Always return a copy that must be freed later */ /* Always return a copy that must be freed later */
static gchar * static gchar *
strip_off_cnumber(gchar *str) strip_off_cnumber (gchar *str)
{ {
gchar * hashptr; gchar * hashptr;
gint num; gint num;
@ -467,7 +464,8 @@ strip_off_cnumber(gchar *str)
/* Return NULL if already unique else a unique string */ /* Return NULL if already unique else a unique string */
static gchar * static gchar *
unique_name(GimpImage *gimage,gchar *cstr) unique_name (GimpImage *gimage,
gchar *cstr)
{ {
GSList *tlist; GSList *tlist;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -525,7 +523,8 @@ unique_name(GimpImage *gimage,gchar *cstr)
} }
static PATHP static PATHP
path_copy(GimpImage *gimage,PATHP p) path_copy (GimpImage *gimage,
PATHP p)
{ {
PATHP p_copy = g_new0(PATH,1); PATHP p_copy = g_new0(PATH,1);
gchar *ext; gchar *ext;
@ -545,7 +544,7 @@ path_copy(GimpImage *gimage,PATHP p)
} }
static PATHPOINTP static PATHPOINTP
path_start_last_seg(GSList *plist) path_start_last_seg (GSList *plist)
{ {
PATHPOINTP retp = plist->data; PATHPOINTP retp = plist->data;
while(plist) while(plist)
@ -562,7 +561,7 @@ path_start_last_seg(GSList *plist)
} }
static void static void
path_close(PATHP bzp) path_close (PATHP bzp)
{ {
PATHPOINTP pdata; PATHPOINTP pdata;
PATHPOINTP pathpoint; PATHPOINTP pathpoint;
@ -595,14 +594,14 @@ path_close(PATHP bzp)
} }
static void static void
beziersel_free(BezierSelect *bezier_sel) beziersel_free (BezierSelect *bezier_sel)
{ {
bezier_select_reset (bezier_sel); bezier_select_reset (bezier_sel);
g_free(bezier_sel); g_free(bezier_sel);
} }
static BezierSelect * static BezierSelect *
path_to_beziersel(PATHP bzp) path_to_beziersel (PATHP bzp)
{ {
BezierSelect *bezier_sel; BezierSelect *bezier_sel;
BezierPoint *bpnt = NULL; BezierPoint *bpnt = NULL;
@ -658,7 +657,7 @@ path_to_beziersel(PATHP bzp)
} }
static void static void
pathimagelist_free(PATHIMAGELISTP iml) pathimagelist_free (PATHIMAGELISTP iml)
{ {
g_return_if_fail(iml != NULL); g_return_if_fail(iml != NULL);
if(iml->bz_paths) if(iml->bz_paths)
@ -670,7 +669,8 @@ pathimagelist_free(PATHIMAGELISTP iml)
} }
static void static void
bz_change_name_row_to(gint row,gchar *text) bz_change_name_row_to (gint row,
gchar *text)
{ {
PATHWIDGETP pwidget; PATHWIDGETP pwidget;
@ -685,7 +685,8 @@ bz_change_name_row_to(gint row,gchar *text)
} }
static void static void
paths_set_dash_line(GdkGC *gc,gboolean state) paths_set_dash_line (GdkGC *gc,
gboolean state)
{ {
gdk_gc_set_foreground(paths_dialog->gc, &paths_dialog->black); gdk_gc_set_foreground(paths_dialog->gc, &paths_dialog->black);
@ -700,7 +701,7 @@ paths_set_dash_line(GdkGC *gc,gboolean state)
} }
static void static void
clear_pixmap_preview(PATHWIDGETP pwidget) clear_pixmap_preview (PATHWIDGETP pwidget)
{ {
gchar *rgb_buf; gchar *rgb_buf;
@ -735,7 +736,8 @@ clear_pixmap_preview(PATHWIDGETP pwidget)
} }
/* insrow == -1 -> append else insert at insrow */ /* insrow == -1 -> append else insert at insrow */
void paths_add_path(PATHP bzp,gint insrow) void paths_add_path (PATHP bzp,
gint insrow)
{ {
/* Create a new entry in the list */ /* Create a new entry in the list */
PATHWIDGETP pwidget; PATHWIDGETP pwidget;
@ -906,11 +908,11 @@ path_widget_preview_events (GtkWidget *widget,
*/ */
static void static void
paths_select_row(GtkWidget *widget, paths_select_row (GtkWidget *widget,
gint row, gint row,
gint column, gint column,
GdkEventButton *event, GdkEventButton *event,
gpointer data) gpointer data)
{ {
PATHWIDGETP pwidget; PATHWIDGETP pwidget;
PATHP bzp; PATHP bzp;
@ -1159,7 +1161,8 @@ paths_dialog_update (GimpImage* gimage)
} }
static void static void
paths_update_paths(gpointer data,gint row) paths_update_paths (gpointer data,
gint row)
{ {
PATHP bzp; PATHP bzp;
BezierSelect * bezier_sel; BezierSelect * bezier_sel;
@ -1189,7 +1192,9 @@ paths_update_paths(gpointer data,gint row)
} }
static void static void
do_rename_paths_callback(GtkWidget *widget, gpointer call_data, gpointer client_data) do_rename_paths_callback (GtkWidget *widget,
gpointer call_data,
gpointer client_data)
{ {
gchar *text; gchar *text;
GdkBitmap *mask; GdkBitmap *mask;
@ -1252,10 +1257,9 @@ static gint
paths_list_events (GtkWidget *widget, paths_list_events (GtkWidget *widget,
GdkEvent *event) GdkEvent *event)
{ {
GdkEventKey *kevent;
GdkEventButton *bevent; GdkEventButton *bevent;
static gint last_row = -1; static gint last_row = -1;
gint this_colunm; gint this_column;
switch (event->type) switch (event->type)
{ {
@ -1264,7 +1268,7 @@ paths_list_events (GtkWidget *widget,
if(!gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list), if(!gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list),
bevent->x, bevent->x,
bevent->y, bevent->y,
&last_row,&this_colunm)) &last_row, &this_column))
last_row = -1; last_row = -1;
else else
{ {
@ -1273,7 +1277,8 @@ paths_list_events (GtkWidget *widget,
} }
if (bevent->button == 3 || bevent->button == 2) if (bevent->button == 3 || bevent->button == 2)
gtk_menu_popup (GTK_MENU (paths_dialog->ops_menu), NULL, NULL, NULL, NULL, bevent->button, bevent->time); gtk_menu_popup (GTK_MENU (paths_dialog->ops_menu),
NULL, NULL, NULL, NULL, bevent->button, bevent->time);
break; break;
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS:
@ -1283,9 +1288,9 @@ paths_list_events (GtkWidget *widget,
gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list), gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list),
bevent->x, bevent->x,
bevent->y, bevent->y,
NULL,&this_colunm)) NULL, &this_column))
{ {
if(this_colunm == 1) if(this_column == 1)
{ {
paths_dialog_edit_path_query (widget); paths_dialog_edit_path_query (widget);
return TRUE; return TRUE;
@ -1296,21 +1301,6 @@ paths_list_events (GtkWidget *widget,
else else
return FALSE; return FALSE;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Up:
printf ("up arrow\n");
break;
case GDK_Down:
printf ("down arrow\n");
break;
default:
return FALSE;
}
return TRUE;
default: default:
break; break;
} }
@ -1318,7 +1308,10 @@ paths_list_events (GtkWidget *widget,
} }
static PATHIMAGELISTP static PATHIMAGELISTP
path_add_to_current(PATHIMAGELISTP pip,PATHP bzp,GimpImage *gimage,gint pos) path_add_to_current (PATHIMAGELISTP pip,
PATHP bzp,
GimpImage *gimage,
gint pos)
{ {
/* add bzp to current list */ /* add bzp to current list */
if(!pip) if(!pip)
@ -1339,7 +1332,10 @@ path_add_to_current(PATHIMAGELISTP pip,PATHP bzp,GimpImage *gimage,gint pos)
} }
static PATHP static PATHP
paths_dialog_new_path(PATHIMAGELISTP *plp,gpointer points,GimpImage *gimage,gint pos) paths_dialog_new_path (PATHIMAGELISTP *plp,
gpointer points,
GimpImage *gimage,
gint pos)
{ {
static gint nseed = 0; static gint nseed = 0;
PATHP bzp = path_dialog_new(gimage,nseed++,points); PATHP bzp = path_dialog_new(gimage,nseed++,points);
@ -1348,7 +1344,8 @@ paths_dialog_new_path(PATHIMAGELISTP *plp,gpointer points,GimpImage *gimage,gint
} }
void void
paths_dialog_new_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_new_path_callback (GtkWidget *widget,
gpointer udata)
{ {
BezierSelect * bsel; BezierSelect * bsel;
GDisplay *gdisp; GDisplay *gdisp;
@ -1379,7 +1376,8 @@ paths_dialog_new_path_callback (GtkWidget * widget, gpointer udata)
} }
void void
paths_dialog_delete_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_delete_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1448,7 +1446,8 @@ paths_dialog_delete_path_callback (GtkWidget * widget, gpointer udata)
void void
paths_dialog_paste_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_paste_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1537,7 +1536,8 @@ paths_dialog_copy_path_callback (GtkWidget * widget, gpointer udata)
} }
void void
paths_dialog_dup_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_dup_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1570,8 +1570,9 @@ paths_dialog_dup_path_callback (GtkWidget * widget, gpointer udata)
paths_dialog->current_path_list->last_selected_row = tmprow; paths_dialog->current_path_list->last_selected_row = tmprow;
} }
static void paths_dialog_advanced_to_path_callback (GtkWidget *widget, static void
gpointer udata) paths_dialog_advanced_to_path_callback (GtkWidget *widget,
gpointer udata)
{ {
ProcRecord *proc_rec; ProcRecord *proc_rec;
Argument *args; Argument *args;
@ -1601,15 +1602,17 @@ static void paths_dialog_advanced_to_path_callback (GtkWidget *widget,
} }
static void paths_dialog_null_callback (GtkWidget *widget, static void
gpointer udata) paths_dialog_null_callback (GtkWidget *widget,
gpointer udata)
{ {
/* Maybe some more here later? */ /* Maybe some more here later? */
} }
void void
paths_dialog_sel_to_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_sel_to_path_callback (GtkWidget *widget,
gpointer udata)
{ {
ProcRecord *proc_rec; ProcRecord *proc_rec;
Argument *args; Argument *args;
@ -1640,7 +1643,8 @@ paths_dialog_sel_to_path_callback (GtkWidget * widget, gpointer udata)
void void
paths_dialog_path_to_sel_callback (GtkWidget * widget, gpointer udata) paths_dialog_path_to_sel_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1690,7 +1694,8 @@ paths_dialog_path_to_sel_callback (GtkWidget * widget, gpointer udata)
} }
void void
paths_dialog_stroke_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_stroke_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1712,7 +1717,7 @@ paths_dialog_stroke_path_callback (GtkWidget * widget, gpointer udata)
static void static void
paths_dialog_map_callback (GtkWidget *w, paths_dialog_map_callback (GtkWidget *w,
gpointer client_data) gpointer client_data)
{ {
if (!paths_dialog) if (!paths_dialog)
return; return;
@ -1770,7 +1775,7 @@ paths_dialog_destroy_cb (GimpImage *gimage)
/* Functions used from the bezier code .. tie in with this code */ /* Functions used from the bezier code .. tie in with this code */
static void static void
pathpoints_free(GSList *list) pathpoints_free (GSList *list)
{ {
if(!list) if(!list)
return; return;
@ -1779,7 +1784,7 @@ pathpoints_free(GSList *list)
} }
static GSList * static GSList *
pathpoints_create(BezierSelect *sel) pathpoints_create (BezierSelect *sel)
{ {
gint i; gint i;
GSList *list = NULL; GSList *list = NULL;
@ -1813,7 +1818,7 @@ pathpoints_create(BezierSelect *sel)
} }
static GSList * static GSList *
pathpoints_copy(GSList *list) pathpoints_copy (GSList *list)
{ {
GSList *slcopy = NULL; GSList *slcopy = NULL;
PATHPOINTP pdata; PATHPOINTP pdata;
@ -1832,7 +1837,8 @@ pathpoints_copy(GSList *list)
} }
static void static void
paths_update_bzpath(PATHIMAGELISTP plp,BezierSelect *bezier_sel) paths_update_bzpath (PATHIMAGELISTP plp,
BezierSelect *bezier_sel)
{ {
PATHP p; PATHP p;
@ -1847,7 +1853,8 @@ paths_update_bzpath(PATHIMAGELISTP plp,BezierSelect *bezier_sel)
} }
static gboolean static gboolean
paths_replaced_current(PATHIMAGELISTP plp,BezierSelect *bezier_sel) paths_replaced_current (PATHIMAGELISTP plp,
BezierSelect *bezier_sel)
{ {
/* Is there a currently selected path in this image? */ /* Is there a currently selected path in this image? */
/* ALT if(paths_dialog && plp && */ /* ALT if(paths_dialog && plp && */
@ -1861,7 +1868,7 @@ paths_replaced_current(PATHIMAGELISTP plp,BezierSelect *bezier_sel)
} }
static gint static gint
number_curves_in_path(GSList *plist) number_curves_in_path (GSList *plist)
{ {
gint count = 0; gint count = 0;
while(plist) while(plist)
@ -1877,10 +1884,10 @@ number_curves_in_path(GSList *plist)
} }
static void static void
paths_draw_segment_points(BezierSelect *bezier_sel, paths_draw_segment_points (BezierSelect *bezier_sel,
GdkPoint *pnt, GdkPoint *pnt,
int npoints, int npoints,
gpointer udata) gpointer udata)
{ {
/* /*
* hopefully the image points are already in image space co-ords. * hopefully the image points are already in image space co-ords.
@ -1940,7 +1947,7 @@ paths_draw_segment_points(BezierSelect *bezier_sel,
} }
static void static void
paths_update_preview(BezierSelect *bezier_sel) paths_update_preview (BezierSelect *bezier_sel)
{ {
gint row; gint row;
PATHCOUNTS curve_count; PATHCOUNTS curve_count;
@ -1973,25 +1980,29 @@ paths_update_preview(BezierSelect *bezier_sel)
} }
static void static void
paths_dialog_new_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_new_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_NEW); bezier_select_mode(EXTEND_NEW);
} }
static void static void
paths_dialog_add_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_add_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_ADD); bezier_select_mode(EXTEND_ADD);
} }
static void static void
paths_dialog_delete_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_delete_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_REMOVE); bezier_select_mode(EXTEND_REMOVE);
} }
static void static void
paths_dialog_edit_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_edit_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_EDIT); bezier_select_mode(EXTEND_EDIT);
} }
@ -2023,7 +2034,8 @@ paths_dialog_flush()
} }
void void
paths_first_button_press(BezierSelect *bezier_sel,GDisplay * gdisp) paths_first_button_press (BezierSelect *bezier_sel,
GDisplay *gdisp)
{ {
/* First time a button is pressed in this display */ /* First time a button is pressed in this display */
/* We have two choices here /* We have two choices here
@ -2070,7 +2082,8 @@ paths_first_button_press(BezierSelect *bezier_sel,GDisplay * gdisp)
} }
void void
paths_newpoint_current(BezierSelect *bezier_sel,GDisplay * gdisp) paths_newpoint_current (BezierSelect *bezier_sel,
GDisplay *gdisp)
{ {
/* Check if currently showing the paths we are updating */ /* Check if currently showing the paths we are updating */
if(paths_dialog && if(paths_dialog &&
@ -2094,7 +2107,7 @@ paths_newpoint_current(BezierSelect *bezier_sel,GDisplay * gdisp)
} }
void void
paths_new_bezier_select_tool() paths_new_bezier_select_tool ()
{ {
if(paths_dialog) if(paths_dialog)
paths_dialog->been_selected = FALSE; paths_dialog->been_selected = FALSE;
@ -2113,9 +2126,9 @@ paths_new_bezier_select_tool()
PATHPOINTP PATHPOINTP
pathpoint_new(gint type, pathpoint_new (gint type,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
PATHPOINTP pathpoint = g_new0(PATHPOINT,1); PATHPOINTP pathpoint = g_new0(PATHPOINT,1);
@ -2152,9 +2165,9 @@ path_new(GimpImage *gimage,
} }
PathsList * PathsList *
pathsList_new(GimpImage * gimage, pathsList_new(GimpImage *gimage,
gint last_selected_row, gint last_selected_row,
GSList * bz_paths) GSList *bz_paths)
{ {
PATHIMAGELISTP pip = g_new0(PATHIMAGELIST,1); PATHIMAGELISTP pip = g_new0(PATHIMAGELIST,1);
pip->gimage = gimage; pip->gimage = gimage;
@ -2515,7 +2528,7 @@ paths_transform_start_undo (GimpImage *gimage)
} }
void void
paths_transform_free_undo(void *data) paths_transform_free_undo (void *data)
{ {
GSList *pundolist = data; GSList *pundolist = data;
PATHP p; PATHP p;
@ -2532,7 +2545,8 @@ paths_transform_free_undo(void *data)
} }
void void
paths_transform_do_undo(GimpImage *gimage,void *data) paths_transform_do_undo (GimpImage *gimage,
void *data)
{ {
GSList *pundolist = data; GSList *pundolist = data;
/* Restore the paths as they were before this transform took place. */ /* Restore the paths as they were before this transform took place. */
@ -2598,10 +2612,10 @@ paths_transform_do_undo(GimpImage *gimage,void *data)
} }
static void static void
transform_func(GimpImage *gimage, transform_func (GimpImage *gimage,
int flip, int flip,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
PATHP p; PATHP p;
@ -2680,27 +2694,29 @@ transform_func(GimpImage *gimage,
} }
void void
paths_transform_flip_horz(GimpImage *gimage) paths_transform_flip_horz (GimpImage *gimage)
{ {
transform_func(gimage,TRUE,0.0,0); transform_func(gimage,TRUE,0.0,0);
} }
void void
paths_transform_flip_vert(GimpImage *gimage) paths_transform_flip_vert (GimpImage *gimage)
{ {
transform_func(gimage,TRUE,1.0,0); transform_func(gimage,TRUE,1.0,0);
} }
void void
paths_transform_xy(GimpImage *gimage,gint x,gint y) paths_transform_xy (GimpImage *gimage,
gint x,
gint y)
{ {
transform_func(gimage,FALSE,(gdouble)x,(gdouble)y); transform_func(gimage,FALSE,(gdouble)x,(gdouble)y);
} }
void void
paths_transform_current_path(GimpImage *gimage, paths_transform_current_path (GimpImage *gimage,
GimpMatrix transform, GimpMatrix transform,
gboolean forpreview) gboolean forpreview)
{ {
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
PATHP p; PATHP p;
@ -2780,9 +2796,9 @@ paths_transform_current_path(GimpImage *gimage,
} }
void void
paths_draw_current(GDisplay * gdisp, paths_draw_current (GDisplay *gdisp,
DrawCore *core, DrawCore *core,
GimpMatrix transform) GimpMatrix transform)
{ {
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
PATHP bzp; PATHP bzp;
@ -2845,8 +2861,8 @@ paths_draw_current(GDisplay * gdisp,
/* Return TRUE if setting the path worked, else false */ /* Return TRUE if setting the path worked, else false */
gboolean gboolean
paths_set_path(GimpImage * gimage, paths_set_path (GimpImage *gimage,
gchar * pname) gchar *pname)
{ {
gint row = 0; gint row = 0;
gboolean found = FALSE; gboolean found = FALSE;
@ -2895,12 +2911,12 @@ paths_set_path(GimpImage * gimage,
/* Return TRUE if path created OK. */ /* Return TRUE if path created OK. */
gboolean gboolean
paths_set_path_points(GimpImage * gimage, paths_set_path_points (GimpImage *gimage,
gchar * pname, gchar *pname,
gint ptype, gint ptype,
gint pclosed, gint pclosed,
gint num_pnts, gint num_pnts,
gdouble * pnts) gdouble *pnts)
{ {
PathsList *plist = gimp_image_get_paths(gimage); PathsList *plist = gimp_image_get_paths(gimage);
GSList *pts_list = NULL; GSList *pts_list = NULL;
@ -3049,7 +3065,9 @@ paths_set_path_points(GimpImage * gimage,
} }
void void
paths_stroke(GimpImage *gimage,PathsList *pl,PATHP bzp) paths_stroke (GimpImage *gimage,
PathsList *pl,
PATHP bzp)
{ {
BezierSelect * bezier_sel; BezierSelect * bezier_sel;
GDisplay * gdisp; GDisplay * gdisp;
@ -3061,7 +3079,11 @@ paths_stroke(GimpImage *gimage,PathsList *pl,PATHP bzp)
} }
gint gint
paths_distance(PATHP bzp,gdouble dist,gint *x,gint *y, gdouble *grad) paths_distance (PATHP bzp,
gdouble dist,
gint *x,
gint *y,
gdouble *grad)
{ {
gint ret; gint ret;
BezierSelect * bezier_sel; BezierSelect * bezier_sel;
@ -3072,7 +3094,7 @@ paths_distance(PATHP bzp,gdouble dist,gint *x,gint *y, gdouble *grad)
} }
Tattoo Tattoo
paths_get_tattoo(PATHP p) paths_get_tattoo (PATHP p)
{ {
if(!p) if(!p)
{ {
@ -3084,7 +3106,8 @@ paths_get_tattoo(PATHP p)
} }
PATHP PATHP
paths_get_path_by_tattoo(GimpImage *gimage,Tattoo tattoo) paths_get_path_by_tattoo (GimpImage *gimage,
Tattoo tattoo)
{ {
GSList *tlist; GSList *tlist;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -3114,8 +3137,8 @@ paths_get_path_by_tattoo(GimpImage *gimage,Tattoo tattoo)
gboolean gboolean
paths_delete_path(GimpImage *gimage, paths_delete_path (GimpImage *gimage,
gchar *pname) gchar *pname)
{ {
gint row = 0; gint row = 0;
gboolean found = FALSE; gboolean found = FALSE;

106
app/layers_dialog.c
View File

@ -59,23 +59,10 @@
#include "layer_pvt.h" #include "layer_pvt.h"
#define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK
#define BUTTON_EVENT_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK | \
GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK
#define LAYER_LIST_WIDTH 200
#define LAYER_LIST_HEIGHT 150
#define LAYER_PREVIEW 0 #define LAYER_PREVIEW 0
#define MASK_PREVIEW 1 #define MASK_PREVIEW 1
#define FS_PREVIEW 2 #define FS_PREVIEW 2
#define NORMAL 0
#define SELECTED 1
#define INSENSITIVE 2
typedef struct _LayersDialog LayersDialog; typedef struct _LayersDialog LayersDialog;
struct _LayersDialog struct _LayersDialog
@ -83,6 +70,7 @@ struct _LayersDialog
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *mode_option_menu; GtkWidget *mode_option_menu;
GtkWidget *layer_list; GtkWidget *layer_list;
GtkWidget *scrolled_win;
GtkWidget *preserve_trans; GtkWidget *preserve_trans;
GtkWidget *mode_box; GtkWidget *mode_box;
GtkWidget *opacity_box; GtkWidget *opacity_box;
@ -137,6 +125,7 @@ struct _LayerWidget
/* layers dialog widget routines */ /* layers dialog widget routines */
static void layers_dialog_preview_extents (void); static void layers_dialog_preview_extents (void);
static void layers_dialog_set_menu_sensitivity (void); static void layers_dialog_set_menu_sensitivity (void);
static void layers_dialog_scroll_index (gint index);
static void layers_dialog_set_active_layer (Layer *); static void layers_dialog_set_active_layer (Layer *);
static void layers_dialog_unset_layer (Layer *); static void layers_dialog_unset_layer (Layer *);
static void layers_dialog_position_layer (Layer *, gint); static void layers_dialog_position_layer (Layer *, gint);
@ -149,22 +138,22 @@ static void paint_mode_menu_callback (GtkWidget *, gpointer);
static gint paint_mode_menu_get_position (gint); static gint paint_mode_menu_get_position (gint);
static void opacity_scale_update (GtkAdjustment *, gpointer); static void opacity_scale_update (GtkAdjustment *, gpointer);
static void preserve_trans_update (GtkWidget *, gpointer); static void preserve_trans_update (GtkWidget *, gpointer);
static gint layer_list_events (GtkWidget *, GdkEvent *); static gint layer_list_events (GtkWidget *, GdkEvent *, gpointer);
/* for (un)installing the menu accelarators */ /* for (un)installing the menu accelarators */
static void layers_dialog_map_callback (GtkWidget *, gpointer); static void layers_dialog_map_callback (GtkWidget *, gpointer);
static void layers_dialog_unmap_callback (GtkWidget *, gpointer); static void layers_dialog_unmap_callback (GtkWidget *, gpointer);
/* ops buttons dnd callbacks */ /* ops buttons dnd callbacks */
static gboolean layers_dialog_drag_new_layer_callback (GtkWidget *, static gboolean layers_dialog_drag_new_layer_callback (GtkWidget *,
GdkDragContext *, GdkDragContext *,
gint, gint, guint); gint, gint, guint);
static gboolean layers_dialog_drag_duplicate_layer_callback (GtkWidget *, static gboolean layers_dialog_drag_duplicate_layer_callback (GtkWidget *,
GdkDragContext *, GdkDragContext *,
gint, gint, guint); gint, gint, guint);
static gboolean layers_dialog_drag_trashcan_callback (GtkWidget *, static gboolean layers_dialog_drag_trashcan_callback (GtkWidget *,
GdkDragContext *, GdkDragContext *,
gint, gint, guint); gint, gint, guint);
/* layer widget function prototypes */ /* layer widget function prototypes */
static LayerWidget *layer_widget_get_ID (Layer *); static LayerWidget *layer_widget_get_ID (Layer *);
@ -324,8 +313,7 @@ layers_dialog_create ()
GtkWidget *label; GtkWidget *label;
GtkWidget *menu; GtkWidget *menu;
GtkWidget *slider; GtkWidget *slider;
GtkWidget *listbox;
if (layersD) if (layersD)
return layersD->vbox; return layersD->vbox;
@ -401,27 +389,27 @@ layers_dialog_create ()
gtk_widget_show (util_box); gtk_widget_show (util_box);
/* The layers listbox */ /* The layers listbox */
listbox = gtk_scrolled_window_new (NULL, NULL); layersD->scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (layersD->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_set_usize (listbox, LAYER_LIST_WIDTH, LAYER_LIST_HEIGHT); gtk_widget_set_usize (layersD->scrolled_win, LIST_WIDTH, LIST_HEIGHT);
gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), layersD->scrolled_win, TRUE, TRUE, 2);
layersD->layer_list = gtk_list_new (); layersD->layer_list = gtk_list_new ();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (layersD->scrolled_win),
layersD->layer_list); layersD->layer_list);
gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list), gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list),
GTK_SELECTION_BROWSE); GTK_SELECTION_BROWSE);
gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event", gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event",
(GtkSignalFunc) layer_list_events, (GtkSignalFunc) layer_list_events,
layersD); layersD);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list), gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox))); gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (layersD->scrolled_win)));
GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (layersD->scrolled_win)->vscrollbar,
GTK_CAN_FOCUS); GTK_CAN_FOCUS);
gtk_widget_show (layersD->layer_list); gtk_widget_show (layersD->layer_list);
gtk_widget_show (listbox); gtk_widget_show (layersD->scrolled_win);
/* The ops buttons */ /* The ops buttons */
button_box = ops_button_box_new (lc_dialog->shell, tool_tips, button_box = ops_button_box_new (lc_dialog->shell, tool_tips,
@ -1058,6 +1046,27 @@ layers_dialog_set_menu_sensitivity ()
gtk_widget_set_sensitive (layersD->mode_box, lp); gtk_widget_set_sensitive (layersD->mode_box, lp);
} }
static void
layers_dialog_scroll_index (gint index)
{
GtkAdjustment *adj;
gint item_height;
item_height = 6 + (preview_size ? preview_size : layer_height);
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (layersD->scrolled_win));
if (index * item_height < adj->value)
{
adj->value = index * item_height;
gtk_adjustment_value_changed (adj);
}
else if ((index + 1) * item_height > adj->value + adj->page_size)
{
adj->value = (index + 1) * item_height - adj->page_size;
gtk_adjustment_value_changed (adj);
}
}
static void static void
layers_dialog_set_active_layer (Layer *layer) layers_dialog_set_active_layer (Layer *layer)
{ {
@ -1079,6 +1088,8 @@ layers_dialog_set_active_layer (Layer *layer)
gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), NULL); gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), NULL);
gtk_list_select_item (GTK_LIST (layersD->layer_list), index); gtk_list_select_item (GTK_LIST (layersD->layer_list), index);
gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), layer_widget); gtk_object_set_user_data (GTK_OBJECT (layer_widget->list_item), layer_widget);
layers_dialog_scroll_index (index);
} }
suspend_gimage_notify--; suspend_gimage_notify--;
@ -1137,6 +1148,10 @@ layers_dialog_position_layer (Layer *layer,
gtk_list_insert_items (GTK_LIST (layersD->layer_list), list, new_index); gtk_list_insert_items (GTK_LIST (layersD->layer_list), list, new_index);
layersD->layer_widgets = g_slist_insert (layersD->layer_widgets, layersD->layer_widgets = g_slist_insert (layersD->layer_widgets,
layer_widget, new_index); layer_widget, new_index);
/* Adjust the scrollbar so the layer is visible */
layers_dialog_scroll_index (new_index > 0 ? new_index + 1: 0);
suspend_gimage_notify--; suspend_gimage_notify--;
} }
@ -1314,20 +1329,21 @@ preserve_trans_update (GtkWidget *widget,
layer->preserve_trans = FALSE; layer->preserve_trans = FALSE;
} }
/********************************/ /********************************/
/* layer list events callback */ /* layer list events callback */
/********************************/ /********************************/
static gint static gint
layer_list_events (GtkWidget *widget, layer_list_events (GtkWidget *widget,
GdkEvent *event) GdkEvent *event,
gpointer data)
{ {
GdkEventKey *kevent;
GdkEventButton *bevent; GdkEventButton *bevent;
GtkWidget *event_widget; GtkWidget *event_widget;
LayerWidget *layer_widget; LayerWidget *layer_widget;
event_widget = gtk_get_event_widget (event); event_widget = gtk_get_event_widget (event);
if (GTK_IS_LIST_ITEM (event_widget)) if (GTK_IS_LIST_ITEM (event_widget))
{ {
@ -1347,27 +1363,11 @@ layer_list_events (GtkWidget *widget,
return TRUE; return TRUE;
} }
break; break;
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS:
bevent = (GdkEventButton *) event; bevent = (GdkEventButton *) event;
layers_dialog_edit_layer_query (layer_widget); layers_dialog_edit_layer_query (layer_widget);
return TRUE; return TRUE;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Up:
/* g_print ("up arrow\n"); */
break;
case GDK_Down:
/* g_print ("down arrow\n"); */
break;
default:
return FALSE;
}
return FALSE;
default: default:
break; break;
} }

16
app/lc_dialogP.h
View File

@ -58,4 +58,20 @@ void lc_dialog_menu_preview_dirty (GtkObject *,gpointer);
/* Main dialog structure */ /* Main dialog structure */
extern LCDialog *lc_dialog; extern LCDialog *lc_dialog;
/* some definitions used in all dialogs */
#define PREVIEW_EVENT_MASK (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK)
#define BUTTON_EVENT_MASK (GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK | \
GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK)
#define LIST_WIDTH 200
#define LIST_HEIGHT 150
#define NORMAL 0
#define SELECTED 1
#define INSENSITIVE 2
#endif /* __LC_DIALOGP_H__ */ #endif /* __LC_DIALOGP_H__ */

335
app/paths_dialog.c
View File

@ -70,12 +70,6 @@
#include "pixmaps/path.xbm" #include "pixmaps/path.xbm"
#include "pixmaps/locked.xbm" #include "pixmaps/locked.xbm"
#define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | \
GDK_ENTER_NOTIFY_MASK
#define PATHS_LIST_WIDTH 200
#define PATHS_LIST_HEIGHT 150
typedef struct { typedef struct {
GtkWidget *paths_list; GtkWidget *paths_list;
GtkWidget *vbox; GtkWidget *vbox;
@ -125,29 +119,29 @@ typedef struct {
static gchar * unique_name(GimpImage *,gchar *); static gchar * unique_name(GimpImage *,gchar *);
/* static gint path_widget_preview_events (GtkWidget *, GdkEvent *); */ /* static gint path_widget_preview_events (GtkWidget *, GdkEvent *); */
static void paths_dialog_realized (GtkWidget *widget); static void paths_dialog_realized (GtkWidget *widget);
static void paths_select_row (GtkWidget *widget, gint row, gint column, static void paths_select_row (GtkWidget *widget, gint row, gint column,
GdkEventButton *event, gpointer data); GdkEventButton *event, gpointer data);
static void paths_unselect_row (GtkWidget *widget, gint row, gint column, static void paths_unselect_row (GtkWidget *widget, gint row, gint column,
GdkEventButton *event, gpointer data); GdkEventButton *event, gpointer data);
static gint paths_list_events (GtkWidget *widget,GdkEvent *event); static gint paths_list_events (GtkWidget *widget, GdkEvent *event);
static void paths_dialog_map_callback (GtkWidget *w,gpointer client_data); static void paths_dialog_map_callback (GtkWidget *w, gpointer client_data);
static void paths_dialog_unmap_callback (GtkWidget *w,gpointer client_data); static void paths_dialog_unmap_callback (GtkWidget *w, gpointer client_data);
static void paths_dialog_destroy_cb (GimpImage *image); static void paths_dialog_destroy_cb (GimpImage *image);
static void paths_update_paths (gpointer data,gint row); static void paths_update_paths (gpointer data, gint row);
static GSList * pathpoints_copy (GSList *list); static GSList * pathpoints_copy (GSList *list);
static void pathpoints_free (GSList *list); static void pathpoints_free (GSList *list);
static void paths_update_preview (BezierSelect *bezier_sel); static void paths_update_preview (BezierSelect *bezier_sel);
static void paths_dialog_preview_extents (void); static void paths_dialog_preview_extents (void);
static void paths_dialog_new_point_callback (GtkWidget *, gpointer); static void paths_dialog_new_point_callback (GtkWidget *, gpointer);
static void paths_dialog_add_point_callback (GtkWidget *, gpointer); static void paths_dialog_add_point_callback (GtkWidget *, gpointer);
static void paths_dialog_delete_point_callback (GtkWidget *, gpointer); static void paths_dialog_delete_point_callback (GtkWidget *, gpointer);
static void paths_dialog_edit_point_callback (GtkWidget *, gpointer); static void paths_dialog_edit_point_callback (GtkWidget *, gpointer);
static void paths_dialog_sel_to_path_callback (GtkWidget *, gpointer); static void paths_dialog_sel_to_path_callback (GtkWidget *, gpointer);
static void paths_dialog_advanced_to_path_callback (GtkWidget *, gpointer); static void paths_dialog_advanced_to_path_callback (GtkWidget *, gpointer);
static void paths_dialog_null_callback (GtkWidget *, gpointer); static void paths_dialog_null_callback (GtkWidget *, gpointer);
static void path_close(PATHP); static void path_close (PATHP);
#define NEW_PATH_BUTTON 1 #define NEW_PATH_BUTTON 1
#define DUP_PATH_BUTTON 2 #define DUP_PATH_BUTTON 2
@ -230,14 +224,14 @@ paths_ops_button_set_sensitive (gint but,
} }
void void
paths_dialog_set_default_op() paths_dialog_set_default_op ()
{ {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(point_ops_buttons[0].widget), gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(point_ops_buttons[0].widget), TRUE);
TRUE);
} }
static void static void
point_ops_button_set_sensitive(gint but,gboolean sensitive) point_ops_button_set_sensitive (gint but,
gboolean sensitive)
{ {
switch(but) switch(but)
{ {
@ -265,7 +259,8 @@ paths_list_destroy (GtkWidget *w)
paths_dialog = NULL; paths_dialog = NULL;
} }
GtkWidget * paths_dialog_create() GtkWidget*
paths_dialog_create ()
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *paths_list; GtkWidget *paths_list;
@ -282,9 +277,7 @@ GtkWidget * paths_dialog_create()
/* The point operations */ /* The point operations */
button_box = ops_button_box_new (lc_dialog->shell, tool_tips, button_box = ops_button_box_new (lc_dialog->shell, tool_tips,
point_ops_buttons, OPS_BUTTON_RADIO); point_ops_buttons, OPS_BUTTON_RADIO);
/* gtk_container_set_border_width (GTK_CONTAINER (button_box), 2); */
gtk_container_set_border_width(GTK_CONTAINER(button_box),7);
gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, TRUE, 2);
gtk_widget_show (button_box); gtk_widget_show (button_box);
@ -294,22 +287,21 @@ GtkWidget * paths_dialog_create()
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS); GTK_POLICY_ALWAYS);
gtk_widget_set_usize (scrolled_win, PATHS_LIST_WIDTH, PATHS_LIST_HEIGHT); gtk_widget_set_usize (scrolled_win, LIST_WIDTH, LIST_HEIGHT);
gtk_box_pack_start(GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 2); gtk_box_pack_start(GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 2);
paths_dialog->paths_list = paths_list = gtk_clist_new (2); paths_dialog->paths_list = paths_list = gtk_clist_new (2);
gtk_signal_connect (GTK_OBJECT (vbox), "destroy", gtk_signal_connect (GTK_OBJECT (vbox), "destroy",
(GtkSignalFunc) paths_list_destroy, NULL); (GtkSignalFunc) paths_list_destroy, NULL);
/* gtk_clist_set_column_title(GTK_CLIST(paths_list), 0, _("Locked")); */ gtk_clist_set_selection_mode (GTK_CLIST (paths_list), GTK_SELECTION_BROWSE);
/* gtk_clist_set_column_title(GTK_CLIST(paths_list), 1, _("Path")); */ gtk_clist_set_reorderable (GTK_CLIST (paths_list), FALSE);
/* gtk_clist_column_titles_show(GTK_CLIST(paths_list)); */ gtk_clist_set_column_width (GTK_CLIST (paths_list), 0, locked_width);
/* gtk_clist_columns_autosize(GTK_CLIST(paths_list)); */ gtk_clist_set_column_min_width (GTK_CLIST (paths_list), 1,
gtk_clist_set_column_width (GTK_CLIST(paths_list),0,locked_width); LIST_WIDTH - locked_width - 4);
gtk_clist_set_column_auto_resize (GTK_CLIST (paths_list), 1, TRUE);
gtk_container_add (GTK_CONTAINER (scrolled_win), paths_list); gtk_container_add (GTK_CONTAINER (scrolled_win), paths_list);
gtk_clist_set_selection_mode (GTK_CLIST (paths_list), GTK_SELECTION_BROWSE);
gtk_signal_connect (GTK_OBJECT (paths_list), "event", gtk_signal_connect (GTK_OBJECT (paths_list), "event",
(GtkSignalFunc) paths_list_events, (GtkSignalFunc) paths_list_events,
paths_dialog); paths_dialog);
@ -367,7 +359,8 @@ GtkWidget * paths_dialog_create()
return paths_dialog->vbox; return paths_dialog->vbox;
} }
static void paths_dialog_realized(GtkWidget *widget) static void
paths_dialog_realized (GtkWidget *widget)
{ {
GdkColormap *colormap; GdkColormap *colormap;
gchar dash_list[2]= {3,3}; gchar dash_list[2]= {3,3};
@ -387,7 +380,7 @@ static void paths_dialog_realized(GtkWidget *widget)
/* Clears out row when list element is deleted/destroyed */ /* Clears out row when list element is deleted/destroyed */
static void static void
clear_pathwidget(gpointer data) clear_pathwidget (gpointer data)
{ {
PATHWIDGETP pwidget = data; PATHWIDGETP pwidget = data;
@ -398,14 +391,16 @@ clear_pathwidget(gpointer data)
} }
static void static void
pathpoint_free(gpointer data,gpointer user_data) pathpoint_free (gpointer data,
gpointer user_data)
{ {
PATHPOINTP pathpoint = data; PATHPOINTP pathpoint = data;
g_free(pathpoint); g_free(pathpoint);
} }
static void static void
path_free(gpointer data,gpointer user_data) path_free (gpointer data,
gpointer user_data)
{ {
PATHP bzp = data; PATHP bzp = data;
g_return_if_fail(bzp != NULL); g_return_if_fail(bzp != NULL);
@ -415,7 +410,9 @@ path_free(gpointer data,gpointer user_data)
} }
static PATHP static PATHP
path_dialog_new(GimpImage *gimage,gint name_seed, gpointer udata) path_dialog_new (GimpImage *gimage,
gint name_seed,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
GString *s = g_string_new (NULL); GString *s = g_string_new (NULL);
@ -437,7 +434,7 @@ path_dialog_new(GimpImage *gimage,gint name_seed, gpointer udata)
/* Always return a copy that must be freed later */ /* Always return a copy that must be freed later */
static gchar * static gchar *
strip_off_cnumber(gchar *str) strip_off_cnumber (gchar *str)
{ {
gchar * hashptr; gchar * hashptr;
gint num; gint num;
@ -467,7 +464,8 @@ strip_off_cnumber(gchar *str)
/* Return NULL if already unique else a unique string */ /* Return NULL if already unique else a unique string */
static gchar * static gchar *
unique_name(GimpImage *gimage,gchar *cstr) unique_name (GimpImage *gimage,
gchar *cstr)
{ {
GSList *tlist; GSList *tlist;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -525,7 +523,8 @@ unique_name(GimpImage *gimage,gchar *cstr)
} }
static PATHP static PATHP
path_copy(GimpImage *gimage,PATHP p) path_copy (GimpImage *gimage,
PATHP p)
{ {
PATHP p_copy = g_new0(PATH,1); PATHP p_copy = g_new0(PATH,1);
gchar *ext; gchar *ext;
@ -545,7 +544,7 @@ path_copy(GimpImage *gimage,PATHP p)
} }
static PATHPOINTP static PATHPOINTP
path_start_last_seg(GSList *plist) path_start_last_seg (GSList *plist)
{ {
PATHPOINTP retp = plist->data; PATHPOINTP retp = plist->data;
while(plist) while(plist)
@ -562,7 +561,7 @@ path_start_last_seg(GSList *plist)
} }
static void static void
path_close(PATHP bzp) path_close (PATHP bzp)
{ {
PATHPOINTP pdata; PATHPOINTP pdata;
PATHPOINTP pathpoint; PATHPOINTP pathpoint;
@ -595,14 +594,14 @@ path_close(PATHP bzp)
} }
static void static void
beziersel_free(BezierSelect *bezier_sel) beziersel_free (BezierSelect *bezier_sel)
{ {
bezier_select_reset (bezier_sel); bezier_select_reset (bezier_sel);
g_free(bezier_sel); g_free(bezier_sel);
} }
static BezierSelect * static BezierSelect *
path_to_beziersel(PATHP bzp) path_to_beziersel (PATHP bzp)
{ {
BezierSelect *bezier_sel; BezierSelect *bezier_sel;
BezierPoint *bpnt = NULL; BezierPoint *bpnt = NULL;
@ -658,7 +657,7 @@ path_to_beziersel(PATHP bzp)
} }
static void static void
pathimagelist_free(PATHIMAGELISTP iml) pathimagelist_free (PATHIMAGELISTP iml)
{ {
g_return_if_fail(iml != NULL); g_return_if_fail(iml != NULL);
if(iml->bz_paths) if(iml->bz_paths)
@ -670,7 +669,8 @@ pathimagelist_free(PATHIMAGELISTP iml)
} }
static void static void
bz_change_name_row_to(gint row,gchar *text) bz_change_name_row_to (gint row,
gchar *text)
{ {
PATHWIDGETP pwidget; PATHWIDGETP pwidget;
@ -685,7 +685,8 @@ bz_change_name_row_to(gint row,gchar *text)
} }
static void static void
paths_set_dash_line(GdkGC *gc,gboolean state) paths_set_dash_line (GdkGC *gc,
gboolean state)
{ {
gdk_gc_set_foreground(paths_dialog->gc, &paths_dialog->black); gdk_gc_set_foreground(paths_dialog->gc, &paths_dialog->black);
@ -700,7 +701,7 @@ paths_set_dash_line(GdkGC *gc,gboolean state)
} }
static void static void
clear_pixmap_preview(PATHWIDGETP pwidget) clear_pixmap_preview (PATHWIDGETP pwidget)
{ {
gchar *rgb_buf; gchar *rgb_buf;
@ -735,7 +736,8 @@ clear_pixmap_preview(PATHWIDGETP pwidget)
} }
/* insrow == -1 -> append else insert at insrow */ /* insrow == -1 -> append else insert at insrow */
void paths_add_path(PATHP bzp,gint insrow) void paths_add_path (PATHP bzp,
gint insrow)
{ {
/* Create a new entry in the list */ /* Create a new entry in the list */
PATHWIDGETP pwidget; PATHWIDGETP pwidget;
@ -906,11 +908,11 @@ path_widget_preview_events (GtkWidget *widget,
*/ */
static void static void
paths_select_row(GtkWidget *widget, paths_select_row (GtkWidget *widget,
gint row, gint row,
gint column, gint column,
GdkEventButton *event, GdkEventButton *event,
gpointer data) gpointer data)
{ {
PATHWIDGETP pwidget; PATHWIDGETP pwidget;
PATHP bzp; PATHP bzp;
@ -1159,7 +1161,8 @@ paths_dialog_update (GimpImage* gimage)
} }
static void static void
paths_update_paths(gpointer data,gint row) paths_update_paths (gpointer data,
gint row)
{ {
PATHP bzp; PATHP bzp;
BezierSelect * bezier_sel; BezierSelect * bezier_sel;
@ -1189,7 +1192,9 @@ paths_update_paths(gpointer data,gint row)
} }
static void static void
do_rename_paths_callback(GtkWidget *widget, gpointer call_data, gpointer client_data) do_rename_paths_callback (GtkWidget *widget,
gpointer call_data,
gpointer client_data)
{ {
gchar *text; gchar *text;
GdkBitmap *mask; GdkBitmap *mask;
@ -1252,10 +1257,9 @@ static gint
paths_list_events (GtkWidget *widget, paths_list_events (GtkWidget *widget,
GdkEvent *event) GdkEvent *event)
{ {
GdkEventKey *kevent;
GdkEventButton *bevent; GdkEventButton *bevent;
static gint last_row = -1; static gint last_row = -1;
gint this_colunm; gint this_column;
switch (event->type) switch (event->type)
{ {
@ -1264,7 +1268,7 @@ paths_list_events (GtkWidget *widget,
if(!gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list), if(!gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list),
bevent->x, bevent->x,
bevent->y, bevent->y,
&last_row,&this_colunm)) &last_row, &this_column))
last_row = -1; last_row = -1;
else else
{ {
@ -1273,7 +1277,8 @@ paths_list_events (GtkWidget *widget,
} }
if (bevent->button == 3 || bevent->button == 2) if (bevent->button == 3 || bevent->button == 2)
gtk_menu_popup (GTK_MENU (paths_dialog->ops_menu), NULL, NULL, NULL, NULL, bevent->button, bevent->time); gtk_menu_popup (GTK_MENU (paths_dialog->ops_menu),
NULL, NULL, NULL, NULL, bevent->button, bevent->time);
break; break;
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS:
@ -1283,9 +1288,9 @@ paths_list_events (GtkWidget *widget,
gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list), gtk_clist_get_selection_info (GTK_CLIST(paths_dialog->paths_list),
bevent->x, bevent->x,
bevent->y, bevent->y,
NULL,&this_colunm)) NULL, &this_column))
{ {
if(this_colunm == 1) if(this_column == 1)
{ {
paths_dialog_edit_path_query (widget); paths_dialog_edit_path_query (widget);
return TRUE; return TRUE;
@ -1296,21 +1301,6 @@ paths_list_events (GtkWidget *widget,
else else
return FALSE; return FALSE;
case GDK_KEY_PRESS:
kevent = (GdkEventKey *) event;
switch (kevent->keyval)
{
case GDK_Up:
printf ("up arrow\n");
break;
case GDK_Down:
printf ("down arrow\n");
break;
default:
return FALSE;
}
return TRUE;
default: default:
break; break;
} }
@ -1318,7 +1308,10 @@ paths_list_events (GtkWidget *widget,
} }
static PATHIMAGELISTP static PATHIMAGELISTP
path_add_to_current(PATHIMAGELISTP pip,PATHP bzp,GimpImage *gimage,gint pos) path_add_to_current (PATHIMAGELISTP pip,
PATHP bzp,
GimpImage *gimage,
gint pos)
{ {
/* add bzp to current list */ /* add bzp to current list */
if(!pip) if(!pip)
@ -1339,7 +1332,10 @@ path_add_to_current(PATHIMAGELISTP pip,PATHP bzp,GimpImage *gimage,gint pos)
} }
static PATHP static PATHP
paths_dialog_new_path(PATHIMAGELISTP *plp,gpointer points,GimpImage *gimage,gint pos) paths_dialog_new_path (PATHIMAGELISTP *plp,
gpointer points,
GimpImage *gimage,
gint pos)
{ {
static gint nseed = 0; static gint nseed = 0;
PATHP bzp = path_dialog_new(gimage,nseed++,points); PATHP bzp = path_dialog_new(gimage,nseed++,points);
@ -1348,7 +1344,8 @@ paths_dialog_new_path(PATHIMAGELISTP *plp,gpointer points,GimpImage *gimage,gint
} }
void void
paths_dialog_new_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_new_path_callback (GtkWidget *widget,
gpointer udata)
{ {
BezierSelect * bsel; BezierSelect * bsel;
GDisplay *gdisp; GDisplay *gdisp;
@ -1379,7 +1376,8 @@ paths_dialog_new_path_callback (GtkWidget * widget, gpointer udata)
} }
void void
paths_dialog_delete_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_delete_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1448,7 +1446,8 @@ paths_dialog_delete_path_callback (GtkWidget * widget, gpointer udata)
void void
paths_dialog_paste_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_paste_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1537,7 +1536,8 @@ paths_dialog_copy_path_callback (GtkWidget * widget, gpointer udata)
} }
void void
paths_dialog_dup_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_dup_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1570,8 +1570,9 @@ paths_dialog_dup_path_callback (GtkWidget * widget, gpointer udata)
paths_dialog->current_path_list->last_selected_row = tmprow; paths_dialog->current_path_list->last_selected_row = tmprow;
} }
static void paths_dialog_advanced_to_path_callback (GtkWidget *widget, static void
gpointer udata) paths_dialog_advanced_to_path_callback (GtkWidget *widget,
gpointer udata)
{ {
ProcRecord *proc_rec; ProcRecord *proc_rec;
Argument *args; Argument *args;
@ -1601,15 +1602,17 @@ static void paths_dialog_advanced_to_path_callback (GtkWidget *widget,
} }
static void paths_dialog_null_callback (GtkWidget *widget, static void
gpointer udata) paths_dialog_null_callback (GtkWidget *widget,
gpointer udata)
{ {
/* Maybe some more here later? */ /* Maybe some more here later? */
} }
void void
paths_dialog_sel_to_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_sel_to_path_callback (GtkWidget *widget,
gpointer udata)
{ {
ProcRecord *proc_rec; ProcRecord *proc_rec;
Argument *args; Argument *args;
@ -1640,7 +1643,8 @@ paths_dialog_sel_to_path_callback (GtkWidget * widget, gpointer udata)
void void
paths_dialog_path_to_sel_callback (GtkWidget * widget, gpointer udata) paths_dialog_path_to_sel_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1690,7 +1694,8 @@ paths_dialog_path_to_sel_callback (GtkWidget * widget, gpointer udata)
} }
void void
paths_dialog_stroke_path_callback (GtkWidget * widget, gpointer udata) paths_dialog_stroke_path_callback (GtkWidget *widget,
gpointer udata)
{ {
PATHP bzp; PATHP bzp;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -1712,7 +1717,7 @@ paths_dialog_stroke_path_callback (GtkWidget * widget, gpointer udata)
static void static void
paths_dialog_map_callback (GtkWidget *w, paths_dialog_map_callback (GtkWidget *w,
gpointer client_data) gpointer client_data)
{ {
if (!paths_dialog) if (!paths_dialog)
return; return;
@ -1770,7 +1775,7 @@ paths_dialog_destroy_cb (GimpImage *gimage)
/* Functions used from the bezier code .. tie in with this code */ /* Functions used from the bezier code .. tie in with this code */
static void static void
pathpoints_free(GSList *list) pathpoints_free (GSList *list)
{ {
if(!list) if(!list)
return; return;
@ -1779,7 +1784,7 @@ pathpoints_free(GSList *list)
} }
static GSList * static GSList *
pathpoints_create(BezierSelect *sel) pathpoints_create (BezierSelect *sel)
{ {
gint i; gint i;
GSList *list = NULL; GSList *list = NULL;
@ -1813,7 +1818,7 @@ pathpoints_create(BezierSelect *sel)
} }
static GSList * static GSList *
pathpoints_copy(GSList *list) pathpoints_copy (GSList *list)
{ {
GSList *slcopy = NULL; GSList *slcopy = NULL;
PATHPOINTP pdata; PATHPOINTP pdata;
@ -1832,7 +1837,8 @@ pathpoints_copy(GSList *list)
} }
static void static void
paths_update_bzpath(PATHIMAGELISTP plp,BezierSelect *bezier_sel) paths_update_bzpath (PATHIMAGELISTP plp,
BezierSelect *bezier_sel)
{ {
PATHP p; PATHP p;
@ -1847,7 +1853,8 @@ paths_update_bzpath(PATHIMAGELISTP plp,BezierSelect *bezier_sel)
} }
static gboolean static gboolean
paths_replaced_current(PATHIMAGELISTP plp,BezierSelect *bezier_sel) paths_replaced_current (PATHIMAGELISTP plp,
BezierSelect *bezier_sel)
{ {
/* Is there a currently selected path in this image? */ /* Is there a currently selected path in this image? */
/* ALT if(paths_dialog && plp && */ /* ALT if(paths_dialog && plp && */
@ -1861,7 +1868,7 @@ paths_replaced_current(PATHIMAGELISTP plp,BezierSelect *bezier_sel)
} }
static gint static gint
number_curves_in_path(GSList *plist) number_curves_in_path (GSList *plist)
{ {
gint count = 0; gint count = 0;
while(plist) while(plist)
@ -1877,10 +1884,10 @@ number_curves_in_path(GSList *plist)
} }
static void static void
paths_draw_segment_points(BezierSelect *bezier_sel, paths_draw_segment_points (BezierSelect *bezier_sel,
GdkPoint *pnt, GdkPoint *pnt,
int npoints, int npoints,
gpointer udata) gpointer udata)
{ {
/* /*
* hopefully the image points are already in image space co-ords. * hopefully the image points are already in image space co-ords.
@ -1940,7 +1947,7 @@ paths_draw_segment_points(BezierSelect *bezier_sel,
} }
static void static void
paths_update_preview(BezierSelect *bezier_sel) paths_update_preview (BezierSelect *bezier_sel)
{ {
gint row; gint row;
PATHCOUNTS curve_count; PATHCOUNTS curve_count;
@ -1973,25 +1980,29 @@ paths_update_preview(BezierSelect *bezier_sel)
} }
static void static void
paths_dialog_new_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_new_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_NEW); bezier_select_mode(EXTEND_NEW);
} }
static void static void
paths_dialog_add_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_add_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_ADD); bezier_select_mode(EXTEND_ADD);
} }
static void static void
paths_dialog_delete_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_delete_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_REMOVE); bezier_select_mode(EXTEND_REMOVE);
} }
static void static void
paths_dialog_edit_point_callback (GtkWidget * widget, gpointer udata) paths_dialog_edit_point_callback (GtkWidget *widget,
gpointer udata)
{ {
bezier_select_mode(EXTEND_EDIT); bezier_select_mode(EXTEND_EDIT);
} }
@ -2023,7 +2034,8 @@ paths_dialog_flush()
} }
void void
paths_first_button_press(BezierSelect *bezier_sel,GDisplay * gdisp) paths_first_button_press (BezierSelect *bezier_sel,
GDisplay *gdisp)
{ {
/* First time a button is pressed in this display */ /* First time a button is pressed in this display */
/* We have two choices here /* We have two choices here
@ -2070,7 +2082,8 @@ paths_first_button_press(BezierSelect *bezier_sel,GDisplay * gdisp)
} }
void void
paths_newpoint_current(BezierSelect *bezier_sel,GDisplay * gdisp) paths_newpoint_current (BezierSelect *bezier_sel,
GDisplay *gdisp)
{ {
/* Check if currently showing the paths we are updating */ /* Check if currently showing the paths we are updating */
if(paths_dialog && if(paths_dialog &&
@ -2094,7 +2107,7 @@ paths_newpoint_current(BezierSelect *bezier_sel,GDisplay * gdisp)
} }
void void
paths_new_bezier_select_tool() paths_new_bezier_select_tool ()
{ {
if(paths_dialog) if(paths_dialog)
paths_dialog->been_selected = FALSE; paths_dialog->been_selected = FALSE;
@ -2113,9 +2126,9 @@ paths_new_bezier_select_tool()
PATHPOINTP PATHPOINTP
pathpoint_new(gint type, pathpoint_new (gint type,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
PATHPOINTP pathpoint = g_new0(PATHPOINT,1); PATHPOINTP pathpoint = g_new0(PATHPOINT,1);
@ -2152,9 +2165,9 @@ path_new(GimpImage *gimage,
} }
PathsList * PathsList *
pathsList_new(GimpImage * gimage, pathsList_new(GimpImage *gimage,
gint last_selected_row, gint last_selected_row,
GSList * bz_paths) GSList *bz_paths)
{ {
PATHIMAGELISTP pip = g_new0(PATHIMAGELIST,1); PATHIMAGELISTP pip = g_new0(PATHIMAGELIST,1);
pip->gimage = gimage; pip->gimage = gimage;
@ -2515,7 +2528,7 @@ paths_transform_start_undo (GimpImage *gimage)
} }
void void
paths_transform_free_undo(void *data) paths_transform_free_undo (void *data)
{ {
GSList *pundolist = data; GSList *pundolist = data;
PATHP p; PATHP p;
@ -2532,7 +2545,8 @@ paths_transform_free_undo(void *data)
} }
void void
paths_transform_do_undo(GimpImage *gimage,void *data) paths_transform_do_undo (GimpImage *gimage,
void *data)
{ {
GSList *pundolist = data; GSList *pundolist = data;
/* Restore the paths as they were before this transform took place. */ /* Restore the paths as they were before this transform took place. */
@ -2598,10 +2612,10 @@ paths_transform_do_undo(GimpImage *gimage,void *data)
} }
static void static void
transform_func(GimpImage *gimage, transform_func (GimpImage *gimage,
int flip, int flip,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
PATHP p; PATHP p;
@ -2680,27 +2694,29 @@ transform_func(GimpImage *gimage,
} }
void void
paths_transform_flip_horz(GimpImage *gimage) paths_transform_flip_horz (GimpImage *gimage)
{ {
transform_func(gimage,TRUE,0.0,0); transform_func(gimage,TRUE,0.0,0);
} }
void void
paths_transform_flip_vert(GimpImage *gimage) paths_transform_flip_vert (GimpImage *gimage)
{ {
transform_func(gimage,TRUE,1.0,0); transform_func(gimage,TRUE,1.0,0);
} }
void void
paths_transform_xy(GimpImage *gimage,gint x,gint y) paths_transform_xy (GimpImage *gimage,
gint x,
gint y)
{ {
transform_func(gimage,FALSE,(gdouble)x,(gdouble)y); transform_func(gimage,FALSE,(gdouble)x,(gdouble)y);
} }
void void
paths_transform_current_path(GimpImage *gimage, paths_transform_current_path (GimpImage *gimage,
GimpMatrix transform, GimpMatrix transform,
gboolean forpreview) gboolean forpreview)
{ {
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
PATHP p; PATHP p;
@ -2780,9 +2796,9 @@ paths_transform_current_path(GimpImage *gimage,
} }
void void
paths_draw_current(GDisplay * gdisp, paths_draw_current (GDisplay *gdisp,
DrawCore *core, DrawCore *core,
GimpMatrix transform) GimpMatrix transform)
{ {
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
PATHP bzp; PATHP bzp;
@ -2845,8 +2861,8 @@ paths_draw_current(GDisplay * gdisp,
/* Return TRUE if setting the path worked, else false */ /* Return TRUE if setting the path worked, else false */
gboolean gboolean
paths_set_path(GimpImage * gimage, paths_set_path (GimpImage *gimage,
gchar * pname) gchar *pname)
{ {
gint row = 0; gint row = 0;
gboolean found = FALSE; gboolean found = FALSE;
@ -2895,12 +2911,12 @@ paths_set_path(GimpImage * gimage,
/* Return TRUE if path created OK. */ /* Return TRUE if path created OK. */
gboolean gboolean
paths_set_path_points(GimpImage * gimage, paths_set_path_points (GimpImage *gimage,
gchar * pname, gchar *pname,
gint ptype, gint ptype,
gint pclosed, gint pclosed,
gint num_pnts, gint num_pnts,
gdouble * pnts) gdouble *pnts)
{ {
PathsList *plist = gimp_image_get_paths(gimage); PathsList *plist = gimp_image_get_paths(gimage);
GSList *pts_list = NULL; GSList *pts_list = NULL;
@ -3049,7 +3065,9 @@ paths_set_path_points(GimpImage * gimage,
} }
void void
paths_stroke(GimpImage *gimage,PathsList *pl,PATHP bzp) paths_stroke (GimpImage *gimage,
PathsList *pl,
PATHP bzp)
{ {
BezierSelect * bezier_sel; BezierSelect * bezier_sel;
GDisplay * gdisp; GDisplay * gdisp;
@ -3061,7 +3079,11 @@ paths_stroke(GimpImage *gimage,PathsList *pl,PATHP bzp)
} }
gint gint
paths_distance(PATHP bzp,gdouble dist,gint *x,gint *y, gdouble *grad) paths_distance (PATHP bzp,
gdouble dist,
gint *x,
gint *y,
gdouble *grad)
{ {
gint ret; gint ret;
BezierSelect * bezier_sel; BezierSelect * bezier_sel;
@ -3072,7 +3094,7 @@ paths_distance(PATHP bzp,gdouble dist,gint *x,gint *y, gdouble *grad)
} }
Tattoo Tattoo
paths_get_tattoo(PATHP p) paths_get_tattoo (PATHP p)
{ {
if(!p) if(!p)
{ {
@ -3084,7 +3106,8 @@ paths_get_tattoo(PATHP p)
} }
PATHP PATHP
paths_get_path_by_tattoo(GimpImage *gimage,Tattoo tattoo) paths_get_path_by_tattoo (GimpImage *gimage,
Tattoo tattoo)
{ {
GSList *tlist; GSList *tlist;
PATHIMAGELISTP plp; PATHIMAGELISTP plp;
@ -3114,8 +3137,8 @@ paths_get_path_by_tattoo(GimpImage *gimage,Tattoo tattoo)
gboolean gboolean
paths_delete_path(GimpImage *gimage, paths_delete_path (GimpImage *gimage,
gchar *pname) gchar *pname)
{ {
gint row = 0; gint row = 0;
gboolean found = FALSE; gboolean found = FALSE;

6
po-plug-ins/ChangeLog
View File

@ -1,3 +1,9 @@
Sun Oct 24 18:58:16 MEST 1999 Sven Neumann <sven@gimp.org>
* de.po: Checked in first german version
(done by Felix Natter <f.natter@ndh.net>
and Daniel Eggert <Daniel.Egger@rz.fh-muenchen.de>)
1999-10-21 Kjartan Maraas <kmaraas@online.no> 1999-10-21 Kjartan Maraas <kmaraas@online.no>
* no.po: Updated Norwegian translation. * no.po: Updated Norwegian translation.

2904
po-plug-ins/de.po
View File

File diff suppressed because it is too large Load Diff