Mercurial > pidgin.yaz

changeset 1228:6773043cf9f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 1238] more ui cleanups courtesy decklin committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 11 Dec 2000 05:39:15 +0000
parents 25611364a504
children 229bf438c591
files src/buddy_chat.c src/conversation.c
diffstat 2 files changed, 26 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy_chat.c	Mon Dec 11 02:26:57 2000 +0000
+++ b/src/buddy_chat.c	Mon Dec 11 05:39:15 2000 +0000
@@ -578,10 +578,12 @@
 	aol_icon(win->window);
 
 	vpaned = gtk_vpaned_new();
+        gtk_paned_set_gutter_size(GTK_PANED(vpaned), 15);
 	gtk_container_add(GTK_CONTAINER(win),vpaned);
 	gtk_widget_show( vpaned );
 
 	hpaned = gtk_hpaned_new();
+        gtk_paned_set_gutter_size(GTK_PANED(hpaned), 15);
 	gtk_paned_pack1(GTK_PANED(vpaned), hpaned, TRUE, FALSE);
 	gtk_widget_show( hpaned );
 
@@ -590,7 +592,7 @@
 					GTK_POLICY_NEVER,
 					GTK_POLICY_ALWAYS);
 	gtk_paned_pack1(GTK_PANED(hpaned), sw, TRUE, TRUE);
-	gtk_widget_set_usize(sw, 320, 150);
+	gtk_widget_set_usize(sw, 320, 160);
 	gtk_widget_show(sw);
 
 	text = gtk_html_new(NULL, NULL);
@@ -600,7 +602,7 @@
 	GTK_HTML (text)->hadj->step_increment = 10.0;
 	GTK_HTML (text)->vadj->step_increment = 10.0;
 
-	lbox = gtk_vbox_new(FALSE, 4);
+	lbox = gtk_vbox_new(FALSE, 5);
 	gtk_paned_pack2(GTK_PANED(hpaned), lbox, TRUE, TRUE);
 	gtk_widget_show(lbox);
 
@@ -621,23 +623,23 @@
 	gtk_widget_set_usize(list, 150, -1);
 	gtk_widget_show(list);
 
-	bbox2 = gtk_hbox_new(TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(lbox), bbox2, FALSE, FALSE, 5);
+	bbox2 = gtk_hbox_new(TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(lbox), bbox2, FALSE, FALSE, 0);
 	gtk_widget_show(bbox2);
 
 	im = picture_button2(win, _("IM"), tmp_send_xpm, FALSE);
-	gtk_box_pack_start(GTK_BOX(bbox2), im, dispstyle, dispstyle, 5);
+	gtk_box_pack_start(GTK_BOX(bbox2), im, dispstyle, dispstyle, 0);
 	gtk_signal_connect(GTK_OBJECT(im), "clicked", GTK_SIGNAL_FUNC(im_callback), b);
 
 	ignore = picture_button2(win, _("Ignore"), close_xpm, FALSE);
-	gtk_box_pack_start(GTK_BOX(bbox2), ignore, dispstyle, dispstyle, 5);
+	gtk_box_pack_start(GTK_BOX(bbox2), ignore, dispstyle, dispstyle, 0);
 	gtk_signal_connect(GTK_OBJECT(ignore), "clicked", GTK_SIGNAL_FUNC(ignore_callback), b);
 
 	info = picture_button2(win, _("Info"), tb_search_xpm, FALSE);
-	gtk_box_pack_start(GTK_BOX(bbox2), info, dispstyle, dispstyle, 5);
+	gtk_box_pack_start(GTK_BOX(bbox2), info, dispstyle, dispstyle, 0);
 	gtk_signal_connect(GTK_OBJECT(info), "clicked", GTK_SIGNAL_FUNC(info_callback), b);
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_paned_pack2(GTK_PANED(vpaned), vbox, TRUE, FALSE);
 	gtk_widget_show(vbox);
 
@@ -645,7 +647,7 @@
 	b->entry = chatentry;
 
 	toolbar = build_conv_toolbar(b);
-	gtk_box_pack_start(GTK_BOX(vbox), toolbar, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
 	gtk_object_set_user_data(GTK_OBJECT(chatentry), b);
 	gtk_text_set_editable(GTK_TEXT(chatentry), TRUE);
@@ -655,7 +657,7 @@
 	gtk_signal_connect(GTK_OBJECT(chatentry), "key_press_event", GTK_SIGNAL_FUNC(entry_key_pressed), chatentry);
 	if (general_options & OPT_GEN_CHECK_SPELLING)
 		gtkspell_attach(GTK_TEXT(chatentry));
-	gtk_box_pack_start(GTK_BOX(vbox), chatentry, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), chatentry, TRUE, TRUE, 0);
 	if (display_options & OPT_DISP_CHAT_BIG_ENTRY)
 		gtk_widget_set_usize(chatentry, 320, 50);
 	else
