changeset 459:fb1d671e168e

[gaim-migrate @ 469] I know, I know -- I'm good. You don't have to keep telling me. :-) committer: Tailor Script <[e-mail]>

--- a/pixmaps/Makefile.am	Sat Jul 01 09:04:33 2000 +0000
+++ b/pixmaps/Makefile.am	Sat Jul 01 23:59:59 2000 +0000
@@ -16,7 +16,8 @@
 	daemon-buddyadd.xpm daemon-buddychat.xpm daemon-buddydel.xpm \
 	daemon-im.xpm daemon-info.xpm daemon-permadd.xpm \
 	daemon-permdel.xpm daemon.xpm fontface.xpm smile_happy.xpm \
-	smile_sad.xpm smile_wink.xpm save.xpm cancel.xpm ok.xpm
+	smile_sad.xpm smile_wink.xpm save.xpm cancel.xpm ok.xpm \
+	join.xpm add.xpm
 
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = gaim.xpm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/add.xpm	Sat Jul 01 23:59:59 2000 +0000
@@ -0,0 +1,55 @@
+/* XPM */
+static char * add_xpm[] = {
+"24 24 28 1",
+" 	c None",
+".	c #000000",
+"+	c #4B6772",
+"@	c #70929F",
+"#	c #668B99",
+"$	c #5E808D",
+"%	c #B6B6B5",
+"&	c #52707B",
+"*	c #A6A7A4",
+"=	c #888D82",
+"-	c #577782",
+";	c #5B7D8A",
+">	c #9E6769",
+",	c #3C4035",
+"'	c #54594B",
+")	c #4E6A75",
+"!	c #91948E",
+"~	c #AE8182",
+"{	c #E1D5D2",
+"]	c #F1F0EC",
+"^	c #AAAAA7",
+"/	c #636361",
+"(	c #C2C2C0",
+"_	c #14090A",
+":	c #85A3AE",
+"<	c #CCCDC4",
+"[	c #7697A3",
+"}	c #999D91",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"         ..........     ",
+"        .+@#$$$$$$.     ",
+"        .@#$$$$$$.%     ",
+"       .&@$$$$$$$.%     ",
+"       .@#$$$$$$.%%     ",
+"      .@#$$$$$$$.%*.    ",
+"     .&@$$$$$$$.%%=.    ",
+"     .@#$$$$$$$.%*.     ",
+"    .-@$$$$$$$.%%=.     ",
+"    .;#$$$$$$$.%*.      ",
+"   .>...,')$$.%%!.      ",
+"   .~{]]]^/...%*.       ",
+"   .>{]]]]]]](%!.       ",
+"    _..:<]]]](*.        ",
+"       ...[<]}=.        ",
+"          ...$.         ",
+"             ..         ",
+"                        ",
+"                        ",
+"                        "};

--- a/src/dialogs.c	Sat Jul 01 09:04:33 2000 +0000
+++ b/src/dialogs.c	Sat Jul 01 23:59:59 2000 +0000
@@ -43,6 +43,7 @@
 #include "pixmaps/cancel.xpm"
 #include "pixmaps/save.xpm"
 #include "pixmaps/ok.xpm"
+#include "pixmaps/add.xpm"
 
 #define DEFAULT_FONT_NAME "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
 
@@ -824,14 +825,20 @@
 	GtkWidget *vbox;
         GtkWidget *topbox;
 	GtkWidget *frame;
+	GtkWidget *icon_i;
+	GdkBitmap *mask;
+	GdkPixmap *icon;
+	GtkWidget *button_box;
 
         struct addbuddy *a = g_new0(struct addbuddy, 1);
         
         a->window = gtk_window_new(GTK_WINDOW_DIALOG);
-        dialogwindows = g_list_prepend(dialogwindows, a->window);
-        cancel = gtk_button_new_with_label(_("Cancel"));
-        add = gtk_button_new_with_label(_("Add"));
-        bbox = gtk_hbox_new(TRUE, 10);
+	gtk_widget_set_usize(a->window, 480, 105);
+	gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
+	gtk_widget_show(a->window);
+	dialogwindows = g_list_prepend(dialogwindows, a->window);
+
+	bbox = gtk_hbox_new(TRUE, 10);
         topbox = gtk_hbox_new(FALSE, 5);
         vbox = gtk_vbox_new(FALSE, 5);
 
@@ -841,8 +848,52 @@
         gtk_combo_set_popdown_strings(GTK_COMBO(a->combo), groups_tree());
         /* Put the buttons in the box */
 
-        gtk_box_pack_start(GTK_BOX(bbox), add, TRUE, TRUE, 10);
-        gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10);
+	/* Build Add Button */
+
+	add = gtk_button_new();
+
+	button_box = gtk_hbox_new(FALSE, 5);
+	icon = gdk_pixmap_create_from_xpm_d ( a->window->window, &mask, NULL, add_xpm);
+	icon_i = gtk_pixmap_new(icon, mask);
+	
+	label = gtk_label_new(_("Add"));
+
+	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
+	gtk_box_pack_end(GTK_BOX(button_box), label, FALSE, FALSE, 2);
+
+	gtk_widget_show(label);
+	gtk_widget_show(icon_i);
+
+	gtk_widget_show(button_box);
+
+	gtk_container_add(GTK_CONTAINER(add), button_box);
+
+	/* End of OK Button */
+	
+	/* Build Cancel Button */
+
+	cancel = gtk_button_new();
+
+	button_box = gtk_hbox_new(FALSE, 5);
+	icon = gdk_pixmap_create_from_xpm_d ( a->window->window, &mask, NULL, cancel_xpm);
+	icon_i = gtk_pixmap_new(icon, mask);
+	
+	label = gtk_label_new(_("Cancel"));
+
+	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
+	gtk_box_pack_end(GTK_BOX(button_box), label, FALSE, FALSE, 2);
+
+	gtk_widget_show(label);
+	gtk_widget_show(icon_i);
+
+	gtk_widget_show(button_box);
+
+	gtk_container_add(GTK_CONTAINER(cancel), button_box);
+	
+	/* End of Cancel Button */
+	
+        gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 5);
+        gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5);
 
 	frame = gtk_frame_new(NULL);
 	gtk_frame_set_label(GTK_FRAME(frame), _("Add Buddy"));
@@ -864,7 +915,7 @@
 
         /* And the boxes in the box */
         gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5);
-        gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
+        gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5);
 
         /* Handle closes right */
         gtk_signal_connect(GTK_OBJECT(a->window), "destroy",