diff src/about.c @ 1210:265abea9db72

[gaim-migrate @ 1220] Decklin is still trying to replace me, I think :-P committer: Tailor Script <[e-mail]>

--- a/src/about.c	Wed Dec 06 02:49:01 2000 +0000
+++ b/src/about.c	Wed Dec 06 21:39:56 2000 +0000
@@ -31,6 +31,7 @@
 #include "gaim.h"
 #include "pixmaps/logo.xpm"
 #include "pixmaps/cancel.xpm"
+#include "pixmaps/about_small.xpm"
 
 static GtkWidget *about=NULL;
 
@@ -56,7 +57,8 @@
 void show_about(GtkWidget *w, void *null)
 {
 	GtkWidget *vbox;
-	GtkWidget *table;
+	GtkWidget *frame;
+	GtkWidget *fbox;
 	GtkWidget *a_table;
 	GtkWidget *label;
 	GtkWidget *pixmap;
@@ -76,17 +78,21 @@
 		g_snprintf(abouttitle, sizeof(abouttitle), _("About GAIM v%s"), VERSION);
 		gtk_window_set_title(GTK_WINDOW(about), abouttitle);
                 gtk_window_set_wmclass(GTK_WINDOW(about), "about", "Gaim" );
-		gtk_container_border_width(GTK_CONTAINER(about), 2);
-		gtk_widget_set_usize(about, 535, 255);
-		gtk_window_set_policy(GTK_WINDOW(about), FALSE, FALSE, TRUE);
+		gtk_window_set_policy(GTK_WINDOW(about), FALSE, TRUE, TRUE);
 
-		gtk_widget_show(about);
+		gtk_widget_realize(about);
         	aol_icon(about->window);
 
+		vbox = gtk_vbox_new(FALSE, 5);
+		gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
+		gtk_container_add(GTK_CONTAINER(about), vbox);
 
-		vbox = gtk_vbox_new(FALSE, 5);
-		
-		table = gtk_table_new(3, 2, FALSE);
+		frame = gtk_frame_new("Gaim " VERSION);
+                gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
+
+                fbox = gtk_hbox_new(FALSE, 5);
+                gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
+		gtk_container_add(GTK_CONTAINER(frame), fbox);
 
 		/* Left side, TOP */
 		style = gtk_widget_get_style(about);
@@ -97,97 +103,60 @@
 		gdk_pixmap_unref(pm);
 		gdk_bitmap_unref(bm);
 
-		gtk_table_attach(GTK_TABLE(table), pixmap, 0, 1, 0, 1, 0, 0, 5, 5);
-		gtk_widget_show(pixmap);
-
-		
-		/* Right side, TOP*/
-		hbox = gtk_vbox_new(FALSE, 5);
-
-		label = gtk_label_new(_("GAIM is a client that supports AOL's Instant Messanger protocol.  It is " 
-				"written using Gtk+ and is licensed under the GPL."));
-		gtk_widget_show(label);
-		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_box_pack_start(GTK_BOX(hbox), label, GTK_EXPAND, FALSE, 0);
+                gtk_box_pack_start(GTK_BOX(fbox), pixmap, FALSE, FALSE, 0);
 
 		/* Set up the author table */
-		a_table = gtk_table_new(2, 5, FALSE);
+		a_table = gtk_table_new(6, 2, TRUE);
+                gtk_table_set_row_spacings(GTK_TABLE(a_table), 5);
+                gtk_table_set_col_spacings(GTK_TABLE(a_table), 5);
 		
+		label = gtk_label_new(_("GAIM is a client that supports AOL's Instant Messenger protocol. "
+                        "It is written using Gtk+ and is licensed under the GPL.\n"
+                        "URL: http://www.marko.net/gaim/"));
+		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+                gtk_table_attach_defaults(GTK_TABLE(a_table), label, 0, 2, 0, 2);
+
 		/* Rob */
 		label = gtk_label_new("Rob Flynn (Maintainer)");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 0, 1, 1, 2, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 0, 1, 2, 3);
 		
 		label = gtk_label_new("[e-mail]");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 1, 2, 1, 2, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 1, 2, 2, 3);
 
 		/* Eric */
 		label = gtk_label_new("Eric Warmenhoven");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 0, 1, 2, 3, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 0, 1, 3, 4);
 		
 		label = gtk_label_new("[e-mail]");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 1, 2, 2, 3, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 1, 2, 3, 4);
 		
 		/* Jim */
 		label = gtk_label_new("Jim Duchek");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 0, 1, 3, 4, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 0, 1, 4, 5);
 		
 		/* Mark */
 		label = gtk_label_new("Mark Spencer");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 0, 1, 4, 5, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 0, 1, 5, 6);
 		
 		label = gtk_label_new("[e-mail]");
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_table_attach(GTK_TABLE(a_table), label, 1, 2, 4, 5, GTK_FILL, 0, 5, 5);
+		gtk_table_attach_defaults(GTK_TABLE(a_table), label, 1, 2, 5, 6);
 		
