2005-07-14 [paul] 1.9.12cvs47

	* src/account.c
	* src/addressbook.c
		add accelerators for the buttons (sync with main)
	* src/compose.c
	* src/compose.h
		add accelerators for the buttons.
		fix editing with external editor.
		replace gdk_input_*() with GIOChannel;
		(sync with main)
	* src/foldersel.c
		display folder names with new/unread
		representation (sync with main)
	* src/main.c
		specify default window icon (sync with main)
	* src/prefs_common.c
		use_addr_book default to FALSE
	* src/summaryview.c
	* src/textview.c
		add accelerators for the buttons (sync with main)
	* src/gtk/menu.c
		fix typos
	* src/pixmaps/sylpheed_icon.xpm
		updated

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c4c5337c7417e3a0cc660ae994590efa0ed98333..05a1b8283ade7eba31b7bcad9864dd8ace508c6f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,29 @@
+2005-07-14 [paul]      1.9.12cvs47
+
+       * src/account.c
+       * src/addressbook.c
+               add accelerators for the buttons (sync with main)
+       * src/compose.c
+       * src/compose.h
+               add accelerators for the buttons.
+               fix editing with external editor.
+               replace gdk_input_*() with GIOChannel;
+               (sync with main)
+       * src/foldersel.c
+               display folder names with new/unread
+               representation (sync with main)
+       * src/main.c
+               specify default window icon (sync with main)
+       * src/prefs_common.c
+               use_addr_book default to FALSE
+       * src/summaryview.c
+       * src/textview.c
+               add accelerators for the buttons (sync with main)
+       * src/gtk/menu.c
+               fix typos
+       * src/pixmaps/sylpheed_icon.xpm
+               updated
+

 2005-07-13 [paul]      1.9.12cvs46
 
        * src/plugins/pgpmime/pgpmime.c
 2005-07-13 [paul]      1.9.12cvs46
 
        * src/plugins/pgpmime/pgpmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 50df43d0e4126a78c289a15af405d8fec2e3bf43..8d1f831127af5de32079e3608ff6dd85858d702c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -641,3 +641,4 @@
 ( cvs diff -u -r 1.654.2.678 -r 1.654.2.679 configure.ac;  cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/html.c;  ) > 1.9.12cvs44.patchset
 ( cvs diff -u -r 1.654.2.679 -r 1.654.2.680 configure.ac;  ) > 1.9.12cvs45.patchset
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/sgpgme.c;  ) > 1.9.12cvs46.patchset
 ( cvs diff -u -r 1.654.2.678 -r 1.654.2.679 configure.ac;  cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/html.c;  ) > 1.9.12cvs44.patchset
 ( cvs diff -u -r 1.654.2.679 -r 1.654.2.680 configure.ac;  ) > 1.9.12cvs45.patchset
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/sgpgme.c;  ) > 1.9.12cvs46.patchset

+( cvs diff -u -r 1.61.2.29 -r 1.61.2.30 src/account.c;  cvs diff -u -r 1.60.2.17 -r 1.60.2.18 src/addressbook.c;  cvs diff -u -r 1.382.2.141 -r 1.382.2.142 src/compose.c;  cvs diff -u -r 1.50.2.9 -r 1.50.2.10 src/compose.h;  cvs diff -u -r 1.26.2.16 -r 1.26.2.17 src/foldersel.c;  cvs diff -u -r 1.115.2.41 -r 1.115.2.42 src/main.c;  cvs diff -u -r 1.204.2.46 -r 1.204.2.47 src/prefs_common.c;  cvs diff -u -r 1.395.2.92 -r 1.395.2.93 src/summaryview.c;  cvs diff -u -r 1.96.2.62 -r 1.96.2.63 src/textview.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/menu.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/sylpheed_icon.xpm;  ) > 1.9.12cvs47.patchset

diff --git a/configure.ac b/configure.ac
index 5f284eb283de31ba82543208ecf739c8ca04c046..58cf95dc971b533aee6c6785307efecacb87701e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=46
+EXTRA_VERSION=47

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index ad40cc042a99692c195b50b094f69456c6f8bfdb..739ef97cdbb82f2ee7c09a9e54d17db224bd80dd 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -718,7 +718,8 @@ static void account_edit_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 

-       default_btn = gtk_button_new_with_label (_(" Set as default account "));
+       default_btn = gtk_button_new_with_mnemonic
+               (_(" _Set as default account "));

        gtk_widget_show (default_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
        g_signal_connect (G_OBJECT(default_btn), "clicked",
        gtk_widget_show (default_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
        g_signal_connect (G_OBJECT(default_btn), "clicked",

diff --git a/src/addressbook.c b/src/addressbook.c
index 4d802e847952c4b52f5e711cd1d2e25abcd42aca..6841ad6a5248ec6d448718e84ca146c214df9d8f 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -2374,15 +2374,12 @@ static void addressbook_treenode_delete_cb(
                        }
                }
                else {
                        }
                }
                else {

-                       message = g_strdup_printf( _(
-                               "Do you want to delete the folder " \
-                               "AND all addresses in `%s' ? \n" \
-                               "If deleting the folder only, addresses " \
-                               "will be moved into parent folder." ),
-                               obj->name );
-                       aval = alertpanel( _("Delete"), message,
-                               _("Folder only"),
-                               _("Folder and Addresses"),
+                       message = g_strdup_printf
+                               ( _( "Do you want to delete the folder AND all addresses in `%s' ?\n"
+                                    "If deleting the folder only, addresses will be moved into parent folder." ),
+                                obj->name );
+                       aval = alertpanel( _("Delete folder"), message,
+                               _("_Folder only"), _("Folder and _addresses"),

                                GTK_STOCK_CANCEL );
                        g_free(message);
                        if( aval == G_ALERTDEFAULT ) {
                                GTK_STOCK_CANCEL );
                        g_free(message);
                        if( aval == G_ALERTDEFAULT ) {

diff --git a/src/compose.c b/src/compose.c
index 1d3e26e67f39de8a4678d10ef5f60054ecd8acb9..ede0fcb9f9cbe27e5519cf8c3ef8d2a26f6158cf 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -298,14 +298,14 @@ static gboolean attach_property_key_pressed       (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gboolean       *cancelled);
 
                                                 GdkEventKey    *event,
                                                 gboolean       *cancelled);
 

-static void compose_exec_ext_editor            (Compose           *compose);
-static gint compose_exec_ext_editor_real       (const gchar       *file);
-static gboolean compose_ext_editor_kill                (Compose           *compose);
-static void compose_input_cb                   (gpointer           data,
-                                                gint               source,
-                                                GdkInputCondition  condition);
-static void compose_set_ext_editor_sensitive   (Compose           *compose,
-                                                gboolean           sensitive);
+static void compose_exec_ext_editor            (Compose        *compose);
+static gint compose_exec_ext_editor_real       (const gchar    *file);
+static gboolean compose_ext_editor_kill                (Compose        *compose);
+static gboolean compose_input_cb               (GIOChannel     *source,
+                                                GIOCondition    condition,
+                                                gpointer        data);
+static void compose_set_ext_editor_sensitive   (Compose        *compose,
+                                                gboolean        sensitive);

 
 static void compose_undo_state_changed         (UndoMain       *undostruct,
                                                 gint            undo_state,
 
 static void compose_undo_state_changed         (UndoMain       *undostruct,
                                                 gint            undo_state,


@@ -2295,12 +2295,14 @@ static gchar *compose_get_signature_str(Compose *compose)
                sig_str = g_strconcat("\n\n", sig_body, NULL);
 
        if (sig_str) {
                sig_str = g_strconcat("\n\n", sig_body, NULL);
 
        if (sig_str) {

-               if (!g_utf8_validate(sig_str,1, NULL)) {
+               if (g_utf8_validate(sig_str, -1, NULL) == TRUE)
+                       utf8_sig_str = sig_str;
+               else {

                        utf8_sig_str = conv_codeset_strdup
                        utf8_sig_str = conv_codeset_strdup

-                               (sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
+                               (sig_str, conv_get_locale_charset_str(),
+                                CS_INTERNAL);

                        g_free(sig_str);
                        g_free(sig_str);

-               } else
-                       utf8_sig_str = sig_str;
+               }

        }
 
        return utf8_sig_str;
        }
 
        return utf8_sig_str;


@@ -2343,7 +2345,11 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                gchar *str;
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                gchar *str;
 

-               str = conv_codeset_strdup(buf, cur_encoding, CS_INTERNAL);
+               if (g_utf8_validate(buf, -1, NULL) == TRUE)
+                       str = g_strdup(buf);
+               else
+                       str = conv_codeset_strdup
+                               (buf, cur_encoding, CS_INTERNAL);

                if (!str) continue;
 
                /* strip <CR> if DOS/Windows file,
                if (!str) continue;
 
                /* strip <CR> if DOS/Windows file,


@@ -2731,6 +2737,7 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
        gboolean can_break = FALSE;
        gboolean do_break = FALSE;
        gboolean was_white = FALSE;
        gboolean can_break = FALSE;
        gboolean do_break = FALSE;
        gboolean was_white = FALSE;

+       gboolean prev_hyphen = FALSE;

 
        gtk_text_iter_forward_to_line_end(&line_end);
        str = gtk_text_buffer_get_text(buffer, &iter, &line_end, FALSE);
 
        gtk_text_iter_forward_to_line_end(&line_end);
        str = gtk_text_buffer_get_text(buffer, &iter, &line_end, FALSE);


@@ -2764,7 +2771,7 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
                gunichar wc;
                gint uri_len;
 
                gunichar wc;
                gint uri_len;
 

-               if (attr->is_line_break && can_break && was_white)
+               if (attr->is_line_break && can_break && was_white && !prev_hyphen)

                        pos = i;
                
                was_white = attr->is_white;
                        pos = i;
                
                was_white = attr->is_white;


@@ -2783,9 +2790,11 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
                }
 
                wc = g_utf8_get_char(p);
                }
 
                wc = g_utf8_get_char(p);

-               if (g_unichar_iswide(wc))
+               if (g_unichar_iswide(wc)) {

                        col += 2;
                        col += 2;

-               else if (*p == '\t')
+                       if (prev_hyphen && can_break && attr->is_line_break)
+                               pos = i;
+               } else if (*p == '\t')

                        col += 8;
                else
                        col++;
                        col += 8;
                else
                        col++;


@@ -2794,6 +2803,11 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
                        break;
                }
 
                        break;
                }
 

+               if (*p == '-')
+                       prev_hyphen = TRUE;
+               else
+                       prev_hyphen = FALSE;
+

                p = g_utf8_next_char(p);
                can_break = TRUE;
        }
                p = g_utf8_next_char(p);
                can_break = TRUE;
        }


@@ -5069,7 +5083,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        compose->exteditor_file    = NULL;
        compose->exteditor_pid     = -1;
 
        compose->exteditor_file    = NULL;
        compose->exteditor_pid     = -1;

-       compose->exteditor_readdes = -1;

        compose->exteditor_tag     = -1;
        compose->draft_timeout_tag = -1;
 
        compose->exteditor_tag     = -1;
        compose->draft_timeout_tag = -1;
 


@@ -5983,13 +5996,14 @@ static void compose_exec_ext_editor(Compose *compose)
 
                compose->exteditor_file    = g_strdup(tmp);
                compose->exteditor_pid     = pid;
 
                compose->exteditor_file    = g_strdup(tmp);
                compose->exteditor_pid     = pid;

-               compose->exteditor_readdes = pipe_fds[0];

 
                compose_set_ext_editor_sensitive(compose, FALSE);
 
 
                compose_set_ext_editor_sensitive(compose, FALSE);
 

-               compose->exteditor_tag =
-                       gdk_input_add(pipe_fds[0], GDK_INPUT_READ,
-                                     compose_input_cb, compose);
+               compose->exteditor_ch = g_io_channel_unix_new(pipe_fds[0]);
+               compose->exteditor_tag = g_io_add_watch(compose->exteditor_ch,
+                                                       G_IO_IN,
+                                                       compose_input_cb,
+                                                       compose);

        } else {        /* process-monitoring process */
                pid_t pid_ed;
 
        } else {        /* process-monitoring process */
                pid_t pid_ed;
 


@@ -6083,8 +6097,10 @@ static gboolean compose_ext_editor_kill(Compose *compose)
                g_free(msg);
 
                if (val == G_ALERTDEFAULT) {
                g_free(msg);
 
                if (val == G_ALERTDEFAULT) {

-                       gdk_input_remove(compose->exteditor_tag);
-                       close(compose->exteditor_readdes);
+                       g_source_remove(compose->exteditor_tag);
+                       g_io_channel_shutdown(compose->exteditor_ch,
+                                             FALSE, NULL);
+                       g_io_channel_unref(compose->exteditor_ch);

 
                        if (kill(pgid, SIGTERM) < 0) perror("kill");
                        waitpid(compose->exteditor_pid, NULL, 0);
 
                        if (kill(pgid, SIGTERM) < 0) perror("kill");
                        waitpid(compose->exteditor_pid, NULL, 0);


@@ -6098,7 +6114,7 @@ static gboolean compose_ext_editor_kill(Compose *compose)
                        g_free(compose->exteditor_file);
                        compose->exteditor_file    = NULL;
                        compose->exteditor_pid     = -1;
                        g_free(compose->exteditor_file);
                        compose->exteditor_file    = NULL;
                        compose->exteditor_pid     = -1;

-                       compose->exteditor_readdes = -1;
+                       compose->exteditor_ch      = NULL;

                        compose->exteditor_tag     = -1;
                } else
                        return FALSE;
                        compose->exteditor_tag     = -1;
                } else
                        return FALSE;


@@ -6107,30 +6123,19 @@ static gboolean compose_ext_editor_kill(Compose *compose)
        return TRUE;
 }
 
        return TRUE;
 }
 

-static void compose_input_cb(gpointer data, gint source,
-                            GdkInputCondition condition)
+static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
+                                gpointer data)

 {
 {

-       gchar buf[3];
+       gchar buf[3] = "3";

        Compose *compose = (Compose *)data;
        Compose *compose = (Compose *)data;

-       gint i = 0;
+       gsize bytes_read;

 
 

-       debug_print("Compose: input from monitoring process\n");
+       debug_print(_("Compose: input from monitoring process\n"));

 
 

-       gdk_input_remove(compose->exteditor_tag);
+       g_io_channel_read_chars(source, buf, sizeof(buf), &bytes_read, NULL);

 
 

-       for (;;) {
-               if (read(source, &buf[i], 1) < 1) {
-                       buf[0] = '3';
-                       break;
-               }
-               if (buf[i] == '\n') {
-                       buf[i] = '\0';
-                       break;
-               }
-               i++;
-               if (i == sizeof(buf) - 1)
-                       break;
-       }
+       g_io_channel_shutdown(source, FALSE, NULL);
+       g_io_channel_unref(source);

 
        waitpid(compose->exteditor_pid, NULL, 0);
 
 
        waitpid(compose->exteditor_pid, NULL, 0);
 


@@ -6154,15 +6159,15 @@ static void compose_input_cb(gpointer data, gint source,
                g_warning("Pipe read failed\n");
        }
 
                g_warning("Pipe read failed\n");
        }
 

-       close(source);
-

        compose_set_ext_editor_sensitive(compose, TRUE);
 
        g_free(compose->exteditor_file);
        compose->exteditor_file    = NULL;
        compose->exteditor_pid     = -1;
        compose_set_ext_editor_sensitive(compose, TRUE);
 
        g_free(compose->exteditor_file);
        compose->exteditor_file    = NULL;
        compose->exteditor_pid     = -1;

-       compose->exteditor_readdes = -1;
+       compose->exteditor_ch      = NULL;

        compose->exteditor_tag     = -1;
        compose->exteditor_tag     = -1;

+
+       return FALSE;

 }
 
 static void compose_set_ext_editor_sensitive(Compose *compose,
 }
 
 static void compose_set_ext_editor_sensitive(Compose *compose,


@@ -6662,7 +6667,7 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
        msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
                              tmpl->name);
        val = alertpanel(_("Apply template"), msg,
        msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
                              tmpl->name);
        val = alertpanel(_("Apply template"), msg,

-                        _("Replace"), _("Insert"), GTK_STOCK_CANCEL);
+                        _("_Replace"), _("_Insert"), GTK_STOCK_CANCEL);

        g_free(msg);
 
        if (val == G_ALERTDEFAULT)
        g_free(msg);
 
        if (val == G_ALERTDEFAULT)

diff --git a/src/compose.h b/src/compose.h
index 060dbe6a99f370e6fff32060ab6ff4e26614e501..b500c9b258ef7743ae6487773e909016e9117a15 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -196,10 +196,10 @@ struct _Compose
        gchar *sig_str;
 
        /* external editor */
        gchar *sig_str;
 
        /* external editor */

-       gchar *exteditor_file;
-       pid_t  exteditor_pid;
-       gint   exteditor_readdes;
-       gint   exteditor_tag;
+       gchar      *exteditor_file;
+       pid_t       exteditor_pid;
+       GIOChannel *exteditor_ch;
+       gint        exteditor_tag;

 
 #if USE_ASPELL
         /* GNU/aspell spell checker */
 
 #if USE_ASPELL
         /* GNU/aspell spell checker */

diff --git a/src/foldersel.c b/src/foldersel.c
index ced132ee4fa8295d731360c5e9eede524c72ae55..3d4393f8861e15ba2a0edb764490f39945638402 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -57,7 +57,8 @@ enum {
        FOLDERSEL_FOLDERITEM,
        FOLDERSEL_PIXBUF,
        FOLDERSEL_PIXBUF_OPEN,
        FOLDERSEL_FOLDERITEM,
        FOLDERSEL_PIXBUF,
        FOLDERSEL_PIXBUF_OPEN,

-       FOLDERSEL_EXPANDER,
+       FOLDERSEL_FOREGROUND,
+       FOLDERSEL_BOLD,

        N_FOLDERSEL_COLUMNS
 };
 
        N_FOLDERSEL_COLUMNS
 };
 


@@ -244,6 +245,7 @@ static void foldersel_create(void)
                                        G_TYPE_POINTER,
                                        GDK_TYPE_PIXBUF,
                                        GDK_TYPE_PIXBUF,
                                        G_TYPE_POINTER,
                                        GDK_TYPE_PIXBUF,
                                        GDK_TYPE_PIXBUF,

+                                       GDK_TYPE_COLOR,

                                        G_TYPE_BOOLEAN);
        gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(tree_store),
                                        FOLDERSEL_FOLDERNAME,
                                        G_TYPE_BOOLEAN);
        gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(tree_store),
                                        FOLDERSEL_FOLDERNAME,


