Merge lp:~slodki/homebank/re into lp:homebank/trunk

[slodki]

See related bug description with examples and screenshots.
Manual should be also updated with reference to https://developer.gnome.org/glib/stable/glib-regex-syntax.html.

[lp:~slodki/homebank/re]

37. By slodki on 2015-10-08

minor fix

38. By slodki on 2015-10-08

GUI for ASGF_OVW* added

39. By slodki on 2015-10-08

Don't allow to overwrite with empty payee or category in assignments

40. By slodki on 2015-10-08

Add ability to assign Payment

41. By slodki on 2015-10-09

Fixed typo in assign_rename()

42. By slodki on 2015-10-24

merged trunk

43. By slodki on 2015-10-24

fix for merging trunk

44. By slodki on 2015-10-24

fix for merging trunk

Unmerged revisions

44. By slodki on 2015-10-24

fix for merging trunk

43. By slodki on 2015-10-24

fix for merging trunk

42. By slodki on 2015-10-24

merged trunk

41. By slodki on 2015-10-09

Fixed typo in assign_rename()

40. By slodki on 2015-10-08

Add ability to assign Payment

39. By slodki on 2015-10-08

Don't allow to overwrite with empty payee or category in assignments

38. By slodki on 2015-10-08

GUI for ASGF_OVW* added

37. By slodki on 2015-10-08

minor fix

36. By slodki on 2015-10-08

update to latest trunk

35. By slodki on 2015-10-08

New attribute "patt" (pattern) added to assignment rule.
Changed assignment window layout - separate name and pattern fields
xhb file format version bumped to 1.2 (upgrade from <1.2 included).

=== modified file 'src/hb-assign.c'
--- src/hb-assign.c	2015-02-08 13:24:47 +0000
+++ src/hb-assign.c	2015-10-24 13:51:48 +0000
@@ -43,6 +43,7 @@
 		DB( g_print(" => %d, %s\n", item->key, item->name) );
 
 		g_free(item->name);
+		g_free(item->patt);
 		g_free(item);
 	}
 }

=== modified file 'src/hb-assign.h'
--- src/hb-assign.h	2015-10-04 09:22:24 +0000
+++ src/hb-assign.h	2015-10-24 13:51:48 +0000
@@ -30,8 +30,10 @@
 	gushort		flags;
 	gushort		field;
 	gchar   	*name;
+	gchar   	*patt;
 	guint32		kpay;
 	guint32		kcat;
+	gushort		paymode;
 };
 
 
@@ -40,6 +42,9 @@
 #define ASGF_DOCAT	(1<<2)
 #define ASGF_OVWPAY	(1<<3)
 #define ASGF_OVWCAT	(1<<4)
+#define ASGF_REMATCH	(1<<5)
+#define ASGF_DOMOD	(1<<6)
+#define ASGF_OVWMOD	(1<<7)
 
 void
 da_asg_free(Assign *item);

=== modified file 'src/hb-hbfile.c'
--- src/hb-hbfile.c	2015-10-04 09:22:24 +0000
+++ src/hb-hbfile.c	2015-10-24 13:51:48 +0000
@@ -273,6 +273,8 @@
 		{
 			g_free(item->name);
 			item->name = g_strdup_printf("assign %d", item->key);
+			g_free(item->patt);
+			item->patt = g_strdup_printf("pattern %d", item->key);
 			GLOBALS->changes_count++;
 		}
 		list = g_list_next(list);

=== modified file 'src/hb-transaction.c'
--- src/hb-transaction.c	2015-10-18 12:22:35 +0000
+++ src/hb-transaction.c	2015-10-24 13:51:48 +0000
@@ -853,6 +853,22 @@
 	return match;
 }
 
