Added an integer type for filtering values. used for size.

2001-07-02  Sam Creasey <sammy@oh.verio.com>
        * filter-int.c: Added an integer type for filtering values.  used
        for size.

        * Makefile.am (SOURCES): added filter-int.c, filter-int.h

        * filtertypes.xml: added a part entry for size based filters

svn path=/trunk/; revision=10717

7 files changed, 321 insertions, 0 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index b6e35dc914..68ff9bb901 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-02  Sam Creasey <sammy@oh.verio.com>
+	* filter-int.c: Added an integer type for filtering values.  used
+	for size.
+
+	* Makefile.am (SOURCES): added filter-int.c, filter-int.h
+
+	* filtertypes.xml: added a part entry for size based filters
+	
 2001-07-02  Anna Marie Dirks <anna@ximian.com> 
 
 	* filter-rule.c (get_widget): Changed "Add criterion" button to have 
diff --git a/filter/Makefile.am b/filter/Makefile.am
index a7f6fe1ce4..17b150baa9 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -40,6 +40,8 @@ libfilter_la_SOURCES =				\
 	filter-folder.h				\
 	filter-input.c				\
 	filter-input.h				\
+	filter-int.c				\
+	filter-int.h				\
 	filter-option.c				\
 	filter-option.h				\
 	filter-part.c				\
diff --git a/filter/filter-element.c b/filter/filter-element.c
index 40d4407277..ea3542b4e2 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -32,6 +32,7 @@
 #include "filter-colour.h"
 #include "filter-datespec.h"
 #include "filter-score.h"
+#include "filter-int.h"
 #include "filter-folder.h"
 #include "filter-source.h"
 
