sync with 0.7.8cvs7

diff --git a/ChangeLog b/ChangeLog
index f8c2ecee36c83d4833618a6d717a49f3f0620e1b..fea85968b1803c02b7c587660846a036d73c48c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-25
+
+       * src/prefs_common.[ch]
+         src/compose.c: enabled "Wrap on input".
+

 2002-06-25
 
        * src/summaryview.[ch]
 2002-06-25
 
        * src/summaryview.[ch]

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1ea921c5d86fb56357c7d918b7b9199bbc6a2d36..da34d9be02930233a13ed3306facd46684a1ecaa 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-06-26 [paul]      0.7.8claws28
+
+       * sync with 0.7.8cvs7
+               see ChangeLog 2002-06-25
+
+       * src/prefs_common.c
+               ...and in the process, tweak the gui a little
+       

 2002-06-25 [alfons]    0.7.8claws27
        
        * configure.in
 2002-06-25 [alfons]    0.7.8claws27
        
        * configure.in

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 0565f8cd93810718c2701c6e1371adab7d49cf2f..3d95873dd54d33b65561024481ca8d38be5e1950 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-06-25
+
+       * src/prefs_common.[ch]
+         src/compose.c: ¡ÖÆþÎÏ»þ¤Ë¼«Æ°²þ¹Ô¡×¤ò¼ÂÁõ¡£
+

 2002-06-25
 
        * src/summaryview.[ch]
 2002-06-25
 
        * src/summaryview.[ch]

diff --git a/configure.in b/configure.in
index 82ca88a8f39934428feaa9d37b02e30914538954..e23b08536fa01df838ca68b550aed7ddff83734e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws27
+EXTRA_VERSION=claws28

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 226a40a66a4efa188c10edf0a1f7dd38bfe21f71..bc3602370ee429c7688ba5accd78ed075bb939ca 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6869,6 +6869,10 @@ static void text_inserted(GtkWidget *widget, const gchar *text,
                g_free(new_text);
        } else
                gtk_editable_insert_text(editable, text, length, position);
                g_free(new_text);
        } else
                gtk_editable_insert_text(editable, text, length, position);

+
+       if (prefs_common.autowrap)
+               compose_wrap_line_all(compose);
+

        gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),
                                           GTK_SIGNAL_FUNC(text_inserted),
                                           compose);
        gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),
                                           GTK_SIGNAL_FUNC(text_inserted),
                                           compose);

diff --git a/src/prefs_common.c b/src/prefs_common.c
index b05500c81da8c7321a69a39841484d9d009c6287..a9033a130ee3ae50cd51a30207170c6dbaf9dbb6 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -114,15 +114,15 @@ static struct Compose {
        GtkWidget *checkbtn_autoextedit;
        GtkWidget *spinbtn_undolevel;
        GtkObject *spinbtn_undolevel_adj;
        GtkWidget *checkbtn_autoextedit;
        GtkWidget *spinbtn_undolevel;
        GtkObject *spinbtn_undolevel_adj;

-       GtkWidget *checkbtn_reply_account_autosel;
-       GtkWidget *checkbtn_forward_account_autosel;
-       GtkWidget *checkbtn_reedit_account_autosel;
-

        GtkWidget *spinbtn_linewrap;
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *spinbtn_linewrap;
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *checkbtn_wrapquote;

+       GtkWidget *checkbtn_autowrap;

        GtkWidget *checkbtn_wrapatsend;
 
        GtkWidget *checkbtn_wrapatsend;
 

+       GtkWidget *checkbtn_reply_account_autosel;
+       GtkWidget *checkbtn_forward_account_autosel;
+       GtkWidget *checkbtn_reedit_account_autosel;

        GtkWidget *checkbtn_quote;
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_quote;
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_redirect_keep_from;


@@ -379,6 +379,9 @@ static PrefParam param[] = {
        {"linewrap_quotation", "FALSE", &prefs_common.linewrap_quote, P_BOOL,
         &compose.checkbtn_wrapquote,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"linewrap_quotation", "FALSE", &prefs_common.linewrap_quote, P_BOOL,
         &compose.checkbtn_wrapquote,
         prefs_set_data_from_toggle, prefs_set_toggle},

+       {"linewrap_auto", "FALSE", &prefs_common.autowrap, P_BOOL,
+        &compose.checkbtn_autowrap,
+        prefs_set_data_from_toggle, prefs_set_toggle},

        {"linewrap_before_sending", "FALSE",
         &prefs_common.linewrap_at_send, P_BOOL,
         &compose.checkbtn_wrapatsend,
        {"linewrap_before_sending", "FALSE",
         &prefs_common.linewrap_at_send, P_BOOL,
         &compose.checkbtn_wrapatsend,


@@ -1719,6 +1722,7 @@ static void prefs_compose_create(void)
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *spinbtn_linewrap;
        GtkWidget *checkbtn_wrapquote;
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *spinbtn_linewrap;
        GtkWidget *checkbtn_wrapquote;

+       GtkWidget *checkbtn_autowrap;

        GtkWidget *checkbtn_wrapatsend;
 
        GtkWidget *frame_reply;
        GtkWidget *checkbtn_wrapatsend;
 
        GtkWidget *frame_reply;


@@ -1734,20 +1738,6 @@ static void prefs_compose_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 

-
-
-       hbox1 = gtk_hbox_new (FALSE, 32);
-       gtk_widget_show (hbox1);
-
-       hbox2 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
-
-
-       hbox1 = gtk_hbox_new (FALSE, 32);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-

        PACK_FRAME(vbox1, frame_sig, _("Signature"));
 
        vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
        PACK_FRAME(vbox1, frame_sig, _("Signature"));
 
        vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);


@@ -1793,9 +1783,7 @@ static void prefs_compose_create(void)
        PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
                           _("Automatically launch the external editor"));
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
                           _("Automatically launch the external editor"));
 

-       PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
-
-       hbox5 = gtk_hbox_new (FALSE, 32);
+       hbox5 = gtk_hbox_new (FALSE, 8);

        gtk_widget_show (hbox5);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox5, FALSE, FALSE, 0);
 
        gtk_widget_show (hbox5);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox5, FALSE, FALSE, 0);
 