@@ -664,29 +666,29 @@
 	gtk_widget_show(chatentry);
 
         bbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
         gtk_widget_show(bbox);
 
 	close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);
 	b->close = close;
 	gtk_object_set_user_data(GTK_OBJECT(close), b);
 	gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback),b);
-        gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 5);
+        gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
 
 	invite_btn = picture_button2(win, _("Invite"), join_xpm, dispstyle);
 	b->invite = invite_btn;
 	gtk_signal_connect(GTK_OBJECT(invite_btn), "clicked", GTK_SIGNAL_FUNC(invite_callback), b);
-	gtk_box_pack_end(GTK_BOX(bbox), invite_btn, dispstyle, dispstyle, 5);
+	gtk_box_pack_end(GTK_BOX(bbox), invite_btn, dispstyle, dispstyle, 0);
 
 	whisper = picture_button2(win, _("Whisper"), tb_forward_xpm, dispstyle);
 	b->whisper = whisper;
 	gtk_signal_connect(GTK_OBJECT(whisper), "clicked", GTK_SIGNAL_FUNC(whisper_callback), b);
-	gtk_box_pack_end(GTK_BOX(bbox), whisper, dispstyle, dispstyle, 5);
+	gtk_box_pack_end(GTK_BOX(bbox), whisper, dispstyle, dispstyle, 0);
 
         send = picture_button2(win, _("Send"), tmp_send_xpm, dispstyle);
 	b->send = send;
 	gtk_signal_connect(GTK_OBJECT(send), "clicked", GTK_SIGNAL_FUNC(send_callback),b);
-	gtk_box_pack_end(GTK_BOX(bbox), send, dispstyle, dispstyle, 5);
+	gtk_box_pack_end(GTK_BOX(bbox), send, dispstyle, dispstyle, 0);
 
 	b->font_dialog = NULL;
 	b->fg_color_dialog = NULL;	
--- a/src/conversation.c	Mon Dec 11 02:26:57 2000 +0000
+++ b/src/conversation.c	Mon Dec 11 05:39:15 2000 +0000
@@ -1730,7 +1730,7 @@
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	c->window = win;
 	gtk_object_set_user_data(GTK_OBJECT(win), c);
-        gtk_window_set_wmclass(GTK_WINDOW(win), "conversation", "Gaim");
+	gtk_window_set_wmclass(GTK_WINDOW(win), "conversation", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 	gtk_container_border_width(GTK_CONTAINER(win), 10);
 	gtk_widget_realize(win);
@@ -1743,10 +1743,11 @@
 	gtk_signal_connect(GTK_OBJECT(win), "delete_event", GTK_SIGNAL_FUNC(delete_event_convo), c);
 
 	paned = gtk_vpaned_new();
+	gtk_paned_set_gutter_size(GTK_PANED(paned), 15);
 	gtk_container_add(GTK_CONTAINER(win), paned);
 	gtk_widget_show(paned);
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_paned_pack1(GTK_PANED(paned), vbox, FALSE, TRUE);
 	gtk_widget_show(vbox);
 
@@ -1754,8 +1755,8 @@
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
 			GTK_POLICY_NEVER, 
 			GTK_POLICY_ALWAYS);
-	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
-	gtk_widget_set_usize(sw, 320, 150);
+	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
+	gtk_widget_set_usize(sw, 320, 175);
 	gtk_widget_show(sw);
 
 	text = gtk_html_new(NULL, NULL);
@@ -1766,7 +1767,7 @@
 	GTK_HTML (text)->vadj->step_increment = 10.0;
 	gtk_widget_show(text);
 
-	vbox2 = gtk_vbox_new(FALSE, 0);
+	vbox2 = gtk_vbox_new(FALSE, 5);
 	gtk_paned_pack2(GTK_PANED(paned), vbox2, FALSE, FALSE);
 	gtk_widget_show(vbox2);
 
@@ -1788,7 +1789,7 @@
 	c->entry = entry;
 
 	toolbar = build_conv_toolbar(c);
-	gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0);
 
 	gtk_object_set_user_data(GTK_OBJECT(entry), c);
 	gtk_text_set_editable(GTK_TEXT(entry), TRUE);
@@ -1803,11 +1804,11 @@
 	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(entry_key_pressed), entry);
 	if (general_options & OPT_GEN_CHECK_SPELLING)
 		gtkspell_attach(GTK_TEXT(c->entry));
-	gtk_box_pack_start(GTK_BOX(vbox2), entry, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox2), entry, TRUE, TRUE, 0);
 	gtk_widget_show(entry);
 
 	bbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox2), bbox, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox2), bbox, FALSE, FALSE, 0);
 	gtk_widget_show(bbox);
 
 	close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);