2005-10-23 [wwp] 1.9.15cvs96

	* src/gtk/about.c
	* src/gtk/authors.h
		rework of the about window (main work by Paul), also featuring a few
		fixes for typos and duplicate names

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 74bcd02149447bf4782c0985dbd7440856c2371f..a27f457eb92e85f9b7f7da0b5ec9d66b89c30709 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-10-23 [wwp]       1.9.15cvs96
+
+       * src/gtk/about.c
+       * src/gtk/authors.h
+               rework of the about window (main work by Paul), also featuring a few
+               fixes for typos and duplicate names
+
 2005-10-23 [wwp]       1.9.15cvs95
 
        * src/.cvsignore

diff --git a/PATCHSETS b/PATCHSETS
index 4ad645765e0f5bb8dffc95b1de50294f06e14e1f..c1560313159d8dec3eaa32e05b9e034cbd271d9a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -932,3 +932,4 @@
 ( cvs diff -u -r 1.65.2.42 -r 1.65.2.43 src/codeconv.c;  ) > 1.9.15cvs93.patchset
 ( cvs diff -u -r 1.382.2.187 -r 1.382.2.188 src/compose.c;  ) > 1.9.15cvs94.patchset
 ( cvs diff -u -r 1.11 -r 1.12 src/.cvsignore;  ) > 1.9.15cvs95.patchset
+( cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/gtk/about.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/authors.h;  ) > 1.9.15cvs96.patchset

diff --git a/configure.ac b/configure.ac
index 0e5c41820004b8c7587ae6eed31f026f67b227cb..58786d93fcbb8bfbf5d16ccf60a7d023137ec2fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/about.c b/src/gtk/about.c
index b076d6eb546fcddae871d34430afd4e5e0ba4e65..ed77b65ee068613cc5a2fffbbf211bed51c040f8 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -50,44 +50,30 @@
 #include "codeconv.h"
 
 static GtkWidget *window;
-static GtkWidget *scrolledwin;
 
 static void about_create(void);
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event);
 static void about_uri_clicked(GtkButton *button, gpointer data);
-static gboolean scrollme = FALSE;
-
-static gboolean scroller(gpointer data)
-{
-       GtkAdjustment *adj = (GtkAdjustment *)data;
-       if (adj->value != adj->upper)
-               gtk_adjustment_set_value(adj, adj->value + 1);
-       else
-               gtk_adjustment_set_value(adj, 0);
-       return scrollme;
-}
 
 void about_show(void)
 {
-       GtkAdjustment *adj = NULL;
        if (!window)
                about_create();
        else
                gtk_window_present(GTK_WINDOW(window));
-       scrollme = TRUE;
-       adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin));
-       gtk_adjustment_set_value(adj, 0);
-       g_timeout_add(30, scroller, adj);
 }
 
 static void about_create(void)
 {
        GtkWidget *vbox1;
        GtkWidget *table;
+       GtkWidget *table2;
        GtkWidget *image;       
        GtkWidget *vbox2;
        GtkWidget *label;
        GtkWidget *button;
+       GtkWidget *scrolledwin;
+       GtkWidget *notebook;
        GtkStyle *style;
        GdkColormap *cmap;
        GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
@@ -97,8 +83,8 @@ static void about_create(void)
        GtkWidget *confirm_area;
        GtkWidget *close_button;
        GtkTextBuffer *buffer;
-       GtkTextIter iter;
-       GdkColor color = {0, 0, 0, 0};
+       GtkTextIter iter, start_iter;
+       GtkTextMark *mark;
 
 #if HAVE_SYS_UTSNAME_H
        struct utsname utsbuf;
@@ -107,9 +93,9 @@ 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",
@@ -125,19 +111,19 @@ static void about_create(void)
        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), 0, 0);