@@ -274,7 +276,6 @@ static void foldersel_create(void)
        gtk_tree_view_column_pack_start(column, renderer, FALSE);
        gtk_tree_view_column_set_attributes
                (column, renderer,
        gtk_tree_view_column_pack_start(column, renderer, FALSE);
        gtk_tree_view_column_set_attributes
                (column, renderer,

-                "is-expander", FOLDERSEL_EXPANDER,

                 "pixbuf", FOLDERSEL_PIXBUF,
                 "pixbuf-expander-open", FOLDERSEL_PIXBUF_OPEN,
                 "pixbuf-expander-closed", FOLDERSEL_PIXBUF,
                 "pixbuf", FOLDERSEL_PIXBUF,
                 "pixbuf-expander-open", FOLDERSEL_PIXBUF_OPEN,
                 "pixbuf-expander-closed", FOLDERSEL_PIXBUF,


@@ -283,9 +284,13 @@ static void foldersel_create(void)
        /* create text renderer */
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_column_pack_start(column, renderer, TRUE);
        /* create text renderer */
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_column_pack_start(column, renderer, TRUE);

-       gtk_tree_view_column_set_attributes(column, renderer,
-                                           "text", FOLDERSEL_FOLDERNAME,
-                                           NULL);
+       gtk_tree_view_column_set_attributes
+               (column, renderer,
+                "text", FOLDERSEL_FOLDERNAME,
+                "foreground-gdk", FOLDERSEL_FOREGROUND,
+                "weight-set", FOLDERSEL_BOLD,
+                NULL);
+       g_object_set(G_OBJECT(renderer), "weight", PANGO_WEIGHT_BOLD, NULL);

        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
        gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
        gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);


@@ -329,6 +334,12 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
 {
        gchar *name, *tmpname;
        GdkPixbuf *pixbuf, *pixbuf_open;
 {
        gchar *name, *tmpname;
        GdkPixbuf *pixbuf, *pixbuf_open;

+       gboolean use_bold, use_color;
+       GdkColor *foreground = NULL;
+       static GdkColor color_noselect = {0, COLOR_DIM, COLOR_DIM, COLOR_DIM};
+       static GdkColor color_new;
+
+       gtkut_convert_int_to_gdk_color(prefs_common.color_new, &color_new);

 
         name = tmpname = folder_item_get_name(item);
 
 
         name = tmpname = folder_item_get_name(item);
 


@@ -375,20 +386,41 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
        }
 #endif        
 
        }
 #endif        
 

-       gtk_tree_store_append(store, iter, parent);
+       if (item->stype == F_QUEUE && item->total_msgs > 0) {
+               name = g_strdup_printf("%s (%d)", name, item->total_msgs);
+       } else if (item->unread_msgs > 0) {
+               name = g_strdup_printf("%s (%d)", name, item->unread_msgs);
+       } else
+               name = g_strdup(name);

 
 

-       pixbuf = item->no_select ? foldernoselect_pixbuf : folder_pixbuf,
+       pixbuf = item->no_select ? foldernoselect_pixbuf : folder_pixbuf;

        pixbuf_open =
        pixbuf_open =

-               item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf,
+               item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf;
+
+       if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
+           item->stype == F_TRASH) {
+               use_bold = use_color = FALSE;
+       } else if (item->stype == F_QUEUE) {
+               use_bold = use_color = (item->total_msgs > 0);
+       } else {
+               use_bold = (item->unread_msgs > 0);
+               use_color = (item->new_msgs > 0);
+       }
+
+       if (item->no_select)
+               foreground = &color_noselect;
+       else if (use_color)
+               foreground = &color_new;

 
        /* insert this node */
 
        /* insert this node */

+       gtk_tree_store_append(store, iter, parent);

        gtk_tree_store_set(store, iter,
                           FOLDERSEL_FOLDERNAME, name,
                           FOLDERSEL_FOLDERITEM, item,
                           FOLDERSEL_PIXBUF, pixbuf,
                           FOLDERSEL_PIXBUF_OPEN, pixbuf_open,
        gtk_tree_store_set(store, iter,
                           FOLDERSEL_FOLDERNAME, name,
                           FOLDERSEL_FOLDERITEM, item,
                           FOLDERSEL_PIXBUF, pixbuf,
                           FOLDERSEL_PIXBUF_OPEN, pixbuf_open,

-                          FOLDERSEL_EXPANDER,
-                               item->node->children ? TRUE : FALSE,
+                          FOLDERSEL_FOREGROUND, foreground,
+                          FOLDERSEL_BOLD, use_bold,

                           -1);
         
         g_free(tmpname);
                           -1);
         
         g_free(tmpname);


@@ -527,10 +559,6 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
                return;
        }
 
                return;
        }
 

-       /* parent can expand */
-       gtk_tree_store_set(store, &selected, FOLDERSEL_EXPANDER, TRUE,
-                          -1);
-

        /* add new child */
        foldersel_append_item(store, new_item, &new_child, &selected);
         
        /* add new child */
        foldersel_append_item(store, new_item, &new_child, &selected);
         

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index 21ce9e5686d8ba72870c77ce543d4f942b8e2f1e..c39b6b00aea20036e1229636e96408cb1e4cd61d 100644 (file)
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -228,7 +228,7 @@ void menu_connect_identical_items(void)
                {"<Main>/Message/Re-edit",                      "<SummaryView>/Re-edit"},
                {"<Main>/Message/Move...",                      "<SummaryView>/Move..."},
                {"<Main>/Message/Copy...",                      "<SummaryView>/Copy..."},
                {"<Main>/Message/Re-edit",                      "<SummaryView>/Re-edit"},
                {"<Main>/Message/Move...",                      "<SummaryView>/Move..."},
                {"<Main>/Message/Copy...",                      "<SummaryView>/Copy..."},

-               {"<Main>/Message/Delete",                       "<SummaryView>/Delete"},
+               {"<Main>/Message/Delete...",                    "<SummaryView>/Delete..."},

                {"<Main>/Message/Cancel a news message",        "<SummaryView>/Cancel a news message"},
                {"<Main>/Message/Mark/Mark",                    "<SummaryView>/Mark/Mark"},
                {"<Main>/Message/Mark/Unmark",                  "<SummaryView>/Mark/Unmark"},
                {"<Main>/Message/Cancel a news message",        "<SummaryView>/Cancel a news message"},
                {"<Main>/Message/Mark/Mark",                    "<SummaryView>/Mark/Mark"},
                {"<Main>/Message/Mark/Unmark",                  "<SummaryView>/Mark/Unmark"},

diff --git a/src/main.c b/src/main.c
index b769df449846bf706c579233c672cb54a6fc4334..9d5857fd235ac31c50e6fea4612ff3eda7174edf 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -90,6 +90,7 @@
 #include "news_gtk.h"
 #include "matcher.h"
 #include "imap-thread.h"
 #include "news_gtk.h"
 #include "matcher.h"
 #include "imap-thread.h"

+#include "stock_pixmap.h"

 
 #if USE_OPENSSL
 #  include "ssl.h"
 
 #if USE_OPENSSL
 #  include "ssl.h"


@@ -228,6 +229,7 @@ int main(int argc, char *argv[])
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;

