2006-04-11 [cleroy] 2.1.0cvs29

	* src/compose.c
		Implement multiple quote levels
	* src/prefs_common.c
		Change a little bit the quote bgcolor for 2nd level

diff --git a/ChangeLog b/ChangeLog
index a22ed49390a0b608a77eaaa2dffe0d00ed078eba..e19230ec95a8386ae49ee52a6b33c9f72457473e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-11 [cleroy]    2.1.0cvs29
+
+       * src/compose.c
+               Implement multiple quote levels
+       * src/prefs_common.c
+               Change a little bit the quote bgcolor for 2nd level
+

 2006-04-11 [colin]     2.1.0cvs28
 
        * src/gtk/about.c
 2006-04-11 [colin]     2.1.0cvs28
 
        * src/gtk/about.c

diff --git a/PATCHSETS b/PATCHSETS
index f7e4b326e03484f569af6f3b2aadfcf91aec97dc..2b67c2f592a154c99bfceb22b171f3627d4a3bd2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1400,3 +1400,4 @@
 ( cvs diff -u -r 1.115.2.78 -r 1.115.2.79 src/main.c;  cvs diff -u -r 1.274.2.106 -r 1.274.2.107 src/mainwindow.c;  cvs diff -u -r 1.39.2.15 -r 1.39.2.16 src/mainwindow.h;  ) > 2.1.0cvs26.patchset
 ( cvs diff -u -r 1.382.2.260 -r 1.382.2.261 src/compose.c;  cvs diff -u -r 1.204.2.82 -r 1.204.2.83 src/prefs_common.c;  cvs diff -u -r 1.103.2.46 -r 1.103.2.47 src/prefs_common.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_msg_colors.c;  cvs diff -u -r 1.96.2.108 -r 1.96.2.109 src/textview.c;  ) > 2.1.0cvs27.patchset
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/gtk/about.c;  ) > 2.1.0cvs28.patchset
 ( cvs diff -u -r 1.115.2.78 -r 1.115.2.79 src/main.c;  cvs diff -u -r 1.274.2.106 -r 1.274.2.107 src/mainwindow.c;  cvs diff -u -r 1.39.2.15 -r 1.39.2.16 src/mainwindow.h;  ) > 2.1.0cvs26.patchset
 ( cvs diff -u -r 1.382.2.260 -r 1.382.2.261 src/compose.c;  cvs diff -u -r 1.204.2.82 -r 1.204.2.83 src/prefs_common.c;  cvs diff -u -r 1.103.2.46 -r 1.103.2.47 src/prefs_common.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_msg_colors.c;  cvs diff -u -r 1.96.2.108 -r 1.96.2.109 src/textview.c;  ) > 2.1.0cvs27.patchset
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/gtk/about.c;  ) > 2.1.0cvs28.patchset

+( cvs diff -u -r 1.382.2.261 -r 1.382.2.262 src/compose.c;  cvs diff -u -r 1.204.2.83 -r 1.204.2.84 src/prefs_common.c;  ) > 2.1.0cvs29.patchset

diff --git a/configure.ac b/configure.ac
index 29574a6d24c8d358cb8041650b2fba8ff03e6281..fdbd91f457258c7f4bd7d90cba3953f3f1114571 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=28
+EXTRA_VERSION=29

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 078568651f1f8cb3fb6b645dd614b1de7636dd83..30e3db7f818bda9d19cbc53ccf71cbff57b26079 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -790,10 +790,18 @@ static gboolean compose_put_existing_to_front(MsgInfo *info)
        return FALSE;
 }
 
        return FALSE;
 }
 

