# HG changeset patch # User Rob Flynn # Date 962440059 0 # Node ID 725ffb93aedcc8a878f92f94f9b0cf64b1d56843 # Parent 430bde33209b72d1a719a06ae3a8364236fe5cb9 [gaim-migrate @ 466] Time for sleepy by? committer: Tailor Script diff -r 430bde33209b -r 725ffb93aedc pixmaps/join.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/join.xpm Sat Jul 01 08:27:39 2000 +0000 @@ -0,0 +1,68 @@ +/* XPM */ +static char * join_xpm[] = { +"24 24 41 1", +" c None", +". c #212121", +"+ c #EAD4CB", +"@ c #E3C5BA", +"# c #DBB4A4", +"$ c #EEDED7", +"% c #FAF7F5", +"& c #F2E5E1", +"* c #D2AC99", +"= c #000000", +"- c #8D9E7C", +"; c #CDD9C2", +"> c #DEE6D7", +", c #DAE2D1", +"' c #9BAD89", +") c #B79382", +"! c #707D63", +"~ c #B4C6A2", +"{ c #ACC098", +"] c #636E57", +"^ c #AB8A7A", +"/ c #E4E9DD", +"( c #657158", +"_ c #C49F8D", +": c #C3D1B5", +"< c #808F70", +"[ c #4C5442", +"} c #58634E", +"| c #E6EBE0", +"1 c #D4DDC9", +"2 c #CAD7BE", +"3 c #90A17F", +"4 c #5F6A53", +"5 c #535C49", +"6 c #E9EDE4", +"7 c #616D56", +"8 c #A8BC95", +"9 c #7C8B6E", +"0 c #4C5443", +"a c #B6C2AA", +"b c #5E6953", +" ", +" ", +" ", +" ", +" ", +" ", +" ... ", +" ..+@#.. ", +" .$%&@*. ", +" =======+#**. ", +" =-;>,'=###). ", +" =!~{]=##*^. ", +" ==/;{(]=#*_. ", +" ==/;:{<[}=)).. ", +" =|12{{34=5=.. ", +" =6{{{7= == ", +" =>890= ", +" =a]= ", +" =b= ", +" = ", +" ", +" ", +" ", +" "}; diff -r 430bde33209b -r 725ffb93aedc src/buddy_chat.c --- a/src/buddy_chat.c Sat Jul 01 08:08:57 2000 +0000 +++ b/src/buddy_chat.c Sat Jul 01 08:27:39 2000 +0000 @@ -44,6 +44,8 @@ #include "pixmaps/strike.xpm" #include "pixmaps/speaker.xpm" #include "pixmaps/wood.xpm" +#include "pixmaps/join.xpm" +#include "pixmaps/cancel.xpm" /* #include "pixmaps/smile_happy.xpm" @@ -98,19 +100,67 @@ GtkWidget *bbox; GtkWidget *vbox; GtkWidget *topbox; + GtkWidget *button_box; + GtkWidget *icon_i; + GdkBitmap *mask; + GdkPixmap *icon; + if (!joinchat) { joinchat = gtk_window_new(GTK_WINDOW_TOPLEVEL); - cancel = gtk_button_new_with_label(_("Cancel")); - join = gtk_button_new_with_label(_("Join")); + gtk_widget_set_usize(joinchat, 280, 85); + gtk_widget_show(joinchat); bbox = gtk_hbox_new(TRUE, 10); topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); entry = gtk_entry_new(); - /* Put the buttons in the box */ - gtk_box_pack_start(GTK_BOX(bbox), join, TRUE, TRUE, 10); - gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10); - + /* Build Join Button */ + + join = gtk_button_new(); + + button_box = gtk_hbox_new(FALSE, 5); + icon = gdk_pixmap_create_from_xpm_d (joinchat->window, &mask, NULL, join_xpm); + icon_i = gtk_pixmap_new(icon, mask); + + label = gtk_label_new(_("Join")); + + 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(join), 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 ( joinchat->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), join, FALSE, FALSE, 5); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); + label = gtk_label_new(_("Join what group:")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5);