@@ -1824,8 +1812,6 @@ static void prefs_compose_create(void)
        gtk_widget_set_usize (spinbtn_undolevel, 64, -1);
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_undolevel), TRUE);
 
        gtk_widget_set_usize (spinbtn_undolevel, 64, -1);
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_undolevel), TRUE);
 

-       PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
-

         /* line-wrapping */
        PACK_FRAME(vbox1, frame_msgwrap, _("Message wrapping"));
 
         /* line-wrapping */
        PACK_FRAME(vbox1, frame_msgwrap, _("Message wrapping"));
 


@@ -1855,13 +1841,14 @@ static void prefs_compose_create(void)
        gtk_widget_show (label_linewrap);
        gtk_box_pack_start (GTK_BOX (hbox3), label_linewrap, FALSE, FALSE, 0);
 
        gtk_widget_show (label_linewrap);
        gtk_box_pack_start (GTK_BOX (hbox3), label_linewrap, FALSE, FALSE, 0);
 

-       PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
-
-       hbox4 = gtk_hbox_new (FALSE, 32);
+       hbox4 = gtk_hbox_new (FALSE, VSPACING);

        gtk_widget_show (hbox4);
        gtk_box_pack_start (GTK_BOX (vbox_linewrap), hbox4, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON (hbox4, checkbtn_wrapquote, _("Wrap quotation"));
        gtk_widget_show (hbox4);
        gtk_box_pack_start (GTK_BOX (vbox_linewrap), hbox4, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON (hbox4, checkbtn_wrapquote, _("Wrap quotation"));

+
+       PACK_CHECK_BUTTON (hbox4, checkbtn_autowrap, _("Wrap on input"));
+

        PACK_CHECK_BUTTON
                (hbox4, checkbtn_wrapatsend, _("Wrap before sending"));
 
        PACK_CHECK_BUTTON
                (hbox4, checkbtn_wrapatsend, _("Wrap before sending"));
 


@@ -1888,6 +1875,7 @@ static void prefs_compose_create(void)
        compose.spinbtn_linewrap     = spinbtn_linewrap;
        compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
        compose.checkbtn_wrapquote   = checkbtn_wrapquote;
        compose.spinbtn_linewrap     = spinbtn_linewrap;
        compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
        compose.checkbtn_wrapquote   = checkbtn_wrapquote;

+       compose.checkbtn_autowrap    = checkbtn_autowrap;

        compose.checkbtn_wrapatsend  = checkbtn_wrapatsend;
 
        compose.checkbtn_forward_as_attachment =
        compose.checkbtn_wrapatsend  = checkbtn_wrapatsend;
 
        compose.checkbtn_forward_as_attachment =

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 8576090486d5207f42cea3e586e16f4b58cb8ea2..b102d962110d347ba870e01351de6c010b5a548e 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -77,6 +77,7 @@ struct _PrefsCommon
        gint undolevels;
        gint linewrap_len;
        gboolean linewrap_quote;
        gint undolevels;
        gint linewrap_len;
        gboolean linewrap_quote;

+       gboolean autowrap;

        gboolean linewrap_at_send;
        gboolean auto_exteditor;
        gboolean reply_account_autosel;
        gboolean linewrap_at_send;
        gboolean auto_exteditor;
        gboolean reply_account_autosel;