aboutsummaryrefslogtreecommitdiffstats
path: root/filter/filter-editor.c
diff options
context:
space:
mode:
Diffstat (limited to 'filter/filter-editor.c')
-rw-r--r--filter/filter-editor.c62
1 files changed, 40 insertions, 22 deletions
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 4b86317141..776fd740ac 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -2,6 +2,7 @@
* Copyright (C) 2000 Helix Code Inc.
*
* Authors: Not Zed <notzed@lostzed.mmc.com.au>
+ * Jeffrey Stedfast <fejj@helixcode.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
@@ -63,7 +64,7 @@ filter_editor_get_type (void)
(GtkArgGetFunc)NULL
};
- type = gtk_type_unique(gnome_dialog_get_type (), &type_info);
+ type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
}
return type;
@@ -75,20 +76,20 @@ filter_editor_class_init (FilterEditorClass *class)
GtkObjectClass *object_class;
object_class = (GtkObjectClass *)class;
- parent_class = gtk_type_class(gnome_dialog_get_type ());
-
+ parent_class = gtk_type_class (gnome_dialog_get_type ());
+
object_class->finalize = filter_editor_finalise;
/* override methods */
-
+
/* signals */
-
- gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
+
+ gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
}
static void
filter_editor_init (FilterEditor *o)
{
- o->priv = g_malloc0(sizeof(*o->priv));
+ o->priv = g_malloc0 (sizeof (*o->priv));
}
static void
@@ -109,7 +110,7 @@ filter_editor_finalise (GtkObject *obj)
FilterEditor *
filter_editor_new (void)
{
- FilterEditor *o = (FilterEditor *)gtk_type_new(filter_editor_get_type ());
+ FilterEditor *o = (FilterEditor *)gtk_type_new (filter_editor_get_type ());
return o;
}
@@ -155,9 +156,13 @@ rule_add (GtkWidget *widget, struct _editor_data *data)
filter_filter_add_action (rule, filter_part_clone (part));
w = filter_rule_get_widget ((FilterRule *)rule, data->f);
- gd = gnome_dialog_new (_("Add Rule"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
- gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gd = gnome_dialog_new (_("Add Filter Rule"),
+ GNOME_STOCK_BUTTON_OK,
+ GNOME_STOCK_BUTTON_CANCEL,
+ NULL);
+ gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
+
gtk_widget_show (gd);
result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
@@ -174,11 +179,13 @@ rule_add (GtkWidget *widget, struct _editor_data *data)
gtk_widget_show (GTK_WIDGET (item));
l = g_list_append (l, item);
+
gtk_list_append_items (data->list, l);
gtk_list_select_child (data->list, GTK_WIDGET (item));
data->current = (FilterRule *)rule;
rule_context_add_rule (data->f, (FilterRule *)rule);
+
set_sensitive (data);
} else {
gtk_object_unref (GTK_OBJECT (rule));
@@ -197,18 +204,23 @@ rule_edit (GtkWidget *widget, struct _editor_data *data)
d(printf ("edit rule\n"));
rule = data->current;
w = filter_rule_get_widget (rule, data->f);
- gd = gnome_dialog_new(_("Edit Rule"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
- gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gd = gnome_dialog_new (_("Edit Filter Rule"),
+ GNOME_STOCK_BUTTON_OK,
+ GNOME_STOCK_BUTTON_CANCEL,
+ NULL);
+ gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
+
gtk_widget_show (gd);
+
result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
if (result == 0) {
- pos = rule_context_get_rank_rule(data->f, data->current, data->current_source);
+ pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
if (pos != -1) {
GtkListItem *item = g_list_nth_data (data->list->children, pos);
- gchar *s = e_utf8_to_gtk_string ((GtkWidget *) item, data->current->name);
- gtk_label_set_text((GtkLabel *)(((GtkBin *)item)->child), s);
+ gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (item), data->current->name);
+ gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), s);
g_free (s);
}
}
@@ -220,7 +232,7 @@ rule_delete (GtkWidget *widget, struct _editor_data *data)
int pos;
GList *l;
GtkListItem *item;
-
+
d(printf("ddelete rule\n"));
pos = rule_context_get_rank_rule(data->f, data->current, data->current_source);
if (pos != -1) {
@@ -234,6 +246,7 @@ rule_delete (GtkWidget *widget, struct _editor_data *data)
gtk_object_unref (GTK_OBJECT (data->current));
data->current = NULL;
}
+
set_sensitive (data);
}
@@ -260,9 +273,9 @@ rule_up (GtkWidget *widget, struct _editor_data *data)
int pos;
d(printf("up rule\n"));
- pos = rule_context_get_rank_rule(data->f, data->current, data->current_source);
+ pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
if (pos > 0) {
- rule_move (data, pos, pos-1);
+ rule_move (data, pos, pos - 1);
}
}
@@ -272,8 +285,8 @@ rule_down (GtkWidget *widget, struct _editor_data *data)
int pos;
d(printf ("down rule\n"));
- pos = rule_context_get_rank_rule(data->f, data->current, data->current_source);
- rule_move (data, pos, pos+1);
+ pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
+ rule_move (data, pos, pos + 1);
}
static struct {
@@ -295,11 +308,14 @@ set_sensitive (struct _editor_data *data)
while ((rule = rule_context_next_rule (data->f, rule, data->current_source))) {
if (rule == data->current)
- index=count;
+ index = count;
count++;
}
+
d(printf ("index = %d count=%d\n", index, count));
+
count--;
+
gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_EDIT]), index != -1);
gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DELETE]), index != -1);
gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_UP]), index > 0);
@@ -312,7 +328,7 @@ select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
if (data->current)
- d(printf ("seledct rule: %s\n", data->current->name));
+ d(printf ("selected rule: %s\n", data->current->name));
else
d(printf ("bad data?\n"));
@@ -418,6 +434,8 @@ filter_editor_construct (struct _FilterContext *f)
gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
select_source (GTK_MENU_ITEM (firstitem), data);
+ set_sensitive (data);
+
gtk_object_unref (GTK_OBJECT (gui));
return d;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 00:37:00 +0800