@@ -265,6 +266,8 @@ filter_element_new_type_name (const char *type)
 		return (FilterElement *)filter_datespec_new ();
 	} else if (!strcmp (type, "score")) {
 		return (FilterElement *)filter_score_new ();
+	} else if (!strcmp (type, "integer")) {
+		return (FilterElement *)filter_int_new ();
 	} else if (!strcmp (type, "regex")) {
 		return (FilterElement *)filter_input_new_type_name (type);
 	} else if (!strcmp (type, "source")) {
diff --git a/filter/filter-int.c b/filter/filter-int.c
new file mode 100644
index 0000000000..e6d2656b46
--- /dev/null
+++ b/filter/filter-int.c
@@ -0,0 +1,229 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Ripped off by Sam Creasey <sammy@oh.verio.com> from filter-score by:
+ *
+ *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *
+ *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkspinbutton.h>
+
+#include "e-util/e-sexp.h"
+#include "filter-int.h"
+
+#define d(x)
+
+static void xml_create (FilterElement *fe, xmlNodePtr node);
+static xmlNodePtr xml_encode (FilterElement *fe);
+static int xml_decode (FilterElement *fe, xmlNodePtr node);
+static GtkWidget *get_widget (FilterElement *fe);
+static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
+static void format_sexp (FilterElement *, GString *);
+
+static void filter_int_class_init (FilterIntClass *class);
+static void filter_int_init (FilterInt *gspaper);
+static void filter_int_finalise (GtkObject *obj);
+
+#define _PRIVATE(x) (((FilterInt *)(x))->priv)
+
+struct _FilterIntPrivate {
+};
+
+static FilterElementClass *parent_class;
+
+enum {
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+guint
+filter_int_get_type (void)
+{
+	static guint type = 0;
+	
+	if (!type) {
+		GtkTypeInfo type_info = {
+			"FilterInt",
+			sizeof (FilterInt),
+			sizeof (FilterIntClass),
+			(GtkClassInitFunc) filter_int_class_init,
+			(GtkObjectInitFunc) filter_int_init,
+			(GtkArgSetFunc) NULL,
+			(GtkArgGetFunc) NULL
+		};
+		
+		type = gtk_type_unique (filter_element_get_type (), &type_info);
+	}
+	
+	return type;
+}
+
+static void
+filter_int_class_init (FilterIntClass *class)
+{
+	GtkObjectClass *object_class;
+	FilterElementClass *filter_element = (FilterElementClass *)class;
+	
+	object_class = (GtkObjectClass *)class;
+	parent_class = gtk_type_class (filter_element_get_type ());
+	
+	object_class->finalize = filter_int_finalise;
+	
+	/* override methods */
+	filter_element->xml_create = xml_create;
+	filter_element->xml_encode = xml_encode;
+	filter_element->xml_decode = xml_decode;
+	filter_element->get_widget = get_widget;
+	filter_element->build_code = build_code;
+	filter_element->format_sexp = format_sexp;
+	
+	/* signals */
+	
+	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
+}
+
+static void
+filter_int_init (FilterInt *o)
+{
+	o->priv = g_malloc0 (sizeof (*o->priv));
+}
+
+static void
+filter_int_finalise(GtkObject *obj)
+{
+	FilterInt *o = (FilterInt *)obj;
+	
+	o = o;
+	
+        ((GtkObjectClass *)(parent_class))->finalize(obj);
+}
+
+/**
+ * filter_int_new:
+ *
+ * Create a new FilterInt object.
+ * 
+ * Return value: A new #FilterInt object.
+ **/
+FilterInt *
+filter_int_new (void)
+{
+	FilterInt *o = (FilterInt *)gtk_type_new(filter_int_get_type ());
+	return o;
+}
+
+static void
+xml_create (FilterElement *fe, xmlNodePtr node)
+{
+	/* parent implementation */
+        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
+}
+
+static xmlNodePtr
+xml_encode (FilterElement *fe)
+{
+	xmlNodePtr value;
+	FilterInt *fs = (FilterInt *)fe;
+	char *intval;
+	
+	d(printf("Encoding integer as xml\n"));
+	
+	value = xmlNewNode (NULL, "value");
+	xmlSetProp (value, "name", fe->name);
+	xmlSetProp (value, "type", "integer");
+	
+	intval = g_strdup_printf ("%d", fs->val);
+	xmlSetProp (value, "integer", intval);
+	g_free (intval);
+	
+	return value;
+}
+
+static int
+xml_decode (FilterElement *fe, xmlNodePtr node)
+{
+	FilterInt *fs = (FilterInt *)fe;
+	char *name;
+	char *intval;
+	
+	d(printf("Decoding integer from xml %p\n", fe));
+	
+	name = xmlGetProp (node, "name");
+	d(printf ("Name = %s\n", name));
+	xmlFree (fe->name);
+	fe->name = name;
+	intval = xmlGetProp (node, "integer");
+	if (intval) {
+		fs->val = atoi (intval);
+		xmlFree (intval);
+	} else
+		fs->val = 0;
+	
+	return 0;
+}
+
+static void
+spin_changed (GtkWidget *spin, FilterElement *fe)
+{
+	FilterInt *fs = (FilterInt *)fe;
+	
+	fs->val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
+}
+
+static GtkWidget *
+get_widget (FilterElement *fe)
+{
+	GtkWidget *spin;
+	GtkObject *adjustment;
+	FilterInt *fs = (FilterInt *)fe;
+	
+	adjustment = gtk_adjustment_new (0.0, 0.0, (gfloat)G_MAXINT, 
+					 1.0, 1.0, 1.0);
+	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 5.0, 0);
+	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+	
+	if (fs->val) {
+		gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), (gfloat) fs->val);
+	}
+	
+	gtk_signal_connect (GTK_OBJECT (spin), "changed", spin_changed, fe);
+	
+	return spin;
+}
+
+static void
+build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
+{
+	return;
+}
+
+static void
+format_sexp (FilterElement *fe, GString *out)
+{
+	FilterInt *fs = (FilterInt *)fe;
+	
+	g_string_append(out, g_strdup_printf("%d", fs->val));
+}
diff --git a/filter/filter-int.h b/filter/filter-int.h
new file mode 100644
index 0000000000..1fb702aec1
--- /dev/null
+++ b/filter/filter-int.h
@@ -0,0 +1,58 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Ripped off by Sam Creasey <sammy@oh.verio.com> from filter-score by:
+ *
+ *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *
+ *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef _FILTER_INT_H
+#define _FILTER_INT_H
+
+#include "filter-element.h"
+
+#define FILTER_INT(obj)           GTK_CHECK_CAST (obj, filter_int_get_type (), FilterInt)
+#define FILTER_INT_CLASS(klass)   GTK_CHECK_CLASS_CAST (klass, filter_int_get_type (), FilterIntClass)
+#define IS_FILTER_INT(obj)        GTK_CHECK_TYPE (obj, filter_int_get_type ())
+
+typedef struct _FilterInt        FilterInt;
+typedef struct _FilterIntClass   FilterIntClass;
+
+struct _FilterInt {
+	FilterElement parent;
+	struct _FilterIntPrivate *priv;
+	
+	gint32 val;
+};
+
+struct _FilterIntClass {
+	FilterElementClass parent_class;
+	
+	/* virtual methods */
+	
+	/* signals */
+};
+
+guint		filter_int_get_type	(void);
+FilterInt	*filter_int_new	(void);
+
+/* methods */
+
+#endif /* ! _FILTER_INT_H */
+
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 8f78594502..9da4fa4b15 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -414,6 +414,26 @@
   <input type="score" name="versus"/>
  </part>
 
+
+ <part name="size">
+  <title>Size (kB)</title>
+  <input type="optionlist" name="size-type">
+   <option value="greater-than">
+    <title>is greater than</title>
+    <code>
+       (match-all (&gt; (get-size) ${versus}))
+    </code>
+   </option>
+   <option value="less-than">
+    <title>is less than</title>
+    <code>
+       (match-all (&lt; (get-size) ${versus}))
+    </code>
+   </option>
+  </input>
+  <input type="integer" name="versus"/>
+ </part>
+
  <part name="status">
   <title>Status</title>
   <input type="optionlist" name="match-type">
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index 7fdeff6abe..d60ea90300 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -42,6 +42,7 @@ char *s = N_("Replied to");
 char *s = N_("Score");
 char *s = N_("Sender");
 char *s = N_("Set Status");
+char *s = N_("Size (kB)");
 char *s = N_("sounds like");
 char *s = N_("Source Account");
 char *s = N_("Specific header");