GNOME.org
 

[evolution-patches] [dsevilla ditec um es: Patch for #46229]

Hi:

	I think this one I sent some time ago got unapproved because I
was not subscribed.

	Please, review it.

	Best regards,
	diego

-- 
Diego Sevilla Ruiz -- http://ditec.um.es/~dsevilla/ -- dsevilla um es _.___
Dep. Ingeniería y Tecnología de Computadores, Facultad de Informática D|TEC
Univ.de Murcia,Campus Espinardo,30080 Murcia (SPAIN),Tel.+34968367571
--- Begin Message --- 
Hi, 

	Please, review this patch. It is an easy fix. I used glade-gnome-2 to
edit the filter dialog and changed the translations strings proposed in
the bug.

	Best regards,
	diego
-- 
Diego Sevilla Ruiz <dsevilla ditec um es>

? diff
? filter.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/filter/ChangeLog,v
retrieving revision 1.417
diff -u -r1.417 ChangeLog
--- ChangeLog	12 Aug 2004 20:35:30 -0000	1.417
+++ ChangeLog	16 Nov 2004 12:35:29 -0000
@@ -1,6 +1,11 @@
+2004-11-16  Diego Sevilla Ruiz  <dsevilla dsevilla>
+
+	* filter.glade:
+	* filter-rule.c: Applied patches proposed by #46229.
+
 2004-07-29  Carlos Garnacho Parro  <carlosg gnome org>
 
-	* filter-file.c: added the "use_filechooser" property to the 
+	* filter-file.c: added the "use_filechooser" property to the
 	GnomeFileEntry
 
 2004-06-21  Jeffrey Stedfast  <fejj novell com>
@@ -288,9 +293,9 @@
 
 	** See bug #47751.
 
-	* rule-editor.c (add_editor_response, edit_editor_response) 
+	* rule-editor.c (add_editor_response, edit_editor_response)
 	(rule_edit, rule_add, rule_editor_construct, editor_response):
-	* rule-context.c (new_rule_response, rule_context_add_rule_gui): 
+	* rule-context.c (new_rule_response, rule_context_add_rule_gui):
 	* filter-datespec.c (button_clicked): RESPONSE_REJECT/ACCEPT ->
 	RESPONSE_CANCEL/OK
 
@@ -302,7 +307,7 @@
 2003-12-06  JP Rosevear <jpr ximian com>
 
 	* */Makefile.am: Remove hard coded disable deprecated flags
-	
+
 2003-12-04  Radek Doulik  <rodo ximian com>
 
 	* filter-rule.h: added FILTER_SOURCE_JUNKTEST - perform only
@@ -352,7 +357,7 @@
 	(rule_context_add_rule_set): Likewise.
 	* rule-context.h: Update prototypes.  Use GType instead of int for
 	type in _part_set_map and _rule_set_map.
-	
+
 2003-09-15  Not Zed  <NotZed Ximian com>
 
 	** See Natzilla task #47524
@@ -379,7 +384,7 @@
 2003-08-05  Not Zed  <NotZed Ximian com>
 
 	** See bug #42636.
-	
+
 	* vfoldertypes.xml: Fix some of the subject rules, they were
 	missing matching ')'s.
 
Index: filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
retrieving revision 1.64
diff -u -r1.64 filter-rule.c
--- filter-rule.c	17 Jun 2004 07:34:07 -0000	1.64
+++ filter-rule.c	16 Nov 2004 12:35:31 -0000
@@ -971,6 +971,6 @@
 #ifdef FOR_TRANSLATIONS_ONLY
 
 static char *list[] = {
-  N_("incoming"), N_("outgoing")
+  N_("Incoming"), N_("Outgoing")
 };
 #endif
Index: filter.glade
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter.glade,v
retrieving revision 1.23
diff -u -r1.23 filter.glade
--- filter.glade	17 Jun 2004 07:34:07 -0000	1.23
+++ filter.glade	16 Nov 2004 12:35:33 -0000
@@ -2,7 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="rule-editor">
   <property name="visible">True</property>
@@ -12,6 +11,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="rule_editor">
@@ -21,6 +25,27 @@
       <property name="spacing">6</property>
 
       <child>
+	<widget class="GtkLabel" id="label17">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">&lt;b&gt;Show Filters for Mail:&lt;/b&gt;</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">True</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
 	<widget class="GtkOptionMenu" id="filter_source">
 	  <property name="can_focus">True</property>
 	  <property name="history">0</property>
@@ -141,6 +166,7 @@
 			      <property name="label">gtk-add</property>
 			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			  </child>
 
@@ -152,6 +178,7 @@
 			      <property name="label" translatable="yes">_Edit</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			  </child>
 
@@ -163,6 +190,7 @@
 			      <property name="label">gtk-remove</property>
 			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			  </child>
 
@@ -174,6 +202,7 @@
 			      <property name="label">gtk-go-up</property>
 			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			  </child>
 
@@ -185,6 +214,7 @@
 			      <property name="label">gtk-go-down</property>
 			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -235,6 +265,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="filter_datespec">

--- End Message ---
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]