added accelerators to all useful widgets in this file such that this

2001-08-09  Anna Marie Dirks <anna@ximian.com>
        * my-evolution.glade : added accelerators to all useful widgets
	in this file such that this dialog can now be fully navigated from
	the keyboard.

	* e-summary-preferences.c : changed the construct_pixmap_button
	function to take glade xml, an hbox and pixmap, making it possible
	to use glade to define and change the keyboard accelerators, instead
	of trying to do this in the c code.

svn path=/trunk/; revision=11844

3 files changed, 193 insertions, 46 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index bdb00558e1..6b627fe456 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,14 @@
+2001-08-09  Anna Marie Dirks <anna@ximian.com>
+        * my-evolution.glade : added accelerators to all useful widgets
+	in this file such that this dialog can now be fully navigated from
+	the keyboard. 
+
+	* e-summary-preferences.c : changed the construct_pixmap_button
+	function to take glade xml, an hbox and pixmap, making it possible
+	to use glade to define and change the keyboard accelerators, instead
+	of trying to do this in the c code. 
+
+
 2001-08-06  Damon Chaplin  <damon@ximian.com>
 
 	* e-summary-tasks.c (sort_uids): 
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 42d96b4b61..d055de9430 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -1102,23 +1102,18 @@ calendar_today_toggled_cb (GtkToggleButton *tb,
 }
 
 static void
