2005-10-23 [wwp] 1.9.15cvs96
[claws.git] / src / gtk / about.c
index 43c7185bc476e1e980a2223cf0e4cc6bb171ffbe..ed77b65ee068613cc5a2fffbbf211bed51c040f8 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 #  include <sys/utsname.h>
 #endif
 
-#include "intl.h"
 #include "about.h"
 #include "gtkutils.h"
 #include "stock_pixmap.h"
 #include "prefs_common.h"
 #include "utils.h"
 #include "version.h"
+#include "authors.h"
+#include "codeconv.h"
 
 static GtkWidget *window;
 
@@ -57,29 +59,32 @@ void about_show(void)
 {
        if (!window)
                about_create();
-       else {
-               gtk_widget_hide(window);
-               gtk_widget_show(window);
-       }
+       else
+               gtk_window_present(GTK_WINDOW(window));
 }
 
 static void about_create(void)
 {
-       GtkWidget *vbox;
-       GtkWidget *pixmap;
+       GtkWidget *vbox1;
+       GtkWidget *table;
+       GtkWidget *table2;
+       GtkWidget *image;       
+       GtkWidget *vbox2;
        GtkWidget *label;
-       GtkWidget *hbox;
        GtkWidget *button;
        GtkWidget *scrolledwin;
-       GtkWidget *text;
-       GtkWidget *confirm_area;
-       GtkWidget *ok_button;
+       GtkWidget *notebook;
        GtkStyle *style;
        GdkColormap *cmap;
        GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gboolean success[2];
+       char *markup;
+       GtkWidget *text;
+       GtkWidget *confirm_area;
+       GtkWidget *close_button;
        GtkTextBuffer *buffer;
-       GtkTextIter iter;
+       GtkTextIter iter, start_iter;
+       GtkTextMark *mark;
 
 #if HAVE_SYS_UTSNAME_H
        struct utsname utsbuf;
@@ -88,49 +93,94 @@ static void about_create(void)
        gint i;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(window), _("About"));
+       gtk_window_set_title(GTK_WINDOW(window), _("About Sylpheed-Claws"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_widget_set_size_request(window, 518, 358);
+       gtk_widget_set_size_request(window, -1, 458);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(gtk_widget_hide_on_delete), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), NULL);
        gtk_widget_realize(window);
 
-       vbox = gtk_vbox_new(FALSE, 6);
-       gtk_container_add(GTK_CONTAINER(window), vbox);
+       vbox1 = gtk_vbox_new(FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(window), vbox1);
+
+       table = gtk_table_new (1, 2, FALSE);
+       gtk_box_pack_start(GTK_BOX(vbox1), table, FALSE, FALSE, 0);
 
-       pixmap = stock_pixmap_widget(window, STOCK_PIXMAP_SYLPHEED_LOGO);
-       gtk_box_pack_start(GTK_BOX(vbox), pixmap, FALSE, FALSE, 0);
+       image = stock_pixmap_widget(window, STOCK_PIXMAP_SYLPHEED_LOGO);
+       gtk_table_attach(GTK_TABLE(table), image, 0, 1, 0, 1,
+                        (GtkAttachOptions) (GTK_SHRINK),
+                        (GtkAttachOptions) (GTK_SHRINK), 8, 0);
 