+                        (GtkAttachOptions) (GTK_SHRINK), 8, 0);
 
        vbox2 = gtk_vbox_new (TRUE, 0);
        gtk_table_attach(GTK_TABLE(table), vbox2, 1, 2, 0, 1,
                         (GtkAttachOptions) (GTK_EXPAND),
-                        (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+                        (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=\"x-large\">Sylpheed-Claws</span>\nversion %s",
+               ("<span weight=\"bold\" size=\"xx-large\">Sylpheed-Claws</span>\nversion %s",
                 VERSION);
        gtk_label_set_markup(GTK_LABEL(label), markup);
        g_free(markup);
@@ -194,7 +180,7 @@ static void about_create(void)
        gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
 
        g_snprintf(buf, sizeof(buf),
-                  _("Compiled-in features:%s"),
+                  _("Compiled-in features:\n%s"),
 #if USE_THREADS
                   " gthread"
 #endif
@@ -229,39 +215,260 @@ static void about_create(void)
 
        label = gtk_label_new(buf);
        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-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_box_pack_start(GTK_BOX(vbox1), label, TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(table2), label, 0, 1, 0, 1,
+                        (GtkAttachOptions) (GTK_EXPAND),
+                        (GtkAttachOptions) (GTK_SHRINK), 0, 6);
+
+       notebook = gtk_notebook_new();
+       gtk_widget_set_size_request(notebook, -1, 200);
+       gtk_widget_show(notebook);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-       gtk_widget_set_size_request(scrolledwin, -1, 80);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-                                      GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_SHADOW_NONE);
-       gtk_box_pack_start(GTK_BOX(vbox1), scrolledwin, FALSE, FALSE, 0);
+                                           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);
 
-       color = gtk_widget_get_style(label)->bg[GTK_STATE_NORMAL];
-       gtk_widget_modify_base (text, GTK_STATE_NORMAL, &color);
+       /* 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_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
 
-       gtk_text_buffer_insert(buffer, &iter, "\n\n\n\n\n\n\n\n", -1);
+       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));
+       gtk_text_buffer_get_iter_at_offset(buffer, &iter, 0);
 
        gtk_text_buffer_insert(buffer, &iter,
                _("This program is free software; you can redistribute it and/or modify "
@@ -279,25 +486,28 @@ static void about_create(void)
                _("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., 51 Franklin Street, Fifth Floor, Boston, "
-                 "MA 02110-1301, USA."), -1);
+                 "MA 02110-1301, USA.\n\n"), -1);
 #ifdef USE_OPENSSL
+       gtk_text_buffer_create_tag(buffer, "link",
+                               "foreground-gdk", &uri_color,
+                               NULL);
+
        gtk_text_buffer_insert(buffer, &iter,
-               _("\n\nThis product includes software developed by the OpenSSL Project "
-                 "for use in the OpenSSL Toolkit (http://www.openssl.org/)"), -1);
+               _("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_text_buffer_insert(buffer, &iter,
-               _("\n\n\nSylpheed-Claws is "
-                 "proudly brought to you by:\n\n"), -1);
-               
-       if (g_utf8_validate(AUTHORS_LIST, -1, NULL))
-               gtk_text_buffer_insert(buffer, &iter, AUTHORS_LIST, -1);
-       else {
-               gchar *conv = conv_codeset_strdup(AUTHORS_LIST, CS_ISO_8859_1, CS_UTF_8);
-               if (conv)
-                       gtk_text_buffer_insert(buffer, &iter, conv, -1);
-               g_free(conv);
-       }
-                
+
+       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);
@@ -313,10 +523,8 @@ static void about_create(void)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event)
 {
-       if (event && event->keyval == GDK_Escape) {
-               scrollme = FALSE;
+       if (event && event->keyval == GDK_Escape)
                gtk_widget_hide(window);
-       }
        return FALSE;
 }
 

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index e9301d58aacebc6143e4a49724d4936e65e5536d..6300b830f9892ffa0d36000a38f9d8fe9035915c 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -1,197 +1,221 @@
-static char *AUTHORS_LIST =
-"Hiroyuki Yamamoto\n"
-"Hoa viet Dinh\n"
-"Keith Edmunds \n"
-"Match Grun\n"
-"Melvin Hadasht\n"
-"Oliver Haertel \n"
-"Christoph Hohmann\n"
-"Alfons Hoogervorst\n"
-"Darko Koruga\n"
-"Colin Leroy\n"
-"Paul Mangan\n"
-"Leandro A. F. Pereira \n"
-"Luke Plant \n"
-"Martin Schaaf\n"
-"Carsten Schurig\n"
-"Sergey Vlasov\n"
-"Werner Koch\n"
-"Thorsten Maerz\n"
-"George Danchev \n"
-"Miquel Oliete \n"
-"Thomas Gilgin \n"
-"Ricardo Mones Lastra \n"
-"Flammie Pirinen \n"
-"Fabien Vantard \n"
-"Dragan \n"
-"Andrea Spadaccini \n"
-"Rui Hirokawa \n"
-"SungHyun Nam \n"
-"Geir Helland \n"
-"Emilian Nowak\n"
-"Frederico Goncalves Guimaraes \n"
-"Pavlo Bohmat \n"
-"Andrej Kacian \n"
-"Urke MMI \n"
-"Hansom Young \n"
-"Wei-Lun Chao \n"
-"François Barriere \n"
-"Martin Bretschneider\n"
-"Paul Kater\n"
-"Jens Oberender\n"
-"Marcelo Ramos \n"
-"Guido Rudolphi\n"
-"Nick Selby\n"
-"Yoichi Imai (Japanese)\n"
-"Paul Kater (English)\n"
-"WAKAI Kazunao\n"
-"Jakub 'jimmac' Steiner\n"
-"Aleksandar Urosevic\n"
-"Jesper Schultz\n"
-"Alte\n"
-"Pierric Descamps\n"
-"Ohmasa\n"
-"Stephen Anthony\n"
-"HIRAMATSU Masami\n"
-"Jorge Van Hemelryck\n"
-"TAKANO\n"
-"Masahiro Tomita\n"
-"Mathias Intemann\n"
-"Chideok Hwang\n"
-"Marc Hoper\n"
-"David Mehrmann\n"
-"Setoh\n"
-"Yuuki NINOMIYA\n"
-"Suzuki Mio\n"
-"Ishihara\n"
-"Jason McCarver\n"
-"Sakamoto\n"
-"Hiramatu\n"
-"John E.P. Hynes\n"
-"Maki\n"
-"Takahashi\n"
-"Nishimura\n"
-"Yoichi Imai\n"
-"Tsutsui\n"
-"Yanase\n"
-"TOGAWA\n"
-"Higuchi\n"
-"Paul Rolland\n"
-"KUROSAWA\n"
-"NAKAGAWA\n"
-"HIROSHIMA\n"
-"Tanaka\n"
-"Hashimoto\n"
-"T. Yamamoto\n"
-"YAMAGUCHI\n"
-"Tomita\n"
-"Nishiyama\n"
-"Michihide Hotta\n"
-"Nishika\n"
-"shigeri\n"
-"Tajiri\n"
-"Rodrigo Dias Arruda Senra\n"
-"Fabio Junior Beneditto\n"
-"Satoshi Nagayasu\n"
-"Henrik Carlqvist\n"
-"Don Quijote\n"
-"David Looney\n"
-"Eric Limpens\n"
-"Paul Evans\n"
-"wwp\n"
-"Jeroen Versteeg\n"
-"Ravemax\n"
-"Jens Jahnke\n"
-"Thierry Godefroy\n"
-"Matthieu Dazy\n"
-"Jonathan Ware\n"
-"Yasumatsu\n"
-"Stefaan A Eeckels\n"
-"OSHIRO Naoki\n"
-"KAJIWARA\n"
-"Hironori IWANE\n"
-"Manrat Chobchuen\n"
-"Shimamoto 'Neko' Tatsuya\n"
-"Jesse Skinner\n"
-"Willem van Engen\n"
-"Tobias Sandhaas\n"
-"Thomas Link\n"
-"Martin Pool\n"
-"Fredrik Olofssen\n"
-"Gustavo Noronha Silva\n"
-"Simon 'corecode' Schubert\n"
-"Dale P. Smith\n"
-"Yukihiro Nakai\n"
-"Watanabe\n"
-"Masaaki Noro\n"
-"Motonobu Ichimura\n"
-"Luca Rosellini\n"
-"Yasuzaki Masayoshi\n"
-"Stoyan Genov\n"
-"Jeremy Andrews\n"
-"Shawn Houston\n"
-"Alessandro Maestri\n"
-"Neill Miller\n"
-"Oliver Haertel\n"
-"Bob Forsman\n"
-"Ville Skyttä\n"
-"Wilbert Berendsen\n"
-"Bob Woodside\n"
-"Stefaan Eeckels\n"
-"Pascal Jermini\n"
-"Thorsten Thielen\n"
-"Eugene Brevdo\n"
-"Mitko Haralanov\n"
-"Bram Metsch\n"
-"Stanislav Karchebny\n"
-"Torsten Schoenfeld\n"
-"Xavier FACQ\n"
-"Botalov Vyacheslav\n"
-"Urosevic Aleksandar\n"
-"Martin Kluge\n"
-"George Danchev\n"
-"Ruslan N. Balkin\n"
-"Nicolas Kaiser\n"
-"Ivan Francolin Martinez\n"
-"Topia\n"
-"Gál Zoltán\n"
-"Mohammed Sameer\n"
-"Kim Schulz\n"
-"Christian Mertes\n"
-"Jens Rantil\n"
-"Florian Mickler\n"
-"André Filipe de Assunção e Brito\n"
-"Sergei Astanin\n"
-"Kevin Vigor\n"
-"James Noyes\n"
-"Radek Vybiral\n"
-"Tsu-Fan Cheng\n"
-"Martin Zwickel\n"
-"Martin Wicke\n"
-"Pawel Pêkala\n"
-"Bogdan Sumanariu\n"
-"David Relson\n"
-"Matthias Förste\n"
-"David Chalmers\n"
-"Chad Robinson\n"
-"Edgar Toernig\n"
-"Fabien Vantard\n"
-"Reza Pakdel\n"
-"Stephan Sachse\n"
-"Thomas Gilgin\n"
-"Guy Rouillier\n"
-"Jean-Yves Lefort\n"
-"George Michaelson\n"
-"IWAMOTO Kouichi\n"
-"Alex S Moore\n"
-"Felix Eckhofer\n"
-"Rich Coe\n"
-"Ivan Rayner\n"
-"Markus Schwarzenberg\n"
-"Luca Cavalli\n"
-"Tim Mann\n"
-"M. Benkmann\n"
-"Yang Guilong\n"
-"Daniel Gustafson\n"
-"Anders Hammar\n"
-"Andrew Nelson\n";
+static char *TEAM_LIST[] = {
+"Holger Berndt <berndth@users.sourceforge.net>",
+"Hoà Viêt Dinh <hoa@users.sourceforge.net>",
+"Darko Koruga <darko@users.sourceforge.net>",
+"Ricardo Mones Lastra <mones@users.sourceforge.net>",
+"Colin Leroy <colinleroy@users.sourceforge.net>",
+"Thorsten Maerz <netztorte@users.sourceforge.net>",
+"Paul Mangan <twb@users.sourceforge.net>",
+"Martin Schaaf <mascha1@users.sourceforge.net>",
+"wwp <wwp@users.sourceforge.net>",
+NULL
+};
+
+static char *EX_TEAM_LIST[] = {
+"Keith Edmunds",
+"Match Grun",
+"Melvin Hadasht",
+"Oliver Haertel",
+"Christoph Hohmann",
+"Alfons Hoogervorst",
+"Leandro A. F. Pereira",
+"Luke Plant",
+"Martin Schaaf",
+"Carsten Schurig",
+"Sergey Vlasov",
+"Hiroyuki Yamamoto",
+NULL
+};
+
+static char *TRANS_TEAM_LIST[] = {
+"[bg] George Danchev <danchev@spnet.net>",
+"[ca] Miquel Oliete <miqueloliete@softhome.net>",
+"[de] Thomas Gilgin <thg1@karate-muellheim.de>",
+"[en_GB] Paul Mangan <claws@thewildbeast.co.uk>",
+"[es] Ricardo Mones Lastra <mones@aic.uniovi.es>",
+"[fi] Flammie Pirinen <flammie@iki.fi>",
+"[fr] Fabien Vantard <fzzzzz@gmail.com>",
+"[hr] Dragan <drleskov@inet.hr>",
+"[it] Andrea Spadaccini <a.spadaccini@catania.linux.it>",
+"[ja] Rui Hirokawa <rui_hirokawa@ybb.ne.jp>",
+"[ko] SungHyun Nam <namsh@kldp.org>",
+"[nb] Geir Helland <pjallabais@users.sourceforge.net>",
+"[pl] Emilian Nowak <eminowbl@posejdon.wpk.p.lodz.pl>",
+"[pt_BR] Frederico Goncalves Guimaraes <fggdebian@yahoo.com.br>",
+"[ru] Pavlo Bohmat <bohm@ukr.net>",
+"[sk] Andrej Kacian <andrej@kacian.sk>",
+"[sr] Urke MMI <urke@users.sourceforge.net>",
+"[zh_CN] Hansom Young <hyoung@operamail.com>",
+"[zh_TW] Wei-Lun Chao <chaoweilun@pcmail.com.tw>",
+NULL
+};
+
+static char *DOC_TEAM_LIST[] = {
+"Ricardo Mones Lastra <mones@users.sourceforge.net>",
+"Paul Mangan <twb@users.sourceforge.net>",
+NULL
+};
+
+static char *LOGO_LIST[] = {
+"Jesper Schultz <jesper@schultz-net.dk>",
+NULL
+};
+
+static char *ICONS_LIST[] = {
+"Jakub 'jimmac' Steiner <jimmac@ximian.com>",
+"Aleksandar Urosevic <urke@users.sf.net>",
+NULL
+};
+
+static char *CONTRIBS_LIST[] = {
+"Alte",
+"Jeremy Andrews",
+"Stephen Anthony",
+"Sergei Astanin",
+"Ruslan N. Balkin",
+"Fabio Junior Beneditto",
+"M. Benkmann",
+"Wilbert Berendsen",
+"Eugene Brevdo",
+"André Filipe de Assunção e Brito",
+"Henrik Carlqvist",
+"Luca Cavalli",
+"David Chalmers",
+"Tsu-Fan Cheng",
+"Manrat Chobchuen",
+"Rich Coe",
+"George Danchev",
+"Matthieu Dazy",
+"Pierric Descamps",
+"Felix Eckhofer",
+"Stefaan A Eeckels",
+"Stefaan Eeckels",
+"Willem van Engen",
+"Paul Evans",
+"Xavier FACQ",
+"Bob Forsman",
+"Matthias Förste",
+"Stoyan Genov",
+"Thomas Gilgin",
+"Thierry Godefroy",
+"Yang Guilong",
+"Daniel Gustafson",
+"HIROSHIMA",
+"Oliver Haertel",
+"Anders Hammar",
+"Mitko Haralanov",
+"Hashimoto",
+"Jorge Van Hemelryck",
+"Higuchi",
+"Hiramatu",
+"Marc Hoper",
+"Michihide Hotta",
+"Shawn Houston",
+"Chideok Hwang",
+"John E.P. Hynes",
+"Hironori IWANE",
+"Motonobu Ichimura",
+"Yoichi Imai",
+"Mathias Intemann",
+"Ishihara",
+"Jens Jahnke",
+"Pascal Jermini",
+"KAJIWARA",
+"KUROSAWA",
+"Nicolas Kaiser",
+"Stanislav Karchebny",
+"WAKAI Kazunao",
+"Martin Kluge",
+"IWAMOTO Kouichi",
+"Ricardo Mones Lastra",
+"Jean-Yves Lefort",
+"Eric Limpens",
+"Thomas Link",
+"David Looney",
+"Alessandro Maestri",
+"Maki",
+"Tim Mann",
+"Ivan Francolin Martinez",
+"HIRAMATSU Masami",
+"Yasuzaki Masayoshi",
+"Jason McCarver",
+"David Mehrmann",
+"Christian Mertes",
+"Bram Metsch",
+"George Michaelson",
+"Florian Mickler",
+"Neill Miller",
+"Suzuki Mio",
+"Alex S Moore",
+"NAKAGAWA",
+"Yuuki NINOMIYA",
+"Satoshi Nagayasu",
+"Yukihiro Nakai",
+"OSHIRO Naoki",
+"Andrew Nelson",
+"Nishika",
+"Nishimura",
+"Nishiyama",
+"Masaaki Noro",
+"James Noyes",
+"Jens Oberender",
+"Ohmasa",
+"Fredrik Olofssen",
+"Reza Pakdel",
+"Martin Pool",
+"Pawel Pêkala",
+"Don Quijote",
+"Jens Rantil",
+"Ravemax",
+"Ivan Rayner",
+"David Relson",
+"Chad Robinson",
+"Paul Rolland",
+"Luca Rosellini",
+"Guy Rouillier",
+"Stephan Sachse",
+"Sakamoto",
+"Mohammed Sameer",
+"Tobias Sandhaas",
+"Torsten Schoenfeld",
+"Simon 'corecode' Schubert",
+"Kim Schulz",
+"Markus Schwarzenberg",
+"Rodrigo Dias Arruda Senra",
+"Setoh",
+"Gustavo Noronha Silva",
+"Jesse Skinner",
+"Ville Skyttä",
+"Dale P. Smith",
+"Bogdan Sumanariu",
+"TAKANO",
+"TOGAWA",
+"Tajiri",
+"Takahashi",
+"Tanaka",
+"shigeri",
+"Shimamoto \"Neko\"Tatsuya",
+"Thorsten Thielen",
+"Edgar Toernig",
+"Masahiro Tomita",
+"Tomita",
+"Topia",
+"Tsutsui",
+"Aleksandar Urosevic",
+"Fabien Vantard",
+"Jeroen Versteeg",
+"Kevin Vigor",
+"Botalov Vyacheslav",
+"Radek Vybiral",
+"Jonathan Ware",
+"Watanabe",
+"Martin Wicke",
+"Bob Woodside",
+"YAMAGUCHI",
+"T. Yamamoto",
+"Yanase",
+"Yasumatsu",
+"Gál Zoltán",
+"Martin Zwickel",
+NULL
+};