Make pretty buttons.

svn path=/trunk/; revision=11207

3 files changed, 66 insertions, 7 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index c7d749cc18..d9a34d14f4 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,5 +1,11 @@
 2001-07-18  Iain Holmes  <iain@ximian.com>
 
+	* e-summary-preferences.c (make_property_dialog): Create the image 
+	buttons.
+	(construct_pixmap_button): Create a box with an image and text.
+
+2001-07-18  Iain Holmes  <iain@ximian.com>
+
 	* e-summary-preferences.c (e_summary_configure): Set the title on the
 	window. Just do a g_return_if_fail if the XML file couldn't be loaded.
 
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index e681884af5..162b1a6861 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -1108,6 +1108,26 @@ calendar_today_toggled_cb (GtkToggleButton *tb,
 	gnome_property_box_changed (pd->box);
 }
 
+static void
+construct_pixmap_button (GtkButton *button,
+			 const char *text,
+			 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);
+
+	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);
+}
+
 static gboolean
 make_property_dialog (PropertyData *pd)
 {
@@ -1145,11 +1165,15 @@ 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"),
+				 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"),
+				 GNOME_STOCK_BUTTON_PREV);
 	gtk_signal_connect (GTK_OBJECT (mail->remove), "clicked",
 			    GTK_SIGNAL_FUNC (mail_remove_clicked_cb), pd);
 	
@@ -1193,6 +1217,8 @@ 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"),
+				 GNOME_STOCK_BUTTON_NEXT);
 	gtk_widget_set_sensitive (rdf->add, FALSE);
 	gtk_signal_connect (GTK_OBJECT (rdf->add), "clicked",
 			    GTK_SIGNAL_FUNC (rdf_add_clicked_cb), pd);
@@ -1200,6 +1226,8 @@ 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"),
+				 GNOME_STOCK_BUTTON_PREV);
 	gtk_widget_set_sensitive (rdf->remove, FALSE);
 	gtk_signal_connect (GTK_OBJECT (rdf->remove), "clicked",
 			    GTK_SIGNAL_FUNC (rdf_remove_clicked_cb), pd);
@@ -1250,11 +1278,17 @@ 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"),
+				 GNOME_STOCK_BUTTON_NEXT);
 	gtk_signal_connect (GTK_OBJECT (weather->add), "clicked",
 			    GTK_SIGNAL_FUNC (weather_add_clicked_cb), 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"),
+				 GNOME_STOCK_BUTTON_PREV);
 	gtk_signal_connect (GTK_OBJECT (weather->remove), "clicked",
 			    GTK_SIGNAL_FUNC (weather_remove_clicked_cb), pd);
 
@@ -1379,7 +1413,8 @@ e_summary_configure (GtkWidget *widget,
 	summary->old_prefs = e_summary_preferences_copy (summary->preferences);
 
 	pd->xml = glade_xml_new (EVOLUTION_GLADEDIR "/my-evolution.glade", NULL);
-	g_assert (pd->xml != NULL); /* Fixme: Nice GUI to explain what happened */
+	g_return_if_fail (pd->xml != NULL);
+
 	pd->box = GNOME_PROPERTY_BOX (glade_xml_get_widget (pd->xml, "dialog1"));
 	gtk_window_set_title (GTK_WINDOW (pd->box), _("My Evolution Settings"));
 	if (make_property_dialog (pd) == FALSE) {
diff --git a/my-evolution/my-evolution.glade b/my-evolution/my-evolution.glade
index 4223e64ec4..15f24d2670 100644
--- a/my-evolution/my-evolution.glade
+++ b/my-evolution/my-evolution.glade
@@ -147,13 +147,16 @@
 	      <name>button4</name>
 	      <sensitive>False</sensitive>
 	      <can_focus>True</can_focus>
-	      <label>Add -&gt;</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
+
+	      <widget>
+		<class>Placeholder</class>
+	      </widget>
 	    </widget>
 
 	    <widget>
@@ -161,13 +164,16 @@
 	      <name>button5</name>
 	      <sensitive>False</sensitive>
 	      <can_focus>True</can_focus>
-	      <label>Remove &lt;-</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
+
+	      <widget>
+		<class>Placeholder</class>
+	      </widget>
 	    </widget>
 	  </widget>
 	</widget>
@@ -433,13 +439,16 @@
 	      <name>button9</name>
 	      <sensitive>False</sensitive>
 	      <can_focus>True</can_focus>
-	      <label>Add -&gt;</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
+
+	      <widget>
+		<class>Placeholder</class>
+	      </widget>
 	    </widget>
 
 	    <widget>
@@ -447,13 +456,16 @@
 	      <name>button10</name>
 	      <sensitive>False</sensitive>
 	      <can_focus>True</can_focus>
-	      <label>Remove &lt;-</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
+
+	      <widget>
+		<class>Placeholder</class>
+	      </widget>
 	    </widget>
 	  </widget>
 	</widget>
@@ -890,13 +902,16 @@
 	      <name>button6</name>
 	      <sensitive>False</sensitive>
 	      <can_focus>True</can_focus>
-	      <label>Add -&gt;</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
+
+	      <widget>
+		<class>Placeholder</class>
+	      </widget>
 	    </widget>
 
 	    <widget>
@@ -904,13 +919,16 @@
 	      <name>button7</name>
 	      <sensitive>False</sensitive>
 	      <can_focus>True</can_focus>
-	      <label>Remove &lt;-</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	      <child>
 		<padding>0</padding>
 		<expand>False</expand>
 		<fill>False</fill>
 	      </child>
+
+	      <widget>
+		<class>Placeholder</class>
+	      </widget>
 	    </widget>
 	  </widget>
 	</widget>