-construct_pixmap_button (GtkButton *button,
-			 const char *text,
+construct_pixmap_button (GladeXML *xml,
+			 const char *id,
 			 const char *image)
 {
-	GtkWidget *label, *box, *pixmap;
-
-	g_return_if_fail (button != NULL);
-
-	box = gtk_hbox_new (FALSE, 0);
-	label = gtk_label_new (text);
-	gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+	GtkWidget *box, *pixmap;
 
+	box = glade_xml_get_widget (xml, id);
+	
 	pixmap = gnome_stock_pixmap_widget (NULL, image);
 	gtk_box_pack_start (GTK_BOX (box), pixmap, TRUE, TRUE, 0);
 
-	gtk_container_add (GTK_CONTAINER (button), box);
-	gtk_widget_show_all (box);
+	gtk_widget_show (pixmap);
 }
 
 static gboolean
@@ -1158,14 +1153,14 @@ make_property_dialog (PropertyData *pd)
 
 	mail->add = glade_xml_get_widget (pd->xml, "button4");
 	g_return_val_if_fail (mail->add != NULL, FALSE);
-	construct_pixmap_button (GTK_BUTTON (mail->add), _("Add"),
+	construct_pixmap_button (pd->xml, "hbox-mailadd", 
 				 GNOME_STOCK_BUTTON_NEXT);
 	gtk_signal_connect (GTK_OBJECT (mail->add), "clicked",
 			    GTK_SIGNAL_FUNC (mail_add_clicked_cb), pd);
 
 	mail->remove = glade_xml_get_widget (pd->xml, "button5");
 	g_return_val_if_fail (mail->remove != NULL, FALSE);
-	construct_pixmap_button (GTK_BUTTON (mail->remove), _("Remove"),
+	construct_pixmap_button (pd->xml, "hbox-mailremove", 
 				 GNOME_STOCK_BUTTON_PREV);
 	gtk_signal_connect (GTK_OBJECT (mail->remove), "clicked",
 			    GTK_SIGNAL_FUNC (mail_remove_clicked_cb), pd);
@@ -1206,7 +1201,7 @@ make_property_dialog (PropertyData *pd)
 	rdf->add = glade_xml_get_widget (pd->xml, "button9");
 	g_return_val_if_fail (rdf->add != NULL, FALSE);
 
-	construct_pixmap_button (GTK_BUTTON (rdf->add), _("Add"),
+	construct_pixmap_button (pd->xml, "hbox-newsadd", 
 				 GNOME_STOCK_BUTTON_NEXT);
 	gtk_widget_set_sensitive (rdf->add, FALSE);
 	gtk_signal_connect (GTK_OBJECT (rdf->add), "clicked",
@@ -1215,7 +1210,7 @@ make_property_dialog (PropertyData *pd)
 	rdf->remove = glade_xml_get_widget (pd->xml, "button10");
 	g_return_val_if_fail (rdf->remove != NULL, FALSE);
 
-	construct_pixmap_button (GTK_BUTTON (rdf->remove), _("Remove"),
+	construct_pixmap_button (pd->xml, "hbox-newsremove", 
 				 GNOME_STOCK_BUTTON_PREV);
 	gtk_widget_set_sensitive (rdf->remove, FALSE);
 	gtk_signal_connect (GTK_OBJECT (rdf->remove), "clicked",
@@ -1268,7 +1263,7 @@ make_property_dialog (PropertyData *pd)
 	weather->add = glade_xml_get_widget (pd->xml, "button6");
 	g_return_val_if_fail (weather->add != NULL, FALSE);
 
-	construct_pixmap_button (GTK_BUTTON (weather->add), _("Add"),
+	construct_pixmap_button (pd->xml, "hbox-weatheradd", 
 				 GNOME_STOCK_BUTTON_NEXT);
 	gtk_signal_connect (GTK_OBJECT (weather->add), "clicked",
 			    GTK_SIGNAL_FUNC (weather_add_clicked_cb), pd);
@@ -1276,7 +1271,7 @@ make_property_dialog (PropertyData *pd)
 	weather->remove = glade_xml_get_widget (pd->xml, "button7");
 	g_return_val_if_fail (weather->remove != NULL, FALSE);
 	
-	construct_pixmap_button (GTK_BUTTON (weather->remove), _("Remove"),
+	construct_pixmap_button (pd->xml, "hbox-weatherremove", 
 				 GNOME_STOCK_BUTTON_PREV);
 	gtk_signal_connect (GTK_OBJECT (weather->remove), "clicked",
 			    GTK_SIGNAL_FUNC (weather_remove_clicked_cb), pd);
diff --git a/my-evolution/my-evolution.glade b/my-evolution/my-evolution.glade
index 90be02ea0f..c9e75c5b7f 100644
--- a/my-evolution/my-evolution.glade
+++ b/my-evolution/my-evolution.glade
@@ -64,13 +64,14 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label9</name>
-	  <label>All folders:</label>
+	  <label>All _folders:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <focus_target>clist7</focus_target>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -90,13 +91,14 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label10</name>
-	  <label>Display folders:</label>
+	  <label>_Display folders:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <focus_target>clist1</focus_target>
 	  <child>
 	    <left_attach>2</left_attach>
 	    <right_attach>3</right_attach>
@@ -155,7 +157,27 @@
 	      </child>
 
 	      <widget>
-		<class>Placeholder</class>
+		<class>GtkHBox</class>
+		<name>hbox-mailadd</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <name>label41</name>
+		  <label>_Add</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>0</padding>
+		    <expand>True</expand>
+		    <fill>True</fill>
+		  </child>
+		</widget>
 	      </widget>
 	    </widget>
 
@@ -172,7 +194,27 @@
 	      </child>
 
 	      <widget>
-		<class>Placeholder</class>
+		<class>GtkHBox</class>
+		<name>hbox-mailremove</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <name>label42</name>
+		  <label> _Remove</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>0</padding>
+		    <expand>True</expand>
+		    <fill>True</fill>
+		  </child>
+		</widget>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -308,7 +350,7 @@
 	<name>checkbutton1</name>
 	<border_width>3</border_width>
 	<can_focus>True</can_focus>
-	<label>Show full path for folders</label>
+	<label>_Show full path for folders</label>
 	<active>False</active>
 	<draw_indicator>True</draw_indicator>
 	<child>
@@ -323,7 +365,7 @@
       <class>GtkLabel</class>
       <child_name>Notebook:tab</child_name>
       <name>label5</name>
-      <label>Mail</label>
+      <label>_Mail</label>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0.5</xalign>
@@ -356,13 +398,14 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label19</name>
-	  <label>All news feeds:</label>
+	  <label>All news _feeds:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <focus_target>clist6</focus_target>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -382,13 +425,14 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label20</name>
-	  <label>Displayed feeds:</label>
+	  <label>_Displayed feeds:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <focus_target>clist5</focus_target>
 	  <child>
 	    <left_attach>2</left_attach>
 	    <right_attach>3</right_attach>
@@ -447,7 +491,27 @@
 	      </child>
 
 	      <widget>
-		<class>Placeholder</class>
+		<class>GtkHBox</class>
+		<name>hbox-newsadd</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <name>label43</name>
+		  <label>_Add</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>0</padding>
+		    <expand>True</expand>
+		    <fill>True</fill>
+		  </child>
+		</widget>
 	      </widget>
 	    </widget>
 
@@ -464,7 +528,39 @@
 	      </child>
 
 	      <widget>
-		<class>Placeholder</class>
+		<class>GtkHBox</class>
+		<name>hbox9</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+
+		<widget>
+		  <class>GtkHBox</class>
+		  <name>hbox-newsremove</name>
+		  <homogeneous>False</homogeneous>
+		  <spacing>0</spacing>
+		  <child>
+		    <padding>0</padding>
+		    <expand>True</expand>
+		    <fill>True</fill>
+		  </child>
+
+		  <widget>
+		    <class>GtkLabel</class>
+		    <name>label47</name>
+		    <label> _Remove</label>
+		    <justify>GTK_JUSTIFY_CENTER</justify>
+		    <wrap>False</wrap>
+		    <xalign>0.5</xalign>
+		    <yalign>0.5</yalign>
+		    <xpad>0</xpad>
+		    <ypad>0</ypad>
+		    <child>
+		      <padding>0</padding>
+		      <expand>True</expand>
+		      <fill>True</fill>
+		    </child>
+		  </widget>
+		</widget>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -621,13 +717,14 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label25</name>
-	    <label>Refresh time (seconds):</label>
+	    <label>_Refresh time (seconds):</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
+	    <focus_target>spinbutton1</focus_target>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
@@ -647,13 +744,14 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label29</name>
-	    <label>Max number of items shown:</label>
+	    <label>Ma_x number of items shown:</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
+	    <focus_target>spinbutton4</focus_target>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
@@ -738,7 +836,7 @@
 	    <class>GtkButton</class>
 	    <name>button11</name>
 	    <can_focus>True</can_focus>
-	    <label>Add new feed</label>
+	    <label>Add n_ew feed</label>
 	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <left_attach>3</left_attach>
@@ -763,7 +861,7 @@
       <class>GtkLabel</class>
       <child_name>Notebook:tab</child_name>
       <name>label6</name>
-      <label>News Feeds</label>
+      <label>_News Feeds</label>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0.5</xalign>
@@ -796,13 +894,14 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label14</name>
-	  <label>All stations:</label>
+	  <label>Al_l stations:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <focus_target>ctree1</focus_target>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -822,13 +921,14 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label15</name>
-	  <label>Display stations:</label>
+	  <label>_Display stations:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <focus_target>clist3</focus_target>
 	  <child>
 	    <left_attach>2</left_attach>
 	    <right_attach>3</right_attach>
@@ -887,7 +987,27 @@
 	      </child>
 
 	      <widget>
-		<class>Placeholder</class>
+		<class>GtkHBox</class>
+		<name>hbox-weatheradd</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <name>label45</name>
+		  <label>_Add</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>0</padding>
+		    <expand>True</expand>
+		    <fill>True</fill>
+		  </child>
+		</widget>
 	      </widget>
 	    </widget>
 
@@ -904,7 +1024,27 @@
 	      </child>
 
 	      <widget>
-		<class>Placeholder</class>
+		<class>GtkHBox</class>
+		<name>hbox-weatherremove</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <name>label48</name>
+		  <label> _Remove</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>0</padding>
+		    <expand>True</expand>
+		    <fill>True</fill>
+		  </child>
+		</widget>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -1087,7 +1227,7 @@
 	      <class>GtkRadioButton</class>
 	      <name>radiobutton7</name>
 	      <can_focus>True</can_focus>
-	      <label>metric</label>
+	      <label>m_etric</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <group>units_group</group>
@@ -1102,7 +1242,7 @@
 	      <class>GtkRadioButton</class>
 	      <name>radiobutton8</name>
 	      <can_focus>True</can_focus>
-	      <label>imperial</label>
+	      <label>_imperial</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <group>units_group</group>
@@ -1128,13 +1268,14 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label38</name>
-	      <label>Refresh time (seconds):</label>
+	      <label>Refresh _time (seconds):</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
+	      <focus_target>spinbutton5</focus_target>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
@@ -1173,7 +1314,7 @@
       <class>GtkLabel</class>
       <child_name>Notebook:tab</child_name>
       <name>label7</name>
-      <label>Weather</label>
+      <label>_Weather</label>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0.5</xalign>
@@ -1228,7 +1369,7 @@
 	    <class>GtkRadioButton</class>
 	    <name>radiobutton3</name>
 	    <can_focus>True</can_focus>
-	    <label>One day</label>
+	    <label>_One day</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>days_group</group>
@@ -1243,7 +1384,7 @@
 	    <class>GtkRadioButton</class>
 	    <name>radiobutton4</name>
 	    <can_focus>True</can_focus>
-	    <label>Five days</label>
+	    <label>_Five days</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>days_group</group>
@@ -1258,7 +1399,7 @@
 	    <class>GtkRadioButton</class>
 	    <name>radiobutton5</name>
 	    <can_focus>True</can_focus>
-	    <label>One week</label>
+	    <label>One w_eek</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>days_group</group>
@@ -1273,7 +1414,7 @@
 	    <class>GtkRadioButton</class>
 	    <name>radiobutton6</name>
 	    <can_focus>True</can_focus>
-	    <label>One month</label>
+	    <label>One mont_h</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>days_group</group>
@@ -1309,7 +1450,7 @@
 	    <class>GtkRadioButton</class>
 	    <name>radiobutton1</name>
 	    <can_focus>True</can_focus>
-	    <label>Show all tasks</label>
+	    <label>Show _all tasks</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>tasks_group</group>
@@ -1324,7 +1465,7 @@
 	    <class>GtkRadioButton</class>
 	    <name>radiobutton2</name>
 	    <can_focus>True</can_focus>
-	    <label>Show today's tasks</label>
+	    <label>Show _today's tasks</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
 	    <group>tasks_group</group>
@@ -1342,7 +1483,7 @@
       <class>GtkLabel</class>
       <child_name>Notebook:tab</child_name>
       <name>label8</name>
-      <label>Schedule</label>
+      <label>_Schedule</label>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0.5</xalign>