+static gboolean misc_re_match(gchar *text, gchar *searchtext, gboolean exact)
+{
+gboolean match = FALSE;
+
+	if(text == NULL)
+		return FALSE;
+	
+	DB( g_print("match RE %s in %s\n", searchtext, text) );
+	if( searchtext != NULL )
+	{
+		match = g_regex_match_simple(searchtext, text, ((exact == TRUE)?0:G_REGEX_CASELESS) | G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTEMPTY );
+		if (match == TRUE) { DB( g_print(" found pattern '%s'\n", searchtext) ); }
+	}
+	return match;
+}
+
 
 static Assign *transaction_auto_assign_eval_txn(GList *l_rul, Transaction *txn)
 {
@@ -874,7 +890,7 @@
 			if(pay)
 				text = pay->name;
 		}
-		if( misc_text_match(text, rul->name, rul->flags & ASGF_EXACT))
+		if( (rul->flags & ASGF_REMATCH) ? misc_re_match(text, rul->patt, rul->flags & ASGF_EXACT) : misc_text_match(text, rul->patt, rul->flags & ASGF_EXACT) )
 			rule = rul;
 
 		list = g_list_next(list);
@@ -898,7 +914,7 @@
 
 		if( rul->field == 0 )   //memo
 		{
-			if( misc_text_match(text, rul->name, rul->flags & ASGF_EXACT))
+			if( (rul->flags & ASGF_REMATCH) ? misc_re_match(text, rul->patt, rul->flags & ASGF_EXACT) : misc_text_match(text, rul->patt, rul->flags & ASGF_EXACT) )
 				rule = rul;
 		}
 		list = g_list_next(list);
@@ -934,17 +950,26 @@
 			rul = transaction_auto_assign_eval_txn(l_rul, ope);
 			if( rul != NULL )
 			{
-				if( (ope->kpay == 0 || (rul->flags & ASGF_OVWPAY)) && (rul->flags & ASGF_DOPAY) )
+				if( (ope->kpay == 0 || (rul->flags & ASGF_OVWPAY)) && rul->kpay != 0 && ope->kpay != rul->kpay && (rul->flags & ASGF_DOPAY) )
 				{
-					if(ope->kpay != rul->kpay) { changed = TRUE; }
+					changed = TRUE;
 					ope->kpay = rul->kpay;
 				}
 
+				if( (ope->paymode == 0 || (rul->flags & ASGF_OVWMOD)) && rul->paymode != 0 && ope->paymode != rul->paymode && (rul->flags & ASGF_DOMOD) )
+				{
+					if(ope->paymode != PAYMODE_INTXFER && rul->paymode != PAYMODE_INTXFER) //ugly hack - don't allow modify intxfer
+					{
+						changed = TRUE;
+						ope->paymode = rul->paymode;
+					}
+				}
+
 				if( !(ope->flags & OF_SPLIT) )
 				{
-					if( (ope->kcat == 0 || (rul->flags & ASGF_OVWCAT)) && (rul->flags & ASGF_DOCAT) )
+					if( (ope->kcat == 0 || (rul->flags & ASGF_OVWCAT)) && rul->kcat != 0 && ope->kcat != rul->kcat && (rul->flags & ASGF_DOCAT) )
 					{
-						if(ope->kcat != rul->kcat) { changed = TRUE; }
+						changed = TRUE;
 						ope->kcat = rul->kcat;
 					}
 				}
@@ -964,9 +989,9 @@
 					if( rul != NULL )
 					{
 						//#1501144: check if user wants to set category in rule
-						if( (split->kcat == 0 || (rul->flags & ASGF_OVWCAT)) && (rul->flags & ASGF_DOCAT) )
+						if( (split->kcat == 0 || (rul->flags & ASGF_OVWCAT)) && rul->kcat != 0 && split->kcat != rul->kcat && (rul->flags & ASGF_DOCAT) )
 						{
-							if(split->kcat != rul->kcat) { changed = TRUE; }
+							changed = TRUE;
 							split->kcat = rul->kcat;
 						}
 					}

=== modified file 'src/hb-xml.c'
--- src/hb-xml.c	2015-10-18 12:22:35 +0000
+++ src/hb-xml.c	2015-10-24 13:51:48 +0000
@@ -405,9 +405,10 @@
 		else if(!strcmp (attribute_names[i], "flags"   )) { entry->flags = atoi(attribute_values[i]); }
 		else if(!strcmp (attribute_names[i], "field"   )) { entry->field = atoi(attribute_values[i]); }
 		else if(!strcmp (attribute_names[i], "name"    )) { if(strcmp(attribute_values[i],"(null)") && attribute_values[i] != NULL) entry->name = g_strdup(attribute_values[i]); }
+		else if(!strcmp (attribute_names[i], "patt"    )) { if(strcmp(attribute_values[i],"(null)") && attribute_values[i] != NULL) entry->patt = g_strdup(attribute_values[i]); }
 		else if(!strcmp (attribute_names[i], "payee"   )) { entry->kpay = atoi(attribute_values[i]); }
 		else if(!strcmp (attribute_names[i], "category")) { entry->kcat = atoi(attribute_values[i]); }
-		//else if(!strcmp (attribute_names[i], "paymode" )) { entry->paymode = atoi(attribute_values[i]); }
+		else if(!strcmp (attribute_names[i], "paymode" )) { entry->paymode = atoi(attribute_values[i]); }
 		// prior v08
 		else if(!strcmp (attribute_names[i], "exact" )) { exact = atoi(attribute_values[i]); }
 	}
