[evolution-patches] [ #53435 ] No Help Text in the Add. book properties druid...

[HP Nadig <hpnadig pacific net in>]

hi all,

	This one is the minor change that fixes the on focus - help text issue
for the search scope and download limit control widgets. Solves #53435
(http://bugzilla.ximian.com/show_bug.cgi?id=53435). diff attached.

thanks,

- h.p.
-- 
http://hpnadig.weblogs.us | http://www.hpnadig.com/

"I never think of the future - it comes soon enough."  -- Albert
Einstein

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1622
diff -u -r1.1622 ChangeLog
--- a/ChangeLog	26 Mar 2004 04:09:17 -0000	1.1622
+++ b/ChangeLog	3 May 2004 15:52:23 -0000
@@ -1,3 +1,12 @@
+2004-05-03  Hari Prasad Nadig <hpnadig pacific net in>
+
+	* gui/component/ldap-config.glade: help labels adjusted.
+
+	* gui/component/addressbook-config.c (setup_searching_tab): focus
+	handlers updated.
+	(scope_optionmenu_selected): a few changes needed to handle the
+	help on focus.
+
 2004-03-25 Sivaiah Nallagatla <snallagatla novell com>
 
 	* gui/component/eab-editor.c (eab_editor_prompt_to_save_changes) : 
Index: gui/component/addressbook-config.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-config.c,v
retrieving revision 1.69
diff -u -r1.69 addressbook-config.c
--- a/gui/component/addressbook-config.c	4 Mar 2004 06:03:38 -0000	1.69
+++ b/gui/component/addressbook-config.c	3 May 2004 15:52:34 -0000
@@ -864,10 +864,24 @@
 }
 
 static void
+scope_optionmenu_selected (GtkWidget *item, AddressbookSourceDialog *dialog)
+{
+	GtkWidget *searching_tab_help;
+	int scope_option = g_list_index (gtk_container_get_children (GTK_CONTAINER (item->parent)),
+				     item);
+
+	searching_tab_help = glade_xml_get_widget (dialog->gui, "searching-tab-help");
+
+	gtk_notebook_set_current_page (GTK_NOTEBOOK(searching_tab_help), scope_option + 1);
+}
+
+static void
 add_scope_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
 {
 	g_signal_connect (item, "activate",
 			  G_CALLBACK (scope_optionmenu_activated), dialog);
+	g_signal_connect (item, "select",
+			  G_CALLBACK (scope_optionmenu_selected), dialog);
 }
 
 static void
@@ -893,13 +907,14 @@
 	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_scope_activate_cb, dialog);
 
 	dialog->timeout_scale = glade_xml_get_widget (dialog->gui, "timeout-scale");
-	add_focus_handler (dialog->timeout_scale, searching_tab_help, 2);
+	add_focus_handler (dialog->timeout_scale, searching_tab_help, 3);
 	if (modify_func)
 		g_signal_connect (GTK_RANGE(dialog->timeout_scale)->adjustment,
 				  "value_changed",
 				  G_CALLBACK (modify_func), dialog);
 
 	dialog->limit_spinbutton = glade_xml_get_widget (dialog->gui, "download-limit-spinbutton");
+	add_focus_handler (dialog->limit_spinbutton, searching_tab_help, 4);
 	if (modify_func)
 		g_signal_connect (dialog->limit_spinbutton, "changed",
 				  G_CALLBACK (modify_func), dialog);
Index: gui/component/ldap-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/ldap-config.glade,v
retrieving revision 1.20
diff -u -r1.20 ldap-config.glade
--- a/gui/component/ldap-config.glade	12 Feb 2004 19:11:29 -0000	1.20
+++ b/gui/component/ldap-config.glade	3 May 2004 15:52:44 -0000
@@ -1877,12 +1877,12 @@
 	  <child>
 	    <widget class="GtkLabel" id="label178">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">This is the port on the LDAP server that Evolution will try to connect to. A 
+	      <property name="label" translatable="yes">This is the port on the LDAP server that Evolution will try to connect to. A
 list of standard ports has been provided. Ask your system administrator
 what port you should specify.</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
 	      <property name="xalign">0.5</property>
@@ -2522,8 +2522,8 @@
 	  <child>
 	    <widget class="GtkLabel" id="label466">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The search scope defines how deep you would like the search to extend down the 
-directory tree. A search scope of &quot;sub&quot; will include all entries below your search base.
+	      <property name="label" translatable="yes">The search scope defines how deep you would like the search to extend down the
+directory tree.
 A search scope of &quot;one&quot; will only include the entries one level beneath your base.
 </property>
 	      <property name="use_underline">False</property>
@@ -2562,6 +2562,48 @@
 	  </child>
 
 	  <child>
+	    <widget class="GtkLabel" id="label466">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">The search scope defines how deep you would like the search to extend down the
+directory tree.
+A search scope of &quot;sub&quot; will include all entries below your search base.
+</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label467">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">label164</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
 	    <widget class="GtkLabel" id="label468">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">This option controls how long a search will be run.</property>