+       GdkPixbuf *icon;

 
        if (!sylpheed_init(&argc, &argv)) {
                return 0;
 
        if (!sylpheed_init(&argc, &argv)) {
                return 0;


@@ -344,6 +346,8 @@ int main(int argc, char *argv[])
        renderer_read_config();
 
        gtkut_widget_init();
        renderer_read_config();
 
        gtkut_widget_init();

+       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_ICON, &icon);
+       gtk_window_set_default_icon(icon);

 
        folderview_initialize();
        mh_gtk_init();
 
        folderview_initialize();
        mh_gtk_init();

diff --git a/src/pixmaps/sylpheed_icon.xpm b/src/pixmaps/sylpheed_icon.xpm
index 19a223a9809bb0b0bd810f2b82847d113b10f684..ba88e36c91083641a44efec2e029b234a7ae5312 100644 (file)
--- a/src/pixmaps/sylpheed_icon.xpm
+++ b/src/pixmaps/sylpheed_icon.xpm
@@ -1,896 +1,1192 @@
 /* XPM */
 static char * sylpheed_icon_xpm[] = {
 /* XPM */
 static char * sylpheed_icon_xpm[] = {

-"64 64 829 2",
+"48 48 1141 2",

 "      c None",
 "      c None",

-".     c #FBFBFB",
-"+     c #FEFEFE",
-"@     c #FAFAFA",
-"#     c #F5F5F5",
-"$     c #F2F2F2",
-"%     c #F1F1F1",
-"&     c #F0F0F0",
-"*     c #F9F9F9",
-"=     c #FFFFFF",
-"-     c #FDFDFD",
-";     c #F4F4F4",
-">     c #F3F3F3",
-",     c #EFEFEF",
-"'     c #F5F5F4",
-")     c #FCFCFB",
-"!     c #F8F8F7",
-"~     c #F7F7F6",
-"{     c #F6F7F5",
-"]     c #EAE7F6",
-"^     c #EBE8F5",
-"/     c #EFEFEE",
-"(     c #F1F0F1",
-"_     c #FEFEFD",
-":     c #FBFBFA",
-"<     c #FAFAF9",
-"[     c #F9F9F8",
-"}     c #F5F4F8",
-"|     c #E8E4F8",
-"1     c #E5E0F8",
-"2     c #D9D2FA",
-"3     c #E5E1F7",
-"4     c #D2C8FB",
-"5     c #D4CCFA",
-"6     c #EFEEF3",
-"7     c #F3F3F2",
-"8     c #F1F0F0",
-"9     c #EEEDEF",
-"0     c #EBEBF0",
-"a     c #E8E6F0",
-"b     c #E1DCF2",
-"c     c #DDD9F2",
-"d     c #D9D3F4",
-"e     c #FDFDFC",
-"f     c #FCFDFB",
-"g     c #EFECFB",
-"h     c #E8E4FB",
-"i     c #E2DDFB",
-"j     c #E6E1FA",
-"k     c #E8E5F9",
-"l     c #DAD4FA",
-"m     c #ECE9F7",
-"n     c #DFD8F9",
-"o     c #DAD4F9",
-"p     c #D9D1F9",
-"q     c #ECEBF5",
-"r     c #F0EEF4",
-"s     c #DBD6F7",
-"t     c #E7E4F4",
-"u     c #E6E4F4",
-"v     c #DAD5F6",
-"w     c #CAC0FA",
-"x     c #E7E5F1",
-"y     c #C9BEFA",
-"z     c #DBD6F3",
-"A     c #D3CBF6",
-"B     c #DED8F1",
-"C     c #DFDBF0",
-"D     c #E4E0FA",
-"E     c #5D5D5D",
-"F     c #616161",
-"G     c #4A4A4A",
-"H     c #FBFAFE",
-"I     c #EDEAFD",
-"J     c #F9F8FC",
-"K     c #F4F1FC",
-"L     c #E0DAFC",
-"M     c #E7E3FC",
-"N     c #E8E5FB",
-"O     c #D1C8FC",
-"P     c #D6CEFC",
-"Q     c #E6E1F9",
-"R     c #E9E5F8",
-"S     c #E2DDF8",
-"T     c #F7F8F5",
-"U     c #F3F2F5",
-"V     c #E8E5F6",
-"W     c #D1C9FA",
-"X     c #DDD7F7",
-"Y     c #F4F4F2",
-"Z     c #D4CBF9",
-"`     c #D9D3F6",
-" .    c #E1DEF4",
-"..    c #E4E0F2",
-"+.    c #D9D3F5",
-"@.    c #E5E4F0",
-"#.    c #E9E8EE",
-"$.    c #EDEDEC",
-"%.    c #ECEDEB",
-"&.    c #5A5A5A",
-"*.    c #6D6D6D",
-"=.    c #A7A7A7",
-"-.    c #C4C4C4",
-";.    c #5E5E5E",
-">.    c #EBE7FC",
-",.    c #CEC3FE",
-"'.    c #F5F3FB",
-").    c #DBD2FC",
-"!.    c #E7E2FB",
-"~.    c #F3F2F9",
-"{.    c #E7E3F9",
-"].    c #DFD9FA",
-"^.    c #D4CBFB",
-"/.    c #CEC4FB",
-"(.    c #D2C8FA",
-"_.    c #CDC3FC",
-":.    c #E5E1F6",
-"<.    c #D6CDF8",
-"[.    c #E4E0F5",
-"}.    c #E7E4F3",
-"|.    c #EAE9F2",
-"1.    c #ECEBF0",
-"2.    c #EEEEEF",
-"3.    c #EEEEED",
-"4.    c #EEEEEE",
-"5.    c #EDEDED",
-"6.    c #B8B8B8",
-"7.    c #8D8D8D",
-"8.    c #636363",
-"9.    c #9A9A9A",
-"0.    c #D2D2D2",
-"a.    c #919191",
-"b.    c #8B8B8B",
-"c.    c #2F2F2F",
-"d.    c #EAE6FC",
-"e.    c #F4F3FB",
-"f.    c #E2DCFC",
-"g.    c #E4DFFB",
-"h.    c #ECE8F9",
-"i.    c #E2DDFA",
-"j.    c #DED7FA",
-"k.    c #E9E6F8",
-"l.    c #DBD4F9",
-"m.    c #E0DBF8",
-"n.    c #E9E5F6",
-"o.    c #E9E7F4",
-"p.    c #F1F1F2",
-"q.    c #F2F2F1",
-"r.    c #F0F1F0",
-"s.    c #EFF0EF",
-"t.    c #EBE8F2",
-"u.    c #D1CFDB",
-"v.    c #A4A4A5",
-"w.    c #6B6B6E",
-"x.    c #898989",
-"y.    c #C7C7C7",
-"z.    c #F8F8F8",
-"A.    c #FCFCFC",
-"B.    c #F7F7F7",
-"C.    c #DADADA",
-"D.    c #757575",
-"E.    c #505050",
-"F.    c #E5DFFC",
-"G.    c #D6CDFC",
-"H.    c #DDD5FB",
-"I.    c #DCD5FB",
-"J.    c #E7E2F9",
-"K.    c #EBE8F8",
-"L.    c #EEECF7",
-"M.    c #F6F6F5",
-"N.    c #F4F4F3",
-"O.    c #F2F3F2",
-"P.    c #E9E8F0",
-"Q.    c #EDEDF0",
-"R.    c #DDD7F8",
-"S.    c #CAC5E0",
-"T.    c #9B98AA",
-"U.    c #69686E",
-"V.    c #5A5A5B",
-"W.    c #7B7B7B",
-"X.    c #BCBCBC",
-"Y.    c #F5F4F4",
-"Z.    c #F6F6F6",
-"`.    c #8F8F8F",
-" +    c #B2B2B2",
-".+    c #A3A3A3",
-"++    c #F2F0F9",
-"@+    c #F3F2F8",
-"#+    c #F5F5F8",
-"$+    c #F4F5F4",
-"%+    c #F1F1F0",
-"&+    c #EAE9F1",
-"*+    c #E1DEF2",
-"=+    c #E2DEF3",
-"-+    c #E3DFF4",
-";+    c #E6E3F4",
-">+    c #D7D1F7",
-",+    c #B2AFBD",
-"'+    c #817E92",
-")+    c #5C5C5D",
-"!+    c #717172",
-"~+    c #AFAFAF",
-"{+    c #EBECEB",
-"]+    c #D1D2ED",
-"^+    c #FFFFFD",
-"/+    c #D9D9D9",
-"(+    c #747474",
-"_+    c #E6E6E6",
-":+    c #EBEBEB",
-"<+    c #3C3C3C",
-"[+    c #F3F2F4",
-"}+    c #E6E1F6",
-"|+    c #EDEBF3",
-"1+    c #DBD3F7",
-"2+    c #E3E0F4",
-"3+    c #D9D2F6",
-"4+    c #D4CBF8",
-"5+    c #D9D2F8",
-"6+    c #DBD5F9",
-"7+    c #EBEAF1",
-"8+    c #ADA7C0",
-"9+    c #5C5D5D",
-"0+    c #696968",
-"a+    c #9F9F9F",
-"b+    c #DFDFDF",
-"c+    c #5158BD",
-"d+    c #B1B1B1",
-"e+    c #EAEAEA",
-"f+    c #878787",
-"g+    c #303030",
-"h+    c #F4F4F6",
-"i+    c #E6E2F8",
-"j+    c #F0EFF6",
-"k+    c #E4E0F7",
-"l+    c #DDD6F8",
-"m+    c #F1F1F3",
-"n+    c #CFC6FA",
-"o+    c #DCD5F6",
-"p+    c #DCD5F7",
-"q+    c #E4E1F4",
-"r+    c #E3DFF6",
-"s+    c #E3DCF8",
-"t+    c #D8D7DD",
-"u+    c #5D5D5E",
-"v+    c #606061",
-"w+    c #929292",
-"x+    c #D8D8D7",
-"y+    c #6267C3",
-"z+    c #D8D8D8",
-"A+    c #E5E5E5",
-"B+    c #E9E9E9",
-"C+    c #D1C7FA",
-"D+    c #D7D1F8",
-"E+    c #D7D0F8",
-"F+    c #E9E7F3",
-"G+    c #EEEEF3",
-"H+    c #E3DFF7",
-"I+    c #E0DAFA",
-"J+    c #D2CFE0",
-"K+    c #A09EAA",
-"L+    c #666470",
-"M+    c #5A5B5B",
-"N+    c #848484",
-"O+    c #C5C5C5",
-"P+    c #7175C9",
-"Q+    c #EBECF7",
-"R+    c #464CB8",
-"S+    c #888CD1",
-"T+    c #E7E7E7",
-"U+    c #6C6C6C",
-"V+    c #F2F1F4",
-"W+    c #F1F0F3",
-"X+    c #E5E0F5",
-"Y+    c #E0DBF7",
-"Z+    c #E4DFF8",
-"`+    c #CFCAE2",
-" @    c #A19FAA",
-".@    c #6A6970",
-"+@    c #5B5B5B",
-"@@    c #767677",
-"#@    c #B5B5B4",
-"$@    c #F0F1FA",
-"%@    c #464DB9",
-"&@    c #EEEFF9",
-"*@    c #545ABD",
-"=@    c #B5B7E2",
-"-@    c #5056BD",
-";@    c #898ED3",
-">@    c #989BD8",
-",@    c #CCCEED",
-"'@    c #D6D6D6",
-")@    c #737373",
-"!@    c #E3E3E3",
-"~@    c #E4E4E4",
-"{@    c #C1C1C1",
-"]@    c #2E2E2E",
-"^@    c #D8D2F9",
-"/@    c #D2C9FE",
-"(@    c #E3DEF8",
-"_@    c #ACA8C1",
-":@    c #8D8D90",
-"<@    c #5D5C5D",
-"[@    c #6F6F6E",
-"}@    c #F6F7FC",
-"|@    c #F6F7FB",
-"1@    c #9DA0DA",
-"2@    c #9295D5",
-"3@    c #CFD0EC",
-"4@    c #3C43B4",
-"5@    c #7E82CE",
-"6@    c #787CCC",
-"7@    c #E5E6F6",
-"8@    c #4349B7",
-"9@    c #878CD2",
-"0@    c #373DB3",
-"a@    c #ADAFDF",
-"b@    c #8C8C8C",
-"c@    c #AEAEAE",
-"d@    c #ECECEC",
-"e@    c #E2E2E2",
-"f@    c #E0E0E0",
-"g@    c #585858",
-"h@    c #FFFFFE",
-"i@    c #BAB9BD",
-"j@    c #909190",
-"k@    c #5E5F5D",
-"l@    c #9A9A99",
-"m@    c #494FB9",
-"n@    c #FAFAFC",
-"o@    c #BEC0E6",
-"p@    c #BABCE4",
-"q@    c #585DBF",
-"r@    c #999CD8",
-"s@    c #7074C9",
-"t@    c #6368C4",
-"u@    c #979BD7",
-"v@    c #6C71C7",
-"w@    c #9497D6",
-"x@    c #8A8ED2",
-"y@    c #AFB1E1",
-"z@    c #CBCDEB",
-"A@    c #E2E3F5",
-"B@    c #D7D7D6",
-"C@    c #E8E8E8",
-"D@    c #A6A6A6",
-"E@    c #6D6D6F",
-"F@    c #5D5E5D",
-"G@    c #C9C9C9",
-"H@    c #F4F5FB",
-"I@    c #5459BD",
-"J@    c #FDFEFE",
-"K@    c #6369C4",
-"L@    c #B8BAE3",
-"M@    c #5B61C0",
-"N@    c #6D71C7",
-"O@    c #AEAFE0",
-"P@    c #3036B1",
-"Q@    c #999DD8",
-"R@    c #585EBF",
-"S@    c #D9DAF0",
-"T@    c #F2F4F8",
-"U@    c #F9FAFA",
-"V@    c #E1E1E1",
-"W@    c #DDDDDD",
-"X@    c #DCDCDC",
-"Y@    c #434343",
-"Z@    c #818181",
-"`@    c #FEFEFF",
-" #    c #7C80CD",
-".#    c #0C14A2",
-"+#    c #5D62C2",
-"@#    c #BDBFE7",
-"##    c #5B5FC0",
-"$#    c #888CD2",
-"%#    c #C2C4E8",
-"&#    c #363CB2",
-"*#    c #8286CF",
-"=#    c #2C32AE",
-"-#    c #DFE0F3",
-";#    c #9195D6",
-">#    c #E9EBF5",
-",#    c #E8EBF5",
-"'#    c #A3AFD8",
-")#    c #95A1CF",
-"!#    c #CCD0E2",
-"~#    c #D4D4D4",
-"{#    c #727272",
-"]#    c #DBDBDB",
-"^#    c #5C5C5C",
-"/#    c #5F5F5F",
-"(#    c #B0B0B0",
-"_#    c #1C24A8",
-":#    c #454AB8",
-"<#    c #979BD8",
-"[#    c #787CCB",
-"}#    c #C9CBEA",
-"|#    c #5E63C2",
-"1#    c #868AD1",
-"2#    c #ACAEE0",
-"3#    c #7F82CE",
-"4#    c #7579CA",
-"5#    c #898DD2",
-"6#    c #B8BAE4",
-"7#    c #F8F7FB",
-"8#    c #E0E4F0",
-"9#    c #9DA9D7",
-"0#    c #909ED0",
-"a#    c #B1B9DB",
-"b#    c #D7DAE7",
-"c#    c #D7D7D7",
-"d#    c #CFCFCF",
-"e#    c #353535",
-"f#    c #6B6B6B",
-"g#    c #9598D7",
-"h#    c #7A7ECC",
-"i#    c #E5E5F5",
-"j#    c #4E53BB",
-"k#    c #474DB9",
-"l#    c #8084CE",
-"m#    c #565CBF",
-"n#    c #9A9DD9",
-"o#    c #5056BC",
-"p#    c #8589D1",
-"q#    c #F0F1F9",
-"r#    c #C2C8E5",
-"s#    c #697BC4",
-"t#    c #8C98CD",
-"u#    c #D5D9E8",
-"v#    c #EFF0F1",
-"w#    c #F3F2F1",
-"x#    c #D5D5D5",
-"y#    c #313131",
-"z#    c #606060",
-"A#    c #BFC1E7",
-"B#    c #4449B7",
-"C#    c #5E63C1",
-"D#    c #6B70C7",
-"E#    c #9C9FDA",
-"F#    c #CCCDEC",
-"G#    c #3B41B3",
-"H#    c #A3A6DC",
-"I#    c #8D91D4",
-"J#    c #C4C6E8",
-"K#    c #F8F9FA",
-"L#    c #B5BEDF",
-"M#    c #475DB5",
-"N#    c #BAC2DF",
-"O#    c #EFF0F2",
-"P#    c #ADADAD",
-"Q#    c #D3D3D3",
-"R#    c #BFBFBF",
-"S#    c #444444",
-"T#    c #767676",
-"U#    c #B9B9B9",
-"V#    c #E2E3F4",
-"W#    c #3037B0",
-"X#    c #A4A8DC",
-"Y#    c #595EC0",
-"Z#    c #C3C5E8",
-"`#    c #F0EFF9",
-" $    c #A4A6DD",
-".$    c #F7F8F9",
-"+$    c #919ED2",
-"@$    c #AEB7DB",
-"#$    c #E7E9F0",
-"$$    c #F6F6F4",
-"%$    c #D1D1D1",
-"&$    c #D0D0D0",
-"*$    c #797979",
-"=$    c #CECECE",
-"-$    c #959595",
-";$    c #6A6A6A",
-">$    c #9E9E9E",
-",$    c #EBECF8",
-"'$    c #CBCDEC",
-")$    c #676BC5",
-"!$    c #00079D",
-"~$    c #AEB0E1",
-"{$    c #3E44B6",
-"]$    c #F4F5F9",
-"^$    c #687AC3",
-"/$    c #B3BDDE",
-"($    c #F2F2F4",
-"_$    c #AAAAAA",
-":$    c #A5A5A5",
-"<$    c #404040",
-"[$    c #6E6E6E",
-"}$    c #838383",
-"|$    c #CACACA",
-"1$    c #6166C3",
-"2$    c #00019B",
-"3$    c #595FBF",
-"4$    c #E1E2F4",
-"5$    c #C9CAEB",
-"6$    c #E6EAF3",
-"7$    c #7686C7",
-"8$    c #8E9CD0",
-"9$    c #CCCCCC",
-"0$    c #494949",
-"a$    c #2D2D2D",
-"b$    c #BBBBBB",
-"c$    c #787878",
-"d$    c #F8F9F9",
-"e$    c #9EA9D6",
-"f$    c #9CA8D6",
-"g$    c #F4F3F5",
-"h$    c #CBCBCB",
-"i$    c #969696",
-"j$    c #686868",
-"k$    c #939393",
-"l$    c #FDFCFC",
-"m$    c #FBFCFB",
-"n$    c #BEC5E2",
-"o$    c #9CA7D6",
-"p$    c #F1F2F4",
-"q$    c #F2F3F3",
-"r$    c #F1F4F4",
-"s$    c #F1F5F5",
-"t$    c #EFF3F3",
-"u$    c #ECEFEF",
-"v$    c #E9EBEB",
-"w$    c #DEDEDE",
-"x$    c #CDCDCD",
-"y$    c #555555",
-"z$    c #B5B5B5",
-"A$    c #DADEED",
-"B$    c #6C7EC3",
-"C$    c #E4E6EF",
-"D$    c #F2F4F4",
-"E$    c #D4BDBD",
-"F$    c #954A4C",
-"G$    c #771416",
-"H$    c #761215",
-"I$    c #93484A",
-"J$    c #CDB6B7",
-"K$    c #C6C6C6",
-"L$    c #2C2C2C",
-"M$    c #707070",
-"N$    c #D7DBEC",
-"O$    c #CFD5E8",
-"P$    c #F7F6F5",
-"Q$    c #F3F4F4",
-"R$    c #CAACAC",
-"S$    c #771618",
-"T$    c #660D0F",
-"U$    c #894C4E",
-"V$    c #905657",
-"W$    c #893E3F",
-"X$    c #771519",
-"Y$    c #AF9191",
-"Z$    c #737575",
-"`$    c #D9DADA",
-" %    c #C2C2C2",
-".%    c #B7B7B7",
-"+%    c #333333",
-"@%    c #8C8C8B",
-"#%    c #CCCCCB",
-"$%    c #F8F7F7",
-"%%    c #741114",
-"&%    c #732A2C",
-"*%    c #733335",
-"=%    c #8F5B5D",
-"-%    c #B18D8D",
-";%    c #98686A",
-">%    c #722A2C",
-",%    c #680507",
-"'%    c #A18A8B",
-")%    c #E2E3E3",
-"!%    c #626262",
-"~%    c #B6B6B6",
-"{%    c #EAECEC",
-"]%    c #984D4F",
-"^%    c #6C1216",
-"/%    c #925E5F",
-"(%    c #B08C8D",
-"_%    c #C8AEAF",
-":%    c #B99799",
-"<%    c #B69596",
-"[%    c #8E4648",
-"}%    c #8E4345",
-"|%    c #DFE2E2",
-"1%    c #C8C8C8",
-"2%    c #BDBDBD",
-"3%    c #BEBEBE",
-"4%    c #323232",
-"5%    c #C0C0C0",
-"6%    c #6C6F6F",
-"7%    c #6C090B",
-"8%    c #6B1E21",
-"9%    c #7D4143",
-"0%    c #B89798",
-"a%    c #DECFCF",
-"b%    c #E0D0D0",
-"c%    c #C3A7A8",
-"d%    c #9C7070",
-"e%    c #905A5B",
-"f%    c #751113",
-"g%    c #DFE3E3",
-"h%    c #C3C3C3",
-"i%    c #BABABA",
-"j%    c #4F4F4F",
-"k%    c #D0D4D4",
-"l%    c #6F0A0E",
-"m%    c #9E696A",
-"n%    c #C1A4A5",
-"o%    c #DED0D0",
-"p%    c #E9DEDE",
-"q%    c #F3EEEE",
-"r%    c #CBB2B3",
-"s%    c #A98283",
-"t%    c #996C6C",
-"u%    c #DDE1E1",
-"v%    c #8E8E8E",
-"w%    c #7D7D7D",
-"x%    c #EEF1F1",
-"y%    c #7D1D1F",
-"z%    c #A86E70",
-"A%    c #C1A5A4",
-"B%    c #A98082",
-"C%    c #D5C1C1",
-"D%    c #D3BEBF",
-"E%    c #C3A8A8",
-"F%    c #CEB9B9",
-"G%    c #9F6C6F",
-"H%    c #751013",
-"I%    c #DADEDE",
-"J%    c #3F3F3F",
-"K%    c #3D3D3D",
-"L%    c #C3A3A3",
-"M%    c #710C10",
-"N%    c #702D2F",
-"O%    c #C9B0B1",
-"P%    c #BA999A",
-"Q%    c #B89697",
-"R%    c #AA8384",
-"S%    c #BC9E9F",
-"T%    c #7C282A",
-"U%    c #914C4D",
-"V%    c #D7DADA",
-"W%    c #B3B3B3",
-"X%    c #E7E9E9",
-"Y%    c #975153",
-"Z%    c #78191C",
-"`%    c #B18889",
-" &    c #B79799",
-".&    c #AA8485",
-"+&    c #843638",
-"@&    c #90484B",
-"#&    c #D2CDCD",
-"$&    c #D5D6D6",
-"%&    c #373737",
-"&&    c #E4E5E5",
-"*&    c #DCD8D8",
-"=&    c #AC7C7E",
-"-&    c #79181B",
-";&    c #731013",
-">&    c #721013",
-",&    c #6D0508",
-"'&    c #934D4F",
-")&    c #D1CDCC",
-"!&    c #535353",
-"~&    c #515151",
-"{&    c #E0E2E2",
-"]&    c #D7D2D2",
-"^&    c #B69293",
-"/&    c #B18A8B",
-"(&    c #C1AAAB",
-"_&    c #D8D9D9",
-":&    c #B4B4B4",
-"<&    c #909090",
-"[&    c #DFE0E0",
-"}&    c #DCDDDD",
-"|&    c #CDC6C7",
-"1&    c #AD9293",
-"2&    c #D8DADA",
-"3&    c #D4D5D5",
-"4&    c #9D9D9D",
-"5&    c #696969",
-"6&    c #A9A9A9",
-"7&    c #E0E2E1",
-"8&    c #DDDEDD",
-"9&    c #AC9191",
-"0&    c #8D5F60",
-"a&    c #956C6E",
-"b&    c #A28383",
-"c&    c #D6D8D8",
-"d&    c #ABABAB",
-"e&    c #454545",
-"f&    c #646464",
-"g&    c #E5E6E6",
-"h&    c #E3E2E2",
-"i&    c #DAD6D6",
-"j&    c #C4B5B5",
-"k&    c #845051",
-"l&    c #A68889",
-"m&    c #A18081",
-"n&    c #A48586",
-"o&    c #A88C8D",
-"p&    c #977172",
-"q&    c #BAABAC",
-"r&    c #D2D3D3",
-"s&    c #858585",
-"t&    c #E8E9E9",
-"u&    c #E7E8E8",
-"v&    c #E7E9E8",
-"w&    c #A88788",
-"x&    c #BDA8A8",
-"y&    c #7D4547",
-"z&    c #713436",
-"A&    c #A17F80",
-"B&    c #C0B2B2",
-"C&    c #D0CACA",
-"D&    c #AF9899",
-"E&    c #88595B",
-"F&    c #A08182",
-"G&    c #9E7E7F",
-"H&    c #D0D1D1",
-"I&    c #EAEBEB",
-"J&    c #D1C6C7",
-"K&    c #A88687",
-"L&    c #B39899",
-"M&    c #B09495",
-"N&    c #CAC0C0",
-"O&    c #BDAAAA",
-"P&    c #D1CBCB",
-"Q&    c #C7BCBD",
-"R&    c #A28182",
-"S&    c #956B6D",
-"T&    c #A38586",
-"U&    c #977273",
-"V&    c #C0B6B6",
-"W&    c #CCCBCB",
-"X&    c #A0A0A0",
-"Y&    c #676767",
-"Z&    c #393939",
-"`&    c #F0F1F1",
-" *    c #EFF0F0",
-".*    c #EEEFEF",
-"+*    c #EEF0F0",
-"@*    c #D8CFCF",
-"#*    c #C2ACAD",
-"$*    c #B09394",
-"%*    c #814C4C",
-"&*    c #C3B3B3",
-"**    c #C2B1B1",
-"=*    c #CEC4C5",
-"-*    c #BFACAC",
-";*    c #C1B1B1",
-">*    c #A38383",
-",*    c #AC9293",
-"'*    c #CCC7C7",
-")*    c #D6D7D7",
-"!*    c #D3D4D4",
-"~*    c #777777",
-"{*    c #414141",
-"]*    c #EAE7E9",
-"^*    c #CAB7B9",
-"/*    c #BDA4A5",
-"(*    c #956768",
-"_*    c #8E5E61",
-":*    c #9E7777",
-"<*    c #B29696",
-"[*    c #DEDCDC",
-"}*    c #BCA5A6",
-"|*    c #BAA5A5",
-"1*    c #824E4F",
-"2*    c #7F484A",
-"3*    c #C1B3B4",
-"4*    c #4C4C4C",
-"5*    c #E6E4E4",
-"6*    c #A17B7B",
-"7*    c #A48081",
-"8*    c #A0797A",
-"9*    c #D2C7C7",
-"0*    c #D8D2D2",
-"a*    c #B8A1A2",
-"b*    c #834F50",
-"c*    c #A78888",
-"d*    c #8A5B5D",
-"e*    c #CDC4C5",
-"f*    c #DDDFDF",
-"g*    c #DADBDB",
-"h*    c #949494",
-"i*    c #595959",
-"j*    c #EDEEEE",
-"k*    c #D4C8C8",
-"l*    c #D7CECF",
-"m*    c #C1ADAD",
-"n*    c #BEA9AA",
-"o*    c #9A7374",
-"p*    c #9C7374",
-"q*    c #A78788",
-"r*    c #D1CACA",
-"s*    c #B19798",
-"t*    c #343434",
-"u*    c #4B4B4B",
-"v*    c #B59B9C",
-"w*    c #7D4344",
-"x*    c #865355",
-"y*    c #CBBEBF",
-"z*    c #CDC2C2",
-"A*    c #D5CECE",
-"B*    c #A88889",
-"C*    c #9C7777",
-"D*    c #A38485",
-"E*    c #B8A5A5",
-"F*    c #E9EAEA",
-"G*    c #DDD8D8",
-"H*    c #BFAAAB",
-"I*    c #C7B9B9",
-"J*    c #B69E9F",
-"K*    c #80494A",
-"L*    c #9A7476",
-"M*    c #9F7E7E",
-"N*    c #C8BFC0",
-"O*    c #474747",
-"P*    c #999999",
-"Q*    c #E6E7E7",
-"R*    c #793E3F",
-"S*    c #845152",
-"T*    c #D1C9C9",
-"U*    c #C5B7B8",
-"V*    c #D8D5D5",
-"W*    c #D5D1D1",
-"X*    c #DDDEDE",
-"Y*    c #D1C7C7",
-"Z*    c #D4CCCC",
-"`*    c #E0E1E1",
-" =    c #383838",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                            .                                                   ",
-"                                                                + + @ # $ % & *                                                 ",
-"                                                      = - * ; ; > $ $ % & & , '                                                 ",
-"                                          = = = ) ! ~ ~ { ] ^ > $ % % & , , / (                                                 ",
-"                              = = = _ : < [ } ! | 1 2 3 4 5 6 7 % 8 9 0 a b c d                                                 ",
-"                    = = = _ e ) f g h i j k l m n o p q r s t u v w x y z A B C D         E F G                                 ",
-"                    H I J K L M N O P P Q R S T U V W X Y Z `  ...+.@.#.$.%.$./ /   &.E *.=.-.;.                                ",
-"                    = >.,.'.).!.~.j {.].^./.(._.:.<.[.}.|.1.2./ / 3.$.3.4.5.6.7.;.8.9.0.@ . a.b.c.                              ",
-"                    = d.e.f.g.h.i.j.k.4 l.m.n.o.p.q.r.& , 4./ 3.3.s.t.u.v.w.;.x.y.z.A.z.B.C.D.4.E.                              ",
-"                    = F.G.H.I.J.K.L.M.' ' N.O.$ % & , , P.P.Q.R.S.T.U.V.W.X.Y.= - * Z.# B.`. +; .+c.                            ",
-"                    = ++@+#+~ ~ M.$+$+N.7 p.q.%+&+*+=+-+;+>+,+'+)+!+~+{+= = = ]+^+Z.# # /+(+_+4.:+<+                            ",
-"                      B.! ~ M.M.' [+}+|+1+2+3+4+5+6+7+8+7.9+0+a+b+= = = - . = c+= # > # 7.d+, e+5.f+g+                          ",
-"                      h+i+j+6+k+l+m+n+o+p+q+r+s+t+a.u+v+w+x+= = = = = - . ^+= y+= > > z+(+A+:+B+B+C.g+                          ",
-"                      [ 3 C+D+E+[.F+G+H+I+J+K+L+M+N+O+A.= = P+H = = = = = Q+R+S+= ~ > 7.~+4.B+T+A+B+U+                          ",
-"                      . V+W+X+Y+6+Z+`+ @.@+@@@#@> = = = = $@%@= = &@= *@=@-@;@>@,@= '@)@!@e+T+A+~@~@{@]@                        ",
-"                      _ ^@l./@(@_@:@<@[@=._+= = }@|@= = = 1@2@= 3@4@5@6@7@8@9@0@a@: b@c@d@T+A+~@e@f@~@g@                        ",
-"                      h@V+i@j@k@8.l@/+= = = = = m@n@o@p@= q@r@s@t@u@v@w@x@y@z@A@^+B@)@e@C@A+~@e@f@b+f@D@c.                      ",
-"                      x.E@F@7.G@= = = = = = = H@I@J@K@2@L@M@N@O@P@Q@x@R@S@T@U@M.& b@c@B+_+~@e@V@b+W@X@W@Y@                      ",
-"                  +@;.Z@X.z.= = `@ #.#+#= = = @#S+= ##$#%#&#*#=#-#;#>#,#'#)#!#4.~#{#f@T+~@e@V@b+W@]#C.]#b@g+                    ",
-"            ^#/#D.(#, = = = = H@_#:#<#-#= [#}#|#1#2#3#4#5#6#= 7#8#9#0#a#b#s.3., b@c@B+~@e@V@b+W@]#C.z+c#d#e#                    ",
-"        /#f#.+f@= = = = = = = g#h#= = = i#j#k#l#m#n#o#p#q#h@r#s#t#u#v#w#, 3.5.0.)@b+A+e@V@b+W@]#C.z+'@x#c#D.y#                  ",
-"      z#=.= = = = = = = = = = A#B#C#D#E#F#m@G#H#I#J#h#= K#L#M#N#O#N.%+4.5.:+d@b.P#T+e@V@b+W@X@C.z+'@x#Q#Q#R#]@                  ",
-"      S#f#T#U#B.= = = = = = = = = = V#W#= X#Y#Z#= `# $.$+$@$#$$$7 & 4.5.:+:+%$)@W@~@V@b+W@X@C.z+c#x#Q#%$&$0.;.                  ",
-"        *$=$-$;$>$!@= = = = = ,$'$)$!$~$= = {$= = = ]$^$/$($N.$ & 4.5.:+B+e+b._$_+V@b+W@X@C.z+c#x#Q#%$&$=$=$:$c.                ",
-"        <$= = W@-$[$}$|$= = = 1$2$3$4$= = = 5$+ _ 6$7$8${ N.$ & 4.5.:+B+C@&$)@X@e@b+W@X@C.z+c#x#Q#%$&$=$9$9$=$0$                ",
-"        a$c#= = = z.b$c$D.P#N.= = = = = = = h@_ d$e$f$g$; $ & 4.5.:+B+T+B+b._$!@b+W@X@C.z+c#x#Q#%$&$=$9$h$G@G@7.g+              ",
-"        g+i$= = = = = = W@-$j$k$C.= = = = + l$m$n$o$p$N.q$q$r$s$t$u$v$C@=$)@C.f@w$X@C./+c#x#Q#0.&$=$x$h$G@y.y.O+<+              ",
-"          y$= = = = = = = = w$z$T#W.R#- = + . A$B$C$Y.> D$E$F$G$H$I$J$v$b._$V@w$X@C./+c#x#Q#0.&$=$x$h$G@y.K$-.O+c$y#            ",
-"          L$, = = = = = = = = = B.b$c$M$:$_++ N$O$P$> Q$R$S$T$U$V$W$X$Y$Z$`$b+X@C./+c#x#Q#0.&$=$x$h$G@y.K$-. % %.%+%            ",
-"          c.c@= = = = = = = = = = = = ]#k$*.@%#%$%# Q$E$%%&%*%=%-%;%>%,%'%)%X@C./+c#x#Q#0.&$=$x$h$G@y.K$-. %{@R#{@!%            ",
-"            j$= = = = = = = = = = + + - - & ~%(+{#d+{%]%^%*%/%(%_%:%<%[%}%|%C./+c#x#Q#0.&$=$x$h$G@1%K$-. %{@R#2%3%.+c.          ",
-"            4%+ = = = = = = = = + - . * B.B.B.d@5%`.6%7%8%9%0%a%b%c%d%e%f%g%/+c#x#~#0.&$d#x$h$G@1%K$-.h%{@R#2%X.i%X.j%          ",
-"            ]@ %= = = = = = = = - . * z.Z.; > $ % & k%l%m%n%o%p%q%r%s%t%f%u%c#x#~#0.&$d#x$h$G@1%K$-.h%{@R#2%X.i%6.U#v%g+        ",
-"              w%= = = = = = = - . * z.Z.; > % , 5.d@x%y%z%A%B%C%D%E%F%G%H%I%x#~#0.&$d#x$h$G@1%K$-.h%{@R#2%X.i%6..%~%z$J%        ",
-"              K%= = = = = = - . * z.Z.; > % , 5.d@e+{%L%M%N%O%P%Q%R%S%T%U%V%~#0.&$d#x$h$G@1%K$-.h%{@R#2%X.i%6..%z$W%z$*$y#      ",
-"              a$Q#= = = = - . * z.Z.; > % , 5.d@e+C@C@X%Y%Z%`% &.&9%+&@&#&$&0.&$d#x$h$|$1%K$O+h%{@R#3%X.i%U#.%z$W% +d+_$%&      ",
-"              g+i$= = = - . @ z.Z.; > % , 4.d@e+B+T+A+&&*&=&-&;&>&,&'&)&$&0.%$d#x$h$|$1%K$O+h%{@R#3%X.i%U#.%z$W% +d+d+(#!&      ",
-"                ~&= = - . @ z.Z.# > % , 4.d@e+B+T+A+!@e@V@{&]&^&/&(&_&$&0.%$d#x$h$|$1%K$O+h%{@R#3%X.i%U#.%z$:&z$ +<&E e#y#      ",
-"                L$:+= . @ z.Z.# > % , 4.d@e+B+T+A+!@e@f@b+[&}&|&1&2&3&0.%$d#x$h$|$1%K$O+h%{@R#3%X.i%U#6..%.%4&5&<+g+            ",
-"                c.6&+ @ z.Z.# > % , 4.d@e+B+T+A+!@!@)%7&8&9&0&a&b&c&0.%$d#x$h$|$1%K$O+h%{@5%3%X.b$b$b$d&T#e&c.4%                ",
-"                  f&= z.Z.# > % , 4.d@e+B+T+_+g&h&i&j&k&l&m&n&o&p&q&r&d#x$9$|$1%y.O+h%{@5%R#3%R#z$s&~&c.y#                      ",
-"                  y#Z.z.# > % & 4.d@:+B+t&u&v&w&x&y&z&A&B&C&D&E&F&G&H&x$9$|$1%y.O+h% % % %2%w+E 4%g+                            ",
-"                  ]@~%z.> % & 4.d@d@I&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&W&=$9$|$1%y.O+-.-.O+X&Y&Z&g+                                  ",
-"                    T#z.% `& *.*+*@*#*$*%*&***=*-*;*>*,*m&'*)*!*H&x$9$|$1%1%1%1%~+~*{*c.                                        ",
-"                    <+# % ]*^*/*(*_*:*<*[*}*|*1*2*o&3*2&'@~#%$d#=$9$h$|$9$X.s&4*c.y#                                            ",
-"                    ]@y.& 5*6*7*8*9*0*a*b*c*d*e*f*g*c#$&Q#%$d#d#=$=$y.h*i*g+g+                                                  ",
-"                    y#x.% j*k*l*m*n*o*p*q*r*s*f*/+'@x#Q#0.%$0.d#:$Y&t*g+                                                        ",
-"                      u*% :+v*w*x*y*z*A*B*C*D*E*)*x#~#~#x# +D.K%c.                                                              ",
-"                      a$~#F*G*H*~@I*J*K*L*M*N*_&z+z+ %N+O*c.4%                                                                  ",
-"                      g+P*e+Q*R*S*T*U*V*W*X*X@=$-$y$]@y#                                                                        ",
-"                        ;.B+g&Y*Z*`*b+b+/+=.8.4%g+                                                                              ",
-"                        c.w$!@V@V@e@W%{# =c.                                                                                    ",
-"                        c.D@_+-.s&<$]@                                                                                          ",
-"                          E i*]@y#                                                                                              ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                "};
+".     c #46778C",
+"+     c #6A9DB3",
+"@     c #8CBCD1",
+"#     c #A7D1E3",
+"$     c #BCDDEB",
+"%     c #C6E2EE",
+"&     c #C8E3EF",
+"*     c #C0DFEC",
+"=     c #B0D6E6",
+"-     c #97C3D6",
+";     c #76A5B9",
+">     c #558497",
+",     c #38607E",
+"'     c #8EBBD0",
+")     c #BFD9E6",
+"!     c #D8E4EB",
+"~     c #E1E8EE",
+"{     c #E5EBEF",
+"]     c #EBF2F7",
+"^     c #EBF3F7",
+"/     c #ECF3F7",
+"(     c #EDF4F9",
+"_     c #EEF5F9",
+":     c #ECF4F8",
+"<     c #E4F0F5",
+"[     c #D0E6F0",
+"}     c #A4CCDC",
+"|     c #71A1B5",
+"1     c #396A84",
+"2     c #83AAC2",
+"3     c #C6D8E4",
+"4     c #D5DDE5",
+"5     c #D6DDE5",
+"6     c #D6DEE5",
+"7     c #D7DFE6",
+"8     c #D8DFE7",
+"9     c #D8DFE6",
+"0     c #D9DFE7",
+"a     c #DBE2E9",
+"b     c #DDE6EC",
+"c     c #DCE3EA",
+"d     c #E0E8EE",
+"e     c #E2EDF3",
+"f     c #D7EAF2",
+"g     c #A8CFE0",
+"h     c #6394A9",
+"i     c #517F9E",
+"j     c #A3BCCE",
+"k     c #C6D1DC",
+"l     c #C8D3DD",
+"m     c #C9D3DD",
+"n     c #C9D4DE",
+"o     c #CBD4DE",
+"p     c #CBD5DF",
+"q     c #CBD5DE",
+"r     c #CAD4DD",
+"s     c #CBD4DD",
+"t     c #CED7E0",
+"u     c #CFD7E0",
+"v     c #CFD8E0",
+"w     c #CFD8E1",
+"x     c #D1DBE3",
+"y     c #D7E3EB",
+"z     c #C3DAE6",
+"A     c #82B2C6",
+"B     c #456889",
+"C     c #A2B5C7",
+"D     c #BAC8D5",
+"E     c #BBC8D5",
+"F     c #BCC9D6",
+"G     c #BDCAD7",
+"H     c #BCC8D4",
+"I     c #B0BCC6",
+"J     c #959FA8",
+"K     c #A2ACB5",
+"L     c #6F757B",
+"M     c #C4CFD9",
+"N     c #C3CED9",
+"O     c #C0CBD6",
+"P     c #ABB5BE",
+"Q     c #BEC9D4",
+"R     c #C4D0DA",
+"S     c #C4CFDA",
+"T     c #B9C8D6",
+"U     c #789AB2",
+"V     c #375970",
+"W     c #496B8E",
+"X     c #A5B7C9",
+"Y     c #ACBDCD",
+"Z     c #ACBDCE",
+"`     c #ADBECE",
+" .    c #AEBFCF",
+"..    c #B0C0D0",
+"+.    c #B1C1D0",
+"@.    c #A0AEBB",
+"#.    c #4C5258",
+"$.    c #5B636A",
+"%.    c #8C97A1",
+"&.    c #171819",
+"*.    c #888E93",
+"=.    c #9FAAB3",
+"-.    c #555A60",
+";.    c #5E666C",
+">.    c #838B94",
+",.    c #B5C2CE",
+"'.    c #BAC7D4",
+").    c #B9C6D3",
+"!.    c #B4C2D0",
+"~.    c #8DAEC4",
+"{.    c #38596F",
+"].    c #416589",
+"^.    c #96ABC0",
+"/.    c #9EB1C4",
+"(.    c #9EB2C4",
+"_.    c #9EB2C5",
+":.    c #A0B3C5",
+"<.    c #A2B4C7",
+"[.    c #A3B5C7",
+"}.    c #9AABBB",
+"|.    c #94A4B3",
+"1.    c #3B4146",
+"2.    c #5F6872",
+"3.    c #6C757E",
+"4.    c #070708",
+"5.    c #111112",
+"6.    c #2E3031",
+"7.    c #030404",
+"8.    c #121415",
+"9.    c #7D8B92",
+"0.    c #BFD3DF",
+"a.    c #BDD1DE",
+"b.    c #BCCFDC",
+"c.    c #B0BFCE",
+"d.    c #BFD4E0",
+"e.    c #C7E1EC",
+"f.    c #8FB9CE",
+"g.    c #284E74",
+"h.    c #859DB5",
+"i.    c #91A6BC",
+"j.    c #91A7BC",
+"k.    c #91A7BD",
+"l.    c #92A7BD",
+"m.    c #94A9BF",
+"n.    c #96AABE",
+"o.    c #667381",
+"p.    c #31373C",
+"q.    c #101214",
+"r.    c #444A50",
+"s.    c #454A4E",
+"t.    c #0A0C05",
+"u.    c #101602",
+"v.    c #070901",
+"w.    c #010100",
+"x.    c #1C2021",
+"y.    c #8A9CA4",
+"z.    c #B3CBD5",
+"A.    c #C5E0EB",
+"B.    c #AEC1D0",
+"C.    c #A7B9C9",
+"D.    c #BFDAE6",
+"E.    c #C3E0EC",
+"F.    c #BDDCE9",
+"G.    c #76A4BC",
+"H.    c #082B4F",
+"I.    c #6282A1",
+"J.    c #839CB4",
+"K.    c #849CB4",
+"L.    c #849CB5",
+"M.    c #859DB6",
+"N.    c #7490AC",
+"O.    c #607F9F",
+"P.    c #405F7E",
+"Q.    c #0E1C2B",
+"R.    c #000101",
+"S.    c #000000",
+"T.    c #0C1102",
+"U.    c #618411",
+"V.    c #638711",
+"W.    c #4A660C",
+"X.    c #243205",
+"Y.    c #080A06",
+"Z.    c #262C2E",
+"`.    c #515D62",
+" +    c #AAC5D0",
+".+    c #B2CBD9",
+"++    c #A3B7C9",
+"@+    c #BCDAE8",
+"#+    c #BCDCE9",
+"$+    c #ADD4E4",
+"%+    c #49718A",
+"&+    c #30577D",
+"*+    c #7490AB",
+"=+    c #7590AC",
+"-+    c #6F8CA9",
+";+    c #57799A",
+">+    c #375F85",
+",+    c #1E4970",
+"'+    c #184365",
+")+    c #1E4863",
+"!+    c #234862",
+"~+    c #274962",
+"{+    c #1D292C",
+"]+    c #0E1108",
+"^+    c #557019",
+"/+    c #779F1C",
+"(+    c #6B9117",
+"_+    c #6A9114",
+":+    c #58790F",
+"<+    c #223003",
+"[+    c #161D16",
+"}+    c #86A2AE",
+"|+    c #91AFBC",
+"1+    c #B3D5E4",
+"2+    c #B8DAE8",
+"3+    c #BADCE9",
+"4+    c #B6D9E8",
+"5+    c #B4D7E6",
+"6+    c #8ABDD2",
+"7+    c #092C4E",
+"8+    c #4F7395",
+"9+    c #6786A4",
+"0+    c #5F80A0",
+"a+    c #426688",
+"b+    c #2A4B5B",
+"c+    c #3B5644",
+"d+    c #556E3F",
+"e+    c #5F7938",
+"f+    c #6A823E",
+"g+    c #738D3E",
+"h+    c #6D853C",
+"i+    c #637A31",
+"j+    c #5C712D",
+"k+    c #607A24",
+"l+    c #728F2E",
+"m+    c #698822",
+"n+    c #668422",
+"o+    c #668520",
+"p+    c #587419",
+"q+    c #3C520F",
+"r+    c #293620",
+"s+    c #2F3C42",
+"t+    c #27343A",
+"u+    c #87BCD3",
+"v+    c #96C9DF",
+"w+    c #A7D2E4",
+"x+    c #B0D7E6",
+"y+    c #AED4E4",
+"z+    c #A1CDE0",
+"A+    c #6091A5",
+"B+    c #1A436B",
+"C+    c #567899",
+"D+    c #5A7B9C",
+"E+    c #3D658B",
+"F+    c #143D64",
+"G+    c #334238",
+"H+    c #7A9639",
+"I+    c #84A636",
+"J+    c #7A9E2A",
+"K+    c #77982D",
+"L+    c #6A862C",
+"M+    c #556A28",
+"N+    c #50622A",
+"O+    c #556B24",
+"P+    c #637D2A",
+"Q+    c #6B8B21",
+"R+    c #6A8924",
+"S+    c #5B771C",
+"T+    c #61801B",
+"U+    c #6D911D",
+"V+    c #67822A",
+"W+    c #5C722A",
+"X+    c #586F36",
+"Y+    c #688D92",
+"Z+    c #74A3B8",
+"`+    c #88C1D9",
+" @    c #87C3DC",
+".@    c #86C1DA",
+"+@    c #8FC5DC",
+"@@    c #A2CFE1",
+"#@    c #A4CFE1",
+"$@    c #7DB3CA",
+"%@    c #2A547C",
+"&@    c #4B6F93",
+"*@    c #40668C",
+"=@    c #194876",
+"-@    c #05325D",
+";@    c #898475",
+">@    c #887A5D",
+",@    c #455225",
+"'@    c #63831D",
+")@    c #5E7C1B",
+"!@    c #4D621D",
+"~@    c #404D23",
+"{@    c #404E25",
+"]@    c #6C8337",
+"^@    c #7E9D38",
+"/@    c #688724",
+"(@    c #668424",
+"_@    c #587024",
+":@    c #495C1F",
+"<@    c #557119",
+"[@    c #709420",
+"}@    c #7F9E38",
+"|@    c #647C2D",
+"1@    c #72922A",
+"2@    c #678031",
+"3@    c #5D7D7C",
+"4@    c #8CC5DD",
+"5@    c #89C4DC",
+"6@    c #85C1DB",
+"7@    c #81BFD9",
+"8@    c #80BED7",
+"9@    c #8DC4DB",
+"0@    c #9CCBDE",
+"a@    c #8DC2D8",
+"b@    c #052849",
+"c@    c #2E5881",
+"d@    c #2B5680",
+"e@    c #093B6C",
+"f@    c #003567",
+"g@    c #455358",
+"h@    c #DDD0B4",
+"i@    c #A7946B",
+"j@    c #333924",
+"k@    c #475723",
+"l@    c #404F22",
+"m@    c #192828",
+"n@    c #1B2D2D",
+"o@    c #5D7532",
+"p@    c #86A443",
+"q@    c #5F7729",
+"r@    c #576F20",
+"s@    c #3F4C21",
+"t@    c #3E4C20",
+"u@    c #567219",
+"v@    c #75952C",
+"w@    c #809C3E",
+"x@    c #5B7128",
+"y@    c #5F7B21",
+"z@    c #6B8334",
+"A@    c #7F9B43",
+"B@    c #698E88",
+"C@    c #86C2DB",
+"D@    c #82BFD9",
+"E@    c #7FBDD7",
+"F@    c #7BBAD5",
+"G@    c #80BCD6",
+"H@    c #8AC2D9",
+"I@    c #5C8FA4",
+"J@    c #083057",
+"K@    c #184674",
+"L@    c #033668",
+"M@    c #003467",
+"N@    c #003365",
+"O@    c #828277",
+"P@    c #CBB993",
+"Q@    c #3A4140",
+"R@    c #161F1E",
+"S@    c #273015",
+"T@    c #232F23",
+"U@    c #193137",
+"V@    c #6B8537",
+"W@    c #7B9839",
+"X@    c #718E2F",
+"Y@    c #5D7525",
+"Z@    c #4B5F21",
+"`@    c #34431C",
+" #    c #12150C",
+".#    c #313E26",
+"+#    c #526D18",
+"@#    c #789634",
+"##    c #738B3B",
+"$#    c #37431F",
+"%#    c #4C6022",
+"&#    c #597124",
+"*#    c #83A23C",
+"=#    c #79943F",
+"-#    c #679094",
+";#    c #85C1DA",
+">#    c #7EBDD7",
+",#    c #76B8D3",
+"'#    c #76B7D2",
+")#    c #649EB7",
+"!#    c #012E5A",
+"~#    c #003466",
+"{#    c #5C615B",
+"]#    c #A0916E",
+"^#    c #062645",
+"/#    c #002549",
+"(#    c #08223B",
+"_#    c #25382B",
+":#    c #688032",
+"<#    c #526428",
+"[#    c #2D3B22",
+"}#    c #283526",
+"|#    c #152228",
+"1#    c #30434A",
+"2#    c #41532F",
+"3#    c #556A26",
+"4#    c #7A9A33",
+"5#    c #85A243",
+"6#    c #3E503B",
+"7#    c #394945",
+"8#    c #3F5219",
+"9#    c #5A751D",
+"0#    c #79992F",
+"a#    c #7C993C",
+"b#    c #5D807A",
+"c#    c #80BDD7",
+"d#    c #7ABAD5",
+"e#    c #72B5D1",
+"f#    c #69AAC5",
+"g#    c #053663",
+"h#    c #003468",
+"i#    c #0F2B45",
+"j#    c #958562",
+"k#    c #192E3F",
+"l#    c #102A38",
+"m#    c #516635",
+"n#    c #779533",
+"o#    c #678622",
+"p#    c #5E7921",
+"q#    c #506424",
+"r#    c #2E3C28",
+"s#    c #183754",
+"t#    c #1C3A59",
+"u#    c #244361",
+"v#    c #517C88",
+"w#    c #45562A",
+"x#    c #556D1F",
+"y#    c #729426",
+"z#    c #8FAE47",
+"A#    c #5C7B67",
+"B#    c #618A9A",
+"C#    c #36463B",
+"D#    c #3F5116",
+"E#    c #617B27",
+"F#    c #6D8A2A",
+"G#    c #728D37",
+"H#    c #5F888A",
+"I#    c #7AB9D3",
+"J#    c #79BAD4",
+"K#    c #75B7D2",
+"L#    c #71B5D1",
+"M#    c #6CB0CC",
+"N#    c #205B84",
+"O#    c #053A6C",
+"P#    c #003465",
+"Q#    c #00274D",
+"R#    c #1A2F3C",
+"S#    c #5B6438",
+"T#    c #6D8637",
+"U#    c #708D2D",
+"V#    c #607929",
+"W#    c #5E7628",
+"X#    c #495B20",
+"Y#    c #273626",
+"Z#    c #153148",
+"`#    c #183959",
+" $    c #1B3B5B",
+".$    c #37617F",
+"+$    c #6298AD",
+"@$    c #435727",
+"#$    c #5D7526",
+"$$    c #6C8B28",
+"%$    c #829F3F",
+"&$    c #5B7B6B",
+"*$    c #638EA0",
+"=$    c #557886",
+"-$    c #364135",
+";$    c #536A21",
+">$    c #617D23",
+",$    c #7D9E35",
+"'$    c #687E39",
+")$    c #618F94",
+"!$    c #78B9D4",
+"~$    c #74B6D2",
+"{$    c #70B4D1",
+"]$    c #6CB1CE",
+"^$    c #144B76",
+"/$    c #428DB4",
+"($    c #144F7F",
+"_$    c #022749",
+":$    c #4C642F",
+"<$    c #718B37",
+"[$    c #698627",
+"}$    c #586F23",
+"|$    c #4B5D25",
+"1$    c #4F6323",
+"2$    c #27372B",
+"3$    c #0F3152",
+"4$    c #123556",
+"5$    c #1C4164",
+"6$    c #3D6C8B",
+"7$    c #74B8D6",
+"8$    c #60939D",
+"9$    c #475A1F",
+"0$    c #5E7B1F",
+"a$    c #799E27",
+"b$    c #7F9A40",
+"c$    c #5F837F",
+"d$    c #6791A2",
+"e$    c #5F8393",
+"f$    c #496A73",
+"g$    c #475627",
+"h$    c #6A8A24",
+"i$    c #779434",
+"j$    c #5B785C",
+"k$    c #76B8D4",
+"l$    c #6FB3D0",
+"m$    c #6AB0CD",
+"n$    c #04335F",
+"o$    c #428CB4",
+"p$    c #5AACD1",
+"q$    c #114B7B",
+"r$    c #003568",
+"s$    c #082A4B",
+"t$    c #3F3F28",
+"u$    c #3A3723",
+"v$    c #323720",
+"w$    c #435222",
+"x$    c #3F4D21",
+"y$    c #404F21",
+"z$    c #1E3230",
+"A$    c #183F60",
+"B$    c #3A6D8D",
+"C$    c #68B0D1",
+"D$    c #76BFDE",
+"E$    c #71B6D1",
+"F$    c #435739",
+"G$    c #506523",
+"H$    c #719227",
+"I$    c #697D39",
+"J$    c #6F7869",
+"K$    c #A5A8AA",
+"L$    c #7E8486",
+"M$    c #405A60",
+"N$    c #3D4C1B",
+"O$    c #4C5F21",
+"P$    c #5F7A22",
+"Q$    c #7A9932",
+"R$    c #607A4F",
+"S$    c #74B7D3",
+"T$    c #6DB2D0",
+"U$    c #67ACC9",
+"V$    c #174970",
+"W$    c #59ABCF",
+"X$    c #61B5D8",
+"Y$    c #3F88B2",
+"Z$    c #013363",
+"`$    c #998F73",
+" %    c #C5B38B",
+".%    c #766642",
+"+%    c #24271D",
+"@%    c #34401B",
+"#%    c #35401E",
+"$%    c #102D40",
+"%%    c #4C88A5",
+"&%    c #6CB9D8",
+"*%    c #72BDDE",
+"=%    c #74B8D5",
+"-%    c #567B7F",
+";%    c #516426",
+">%    c #617C24",
+",%    c #6E8734",
+"'%    c #72873E",
+")%    c #91948A",
+"!%    c #C0C0C0",
+"~%    c #D4D6D5",
+"{%    c #3F5258",
+"]%    c #38451B",
+"^%    c #3B4A1A",
+"/%    c #607829",
+"(%    c #7B9838",
+"_%    c #5F784B",
+":%    c #71B5D2",
+"<%    c #6EB3D0",
+"[%    c #6BB1CF",
+"}%    c #60A1BD",
+"|%    c #245676",
+"1%    c #5AABCF",
+"2%    c #61B5D7",
+"3%    c #58A9CE",
+"4%    c #083E6F",
+"5%    c #174E77",
+"6%    c #9F967B",
+"7%    c #D8C8A7",
+"8%    c #BBA474",
+"9%    c #201F1B",
+"0%    c #2E361F",
+"a%    c #132425",
+"b%    c #183C5F",
+"c%    c #517895",
+"d%    c #91B3C1",
+"e%    c #A8B6BB",
+"f%    c #BEBEBF",
+"g%    c #707564",
+"h%    c #465329",
+"i%    c #4C5E22",
+"j%    c #6D8438",
+"k%    c #67783E",
+"l%    c #979795",
+"m%    c #FBFBF9",
+"n%    c #F7F7F5",
+"o%    c #708A95",
+"p%    c #2A372A",
+"q%    c #434F26",
+"r%    c #42452B",
+"s%    c #5F5E45",
+"t%    c #526C63",
+"u%    c #6EB4D1",
+"v%    c #6CB2CF",
+"w%    c #68B0CE",
+"x%    c #5692AC",
+"y%    c #54A3C6",
+"z%    c #5BABCD",
+"A%    c #559FBD",
+"B%    c #215273",
+"C%    c #1B3951",
+"D%    c #766D53",
+"E%    c #DCCFB2",
+"F%    c #C2AC7C",
+"G%    c #33393A",
+"H%    c #30363C",
+"I%    c #494E53",
+"J%    c #8C8E91",
+"K%    c #C0C0C1",
+"L%    c #CECECE",
+"M%    c #D3D3D3",
+"N%    c #D7D7D7",
+"O%    c #818281",
+"P%    c #2F2F2D",
+"Q%    c #453C2A",
+"R%    c #8B7B58",
+"S%    c #322E1D",
+"T%    c #565C48",
+"U%    c #D7D7D5",
+"V%    c #FEFEFC",
+"W%    c #86959B",
+"X%    c #4A7485",
+"Y%    c #485048",
+"Z%    c #C3B597",
+"`%    c #D0BF9B",
+" &    c #67766D",
+".&    c #6AAFCC",
+"+&    c #67ADCA",
+"@&    c #64ABC9",
+"#&    c #487B91",
+"$&    c #4384A3",
+"%&    c #40778E",
+"&&    c #6F8791",
+"*&    c #BAC1C4",
+"=&    c #DADBDB",
+"-&    c #888378",
+";&    c #C8BA9A",
+">&    c #CBB68A",
+",&    c #867E6C",
+"'&    c #AEAEAE",
+")&    c #9B9B9B",
+"!&    c #989898",
+"~&    c #939393",
+"{&    c #ADABA9",
+"]&    c #E6E6E6",
+"^&    c #BDBDBD",
+"/&    c #605846",
+"(&    c #B59D6B",
+"_&    c #DCCFB3",
+":&    c #63583E",
+"<&    c #969695",
+"[&    c #E7E7E5",
+"}&    c #FDFDFB",
+"|&    c #9EA2A3",
+"1&    c #466F81",
+"2&    c #888063",
+"3&    c #E3D8C0",
+"4&    c #BBA473",
+"5&    c #537075",
+"6&    c #64A8C4",
+"7&    c #61A6C3",
+"8&    c #5DA1BE",
+"9&    c #3F525C",
+"0&    c #C6CACB",
+"a&    c #FFFFFF",
+"b&    c #F3F3F3",
+"c&    c #B1B1B1",
+"d&    c #837B69",
+"e&    c #C2B08A",
+"f&    c #BBA577",
+"g&    c #8D8169",
+"h&    c #9B9486",
+"i&    c #AAA18E",
+"j&    c #74684E",
+"k&    c #7D7C7A",
+"l&    c #766645",
+"m&    c #D2D1CF",
+"n&    c #8E897F",
+"o&    c #A48B57",
+"p&    c #D1BF99",
+"q&    c #9F9072",
+"r&    c #848380",
+"s&    c #B9B8B6",
+"t&    c #736A56",
+"u&    c #9D937E",
+"v&    c #BAB5AC",
+"w&    c #9C968C",
+"x&    c #837B60",
+"y&    c #D2C29E",
+"z&    c #C9B58A",
+"A&    c #6B674E",
+"B&    c #50869C",
+"C&    c #5EA1BD",
+"D&    c #5B9EBB",
+"E&    c #508CA6",
+"F&    c #404040",
+"G&    c #DEDEDE",
+"H&    c #FBFBFB",
+"I&    c #BBBBBB",
+"J&    c #B0B0AF",
+"K&    c #8B867D",
+"L&    c #9D8E70",
+"M&    c #B29F76",
+"N&    c #9A8C6C",
+"O&    c #BCB9B2",
+"P&    c #A7A7A7",
+"Q&    c #866F40",
+"R&    c #958259",
+"S&    c #AC9665",
+"T&    c #C7B285",
+"U&    c #9F9174",
+"V&    c #7A7772",
+"W&    c #B3B3B2",
+"X&    c #E1E0DF",
+"Y&    c #CFCECA",
+"Z&    c #8D7E5D",
+"`&    c #A08B5C",
+" *    c #B09A6B",
+".*    c #B6A071",
+"+*    c #9D8C63",
+"@*    c #5A5C4B",
+"#*    c #3B6272",
+"$*    c #4D859C",
+"%*    c #5696B0",
+"&*    c #5393AE",
+"**    c #366071",
+"=*    c #FFFFFE",
+"-*    c #FEFEFE",
+";*    c #FEFEFF",
+">*    c #FFFEFF",
+",*    c #B7B7B7",
+"'*    c #D2D2D2",
+")*    c #DFDFDE",
+"!*    c #DFDEDE",
+"~*    c #F6F6F6",
+"{*    c #EAEAEA",
+"]*    c #60594B",
+"^*    c #948158",
+"/*    c #A18C60",
+"(*    c #776B53",
+"_*    c #777572",
+":*    c #ACACAA",
+"<*    c #C9C9C7",
+"[*    c #F1F0EE",
+"}*    c #EFEDEC",
+"|*    c #E5E3E1",
+"1*    c #C1BDB9",
+"2*    c #B7B1A7",
+"3*    c #76756F",
+"4*    c #616C6F",
+"5*    c #65757B",
+"6*    c #65767C",
+"7*    c #8298A0",
+"8*    c #89A0A9",
+"9*    c #879CA5",
+"0*    c #939697",
+"a*    c #A3A3A2",
+"b*    c #959594",
+"c*    c #4B4B4B",
+"d*    c #F9F9F9",
+"e*    c #FAF9F9",
+"f*    c #FAFAF9",
+"g*    c #FAF9FA",
+"h*    c #8A8A89",
+"i*    c #696968",
+"j*    c #4E4E4E",
+"k*    c #999999",
+"l*    c #C9C9C9",
+"m*    c #D5D5D5",
+"n*    c #CCCCCC",
+"o*    c #C1C1C1",
+"p*    c #E3E3E3",
+"q*    c #7C7C7C",
+"r*    c #AFAFAF",
+"s*    c #7E7E7E",
+"t*    c #A6A6A5",
+"u*    c #BBBAB9",
+"v*    c #EDECEA",
+"w*    c #E5E3E2",
+"x*    c #B3B2B0",
+"y*    c #C3C1BF",
+"z*    c #CDCBC9",
+"A*    c #C2C0BE",
+"B*    c #858483",
+"C*    c #ADADAC",
+"D*    c #B6B6B4",
+"E*    c #CFCFCD",
+"F*    c #FCFCFA",
+"G*    c #EDBCB1",
+"H*    c #EDAEA3",
+"I*    c #E9B9AD",
+"J*    c #DFDDDA",
+"K*    c #8A8A8A",
+"L*    c #F4F4F4",
+"M*    c #F5F4F4",
+"N*    c #9A9A9A",
+"O*    c #B7B7B6",
+"P*    c #DCDCDA",
+"Q*    c #B1B1AF",
+"R*    c #6E6E6D",
+"S*    c #7F7F7F",
+"T*    c #828282",
+"U*    c #ADADAD",
+"V*    c #ABABAB",
+"W*    c #7D7D7C",
+"X*    c #A09F9F",
+"Y*    c #B8B7B6",
+"Z*    c #E4E3E1",
+"`*    c #EDEBE9",
+" =    c #E9E7E5",
+".=    c #D3D0CE",
+"+=    c #ABA9A7",
+"@=    c #A19E9D",
+"#=    c #9D9B99",
+"$=    c #858381",
+"%=    c #A4A4A3",
+"&=    c #D4D4D2",
+"*=    c #FAFAF8",
+"==    c #E2978D",
+"-=    c #DC786E",
+";=    c #D55543",
+">=    c #D9D7D3",
+",=    c #9E9E9E",
+"'=    c #EFEFEF",
+")=    c #E5E5E5",
+"!=    c #ACACAC",
+"~=    c #999998",
+"{=    c #989896",
+"]=    c #AAAAA8",
+"^=    c #A8A8A6",
+"/=    c #979797",
+"(=    c #BCBCBC",
+"_=    c #7B7B7B",
+":=    c #9C9B9A",
+"<=    c #BBBAB8",
+"[=    c #DDDCDA",
+"}=    c #E6E4E2",
+"|=    c #E7E4E2",
+"1=    c #E4E1DF",
+"2=    c #E1DDDC",
+"3=    c #D9D5D4",
+"4=    c #CAC6C4",
+"5=    c #C2BEBC",
+"6=    c #BBB7B6",
+"7=    c #B4B4B2",
+"8=    c #CC948D",
+"9=    c #CEC7C8",
+"0=    c #E1847A",
+"a=    c #D8D5CF",
+"b=    c #909090",
+"c=    c #E9E9E9",
+"d=    c #E9EAE9",
+"e=    c #EAE9E9",
+"f=    c #E9E9EA",
+"g=    c #B9B9B9",
+"h=    c #B9B9B7",
+"i=    c #D2D2D1",
+"j=    c #BEBEBD",
+"k=    c #D2D1D0",
+"l=    c #DFDDDC",
+"m=    c #E3E1DF",
+"n=    c #E0DDDC",
+"o=    c #DCDAD9",
+"p=    c #DAD7D5",
+"q=    c #D9D6D4",
+"r=    c #DAD5D4",
+"s=    c #D7D3D1",
+"t=    c #D4CFCD",
+"u=    c #D0CBCA",
+"v=    c #CDC7C6",
+"w=    c #A4A2A1",
+"x=    c #F5F4F2",
+"y=    c #C96558",
+"z=    c #CD675E",
+"A=    c #E16354",
+"B=    c #D5D2CD",
+"C=    c #4A4A4A",
+"D=    c #E0E0E0",
+"E=    c #E4E4E4",
+"F=    c #E4E4E5",
+"G=    c #E5E4E5",
+"H=    c #D9D9D9",
+"I=    c #A1A1A0",
+"J=    c #DFDEDC",
+"K=    c #E1DFDD",
+"L=    c #DEDBDA",
+"M=    c #DBD8D6",
+"N=    c #D8D4D3",
+"O=    c #D4D0CF",
+"P=    c #D1CDCB",
+"Q=    c #CEC9C8",
+"R=    c #CDC8C6",
+"S=    c #CBC5C3",
+"T=    c #C7C1BF",
+"U=    c #999594",
+"V=    c #F6F6F4",
+"W=    c #E1D2CC",
+"X=    c #E4CFC7",
+"Y=    c #EFE0D8",
+"Z=    c #D4D2D0",
+"`=    c #DEDFDF",
+" -    c #DFDFDF",
+".-    c #A7A6A5",
+"+-    c #DFDCDB",
+"@-    c #DFDDDB",
+"#-    c #DCDAD8",
+"$-    c #D6D2D1",
+"%-    c #D2CECD",
+"&-    c #CFCAC9",
+"*-    c #CBC6C5",
+"=-    c #C8C3C1",
+"--    c #C4BFBE",
+";-    c #C1BCBA",
+">-    c #C0BAB9",
+",-    c #C0B9B8",
+"'-    c #A6A09F",
+")-    c #FDFCFA",
+"!-    c #F9F9F7",
+"~-    c #F7F6F4",
+"{-    c #F3F2F0",
+"]-    c #D0CECD",
+"^-    c #3F3F3F",
+"/-    c #C8C8C8",
+"(-    c #DAD9D9",
+"_-    c #DADADA",
+":-    c #8C8B8A",
+"<-    c #D1CECD",
+"[-    c #DAD7D6",
+"}-    c #D7D4D2",
+"|-    c #D0CCCA",
+"1-    c #CCC8C6",
+"2-    c #C9C4C2",
+"3-    c #C5C0BF",
+"4-    c #C2BDBC",
+"5-    c #BFB9B8",
+"6-    c #B8B1B0",
+"7-    c #9E9897",
+"8-    c #8D8988",
+"9-    c #858281",
+"0-    c #D5D5D3",
+"a-    c #F3F1EF",
+"b-    c #F0EFED",
+"c-    c #EFEDEB",
+"d-    c #ECEBE9",
+"e-    c #C9C7C6",
+"f-    c #5A5A5A",
+"g-    c #989797",
+"h-    c #D0D0D0",
+"i-    c #D4D4D4",
+"j-    c #D4D5D5",
+"k-    c #949392",
+"l-    c #C6C4C2",
+"m-    c #D5D1D0",
+"n-    c #D2CECC",
+"o-    c #CBC6C4",
+"p-    c #C7C2C0",
+"q-    c #BCB7B6",
+"r-    c #ACA7A6",
+"s-    c #8D8A88",
+"t-    c #7A7777",
+"u-    c #81807F",
+"v-    c #9F9E9D",
+"w-    c #B4B3B1",
+"x-    c #BFBEBC",
+"y-    c #E2E0DF",
+"z-    c #EEEDEB",
+"A-    c #ECEAE9",
+"B-    c #EAE8E6",
+"C-    c #E8E6E4",
+"D-    c #C2C0BF",
+"E-    c #AAAAA9",
+"F-    c #A7A7A6",
+"G-    c #CFCFCF",
+"H-    c #D0D0CF",
+"I-    c #929190",
+"J-    c #C1BDBC",
+"K-    c #CFCBC9",
+"L-    c #CCC7C6",
+"M-    c #B3AEAD",
+"N-    c #93908E",
+"O-    c #918F8E",
+"P-    c #9A9998",
+"Q-    c #A8A7A6",
+"R-    c #B3B2B1",
+"S-    c #C4C3C2",
+"T-    c #D8D6D5",
+"U-    c #E6E3E2",
+"V-    c #E2DFDD",
+"W-    c #E0DDDB",
+"X-    c #BCB9B8",
+"Y-    c #555555",
+"Z-    c #C8C9C8",
+"`-    c #C9C9C8",
+" ;    c #959595",
+".;    c #9D9D9C",
+"+;    c #E3E2E1",
+"@;    c #858585",
+"#;    c #CAC9C9",
+"$;    c #CACACA",
+"%;    c #757473",
+"&;    c #9C9A99",
+"*;    c #9B9998",
+"=;    c #999897",
+"-;    c #AEADAC",
+";;    c #BFBFBD",
+">;    c #D7D6D4",
+",;    c #DBD9D7",
+"';    c #D4D2D1",
+");    c #D1CFCD",
+"!;    c #E8E5E4",
+"~;    c #E6E3E1",
+"{;    c #E2DEDD",
+"];    c #E0DCDB",
+"^;    c #DEDAD8",
+"/;    c #DAD6D4",
+"(;    c #B5B2B0",
+"_;    c #454545",
+":;    c #BEBEBE",
+"<;    c #C3C3C3",
+"[;    c #C4C3C3",
+"};    c #757575",
+"|;    c #565655",
+"1;    c #848382",
+"2;    c #B2B2B2",
+"3;    c #C4C4C4",
+"4;    c #C4C4C5",
+"5;    c #B0B0B0",
+"6;    c #7F7F7E",
+"7;    c #C5C5C3",
+"8;    c #DBDAD8",
+"9;    c #E5E4E2",
+"0;    c #F0EEEC",
+"a;    c #EEECEA",
+"b;    c #ECEAE8",
+"c;    c #EAE7E6",
+"d;    c #E8E5E3",
+"e;    c #E0DCDA",
+"f;    c #DDDAD8",
+"g;    c #D5D1CF",
+"h;    c #D3CECD",
+"i;    c #AFABA9",
+"j;    c #A8A8A8",
+"k;    c #BFBEBF",
+"l;    c #BFBFBE",
+"m;    c #BFBEBE",
+"n;    c #BFBFBF",
+"o;    c #868585",
+"p;    c #CCCCCA",
+"q;    c #F2F1EF",
+"r;    c #EAE7E5",
+"s;    c #DBD7D6",
+"t;    c #D3CFCD",
+"u;    c #D1CCCB",
+"v;    c #CFCAC8",
+"w;    c #A8A4A3",
+"x;    c #5B5B5B",
+"y;    c #B6B6B6",
+"z;    c #B8B8B8",
+"A;    c #B9B9B8",
+"B;    c #787878",
+"C;    c #A2A1A0",
+"D;    c #EBEAE8",
+"E;    c #ECE9E8",
+"F;    c #E7E5E3",
+"G;    c #E5E2E1",
+"H;    c #E3E0DE",
+"I;    c #E1DEDC",
+"J;    c #DFDCDA",
+"K;    c #DDD9D8",
+"L;    c #DBD7D5",
+"M;    c #D9D5D3",
+"N;    c #D5D0CF",
+"O;    c #D1CCCA",
+"P;    c #CFC9C8",
+"Q;    c #C9C3C1",
+"R;    c #C7C0BF",
+"S;    c #A29C9B",
+"T;    c #666666",
+"U;    c #B3B3B3",
+"V;    c #B3B4B4",
+"W;    c #B4B4B3",
+"X;    c #B4B4B4",
+"Y;    c #A3A3A3",
+"Z;    c #636363",
+"`;    c #C8C6C4",
+" >    c #EBE9E7",
+".>    c #D7D2D1",
+"+>    c #D3CECC",
+"@>    c #C4BEBC",
+"#>    c #C2BCBA",
+"$>    c #C0BAB8",
+"%>    c #9B9594",
+"&>    c #3D3D3D",
+"*>    c #7A7A7A",
+"=>    c #A2A2A2",
+"->    c #A4A4A5",
+";>    c #858685",
+">>    c #5D5D5C",
+",>    c #91908F",
+"'>    c #8F8D8D",
+")>    c #8A8887",
+"!>    c #878585",
+"~>    c #858382",
+"{>    c #828180",
+"]>    c #807E7D",
+"^>    c #7D7B7B",
+"/>    c #7B7978",
+"(>    c #787676",
+"_>    c #767473",
+":>    c #747170",
+"<>    c #716F6E",
+"[>    c #6F6C6B",
+"}>    c #6D6969",
+"|>    c #6A6766",
+"1>    c #686464",
+"2>    c #656261",
+"3>    c #625F5E",
+"4>    c #605D5C",
+"5>    c #5D5A5A",
+"6>    c #4B4848",
+"7>    c #393939",
+"8>    c #373737",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                    . + @ # $ % & * = - ; >                                     ",
+"                                , ' ) ! ~ { ] ^ / ( _ : < [ } |                                 ",
+"                            1 2 3 4 5 5 6 7 8 9 0 a b c a d e f g h                             ",
+"                          i j k l l l m n o p q r s t t u v w x y z A                           ",
+"                        B C D D D D E F G H I J K L M N O P Q R S N T U V                       ",
+"                      W X Y Z Y Y `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.E ).!.~.{.                    ",
+"                    ].^./.(._./.(.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.                    ",
+"                  g.h.i.j.j.k.k.l.m.^.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.                  ",
+"                H.I.J.K.K.L.L.L.M.J.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+F.#+$+%+                ",
+"                &+*+=+=+=+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+2+4+5+6+                ",
+"              7+8+9+9+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+= y+z+A+              ",
+"              B+C+D+;+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@# #@$@              ",
+"              %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@              ",
+"            b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@]@q@r@s@t@u@v@w@x@y@z@A@B@`+C@D@E@F@G@H@I@            ",
+"            J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#D@>#F@,#'#)#            ",
+"            !#~#M@M@M@{#]#^#/#(#_#:#X@k+<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#>#d#'#e#f#            ",
+"            g#~#M@h#M@i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#J#K#L#M#            ",
+"            N#O#M@M@P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$            ",
+"            ^$/$($M@~#_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$&#h$i$j$k$e#l$m$            ",
+"            n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$'@H$I$J$K$L$M$N$O$P$Q$R$S${$T$U$            ",
+"            V$W$X$Y$r$Z$`$ %.%+%@%#%$%%%&%*%=%-%x$;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%[%}%            ",
+"            |%1%2%3%4%5%6%7%8%9%0%a%b%c%d%e%f%g%h%k@i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%            ",
+"              y%z%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%V%W%X%Y%Z%`% &.&+&@&#&            ",
+"              $&%&&&*&=&-&;&>&,&'&)&!&~&L%{&]&^&/&(&_&:&<&[&}&m%|&1&2&3&4&5&6&7&8&              ",
+"              9&0&a&a&b&c&d&e&f&g&h&i&j&k&l&m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&              ",
+"            F&G&a&a&a&H&I&J&K&L&M&M&N&O&P&Q&R&S&T&U&V&W&X&Y&Z&`& *.*+*@*#*$*%*&***              ",
+"            ^&=*-*;*;*>*M%,*,*'*)*!*~*-*{*]*^*/*(*_*:*<*[*}*|*1*2*3*4*5*6*7*8*9*0*a*b*          ",
+"          c*d*e*f*e*g*I&h*i*j*k*l*m*n*o*p*q*p*r*s*t*u*v*w*x*y*z*A*B*C*D*E*F*V%G*H*I*J*          ",
+"          K*L*L*L*L*M*N*O*P*Q*R*S*q*T*P&U*q*V*W*X*Y*Z*`* =.=+=@=#=$=%=&=*=V%V%==-=;=>=          ",
+"          ,='='='='='=)=!=~={=]=:*^=)&/=(=(=_=:=<=[=}=|=1=2=3=4=5=6=7=V%V%V%m%8=9=0=a=          ",
+"          b=c=c=d=e=c=f=d={*p*g=,=~=h=i=j=%=k=l=m=n=o=p=q=r=s=t=u=v=w=}&V%V%x=y=z=A=B=          ",
+"          C=D=E=E=E=E=E=E=F=G=)=)=H=I=I=U%J=K=K=L=M=N=O=P=Q=R=v=S=T=U=V=V%V%}&W=X=Y=Z=          ",
+"            _=H=`= - - - - - - -D=D=D=V*.-+-@-#-q=$-%-&-*-=---;->-,-'-&=)-m%!-~-x={-]-          ",
+"              ^-!&/-H=H=H=H=(-_-_-_-_-N%:-<-[-}-.=|-1-2-3-4-5-6-7-8-9-0-~-x=a-b-c-d-e-          ",
+"                    f-g-^&h-i-i-i-j-m*m*k-l-m-n-Q=o-p-q-r-s-t-u-v-w-x-y-b-z-A-B-C-}=D-          ",
+"                      E-F-h*U*G-G-G-G-H-I-J-K-L-M-N-O-P-F-Q*Q-R-S-T-`*A-B-C-U-1=V-W-X-          ",
+"      Y-/-/-Z-l*`- ;  .;+;D*@;l*#;#;$;/-%;&;*;=;t*:*-;;;>;y-,;';);K=!;~;1={;];^;M=/;(;          ",
+"      _;:;<;<;<;[;:;};|;:-1;2;3;3;3;4;5;6;7;8;9;v*b-[*0;a;b;c;d;~;1={;e;f;M=3=s=g;h;i;          ",
+"        j;:;:;:;:;:;f%k;l;m;n;n;n;n;l;o;p;q;{-q;0;a;b;r;d;~;1={;e;f;s;3=s=g;t;u;v;R=w;          ",
+"        x;y;z;z;z;z;A;g=g=g=g=g=g=g=B;C;D;0;v*E; =F;G;H;I;J;K;L;M;s=N;h;O;P;v=S=Q;R;S;          ",
+"          T;U*U;U;U;U;V;W;X;X;U;Y;Z;  `; > =F;G;H;I;J;K;L;M;.>N;+>O;P;v=S=Q;R;@>#>$>%>          ",
+"            &>*>=>'&'&'&'&->;>>>      1;,>'>:-)>!>~>{>]>^>/>(>_>:><>[>}>|>1>2>3>4>5>6>          ",
+"                    7>8>                                                                        ",
+"                                                                                                ",
+"                                                                                                "};

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 2addc22ac256227b863ff05979e87112ad2b6cca..64300051936a1ab4565871acf4b8fcedae3f6594 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -239,7 +239,7 @@ static PrefParam param[] = {
        /* Display: Summary View */
        {"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
         NULL, NULL, NULL},
        /* Display: Summary View */
        {"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
         NULL, NULL, NULL},

-       {"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
+       {"use_address_book", "FALSE", &prefs_common.use_addr_book, P_BOOL,

         NULL, NULL, NULL},
        {"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
         NULL, NULL, NULL},

diff --git a/src/summaryview.c b/src/summaryview.c
index b5bf69c10fda26220aed8321eada6c72cf5243ab..d177b4545b6bad56e07e0f95cb41f723b48c51b2 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1291,7 +1291,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
                        case NEXTUNREADMSGDIALOG_ALWAYS:
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                        case NEXTUNREADMSGDIALOG_ALWAYS:
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "

-                                                  "Search from the end?"),
+                                                  "_Search from the end?"),

                                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:


@@ -1384,7 +1384,7 @@ void summary_select_prev_new(SummaryView *summaryview)
 
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
 
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "

-                                  "Search from the end?"),
+                                  "_Search from the end?"),

                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,