-		gtk_box_pack_start(GTK_BOX(hbox), a_table, TRUE, FALSE, 0);	
-
-		gtk_widget_show_all(a_table);
-
-		/* End Author List */
-
-		gtk_table_attach(GTK_TABLE(table), hbox, 1, 3, 0, 1, 0, 0, 5, 5);
-		gtk_widget_show(hbox);
-
-		/* Clickable URL */
-		eventbox = gtk_event_box_new();
-		gtk_table_attach(GTK_TABLE(table), eventbox, 0, 3, 1, 2, GTK_FILL, FALSE, 5, 5);
-		gtk_widget_show(eventbox);
-		
-		label = gtk_label_new("Gaim " VERSION " - http://www.marko.net/gaim/\n");
-		gtk_container_add(GTK_CONTAINER(eventbox), label);
-
-		gtk_signal_connect(GTK_OBJECT(eventbox), "button_press_event",
-				   GTK_SIGNAL_FUNC(about_click), NULL);
-		gdk_window_set_cursor(eventbox->window, gdk_cursor_new(GDK_HAND2));
-		gtk_widget_show(label);
-
-		/* End Clickable URL */
+		gtk_box_pack_start(GTK_BOX(fbox), a_table, TRUE, TRUE, 0);
 
 		/* Close Button */
 
-		button = picture_button(about, _("Close"), cancel_xpm);
-
 		hbox = gtk_hbox_new(FALSE, 5);
-		gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-		gtk_widget_show(hbox);
-
-		/* End Button */
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-		gtk_widget_show(vbox);
-		gtk_widget_show(table);
-
-
-		gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-		gtk_box_pack_end(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-
-		gtk_container_add(GTK_CONTAINER(about), vbox);
+		button = picture_button(about, _("Close"), cancel_xpm);
+		gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 		if (null != (void *)2) {
 			/* 2 can be as sad as 1, it's the loneliest number since the number 1 */ 
@@ -201,18 +170,22 @@
 			gtk_signal_connect(GTK_OBJECT(about), "destroy",
 					   GTK_SIGNAL_FUNC(version_exit), NULL);
 		}
- 		
- 		if (display_options & OPT_DISP_COOL_LOOK)
- 			gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- 			
-		GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-		gtk_widget_grab_default(button);
+
+                /* this makes the sizes not work. */
+		//GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+		//gtk_widget_grab_default(button);
 
+		button = picture_button(about, _("Web Site"), about_small_xpm);
+		gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+		gtk_signal_connect(GTK_OBJECT(button), "clicked",
+				   GTK_SIGNAL_FUNC(about_click), NULL);
 
+		if (display_options & OPT_DISP_COOL_LOOK)
+			gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	}
-	else
-		/* Let's give'em something to talk about -- woah woah woah */
-		gtk_widget_show(about);
+
+	/* Let's give'em something to talk about -- woah woah woah */
+	gtk_widget_show_all(about);
 	
 }