@@ -420,6 +421,12 @@
 		   entry->flags |= ASGF_EXACT;
 	}
 
+	/* in v1.2 pattern field added, value stored in name earlier */
+	if( ctx->file_version < 1.2)
+	{
+		entry->patt = g_strdup(entry->name);
+	}
+
 	//all attribute loaded: append
 	da_asg_append(entry);
 
@@ -1224,9 +1231,10 @@
 		hb_xml_append_int(node, "flags"   , item->flags);
 		hb_xml_append_int(node, "field"   , item->field);
 		hb_xml_append_txt(node, "name"    , item->name);	
+		hb_xml_append_txt(node, "patt"    , item->patt);
 		hb_xml_append_int(node, "payee"   , item->kpay);
 		hb_xml_append_int(node, "category", item->kcat);
-		//hb_xml_append_int(node, "paymode" , item->paymode);
+		hb_xml_append_int(node, "paymode" , item->paymode);
 
 		g_string_append(node, "/>\n");
 		

=== modified file 'src/homebank.h'
--- src/homebank.h	2015-10-04 09:22:24 +0000
+++ src/homebank.h	2015-10-24 13:51:48 +0000
@@ -76,7 +76,7 @@
 #define HB_VERSION			"5.0.6"
 #define HB_VERSION_NUM	(HB_VERSION_MAJOR*10000) + (HB_VERSION_MINOR*100) + HB_VERSION_MICRO
 
-#define FILE_VERSION		1.1
+#define FILE_VERSION		1.2
 #define PREF_VERSION		500
 
 #if HB_UNSTABLE == FALSE

=== modified file 'src/ui-assign.c'
--- src/ui-assign.c	2015-10-18 12:22:35 +0000
+++ src/ui-assign.c	2015-10-24 13:51:48 +0000
@@ -312,7 +312,7 @@
 
 		item->field = radio_get_active(GTK_CONTAINER(data->CY_field));
 		
-		/*txt = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->ST_text));
+		/*txt = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->ST_name));
 		if (txt && *txt)
 		{
 			bool = assign_rename(item, txt);
@@ -322,7 +322,7 @@
 			}
 			else
 			{
-				gtk_entry_set_text(GTK_ENTRY(data->ST_text), item->name);
+				gtk_entry_set_text(GTK_ENTRY(data->ST_name), item->name);
 			}
 		}*/
 
@@ -331,15 +331,30 @@
 		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_exact));
 		if(active == 1) item->flags |= ASGF_EXACT;
 
+		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_re));
+		if(active == 1) item->flags |= ASGF_REMATCH;
+
 		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_pay));
 		if(active == 1) item->flags |= ASGF_DOPAY;
 
 		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_cat));
 		if(active == 1) item->flags |= ASGF_DOCAT;
 