-       label = gtk_label_new("version "VERSION);
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       vbox2 = gtk_vbox_new (TRUE, 0);
+       gtk_table_attach(GTK_TABLE(table), vbox2, 1, 2, 0, 1,
+                        (GtkAttachOptions) (GTK_EXPAND),
+                        (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+       label = gtk_label_new("");
+       gtk_label_set_selectable(GTK_LABEL(label), TRUE);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+       gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
+       markup = g_markup_printf_escaped
+               ("<span weight=\"bold\" size=\"xx-large\">Sylpheed-Claws</span>\nversion %s",
+                VERSION);
+       gtk_label_set_markup(GTK_LABEL(label), markup);
+       g_free(markup);
+
+       button = gtk_button_new_with_label(" "HOMEPAGE_URI" ");
+       gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
+       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+       g_signal_connect(G_OBJECT(button), "clicked",
+                        G_CALLBACK(about_uri_clicked), NULL);
+       buf[0] = ' ';
+       for (i = 1; i <= strlen(HOMEPAGE_URI); i++) buf[i] = '_';
+       strcpy(buf + i, " ");
+       gtk_label_set_pattern(GTK_LABEL(GTK_BIN(button)->child), buf);
+       cmap = gdk_drawable_get_colormap(window->window);
+       gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
+       if (success[0] == TRUE && success[1] == TRUE) {
+               gtk_widget_ensure_style(GTK_BIN(button)->child);
+               style = gtk_style_copy
+                       (gtk_widget_get_style(GTK_BIN(button)->child));
+               style->fg[GTK_STATE_NORMAL]   = uri_color[0];
+               style->fg[GTK_STATE_ACTIVE]   = uri_color[1];
+               style->fg[GTK_STATE_PRELIGHT] = uri_color[0];
+               gtk_widget_set_style(GTK_BIN(button)->child, style);
+       } else
+               g_warning("about_create(): color allocation failed.\n");
 
 #if HAVE_SYS_UTSNAME_H
        uname(&utsbuf);
        g_snprintf(buf, sizeof(buf),
-                  _("GTK+ version %d.%d.%d\n"
+                  _("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
                   "Operating System: %s %s (%s)"),
                   gtk_major_version, gtk_minor_version, gtk_micro_version,
+                  glib_major_version, glib_minor_version, glib_micro_version,
                   utsbuf.sysname, utsbuf.release, utsbuf.machine);
+#elif defined(G_OS_WIN32)
+       g_snprintf(buf, sizeof(buf),
+                  _("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+                  "Operating System: %s"),
+                  gtk_major_version, gtk_minor_version, gtk_micro_version,
+                  glib_major_version, glib_minor_version, glib_micro_version,
+                  "Win32");
 #else
        g_snprintf(buf, sizeof(buf),
-                  "GTK+ version %d.%d.%d\n"
-                  "Operating System: Windoze",
-                  gtk_major_version, gtk_minor_version, gtk_micro_version);
+                  _("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+                  "Operating System: unknown"),
+                  gtk_major_version, gtk_minor_version, gtk_micro_version,
+                  glib_major_version, glib_minor_version, glib_micro_version);
 #endif
 
        label = gtk_label_new(buf);
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gtk_label_set_selectable(GTK_LABEL(label), TRUE);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
 
        g_snprintf(buf, sizeof(buf),
-                  _("Compiled-in features:%s"),
-#if HAVE_GDK_IMLIB
-                  " gdk_imlib"
-#endif
-#if HAVE_GDK_PIXBUF
-                  " gdk-pixbuf"
-#endif
+                  _("Compiled-in features:\n%s"),
 #if USE_THREADS
                   " gthread"
 #endif
@@ -154,49 +204,267 @@ static void about_create(void)
 #endif
 #if USE_ASPELL
                   " GNU/aspell"
+#endif
+#if HAVE_LIBETPAN
+                  " libetpan"
+#endif
+#if USE_GNOMEPRINT
+                  " libgnomeprint"
 #endif
        "");
 
        label = gtk_label_new(buf);
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gtk_label_set_selectable(GTK_LABEL(label), TRUE);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
+
+       table2 = gtk_table_new (2, 3, FALSE);
+       gtk_box_pack_start(GTK_BOX(vbox1), table2, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               ("Copyright (C) 1999-2004 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+               ("Copyright (C) 1999-2005 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+                "and the Sylpheed-Claws team");
+       gtk_label_set_selectable(GTK_LABEL(label), TRUE);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+       gtk_table_attach(GTK_TABLE(table2), label, 0, 1, 0, 1,
+                        (GtkAttachOptions) (GTK_EXPAND),
+                        (GtkAttachOptions) (GTK_SHRINK), 0, 6);
 
-       hbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       notebook = gtk_notebook_new();
+       gtk_widget_set_size_request(notebook, -1, 200);
+       gtk_widget_show(notebook);
 
-       button = gtk_button_new_with_label(" "HOMEPAGE_URI" ");
-       gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
-       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       g_signal_connect(G_OBJECT(button), "clicked",
-                        G_CALLBACK(about_uri_clicked), NULL);
-       buf[0] = ' ';
-       for (i = 1; i <= strlen(HOMEPAGE_URI); i++) buf[i] = '_';
-       strcpy(buf + i, " ");
-       gtk_label_set_pattern(GTK_LABEL(GTK_BIN(button)->child), buf);
-       cmap = gdk_window_get_colormap(window->window);
-       gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
-       if (success[0] == TRUE && success[1] == TRUE) {
-               gtk_widget_ensure_style(GTK_BIN(button)->child);
-               style = gtk_style_copy
-                       (gtk_widget_get_style(GTK_BIN(button)->child));
-               style->fg[GTK_STATE_NORMAL]   = uri_color[0];
-               style->fg[GTK_STATE_ACTIVE]   = uri_color[1];
-               style->fg[GTK_STATE_PRELIGHT] = uri_color[0];
-               gtk_widget_set_style(GTK_BIN(button)->child, style);
-       } else
-               g_warning("about_create(): color allocation failed.\n");
+       scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
+
+       text = gtk_text_view_new();
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
+       gtk_container_add(GTK_CONTAINER(scrolledwin), text);
+
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+       gtk_text_buffer_get_iter_at_offset(buffer, &iter, 0);
+
+       /* textview link style (based upon main prefs) */
+       gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
+                                      (GdkColor*)&uri_color);
+       gtk_text_buffer_create_tag(buffer, "link",
+                               "foreground-gdk", &uri_color,
+                               NULL);
+
+       gtk_text_buffer_insert(buffer, &iter, _("Sylpheed-Claws is a lightweight, fast and "
+                               "highly-configurable e-mail client.\n\n"
+                               "For further information visit the Sypheed-"
+                               "Claws website, "), -1);
+       mark = gtk_text_buffer_create_mark(buffer, "mark", &iter, TRUE);
+       gtk_text_buffer_insert(buffer, &iter, HOMEPAGE_URI, -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "link", &start_iter, &iter);
+       gtk_text_buffer_insert(buffer, &iter, _(".\n\n"
+                               "Sylpheed-Claws is free software released "
+                               "under the GPL license. If you wish to donate "
+                               "to the Sylpheed-Claws project you can do "
+                               "so at "), -1);
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, DONATE_URI, -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "link", &start_iter, &iter);
+       gtk_text_buffer_insert(buffer, &iter, _(".\n\n"), -1);
+
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                               scrolledwin,
+                               gtk_label_new(_("Info")));
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
 
        text = gtk_text_view_new();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
+       gtk_container_add(GTK_CONTAINER(scrolledwin), text);
+
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+       gtk_text_buffer_get_iter_at_offset(buffer, &iter, 0);
+
+       /* init formatting tag: indentation  for list items */
+       gtk_text_buffer_create_tag(buffer, "indented-list-item",
+                               "indent", 24,
+                               NULL);
+       gtk_text_buffer_create_tag(buffer, "underlined-list-title",
+                               "underline", PANGO_UNDERLINE_SINGLE,
+                               NULL);
+
+       mark = gtk_text_buffer_create_mark(buffer, "mark", &iter, TRUE);
+       gtk_text_buffer_insert(buffer, &iter, (_("The Sylpheed-Claws Team\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; TEAM_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(TEAM_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, TEAM_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(TEAM_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, (_("\nPrevious team members\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; EX_TEAM_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(EX_TEAM_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, EX_TEAM_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(EX_TEAM_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, (_("\nThe translation team\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; TRANS_TEAM_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(TRANS_TEAM_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, TRANS_TEAM_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(TRANS_TEAM_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, (_("\nDocumentation team\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; DOC_TEAM_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(DOC_TEAM_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, DOC_TEAM_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(DOC_TEAM_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, (_("\nLogo\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; LOGO_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(LOGO_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, LOGO_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(LOGO_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, (_("\nIcons\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; ICONS_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(ICONS_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, ICONS_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(ICONS_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_move_mark(buffer, mark, &iter);
+       gtk_text_buffer_insert(buffer, &iter, (_("\nContributors\n")), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "underlined-list-title", &start_iter, &iter);
+
+       for (i = 0; CONTRIBS_LIST[i] != NULL; i++) {
+               gtk_text_buffer_move_mark(buffer, mark, &iter);
+               if (g_utf8_validate(CONTRIBS_LIST[i], -1, NULL))
+                       gtk_text_buffer_insert(buffer, &iter, CONTRIBS_LIST[i], -1);
+               else {
+                       gchar *conv = conv_codeset_strdup(CONTRIBS_LIST[i], CS_ISO_8859_1, CS_UTF_8);
+                       if (conv)
+                               gtk_text_buffer_insert(buffer, &iter, conv, -1);
+                       g_free(conv);
+               }
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_apply_tag_by_name(buffer, "indented-list-item", &start_iter, &iter);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+       }
+
+       gtk_text_buffer_delete_mark(buffer, mark);      
+
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                                scrolledwin,
+                                gtk_label_new(_("Authors")));
+
+       scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
+
+       text = gtk_text_view_new();
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
@@ -217,17 +485,39 @@ static void about_create(void)
        gtk_text_buffer_insert(buffer, &iter,
                _("You should have received a copy of the GNU General Public License "
                  "along with this program; if not, write to the Free Software "
-                 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
-                 "MA 02111-1307, USA."), -1);
+                 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+                 "MA 02110-1301, USA.\n\n"), -1);
+#ifdef USE_OPENSSL
+       gtk_text_buffer_create_tag(buffer, "link",
+                               "foreground-gdk", &uri_color,
+                               NULL);
 
-       gtkut_button_set_create(&confirm_area, &ok_button, _("OK"),
-                               NULL, NULL, NULL, NULL);
-       gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_default(ok_button);
+       gtk_text_buffer_insert(buffer, &iter,
+               _("This product includes software developed by the OpenSSL Project "
+                 "for use in the OpenSSL Toolkit ("), -1);
+       mark = gtk_text_buffer_create_mark(buffer, "mark", &iter, TRUE);
+       gtk_text_buffer_insert(buffer, &iter, _("http://www.openssl.org/"), -1);
+       gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+       gtk_text_buffer_apply_tag_by_name(buffer, "link", &start_iter, &iter);
+       gtk_text_buffer_insert(buffer, &iter, _(").\n\n"), -1);
+#endif
+
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                                scrolledwin,
+                                gtk_label_new(_("License")));
+
+       gtk_box_pack_start(GTK_BOX(vbox1), notebook, TRUE, TRUE, 0);
+
+       gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE,
+                                     NULL, NULL, NULL, NULL);
+       gtk_box_pack_end(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 4);
+       gtk_widget_grab_default(close_button);
+       gtk_widget_grab_focus(close_button);
        g_signal_connect_closure
-               (G_OBJECT(ok_button), "clicked",
+               (G_OBJECT(close_button), "clicked",
                 g_cclosure_new_swap(G_CALLBACK(gtk_widget_hide_on_delete),
                                     window, NULL), FALSE);
+
        gtk_widget_show_all(window);
 }