2008-06-21 [paul] 3.4.0cvs101
[claws.git] / src / gtk / about.c
index fee146813316961125c4f517a1385c58e029fd0e..e22a5f2770eec4c403818740dcccba3e018f6ed5 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -87,8 +87,9 @@ void about_show(void)
 {
        if (!window)
                about_create();
-       else
+       else 
                gtk_window_present(GTK_WINDOW(window));
+       
 }
 
 static GtkWidget *about_create_child_page_info(void)
@@ -155,9 +156,9 @@ static GtkWidget *about_create_child_page_info(void)
        gtk_text_buffer_create_tag(buffer, "underlined-list-title",
                                "underline", PANGO_UNDERLINE_SINGLE,
                                NULL);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        gtk_text_buffer_insert(buffer, &iter, _(
-                               "\n\nCopyright (C) 1999-2007\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+                               "\n\nCopyright (C) 1999-2008\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
                                "and the Claws Mail team"), -1);
 #endif
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("\n\nSystem Information\n")), -1,
@@ -411,56 +412,66 @@ static GtkWidget *about_create_child_page_features(void)
        stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf);
        stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf);
 
-#if INET6
+#if HAVE_LIBCOMPFACE
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
        gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
 #endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new internet "
-                           "addressing protocol\n"), -1);
+               (gchar *)Q_("compface|adds support for the X-Face header\n"), -1);
 
-#if HAVE_ICONV
+#if USE_ASPELL
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
        gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
 #endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GNU/aspell "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1);
+               (gchar *)Q_("GNU/aspell|adds support for spell checking\n"), -1);
 
-#if HAVE_LIBCOMPFACE
+#if USE_GNUTLS
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
        gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
 #endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GnuTLS "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("compface|adds support for the X-Face header\n"), -1);
+               (gchar *)Q_("GnuTLS|adds support for encrypted connections to servers\n"), -1);
 
-#if USE_OPENSSL
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
        gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
 #endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GTK+ >= 2.10.0 "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1);
+               (gchar *)Q_("GTK+ >= 2.10.0|adds support for a complete print dialog\n"), -1);
 
-#if USE_LDAP
+#if INET6
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
        gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
 #endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1);
+               (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new Internet "
+                           "addressing protocol\n"), -1);
+
+#if HAVE_ICONV
+       gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
+#else
+       gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
+#endif
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1,
+                                                "bold", NULL);
+       gtk_text_buffer_insert(buffer, &iter, 
+               (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1);
 
 #if USE_JPILOT
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -472,15 +483,15 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_insert(buffer, &iter, 
                (gchar *)Q_("JPilot|adds support for PalmOS addressbooks\n"), -1);
 
-#if USE_ASPELL
+#if USE_LDAP
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 #else
        gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
 #endif
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GNU/aspell "), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("GNU/aspell|adds support for spell checking\n"), -1);
+               (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1);
 
 #if HAVE_LIBETPAN
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -490,7 +501,7 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" libetpan "), -1,
                                                 "bold", NULL);
        gtk_text_buffer_insert(buffer, &iter, 
-               (gchar *)Q_("libetpan|adds support for IMAP servers\n"), -1);
+               (gchar *)Q_("libetpan|adds support for IMAP and NNTP servers\n"), -1);
 
 #if USE_GNOMEPRINT
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -512,6 +523,26 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_insert(buffer, &iter, 
                (gchar *)Q_("libSM|adds support for session handling\n"), -1);
 
+#if HAVE_NETWORKMANAGER_SUPPORT
+       gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
+#else
+       gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
+#endif
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" NetworkManager "), -1,
+                                                "bold", NULL);
+       gtk_text_buffer_insert(buffer, &iter,
+               (gchar *)Q_("NetworkManager|adds support for detection of network connection changes\n"), -1);
+
+#if USE_OPENSSL
+       gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
+#else
+       gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
+#endif
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1,
+                                                "bold", NULL);
+       gtk_text_buffer_insert(buffer, &iter, 
+               (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1);
+
        return scrolledwin;
 }
 
@@ -567,11 +598,11 @@ static GtkWidget *about_create_child_page_license(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, see <"), -1);
+                 "along with this program. If not, see "), -1);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, 
                "http://www.gnu.org/licenses/", -1,
                "link", NULL);
-       gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);
+       gtk_text_buffer_insert(buffer, &iter, ".\n\n", -1);
 #ifdef USE_OPENSSL
        gtk_text_buffer_insert(buffer, &iter,
                _("This product includes software developed by the OpenSSL Project "
@@ -579,6 +610,7 @@ static GtkWidget *about_create_child_page_license(void)
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, OPENSSL_URI, -1,
                "link", NULL);
        gtk_text_buffer_insert(buffer, &iter, _(").\n"), -1);
+#endif
 
        g_signal_connect(G_OBJECT(tag), "event",
                                G_CALLBACK(about_textview_uri_clicked), text);
@@ -586,7 +618,6 @@ static GtkWidget *about_create_child_page_license(void)
                         G_CALLBACK(about_textview_motion_notify), text);
        g_signal_connect(G_OBJECT(text), "leave-notify-event",
                                G_CALLBACK(about_textview_leave_notify), text);
-#endif
 
        return scrolledwin;
 }
@@ -671,6 +702,7 @@ static void about_create(void)
        static GdkGeometry geometry;
 
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "about");
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER_ALWAYS);
        gtk_window_set_title(GTK_WINDOW(window), _("About Claws Mail"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_widget_set_size_request(window, -1, -1);
@@ -720,9 +752,9 @@ static void about_create(void)
 
        button = gtkut_get_link_btn(window, HOMEPAGE_URI, " "HOMEPAGE_URI" ");
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        label = gtk_label_new
-               (_("Copyright (C) 1999-2007\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+               (_("Copyright (C) 1999-2008\nHiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
                 "and the Claws Mail team"));
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
@@ -826,7 +858,7 @@ static gboolean about_textview_uri_clicked(GtkTextTag *tag, GObject *obj,
                }
                /* open link and do *not* return TRUE so that
                   further gtk processing of the signal is done */
-               open_uri(link, prefs_common.uri_cmd);
+               open_uri(link, prefs_common_get_uri_cmd());
 
        } else {
                if (bevent->button == 3 && event->type == GDK_BUTTON_PRESS) {
@@ -862,7 +894,7 @@ static void about_open_link_cb(GtkWidget *widget, guint action, void *data)
                return;
        }
 
-       open_uri(link, prefs_common.uri_cmd);
+       open_uri(link, prefs_common_get_uri_cmd());
        g_object_set_data(G_OBJECT(link_popupmenu), "menu_button",
                          NULL);
 }