+		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_mod));
+		if(active == 1) item->flags |= ASGF_DOMOD;
+
 		item->kcat    = ui_cat_comboboxentry_get_key_add_new(GTK_COMBO_BOX(data->PO_cat));
 		item->kpay    = ui_pay_comboboxentry_get_key_add_new(GTK_COMBO_BOX(data->PO_pay));
-
+		item->paymode = gtk_combo_box_get_active(GTK_COMBO_BOX(data->NU_mod));
+
+		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_payovw));
+		if(active == 1) item->flags |= ASGF_OVWPAY;
+
+		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_catovw));
+		if(active == 1) item->flags |= ASGF_OVWCAT;
+
+		active   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_modovw));
+		if(active == 1) item->flags |= ASGF_OVWMOD;
 	}
 
 }
@@ -371,15 +386,23 @@
 
 		radio_set_active(GTK_CONTAINER(data->CY_field), item->field);
 		
-		gtk_entry_set_text(GTK_ENTRY(data->ST_text), item->name);
+		gtk_entry_set_text(GTK_ENTRY(data->ST_name), item->name);
+		gtk_entry_set_text(GTK_ENTRY(data->ST_patt), item->patt);
 
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_exact), (item->flags & ASGF_EXACT) ? 1 : 0);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_re), (item->flags & ASGF_REMATCH) ? 1 : 0);
 
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_cat), (item->flags & ASGF_DOCAT) ? 1 : 0);
 		ui_cat_comboboxentry_set_active(GTK_COMBO_BOX(data->PO_cat), item->kcat);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_catovw), (item->flags & ASGF_OVWCAT) ? 1 : 0);
 
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_pay), (item->flags & ASGF_DOPAY) ? 1 : 0);
 		ui_pay_comboboxentry_set_active(GTK_COMBO_BOX(data->PO_pay), item->kpay);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_payovw), (item->flags & ASGF_OVWPAY) ? 1 : 0);
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_mod), (item->flags & ASGF_DOMOD) ? 1 : 0);
+		gtk_combo_box_set_active(GTK_COMBO_BOX(data->NU_mod), item->paymode);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_modovw), (item->flags & ASGF_OVWMOD) ? 1 : 0);
 
 
 	}
@@ -405,12 +428,15 @@
 
 	active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_pay));
 	gtk_widget_set_sensitive(data->PO_pay, active);
+	gtk_widget_set_sensitive(data->CM_payovw, active);
 	
 	active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_cat));
 	gtk_widget_set_sensitive(data->PO_cat, active);
+	gtk_widget_set_sensitive(data->CM_catovw, active);
 	
-	//active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_mod));
-	//gtk_widget_set_sensitive(data->NU_mod, active);
+	active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_mod));
+	gtk_widget_set_sensitive(data->NU_mod, active);
+	gtk_widget_set_sensitive(data->CM_modovw, active);
 
 }
 
@@ -440,6 +466,7 @@
 
 
 	sensitive = (selected == TRUE) ? TRUE : FALSE;
+	gtk_widget_set_sensitive(data->GR_name, sensitive);
 	gtk_widget_set_sensitive(data->GR_condition, sensitive);
 	gtk_widget_set_sensitive(data->GR_assignment, sensitive);
 
@@ -481,6 +508,7 @@
 
 	item = da_asg_malloc();
 	item->name = g_strdup_printf( _("(assignment %d)"), da_asg_length()+1);
+	item->patt = g_strdup(item->name);
 
 	da_asg_append(item);
 	ui_asg_listview_add(GTK_TREE_VIEW(data->LV_rul), item);
@@ -550,7 +578,7 @@
 	{
 	Assign *item = da_asg_get(key);
 
-		txt = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->ST_text));
+		txt = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->ST_name));
 		if( txt == NULL || *txt == '\0' )
 		{
 			error = TRUE;
@@ -571,11 +599,40 @@
 	}
 
 end:
