diff src/buddy.c @ 577:aa9a8bcddd80

[gaim-migrate @ 587] add group button. need pixmaps. committer: Tailor Script <[e-mail]>

--- a/src/buddy.c	Wed Aug 02 00:19:28 2000 +0000
+++ b/src/buddy.c	Wed Aug 02 02:28:28 2000 +0000
@@ -72,7 +72,7 @@
 static GtkWidget *edittree;
 static GtkWidget *permtree;
 static GtkWidget *imbutton, *infobutton, *chatbutton;
-static GtkWidget *addbutton, *rembutton;
+static GtkWidget *addbutton, *groupbutton, *rembutton;
 static GtkWidget *addpermbutton, *rempermbutton;
 static GtkWidget *lagometer = NULL;
 static GtkWidget *lagometer_box = NULL;
@@ -251,7 +251,7 @@
         GtkWidget *label;
 
 		/*if the user had opted to put pictures on the buttons*/
-        if (display_options & OPT_DISP_SHOW_BUTTON_XPM) {
+        if (display_options & OPT_DISP_SHOW_BUTTON_XPM && xpm) {
 		pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
 						  NULL, xpm);
 		pic = gtk_pixmap_new(pm, bm);
@@ -275,6 +275,7 @@
 
 	if (display_options & OPT_DISP_DEVIL_PIXMAPS) {
 	        adjust_pic(addbutton, _("Add"), (gchar **)daemon_buddyadd_xpm);
+	        adjust_pic(groupbutton, _("Group"), NULL);
 		adjust_pic(rembutton, _("Remove"), (gchar **)daemon_buddydel_xpm);
 		adjust_pic(chatbutton, _("Chat"), (gchar **)daemon_buddychat_xpm);
 	        adjust_pic(imbutton, _("IM"), (gchar **)daemon_im_xpm);
@@ -283,6 +284,7 @@
 	        adjust_pic(rempermbutton, _("Remove"), (gchar **)daemon_permdel_xpm);
 	} else {
 	        adjust_pic(addbutton, _("Add"), (gchar **)buddyadd_xpm);
+	        adjust_pic(groupbutton, _("Group"), NULL);
 		adjust_pic(rembutton, _("Remove"), (gchar **)buddydel_xpm);
 		adjust_pic(chatbutton, _("Chat"), (gchar **)buddychat_xpm);
 	        adjust_pic(imbutton, _("IM"), (gchar **)im_xpm);
@@ -1163,6 +1165,11 @@
 
 }
 
+void add_group_callback(GtkWidget *widget, void *dummy)
+{
+	show_add_group();
+}
+
 void add_perm_callback(GtkWidget *widget, void *dummy)
 {
         show_add_perm(NULL);
@@ -2042,11 +2049,13 @@
 
         
        	addbutton = gtk_button_new_with_label(_("Add"));
+       	groupbutton = gtk_button_new_with_label(_("Group"));
        	rembutton = gtk_button_new_with_label(_("Remove"));
 	
 	if (display_options & OPT_DISP_COOL_LOOK)
 	{
 		gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE);
 	}
 	
@@ -2066,10 +2075,12 @@
 	bbox = gtk_hbox_new(TRUE, 10);
        	tbox = gtk_scrolled_window_new(NULL, NULL);
        	/* Put the buttons in the box */
-       	gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 10);
-       	gtk_box_pack_start(GTK_BOX(bbox), rembutton, TRUE, TRUE, 10);
+       	gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 0);
+       	gtk_box_pack_start(GTK_BOX(bbox), groupbutton, TRUE, TRUE, 0);
+       	gtk_box_pack_start(GTK_BOX(bbox), rembutton, TRUE, TRUE, 0);
 
 	gtk_tooltips_set_tip(tips, addbutton, _("Add a new Buddy"), "Penguin");
+	gtk_tooltips_set_tip(tips, groupbutton, _("Add a new Group"), "Penguin");
 	gtk_tooltips_set_tip(tips, rembutton, _("Remove selected Buddy"), "Penguin");
 
        	/* And the boxes in the box */
@@ -2082,6 +2093,7 @@
 
        	/* Finish up */
        	gtk_widget_show(addbutton);
+       	gtk_widget_show(groupbutton);
        	gtk_widget_show(rembutton);
        	gtk_widget_show(edittree);
        	gtk_widget_show(tbox);
@@ -2177,6 +2189,7 @@
 	gtk_signal_connect(GTK_OBJECT(chatbutton), "clicked", GTK_SIGNAL_FUNC(chat_callback), buddies);
        	gtk_signal_connect(GTK_OBJECT(rembutton), "clicked", GTK_SIGNAL_FUNC(do_del_buddy), edittree);
        	gtk_signal_connect(GTK_OBJECT(addbutton), "clicked", GTK_SIGNAL_FUNC(add_buddy_callback), NULL);
+       	gtk_signal_connect(GTK_OBJECT(groupbutton), "clicked", GTK_SIGNAL_FUNC(add_group_callback), NULL);
         gtk_signal_connect(GTK_OBJECT(addpermbutton), "clicked", GTK_SIGNAL_FUNC(add_perm_callback), NULL);
         gtk_signal_connect(GTK_OBJECT(rempermbutton), "clicked", GTK_SIGNAL_FUNC(do_del_perm), permtree);
         gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);