Re: [evolution-patches] Patch for bug#246225 , bug#246227
- From: Arulanandan P <arulanandan gmail com>
- To: Not Zed <notzed ximian com>
- Cc: evolution-patches lists ximian com, partha <sparthasarathi novell com>
- Subject: Re: [evolution-patches] Patch for bug#246225 , bug#246227
- Date: Wed, 3 Aug 2005 22:06:52 +0530
hi
i have changed the strings wherever necessary .
On 8/3/05, Not Zed <notzed ximian com> wrote:
Sigh. The string still needs MARKUP, but as can be plainly seen in the
original code, the markup wasn't in the *translated* string ...
On Tue, 2005-08-02 at 16:32 +0530, Arulanandan P wrote:
> - 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"));
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 3 Aug 2005 16:31:32 -0000
@@ -777,6 +777,7 @@ 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;
@@ -788,7 +789,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,7 +817,7 @@ 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"));
+ text = g_strdup_printf("<b>%s</b>", _("Find items that meet the following criteria"));
label = gtk_label_new (text);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -855,9 +856,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,8 +920,27 @@ 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 */
+
+ 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 3 Aug 2005 16:31:55 -0000
@@ -1,3 +1,9 @@
+2005-08-03 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]