-	gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET(data->ST_text)), GTK_STYLE_CLASS_ERROR);
+	gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET(data->ST_name)), GTK_STYLE_CLASS_ERROR);
 
 	if( error == TRUE )
-		gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(data->ST_text)), GTK_STYLE_CLASS_ERROR);
-}
+		gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(data->ST_name)), GTK_STYLE_CLASS_ERROR);
+}
+
+
+
+/*
+**
+*/
+static void ui_asg_manage_update_pattern(GtkWidget *widget, gpointer user_data)
+{
+struct ui_asg_manage_data *data;
+guint32 key;
+gchar *txt;
+
+	data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
+	DB( g_print("\n(ui_asg_manage_update_pattern) (data=%x)\n", (guint)data) );
+
+	key = ui_asg_listview_get_selected_key(GTK_TREE_VIEW(data->LV_rul));
+	if( key > 0 )
+	{
+		Assign *item = da_asg_get(key);
+		txt = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->ST_patt));
+		if (txt && *txt)
+		{
+			g_free(item->patt);
+			item->patt = g_strdup(txt);
+		}
+		data->change++;
+	}
+}
+
 
 
 /*
@@ -736,12 +793,27 @@
 	gtk_widget_set_margin_start(content_grid, SPACING_SMALL);
 	gtk_paned_pack2 (GTK_PANED(hpaned), content_grid, FALSE, FALSE);
 
+	// group :: Name
+    group_grid = gtk_grid_new ();
+	data.GR_name = group_grid; 
+	gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
+	gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
+	gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 0, 1, 1);
+	
+	row = 0;
+	label = make_label(_("_Name:"), 0.0, 0.5);
+	gtk_grid_attach (GTK_GRID (group_grid), label, 0, row, 1, 1);
+	entry1 = make_string(label);
+	data.ST_name = entry1;
+	gtk_widget_set_hexpand(entry1, TRUE);
+	gtk_grid_attach (GTK_GRID (group_grid), entry1, 1, row, 1, 1);
+
 	// group :: Condition
     group_grid = gtk_grid_new ();
 	data.GR_condition = group_grid; 
 	gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
 	gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
-	gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 0, 1, 1);
+	gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 1, 1, 1);
 	
 	row = 0;
 	label = make_label_group(_("Condition"));
@@ -758,7 +830,7 @@
 	label = make_label(_("Con_tains:"), 0.0, 0.5);
 	gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
 	entry1 = make_string(label);
-	data.ST_text = entry1;
+	data.ST_patt = entry1;
 	gtk_widget_set_hexpand(entry1, TRUE);
 	gtk_grid_attach (GTK_GRID (group_grid), entry1, 2, row, 2, 1);
 
@@ -767,12 +839,17 @@
 	data.CM_exact = widget;
 	gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 3, 1);
 
+	row++;
+	widget = gtk_check_button_new_with_mnemonic (_("Use _Regular Expressions"));
+	data.CM_re = widget;
+	gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 3, 1);
+
 	// group :: Assignments
     group_grid = gtk_grid_new ();
 	data.GR_assignment = group_grid;
 	gtk_grid_set_row_spacing (GTK_GRID (group_grid), SPACING_SMALL);
 	gtk_grid_set_column_spacing (GTK_GRID (group_grid), SPACING_MEDIUM);
-	gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 1, 1, 1);
+	gtk_grid_attach (GTK_GRID (content_grid), group_grid, 0, 2, 1, 1);
 	
 	row = 0;
 	label = make_label_group(_("Assignments"));
@@ -793,6 +870,11 @@
 	gtk_widget_set_tooltip_text(widget, _("Autocompletion and direct seizure\nis available for Category"));
 	
 	row++;
+	widget = gtk_check_button_new_with_mnemonic (_("Allow overwrite"));
+	data.CM_catovw = widget;
+	gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 2, 1);
+
+	row++;
 	label = gtk_label_new_with_mnemonic (_("_Payee:"));
 	gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
 	widget = gtk_check_button_new();
@@ -806,6 +888,30 @@
 
 	gtk_widget_set_tooltip_text(widget, _("Autocompletion and direct seizure\nis available for Payee"));
 
+	row++;
+	widget = gtk_check_button_new_with_mnemonic (_("Allow overwrite"));
+	data.CM_payovw = widget;
+	gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 2, 1);
+
+	row++;
+	label = gtk_label_new_with_mnemonic (_("Pay_ment:"));
+	gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
+	widget = gtk_check_button_new();
+	data.CM_mod = widget;
+	gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+	gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
+	widget = make_paymode(label);
+	data.NU_mod = widget;
+	gtk_widget_set_hexpand(widget, TRUE);
+	gtk_grid_attach (GTK_GRID (group_grid), widget, 3, row, 1, 1);
+
+	//ugly hack
+	gtk_widget_set_tooltip_text(widget, _("Internal transfer unsupported\nin auto assignments"));
+
+	row++;
+	widget = gtk_check_button_new_with_mnemonic (_("Allow overwrite"));
+	data.CM_modovw = widget;
+	gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 2, 1);
 
 
 	//connect all our signals
@@ -813,10 +919,15 @@
 
 	g_signal_connect (gtk_tree_view_get_selection(GTK_TREE_VIEW(data.LV_rul)), "changed", G_CALLBACK (ui_asg_manage_selection), NULL);
 
-	g_signal_connect (G_OBJECT (data.ST_text), "changed", G_CALLBACK (ui_asg_manage_rename), NULL);
+	g_signal_connect (G_OBJECT (data.ST_name), "changed", G_CALLBACK (ui_asg_manage_rename), NULL);
+	g_signal_connect (G_OBJECT (data.ST_patt), "changed", G_CALLBACK (ui_asg_manage_update_pattern), NULL);
 
 	g_signal_connect (G_OBJECT (data.CM_cat), "toggled", G_CALLBACK (ui_asg_manage_update_assignments), NULL);
 	g_signal_connect (G_OBJECT (data.CM_pay), "toggled", G_CALLBACK (ui_asg_manage_update_assignments), NULL);
+	g_signal_connect (G_OBJECT (data.CM_mod), "toggled", G_CALLBACK (ui_asg_manage_update_assignments), NULL);
+	g_signal_connect (G_OBJECT (data.CM_catovw), "toggled", G_CALLBACK (ui_asg_manage_update_assignments), NULL);
+	g_signal_connect (G_OBJECT (data.CM_payovw), "toggled", G_CALLBACK (ui_asg_manage_update_assignments), NULL);
+	g_signal_connect (G_OBJECT (data.CM_modovw), "toggled", G_CALLBACK (ui_asg_manage_update_assignments), NULL);
 
 	g_signal_connect (G_OBJECT (data.BT_add), "clicked", G_CALLBACK (ui_asg_manage_add), NULL);
 	g_signal_connect (G_OBJECT (data.BT_rem), "clicked", G_CALLBACK (ui_asg_manage_delete), NULL);

=== modified file 'src/ui-assign.h'
--- src/ui-assign.h	2015-02-08 13:24:47 +0000
+++ src/ui-assign.h	2015-10-24 13:51:48 +0000
@@ -57,14 +57,18 @@
 	GtkWidget	*LV_rul;
 	GtkWidget	*BT_add, *BT_rem;
 
+	GtkWidget   *GR_name;
 	GtkWidget   *GR_condition;
 	GtkWidget   *GR_assignment;
 	GtkWidget   *CY_field;
-	GtkWidget	*ST_text;
+	GtkWidget	*ST_name;
+	GtkWidget	*ST_patt;
 	GtkWidget	*CM_exact;
+	GtkWidget	*CM_re;
 	
-	GtkWidget	*CM_pay, *PO_pay;
-	GtkWidget	*CM_cat, *PO_cat;
+	GtkWidget	*CM_pay, *PO_pay, *CM_payovw;
+	GtkWidget	*CM_cat, *PO_cat, *CM_catovw;
+	GtkWidget	*CM_mod, *NU_mod, *CM_modovw;
 
 
 };