@@ -1409,7 +1409,7 @@ void summary_select_next_new(SummaryView *summaryview)
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Go to next folder?"),
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Go to next folder?"),

-                                GTK_STOCK_YES, _("Search again"),
+                                GTK_STOCK_YES, _("_Search again"),

                                 GTK_STOCK_NO);
                if (val == G_ALERTDEFAULT) {
                        g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
                                 GTK_STOCK_NO);
                if (val == G_ALERTDEFAULT) {
                        g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");


@@ -1437,7 +1437,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "

-                                  "Search from the end?"),
+                                  "_Search from the end?"),

                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,


@@ -1462,7 +1462,7 @@ void summary_select_next_marked(SummaryView *summaryview)
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "

-                                  "Search from the beginning?"),
+                                  "_Search from the beginning?"),

                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,


@@ -1487,7 +1487,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "

-                                  "Search from the end?"),
+                                  "_Search from the end?"),

                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,


@@ -1512,7 +1512,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "

-                                  "Search from the beginning?"),
+                                  "_Search from the beginning?"),

                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,

diff --git a/src/textview.c b/src/textview.c
index bd14b88c3777b08542c22bfc93bd8aa3e1de6ae3..86152f835765b302bffb8d1070cdd2553cee90e4 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -2210,9 +2210,10 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
 
                msg = g_strdup_printf(_("The real URL (%s) is different from\n"
                                        "the apparent URL (%s).\n"
 
                msg = g_strdup_printf(_("The real URL (%s) is different from\n"
                                        "the apparent URL (%s).\n"

+                                       "\n"

                                        "Open it anyway?"),
                                      uri->uri, visible_str);
                                        "Open it anyway?"),
                                      uri->uri, visible_str);

-               aval = alertpanel_with_type(_("Warning"), msg,
+               aval = alertpanel_with_type(_("Fake URL warning"), msg,

                                            GTK_STOCK_YES, GTK_STOCK_NO,
                                            NULL, NULL, ALERT_WARNING);
                g_free(msg);
                                            GTK_STOCK_YES, GTK_STOCK_NO,
                                            NULL, NULL, ALERT_WARNING);
                g_free(msg);