qi-hardware/fped
1
0
Fork 0
mirror of git://projects.qi-hardware.com/fped.git synced 2025-04-21 12:27:27 +03:00
Code Activity

- gui_tools.c:new_vec didn't initialize vec->samples, causing fped to crash

Browse Source 
- we didn't dehover before deleting, which could cause a crash
- added delete tool to canvas. Thus ...
- we no longer need the Delete key on the canvas, so we can ...
- always focus the (first) entry field, and ...
- removed "focus" parameter to edit functions



git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5403 99fdad57-331a-0410-800a-d7fa5415bdb3
This commit is contained in:
werner
2009-08-07 19:42:57 +00:00
parent 3ef1bb4afa
commit bb7355d84b
9 changed files with 87 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gui_status.c
View File

@@ -168,8 +168,7 @@ static gboolean edit_key_press_event(GtkWidget *widget, GdkEventKey *event,
}
static void setup_edit(GtkWidget *widget, struct edit_ops *ops, void *ctx,
int focus)
static void setup_edit(GtkWidget *widget, struct edit_ops *ops, void *ctx)
{
gtk_object_set_data(GTK_OBJECT(widget), "edit-ops", ops);
gtk_object_set_data(GTK_OBJECT(widget), "edit-ctx", ctx);
@@ -177,7 +176,7 @@ static void setup_edit(GtkWidget *widget, struct edit_ops *ops, void *ctx,
reset_edit(widget);
if (focus)
if (!open_edits)
gtk_widget_grab_focus(GTK_WIDGET(widget));
gtk_widget_show(widget);
@@ -241,14 +240,14 @@ static struct edit_ops edit_ops_unique = {
void edit_unique(const char **s, int (*validate)(const char *s, void *ctx),
void *ctx, int focus)
void *ctx)
{
static struct edit_unique_ctx unique_ctx;
unique_ctx.s = s;
unique_ctx.validate = validate;
unique_ctx.ctx = ctx;
setup_edit(status_entry, &edit_ops_unique, &unique_ctx, focus);
setup_edit(status_entry, &edit_ops_unique, &unique_ctx);
}
@@ -287,14 +286,14 @@ static struct edit_ops edit_ops_null_unique = {
void edit_unique_null(const char **s,
int (*validate)(const char *s, void *ctx), void *ctx, int focus)
int (*validate)(const char *s, void *ctx), void *ctx)
{
static struct edit_unique_ctx unique_ctx;
unique_ctx.s = s;
unique_ctx.validate = validate;
unique_ctx.ctx = ctx;
setup_edit(status_entry, &edit_ops_null_unique, &unique_ctx, focus);
setup_edit(status_entry, &edit_ops_null_unique, &unique_ctx);
}
@@ -343,15 +342,14 @@ static struct edit_ops edit_ops_name = {
};
void edit_name(char **s, int (*validate)(const char *s, void *ctx), void *ctx,
int focus)
void edit_name(char **s, int (*validate)(const char *s, void *ctx), void *ctx)
{
static struct edit_name_ctx name_ctx;
name_ctx.s = s;
name_ctx.validate = validate;
name_ctx.ctx = ctx;
setup_edit(status_entry, &edit_ops_name, &name_ctx, focus);
setup_edit(status_entry, &edit_ops_name, &name_ctx);
}
@@ -405,27 +403,27 @@ static struct edit_ops edit_ops_expr = {
};
static void edit_any_expr(GtkWidget *widget, struct expr **expr, int focus)
static void edit_any_expr(GtkWidget *widget, struct expr **expr)
{
setup_edit(widget, &edit_ops_expr, expr, focus);
setup_edit(widget, &edit_ops_expr, expr);
}
void edit_expr(struct expr **expr, int focus)
void edit_expr(struct expr **expr)
{
edit_any_expr(status_entry, expr, focus);
edit_any_expr(status_entry, expr);
}
void edit_x(struct expr **expr)
{
edit_any_expr(status_entry_x, expr, 0);
edit_any_expr(status_entry_x, expr);
}
void edit_y(struct expr **expr)
{
edit_any_expr(status_entry_y, expr, 0);
edit_any_expr(status_entry_y, expr);
}