# HG changeset patch # User Rob Flynn # Date 975569766 0 # Node ID 4135d8fc7b4eeb3df11d12553b5c3393a219aecf # Parent 11f8829f82fbc448ed7f706eabfdeb433497d25c [gaim-migrate @ 1182] Some pretty-ifications by Decklin Foster. Thanks bro committer: Tailor Script diff -r 11f8829f82fb -r 4135d8fc7b4e src/away.c --- a/src/away.c Thu Nov 30 02:07:06 2000 +0000 +++ b/src/away.c Thu Nov 30 07:36:06 2000 +0000 @@ -95,9 +95,7 @@ GtkWidget *back; GtkWidget *awaytext; GtkWidget *vscrollbar; - GtkWidget *bbox; GtkWidget *vbox; - GtkWidget *topbox; char *buf2; char buf[BUF_LONG]; GList *cnv = conversations; @@ -119,11 +117,10 @@ if (!imaway) { imaway = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim"); + gtk_container_set_border_width(GTK_CONTAINER(imaway), 5); gtk_widget_realize(imaway); aol_icon(imaway->window); back = picture_button(imaway, _("I'm Back!"), join_xpm); - bbox = gtk_hbox_new(TRUE, 10); - topbox = gtk_hbox_new(FALSE, 5); vbox = gtk_vbox_new(FALSE, 5); awaytext = gtk_text_new(NULL, NULL); @@ -133,7 +130,7 @@ */ strncpy_nohtml(buf, a->message, sizeof (buf)); - vscrollbar = gtk_vscrollbar_new(GTK_TEXT(awaytext)->vadj); + vscrollbar = gtk_vscrollbar_new(GTK_TEXT(awaytext)->vadj); gtk_widget_show(vscrollbar); gtk_widget_set_usize(awaytext, 225, 75); gtk_text_set_word_wrap(GTK_TEXT(awaytext), TRUE); @@ -141,19 +138,14 @@ gtk_text_freeze(GTK_TEXT(awaytext)); gtk_text_insert(GTK_TEXT(awaytext), NULL, NULL, NULL, buf, -1); gtk_widget_show(awaytext); - + if (display_options & OPT_DISP_COOL_LOOK) gtk_button_set_relief(GTK_BUTTON(back), GTK_RELIEF_NONE); /* Put the buttons in the box */ - gtk_box_pack_start(GTK_BOX(bbox), back, TRUE, TRUE, 10); - - gtk_box_pack_start(GTK_BOX(topbox), awaytext, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), awaytext, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), back, FALSE, FALSE, 0); - /* 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); - /* Handle closes right */ gtk_signal_connect(GTK_OBJECT(imaway), "destroy", GTK_SIGNAL_FUNC(do_im_back), imaway); @@ -162,8 +154,6 @@ /* Finish up */ gtk_widget_show(back); - gtk_widget_show(topbox); - gtk_widget_show(bbox); gtk_widget_show(vbox); if (strlen(a->name)) gtk_window_set_title(GTK_WINDOW(imaway), a->name); diff -r 11f8829f82fb -r 4135d8fc7b4e src/buddy.c --- a/src/buddy.c Thu Nov 30 02:07:06 2000 +0000 +++ b/src/buddy.c Thu Nov 30 07:36:06 2000 +0000 @@ -2018,7 +2018,7 @@ gtk_box_pack_start(GTK_BOX(imchatbox), imbutton, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(imchatbox), infobutton, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(imchatbox), chatbutton, TRUE, TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(imchatbox), 10); + gtk_container_border_width(GTK_CONTAINER(imchatbox), 5); gtk_signal_connect(GTK_OBJECT(imbutton), "clicked", GTK_SIGNAL_FUNC(im_callback), buddies); gtk_signal_connect(GTK_OBJECT(infobutton), "clicked", GTK_SIGNAL_FUNC(info_callback), buddies); @@ -2202,8 +2202,8 @@ /* Do buddy list stuff */ - - buddypane = gtk_vbox_new(FALSE, 0); + /* FIXME: spacing on both panes is ad hoc */ + buddypane = gtk_vbox_new(FALSE, 1); buddies = gtk_tree_new(); sw = gtk_scrolled_window_new(NULL, NULL); @@ -2227,9 +2227,8 @@ /* Swing the edit buddy */ - editpane = gtk_vbox_new(FALSE, 0); + editpane = gtk_vbox_new(FALSE, 1); - addbutton = gtk_button_new_with_label(_("Add")); groupbutton = gtk_button_new_with_label(_("Group")); rembutton = gtk_button_new_with_label(_("Remove")); @@ -2254,7 +2253,8 @@ GTK_SIGNAL_FUNC (edit_tree_move), NULL); - bbox = gtk_hbox_new(TRUE, 10); + bbox = gtk_hbox_new(TRUE, 5); + gtk_container_set_border_width(GTK_CONTAINER(bbox), 5); tbox = gtk_scrolled_window_new(NULL, NULL); /* Put the buttons in the box */ gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 0); @@ -2266,8 +2266,8 @@ gtk_tooltips_set_tip(tips, rembutton, _("Remove selected Buddy"), "Penguin"); /* And the boxes in the box */ - gtk_box_pack_start(GTK_BOX(editpane), tbox, TRUE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(editpane), bbox, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(editpane), tbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(editpane), bbox, FALSE, FALSE, 0); /* Handle closes right */ diff -r 11f8829f82fb -r 4135d8fc7b4e src/dialogs.c --- a/src/dialogs.c Thu Nov 30 02:07:06 2000 +0000 +++ b/src/dialogs.c Thu Nov 30 07:36:06 2000 +0000 @@ -3113,7 +3113,6 @@ ca->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_widget_set_usize(ca->window, 275, 200); gtk_container_border_width(GTK_CONTAINER(ca->window), 5); - gtk_window_set_policy(GTK_WINDOW(ca->window), FALSE, FALSE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim"); gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message")); gtk_widget_show(ca->window); @@ -3125,20 +3124,21 @@ frame = gtk_frame_new(_("New away message")); /* set up container boxes */ - bbox = gtk_hbox_new(FALSE, 0); - fbox = gtk_vbox_new(FALSE, 0); - hbox = gtk_hbox_new(FALSE, 0); - titlebox = gtk_hbox_new(FALSE, 0); - tbox = gtk_vbox_new(FALSE, 0); + bbox = gtk_hbox_new(FALSE, 5); + fbox = gtk_vbox_new(FALSE, 5); + gtk_container_border_width(GTK_CONTAINER(fbox), 5); + hbox = gtk_hbox_new(FALSE, 5); + titlebox = gtk_hbox_new(FALSE, 5); + tbox = gtk_vbox_new(FALSE, 5); /* Make a label for away entry */ label = gtk_label_new(_("Away title: ")); - gtk_box_pack_start(GTK_BOX(titlebox), label, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(titlebox), label, FALSE, FALSE, 0); gtk_widget_show(label); /* make away title entry */ ca->entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(titlebox), ca->entry, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(titlebox), ca->entry, TRUE, TRUE, 0); sw = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), @@ -3152,24 +3152,24 @@ gtk_text_set_editable(GTK_TEXT(ca->text), TRUE ); gtk_container_add(GTK_CONTAINER(sw), ca->text); gtk_widget_show(ca->text); - gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 0); button = picture_button(ca->window, _("Save"), save_xpm); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(save_away_mess), ca); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); button = picture_button(ca->window, _("Cancel"), cancel_xpm); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), ca->window); - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); + gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, TRUE, 0); /* pack boxes where they belong */ - gtk_box_pack_start(GTK_BOX(fbox), titlebox, TRUE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(fbox), bbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(fbox), titlebox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(fbox), bbox, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(frame), fbox); - gtk_container_set_border_width(GTK_CONTAINER(frame), 5); + gtk_container_set_border_width(GTK_CONTAINER(frame), 0); gtk_box_pack_start(GTK_BOX(tbox), frame, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(tbox), hbox, TRUE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(ca->window), tbox); @@ -3183,7 +3183,7 @@ } else { /* Checkbox for showing away msg */ ca->checkbx = gtk_check_button_new_with_label(_("Make Away Now")); - gtk_box_pack_start(GTK_BOX(fbox), ca->checkbx, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(fbox), ca->checkbx, FALSE, FALSE, 0); gtk_widget_show(ca->checkbx); } diff -r 11f8829f82fb -r 4135d8fc7b4e src/multi.c --- a/src/multi.c Thu Nov 30 02:07:06 2000 +0000 +++ b/src/multi.c Thu Nov 30 07:36:06 2000 +0000 @@ -803,7 +803,7 @@ GtkWidget *box, *label, *button; char buf[256]; - gc->meter = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gc->meter = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(gc->meter), 0, 0, 1); gtk_window_set_wmclass(GTK_WINDOW(gc->meter), "signon", "Gaim"); gtk_container_set_border_width(GTK_CONTAINER(gc->meter), 5); @@ -819,21 +819,21 @@ gtk_widget_show(box); label = gtk_label_new(buf); - gtk_box_pack_start(GTK_BOX(box), label, 0, 0, 5); + gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0); gtk_widget_show(label); gc->progress = gtk_progress_bar_new(); gtk_widget_set_usize(gc->progress, 150, 0); - gtk_box_pack_start(GTK_BOX(box), gc->progress, 0, 0, 5); + gtk_box_pack_start(GTK_BOX(box), gc->progress, FALSE, FALSE, 0); gtk_widget_show(gc->progress); gc->status = gtk_statusbar_new(); gtk_widget_set_usize(gc->status, 150, 0); - gtk_box_pack_start(GTK_BOX(box), gc->status, 0, 0, 5); + gtk_box_pack_start(GTK_BOX(box), gc->status, FALSE, FALSE, 0); gtk_widget_show(gc->status); button = gtk_button_new_with_label(_("Cancel")); - gtk_box_pack_start(GTK_BOX(box), button, 0, 0, 5); + gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(cancel_signon), gc); gtk_widget_show(button); diff -r 11f8829f82fb -r 4135d8fc7b4e src/prefs.c --- a/src/prefs.c Thu Nov 30 02:07:06 2000 +0000 +++ b/src/prefs.c Thu Nov 30 07:36:06 2000 +0000 @@ -112,6 +112,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -171,6 +172,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -217,6 +219,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -328,6 +331,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -413,6 +417,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -615,6 +620,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -800,6 +806,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -885,6 +892,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -1009,6 +1017,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -1171,15 +1180,11 @@ box = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_widget_show(box); hbox = gtk_hbox_new(TRUE, 0); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5); - gtk_widget_set_usize(hbox, -1, 30); - gtk_widget_show(hbox); - - hbox = gtk_hbox_new(TRUE, 0); - gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5); gtk_widget_show(hbox); label = gtk_label_new(_("Title")); @@ -1191,7 +1196,7 @@ gtk_widget_show(label); top = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(box), top, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(box), top, TRUE, TRUE, 0); gtk_widget_show(top); sw = gtk_scrolled_window_new(NULL, NULL); @@ -1377,6 +1382,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box); @@ -1617,6 +1623,7 @@ gtk_container_add(GTK_CONTAINER(parent), prefdialog); box = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(box), 5); gtk_container_add(GTK_CONTAINER(prefdialog), box); gtk_widget_show(box);