-static GdkColor quote_color = 
+static GdkColor quote_color1 = 
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_color2 = 
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_color3 = 

        {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
 
        {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
 

-static GdkColor quote_bgcolor = 
+static GdkColor quote_bgcolor1 = 
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_bgcolor2 = 
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_bgcolor3 = 

        {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
 
 static GdkColor signature_color = {
        {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
 
 static GdkColor signature_color = {


@@ -814,34 +822,61 @@ static void compose_create_tags(GtkTextView *text, Compose *compose)
 {
        GtkTextBuffer *buffer;
        GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
 {
        GtkTextBuffer *buffer;
        GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};

+       GdkColormap *cmap;
+       GdkColor color[8];
+       gboolean success[8];
+       int i;

 
        buffer = gtk_text_view_get_buffer(text);
 
        buffer = gtk_text_view_get_buffer(text);

-       
+

        if (prefs_common.enable_color) {
                /* grab the quote colors, converting from an int to a GdkColor */
                gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_col,
        if (prefs_common.enable_color) {
                /* grab the quote colors, converting from an int to a GdkColor */
                gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_col,

-                                              &quote_color);
+                                              &quote_color1);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level2_col,
+                                              &quote_color2);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level3_col,
+                                              &quote_color3);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_bgcol,
+                                              &quote_bgcolor1);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level2_bgcol,
+                                              &quote_bgcolor2);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level3_bgcol,
+                                              &quote_bgcolor3);

                gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
                                               &signature_color);
                gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
                                               &uri_color);
        } else {
                gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
                                               &signature_color);
                gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
                                               &uri_color);
        } else {

-               signature_color = quote_color = uri_color = black;
+               signature_color = quote_color1 = quote_color2 = quote_color3 = 
+                       quote_bgcolor1 = quote_bgcolor2 = quote_bgcolor3 = uri_color = black;

        }
 
        if (prefs_common.enable_color && prefs_common.enable_bgcolor) {
        }
 
        if (prefs_common.enable_color && prefs_common.enable_bgcolor) {

-               gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_bgcol,
-                                                  &quote_bgcolor);
-               gtk_text_buffer_create_tag(buffer, "quote",
-                                          "foreground-gdk", &quote_color,
-                                          "paragraph-background-gdk", &quote_bgcolor,
+               gtk_text_buffer_create_tag(buffer, "quote0",
+                                          "foreground-gdk", &quote_color1,
+                                          "paragraph-background-gdk", &quote_bgcolor1,
+                                          NULL);
+               gtk_text_buffer_create_tag(buffer, "quote1",
+                                          "foreground-gdk", &quote_color2,
+                                          "paragraph-background-gdk", &quote_bgcolor2,
+                                          NULL);
+               gtk_text_buffer_create_tag(buffer, "quote2",
+                                          "foreground-gdk", &quote_color3,
+                                          "paragraph-background-gdk", &quote_bgcolor3,

                                           NULL);
        } else {
                                           NULL);
        } else {

-               gtk_text_buffer_create_tag(buffer, "quote",
-                                          "foreground-gdk", &quote_color,
+               gtk_text_buffer_create_tag(buffer, "quote0",
+                                          "foreground-gdk", &quote_color1,
+                                          NULL);
+               gtk_text_buffer_create_tag(buffer, "quote1",
+                                          "foreground-gdk", &quote_color2,
+                                          NULL);
+               gtk_text_buffer_create_tag(buffer, "quote2",
+                                          "foreground-gdk", &quote_color3,

                                           NULL);
        }
                                           NULL);
        }

-
+       

        gtk_text_buffer_create_tag(buffer, "signature",
                                   "foreground-gdk", &signature_color,
                                   NULL);
        gtk_text_buffer_create_tag(buffer, "signature",
                                   "foreground-gdk", &signature_color,
                                   NULL);


@@ -850,6 +885,29 @@ static void compose_create_tags(GtkTextView *text, Compose *compose)
                                         NULL);
        compose->no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
        compose->no_join_tag = gtk_text_buffer_create_tag(buffer, "no_join", NULL);
                                         NULL);
        compose->no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
        compose->no_join_tag = gtk_text_buffer_create_tag(buffer, "no_join", NULL);

+
+       color[0] = quote_color1;
+       color[1] = quote_color2;
+       color[2] = quote_color3;
+       color[3] = quote_bgcolor1;
+       color[4] = quote_bgcolor2;
+       color[5] = quote_bgcolor3;
+       color[6] = signature_color;
+       color[7] = uri_color;
+       cmap = gdk_drawable_get_colormap(compose->window->window);
+       gdk_colormap_alloc_colors(cmap, color, 8, FALSE, TRUE, success);
+
+       for (i = 0; i < 8; i++) {
+               if (success[i] == FALSE) {
+                       GtkStyle *style;
+
+                       g_warning("Compose: color allocation failed.\n");
+                       style = gtk_widget_get_style(text);
+                       quote_color1 = quote_color2 = quote_color3 = 
+                               quote_bgcolor1 = quote_bgcolor2 = quote_bgcolor3 = 
+                               signature_color = uri_color = black;
+               }
+       }

 }
 
 Compose *compose_new(PrefsAccount *account, const gchar *mailto,
 }
 
 Compose *compose_new(PrefsAccount *account, const gchar *mailto,


@@ -884,6 +942,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        g_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, COMPOSE_NEW, FALSE);
        g_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, COMPOSE_NEW, FALSE);

+

        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        compose->replyinfo = NULL;
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        compose->replyinfo = NULL;


@@ -3372,6 +3431,7 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
        gint uri_start = -1, uri_stop = -1;
        gint nouri_start = -1, nouri_stop = -1;
        gint num_blocks = 0;
        gint uri_start = -1, uri_stop = -1;
        gint nouri_start = -1, nouri_stop = -1;
        gint num_blocks = 0;

+       gint quotelevel = -1;

 
        compose->autowrap = FALSE;
 
 
        compose->autowrap = FALSE;
 


@@ -3459,9 +3519,18 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                        debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
                        if (startq_offset == -1) 
                                startq_offset = gtk_text_iter_get_offset(&iter);
                        debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
                        if (startq_offset == -1) 
                                startq_offset = gtk_text_iter_get_offset(&iter);

