more sync with sylpheed 0.6.5cvs18
authorPaul Mangan <paul@claws-mail.org>
Wed, 28 Nov 2001 10:26:17 +0000 (10:26 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 28 Nov 2001 10:26:17 +0000 (10:26 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/prefs_common.c

index 9cb6d2a..9e91015 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
        * src/textview.c: textview_show_part(): use first found
          message/rfc822 header.
        * src/folderview.c: added "Search messages..." to the context menu.
+       * src/prefs_common.c: prefs_quote_description_create(): added
+         description for characters which need to be escaped.
 
 2001-11-26
 
index da04098..546a410 100644 (file)
@@ -1,3 +1,8 @@
+2001-11-28 [paul]      0.6.5claws41
+
+       * more sync with sylpheed 0.6.5cvs18
+               see ChangeLog entry 2001-11-27 (src/prefs_common.c)
+
 2001-11-27 [paul]      0.6.5claws40
        
         * po/pt_BR.po
index cd5e128..b65f38b 100644 (file)
@@ -4,6 +4,8 @@
          message/rfc822 ¥Ø¥Ã¥À¤ò»ÈÍÑ¡£
        * src/folderview.c: ¡Ö¥á¥Ã¥»¡¼¥¸¤ò¸¡º÷...¡×¤ò¥³¥ó¥Æ¥­¥¹¥È¥á¥Ë¥å¡¼
          ¤ËÄɲá£
+       * src/prefs_common.c: prefs_quote_description_create(): ¥¨¥¹¥±¡¼¥×
+         ¤¹¤ëɬÍפΤ¢¤ëʸ»ú¤ÎÀâÌÀ¤òÄɲá£
 
 2001-11-26
 
index 5bb8bd2..320c0c9 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws40
+EXTRA_VERSION=claws41
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index c06c429..3e6ba64 100644 (file)
@@ -3092,8 +3092,9 @@ static void prefs_quote_description_create(void)
 {
        GtkWidget *vbox;
        GtkWidget *hbox;
-       GtkWidget *hbbox;
+       GtkWidget *vbox2;
        GtkWidget *label;
+       GtkWidget *hbbox;
        GtkWidget *ok_btn;
 
        quote_desc_win = gtk_window_new(GTK_WINDOW_DIALOG);
@@ -3102,17 +3103,24 @@ static void prefs_quote_description_create(void)
        gtk_container_set_border_width(GTK_CONTAINER(quote_desc_win), 8);
        gtk_window_set_position(GTK_WINDOW(quote_desc_win), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(quote_desc_win), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(quote_desc_win), FALSE, TRUE, FALSE);
+       gtk_window_set_policy(GTK_WINDOW(quote_desc_win), FALSE, FALSE, FALSE);
 
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add(GTK_CONTAINER(quote_desc_win), vbox);
 
-       hbox = gtk_hbox_new(FALSE, 4);
+       hbox = gtk_hbox_new(FALSE, 8);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
+       vbox2 = gtk_vbox_new(FALSE, 8);
+       gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
+
+#define PACK_LABEL() \
+       gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); \
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); \
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
        label = gtk_label_new
-               ("SYMBOL\n\n"
-                 "%d\n"                /* date */
+               ("%d\n"         /* date */
                 "%f\n"         /* from */
                 "%N\n"         /* full name of sender */
                 "%F\n"         /* first name of sender */
@@ -3121,24 +3129,34 @@ static void prefs_quote_description_create(void)
                 "%t\n"         /* to */
                 "%c\n"         /* cc */
                 "%n\n"         /* newsgroups */
-                "%i\n"         /* message id */
                 "%r\n"         /* references */
-                "\n"
-                "%x\n"
-                "?x(expr)\n"   /* condition */
-                "\n"
-                "%M\n"         /* message body */
+                "%i");         /* message id */
+       PACK_LABEL();
+
+       label = gtk_label_new
+               ("?x(expr)");   /* condition */
+       PACK_LABEL();
+
+       label = gtk_label_new
+               ("%M\n"         /* message body */
                 "%Q\n"         /* quoted message body */
                 "%m\n"         /* message body without signature */
                 "%q\n"         /* quoted message body without signature */
                 "%%");         /* literal percent */
+       PACK_LABEL();
 
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+       label = gtk_label_new
+               ("\\\\\n"       /* literal backslash */
+                "\\?\n"        /* literal question mark */
+                "\\(\n"        /* literal opening parenthesis */
+                "\\)");        /* literal closing parenthesis */
+       PACK_LABEL();
+
+       vbox2 = gtk_vbox_new(FALSE, 8);
+       gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
 
        label = gtk_label_new
-               (_("DESCRIPTION\n\n"
-                   "Date\n"
+               (_("Date\n"
                   "From\n"
                   "Full Name of Sender\n"
                   "First Name of Sender\n"
@@ -3147,20 +3165,30 @@ static void prefs_quote_description_create(void)
                   "To\n"
                   "Cc\n"
                   "Newsgroups\n"
-                  "Message-ID\n"
                   "References\n"
-                  "\n"
-                  "Display the information\n"
-                  "If the information x is set, displays expr\n"
-                  "\n"
-                  "Message body\n"
+                  "Message-ID"));
+       PACK_LABEL();
+
+       label = gtk_label_new
+               (_("If x is set, displays expr"));
+       PACK_LABEL();
+
+       label = gtk_label_new
+               (_("Message body\n"
                   "Quoted message body\n"
                   "Message body without signature\n"
                   "Quoted message body without signature\n"
                   "Literal %"));
+       PACK_LABEL();
+
+       label = gtk_label_new
+               (_("Literal backslash\n"
+                  "Literal question mark\n"
+                  "Literal opening parenthesis\n"
+                  "Literal closing parenthesis"));
+       PACK_LABEL();
 
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+#undef PACK_LABEL
 
        gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
                                NULL, NULL, NULL, NULL);