Re: [evolution-patches] Patch for bug#246225 , bug#246227

[Arulanandan P <arulanandan gmail com>]

hi 
        i have made the necessary
changes . Included the _() macro for all the strings . removed 
the html tags  in stings . 
        i have attached the revised patch with this mail .

On 8/2/05, Not Zed <notzed ximian com> wrote:

Any displayed strings need to be setup for translating.  You may want to
look at the gnome programming information on developer.gnome.org.  Or
the gettext manual.  This is a pretty basic requirement for programming
in gnome.  But in the short, you add the macro _() around the string
text that is to be translated.  You don't include html or other markup
etc if possible, etc.  It is explained on the gnome developer site
somewhere, probably under i18n.

On Tue, 2005-08-02 at 00:05 +0530, Arulanandan P wrote:
> hi
>
> On 8/1/05, Not Zed <notzed ximian com> wrote:
> >
> > And none of the new strings are translated.
> >
>    Can u explain more on this . im not clear with your statement .
>
>
> > On Sat, 2005-07-30 at 13:20 +0530, Arulanandan P wrote:
> > > Hi,
> > >
> > >      i have attached the patch for the bugs # 246225 and
> 246227  with
> > > changelog . This fixes the UI suggestions for  the "Advanced
> Search"
> > > and "Save Search" dialogs .
> > >
> > > Please review it .
> > >
> > > bye
> > > arulanandan
> > > _______________________________________________
> > > evolution-patches mailing list
> > > evolution-patches lists ximian com
> > > http://lists.ximian.com/mailman/listinfo/evolution-patches
> >
> >

Index: filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
retrieving revision 1.68
diff -u -p -r1.68 filter-rule.c
--- filter-rule.c	16 May 2005 06:14:34 -0000	1.68
+++ filter-rule.c	2 Aug 2005 10:56:03 -0000
@@ -777,9 +777,9 @@ get_widget (FilterRule *fr, struct _Rule
 	GtkWidget *add, *label, *name, *w;
 	GtkWidget *omenu, *menu, *item;
 	GtkWidget *scrolledwindow;
+	GtkWidget *scrollbox , *columntitle;
 	GtkObject *hadj, *vadj;
 	GList *l;
-	gchar *text;
 	FilterPart *part;
 	struct _rule_data *data;
 	int rows, i;
@@ -788,7 +788,7 @@ get_widget (FilterRule *fr, struct _Rule
 	   rule parts need to be a vbox */
 	vbox = gtk_vbox_new (FALSE, 6);
 
-	label = gtk_label_new_with_mnemonic (_("_Rule name:"));
+	label = gtk_label_new_with_mnemonic (_("_Search name:"));
 	name = gtk_entry_new ();
 	gtk_label_set_mnemonic_widget (label, name);
 
@@ -816,13 +816,10 @@ get_widget (FilterRule *fr, struct _Rule
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);
 
-	text = g_strdup_printf("<b>%s</b>", _("If"));
-	label = gtk_label_new (text);
-	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+	label = gtk_label_new (_("Find items that meet the following criteria"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
-	g_free(text);
 
 	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
@@ -855,9 +852,9 @@ get_widget (FilterRule *fr, struct _Rule
 	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0);
 
 	if (f->flags & RULE_CONTEXT_GROUPING) {
-		const char *thread_types[] = { N_("if all criteria are met"), N_("if any criteria are met") };
+		const char *thread_types[] = { N_("If all criteria are met"), N_("If any criteria are met") };
 
-		label = gtk_label_new (_("Execute actions"));
+		label = gtk_label_new (_("Find items:"));
 		menu = gtk_menu_new ();
 	
 		for (i=0;i<2;i++) {
@@ -919,9 +916,28 @@ get_widget (FilterRule *fr, struct _Rule
 					GTK_POLICY_AUTOMATIC,
 					GTK_POLICY_AUTOMATIC);
 	
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
+	/* adds title to the columns in the table of criteria : Field , Condition , Value */
+        columntitle = gtk_hbox_new(FALSE,0);
+
+        label = gtk_label_new(_("Field")) ;
+        gtk_box_pack_start (GTK_BOX (columntitle), label, FALSE, FALSE,45);
+
+        label = gtk_label_new(_("Condition"));
+        gtk_box_pack_start( GTK_BOX(columntitle) , label , FALSE ,FALSE ,50);
+
+        label =  gtk_label_new(_("Value"));
+        gtk_box_pack_start(GTK_BOX(columntitle) , label , FALSE , FALSE , 75 );/* packs the column titles to the hbox */
 	
-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
+	scrollbox =  gtk_vbox_new(FALSE,0);
+
+	/*columntitle and parts get added to the vbox  scrollbox */
+        gtk_box_pack_start(GTK_BOX(scrollbox),columntitle,FALSE,FALSE,0);
+
+        gtk_box_pack_start(GTK_BOX(scrollbox),parts,FALSE,FALSE,0);
+        
+	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), scrollbox);
+        
+	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);	
 	
 	gtk_widget_show_all (vbox);
 	
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/filter/ChangeLog,v
retrieving revision 1.425
diff -u -p -r1.425 ChangeLog
--- ChangeLog	16 May 2005 06:14:34 -0000	1.425
+++ ChangeLog	30 Jul 2005 07:34:41 -0000
@@ -1,3 +1,9 @@
+2005-07-30  Arulanandan P <arulanandan gmail com>
+
+	* filter-rule.c : Added the UI suggestions for "Advanced search" and "Save search"
+
+	* Fixes bugs   #246225  , #246227 
+		
 2005-05-16  Not Zed  <NotZed Ximian com>
 
 	* moved e-error to e-util