+                       quotelevel = get_quote_level(quote_str, prefs_common.quote_chars);
+                       if (quotelevel > 2) {
+                               /* recycle colors */
+                               if (prefs_common.recycle_quote_colors)
+                                       quotelevel %= 3;
+                               else
+                                       quotelevel = 2;
+                       }

                } else {
                        if (startq_offset == -1)
                                noq_offset = gtk_text_iter_get_offset(&iter);
                } else {
                        if (startq_offset == -1)
                                noq_offset = gtk_text_iter_get_offset(&iter);

+                       quotelevel = -1;

                }
 
                if (prev_autowrap == FALSE && !force && !wrap_quote) {
                }
 
                if (prev_autowrap == FALSE && !force && !wrap_quote) {


@@ -3575,8 +3644,17 @@ colorize:
                        gtk_text_buffer_get_iter_at_offset(
                                buffer, &startquote, startq_offset);
                        endquote = iter;
                        gtk_text_buffer_get_iter_at_offset(
                                buffer, &startquote, startq_offset);
                        endquote = iter;

-                       gtk_text_buffer_apply_tag_by_name(
-                               buffer, "quote", &startquote, &endquote);
+                       switch (quotelevel) {
+                       case 0: gtk_text_buffer_apply_tag_by_name(
+                                       buffer, "quote0", &startquote, &endquote);
+                               break;
+                       case 1: gtk_text_buffer_apply_tag_by_name(
+                                       buffer, "quote1", &startquote, &endquote);
+                               break;
+                       case 2: gtk_text_buffer_apply_tag_by_name(
+                                       buffer, "quote2", &startquote, &endquote);
+                               break;
+                       }

                        startq_offset = -1;
                } else if (noq_offset != -1) {
                        GtkTextIter startnoquote, endnoquote;
                        startq_offset = -1;
                } else if (noq_offset != -1) {
                        GtkTextIter startnoquote, endnoquote;


@@ -3584,7 +3662,11 @@ colorize:
                                buffer, &startnoquote, noq_offset);
                        endnoquote = iter;
                        gtk_text_buffer_remove_tag_by_name(
                                buffer, &startnoquote, noq_offset);
                        endnoquote = iter;
                        gtk_text_buffer_remove_tag_by_name(

-                               buffer, "quote", &startnoquote, &endnoquote);
+                               buffer, "quote0", &startnoquote, &endnoquote);
+                       gtk_text_buffer_remove_tag_by_name(
+                               buffer, "quote1", &startnoquote, &endnoquote);
+                       gtk_text_buffer_remove_tag_by_name(
+                               buffer, "quote2", &startnoquote, &endnoquote);

                        noq_offset = -1;
                }
                
                        noq_offset = -1;
                }
                


@@ -5504,9 +5586,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
 
        gchar *titles[N_ATTACH_COLS];
        guint n_menu_entries;
 
        gchar *titles[N_ATTACH_COLS];
        guint n_menu_entries;

-       GdkColormap *cmap;
-       GdkColor color[1];
-       gboolean success[1];

        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
        GtkItemFactory *ifactory;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
        GtkItemFactory *ifactory;


@@ -5706,17 +5785,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
                }
        }
 
                }
        }
 

-       color[0] = quote_color;
-       cmap = gdk_drawable_get_colormap(window->window);
-       gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success);
-       if (success[0] == FALSE) {
-               GtkStyle *style;
-
-               g_warning("Compose: color allocation failed.\n");
-               style = gtk_widget_get_style(text);
-               quote_color = style->black;
-       }
-

        n_entries = sizeof(compose_popup_entries) /
                sizeof(compose_popup_entries[0]);
        popupmenu = menu_create_items(compose_popup_entries, n_entries,
        n_entries = sizeof(compose_popup_entries) /
                sizeof(compose_popup_entries[0]);
        popupmenu = menu_create_items(compose_popup_entries, n_entries,

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 72a7424e93d1edd1cfa794efec120a99593dcd19..b77e3b581000137f97651e0bcdb199cad61ba977 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -526,7 +526,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"quote_level1_bgcolor", "13421772", &prefs_common.quote_level1_bgcol, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"quote_level1_bgcolor", "13421772", &prefs_common.quote_level1_bgcol, P_COLOR,
         NULL, NULL, NULL},

-       {"quote_level2_bgcolor", "13882323", &prefs_common.quote_level2_bgcol, P_COLOR,
+       {"quote_level2_bgcolor", "13948116", &prefs_common.quote_level2_bgcol, P_COLOR,

         NULL, NULL, NULL},
        {"quote_level3_bgcolor", "14540253", &prefs_common.quote_level3_bgcol, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"quote_level3_bgcolor", "14540253", &prefs_common.quote_level3_bgcol, P_COLOR,
         NULL, NULL, NULL},