2006-01-16 [paul] 1.9.100cvs158
authorPaul Mangan <paul@claws-mail.org>
Mon, 16 Jan 2006 08:27:21 +0000 (08:27 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 16 Jan 2006 08:27:21 +0000 (08:27 +0000)
* src/prefs_actions.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
* src/quote_fmt.c
* src/gtk/description_window.c
* src/gtk/description_window.h
* src/gtk/quicksearch.c
description window cleanups

ChangeLog
PATCHSETS
configure.ac
src/gtk/description_window.c
src/gtk/description_window.h
src/gtk/quicksearch.c
src/prefs_actions.c
src/prefs_filtering_action.c
src/prefs_matcher.c
src/quote_fmt.c

index 49e7ae96c055d4a149f65dcc4347d7d445119e9b..9469d22fe4b8f1817b7032283e097f78d98747af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-16 [paul]      1.9.100cvs158
+
+       * src/prefs_actions.c
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+       * src/quote_fmt.c
+       * src/gtk/description_window.c
+       * src/gtk/description_window.h
+       * src/gtk/quicksearch.c
+               description window cleanups
+
 2006-01-15 [colin]     1.9.100cvs157
 
        * src/addressbook.c
index 6b35eaf703f85cc82075104431e986970b1258e7..35c8e72e88d3d7d45776061dac0589cd659db3cc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.149.2.41 -r 1.149.2.42 src/inc.c;  ) > 1.9.100cvs155.patchset
 ( cvs diff -u -r 1.207.2.84 -r 1.207.2.85 src/folderview.c;  cvs diff -u -r 1.274.2.90 -r 1.274.2.91 src/mainwindow.c;  ) > 1.9.100cvs156.patchset
 ( cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/addressbook.c;  cvs diff -u -r 1.59.2.31 -r 1.59.2.32 src/prefs_filtering.c;  ) > 1.9.100cvs157.patchset
+( cvs diff -u -r 1.60.2.31 -r 1.60.2.32 src/prefs_actions.c;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.33 -r 1.43.2.34 src/prefs_matcher.c;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/quote_fmt.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/gtk/description_window.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/description_window.h;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/quicksearch.c;  ) > 1.9.100cvs158.patchset
index 39d4106d0c888c7a5d307adccb4a90f4af79d110..8a1e04e926f7e585c2770aa1e11872cf841ba46d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=157
+EXTRA_VERSION=158
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 6534c3160f71835838dac5bc7d634abed0105e39..c6d82b987205ac4fffcc7f2a3636e16d294e2bb5 100644 (file)
@@ -29,6 +29,7 @@
 #include "manage_window.h"
 #include "description_window.h"
 #include "gtkutils.h"
+#include "prefs_gtk.h"
 
 static void description_create                         (DescriptionWindow *dwindow);
 static gboolean description_window_key_pressed         (GtkWidget *widget,
@@ -67,6 +68,8 @@ void description_window_create(DescriptionWindow *dwindow)
 
 static void description_create(DescriptionWindow * dwindow)
 {
+       GtkWidget *hbox;
+       GtkWidget *label;
        GtkWidget *vbox;
        GtkWidget *table;
        GtkWidget *hbbox;
@@ -93,13 +96,14 @@ static void description_create(DescriptionWindow * dwindow)
        
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(scrolledwin);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
        
        table = gtk_table_new(sz, dwindow->columns, FALSE);
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwin), table);
        gtk_container_set_border_width(GTK_CONTAINER(table), 4);
 
-       gtk_table_set_col_spacings(GTK_TABLE(table), 10);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        line = 0;
        for(i = 0; dwindow->symbol_table[i] != NULL; i = i + dwindow->columns) {
@@ -117,11 +121,13 @@ static void description_create(DescriptionWindow * dwindow)
                                }
                                label = gtk_label_new(gettext(dwindow->symbol_table[i+col]));
                                gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+                               gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+                               gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
                                gtk_misc_set_alignment (GTK_MISC(label), 0, 0);
                                gtk_table_attach(GTK_TABLE(table), label,
                                                 col, colend, line, line+1,
-                                                GTK_EXPAND | GTK_FILL, 0,
-                                                0, 0);
+                                                (GtkAttachOptions) (GTK_FILL),
+                                                (GtkAttachOptions) (0), 0, 2);
                        }
                } else {
                        GtkWidget *separator;
@@ -129,8 +135,8 @@ static void description_create(DescriptionWindow * dwindow)
                        separator = gtk_hseparator_new();
                        gtk_table_attach(GTK_TABLE(table), separator,
                                         0, dwindow->columns, line, line+1,
-                                        GTK_EXPAND | GTK_FILL, 0,
-                                        0, 4);
+                                        (GtkAttachOptions) (GTK_FILL),
+                                        (GtkAttachOptions) (0), 0, 4);
                }
                line++;
        }
@@ -139,19 +145,27 @@ static void description_create(DescriptionWindow * dwindow)
                                      NULL, NULL, NULL, NULL);
        gtk_widget_show(hbbox);
 
-       vbox = gtk_vbox_new(FALSE, 0);
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(dwindow->window), vbox);
+
+       hbox = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(hbox);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+       label = gtk_label_new(gettext(dwindow->description));
+       gtk_widget_show(label);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(scrolledwin),
                           TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbbox),
                           FALSE, FALSE, 3);
                           
-/* OLD CODE
-       gtk_table_attach_defaults(GTK_TABLE(table), hbbox,
-                                 1, 2, i, i+1);
-*/
        gtk_widget_grab_default(close_btn);
+
        g_signal_connect(G_OBJECT(close_btn), "clicked",
                         G_CALLBACK(gtk_main_quit), NULL);
        g_signal_connect(G_OBJECT(dwindow->window), "key_press_event",
index 7bc6568ffa3ccd318d602492e841cb9a6e923d80..aeff4e41f4767d36577d50333a8c1ead1eb5b4e7 100644 (file)
@@ -30,6 +30,8 @@ struct _DescriptionWindow
        int               columns;
        /** title of the window **/
        gchar           * title;
+       /** description **/
+       gchar           * description;
        /** points to the table of strings to be show in the window */
        gchar           ** symbol_table;
 };
index dd9eb983590c542468e8118f88fc98b3e7e88aac..08e06ef4224b569098f78958ce9766376a4f1f0b 100644 (file)
@@ -263,7 +263,7 @@ static gchar *search_descr_strings[] = {
        "X cmd", N_("messages returning 0 when passed to command"),
        "y S",   N_("messages which contain S in X-Label header"),
        "",      "" ,
-       "&",     N_("logical AND operator"),
+       "&amp;",         N_("logical AND operator"),
        "|",     N_("logical OR operator"),
        "! or ~",       N_("logical NOT operator"),
        "%",     N_("case sensitive search"),
@@ -276,7 +276,10 @@ static DescriptionWindow search_descr = {
        NULL,
        NULL, 
        2,
-       N_("Extended Search symbols"),
+       N_("Extended Search"),
+       N_("Extended Search allows the user to define criteria that messages must "
+           "have in order to match and be displayed in the message list.\n\n"
+          "The following symbols can be used:"),
        search_descr_strings
 };
        
index b05ad7edaa7516922ed9b4a8b5e5a595fd94abd0..71a79c465ff0eb87dab9fe3927a6d6926c2ff028 100644 (file)
@@ -271,7 +271,7 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
 
-       help_button = gtk_button_new_with_label(_(" Syntax help... "));
+       help_button = gtk_button_new_from_stock(GTK_STOCK_HELP);
        gtk_widget_show(help_button);
        gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(help_button), "clicked",
@@ -785,19 +785,19 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
  * When adding new lines, remember to put one string for each line
  */
 static gchar *actions_desc_strings[] = {
-       N_("MENU NAME:"), NULL,
-       "      ",   N_("Use / in menu name to make submenus."),
+       N_("<span weight=\"bold\" underline=\"single\">Menu name:</span>"), NULL,
+       N_("Use / in menu name to make submenus."), NULL,
        "", NULL,
-       N_("COMMAND LINE:"), NULL,
-       N_("Begin with:"), NULL,
+       N_("<span weight=\"bold\" underline=\"single\">Command line:</span>"), NULL,
+       N_("<span weight=\"bold\">Begin with:</span>"), NULL,
        "     |",   N_("to send message body or selection to command's standard input"),
-       "     >",   N_("to send user provided text to command's standard input"),
+       "     &gt;",   N_("to send user provided text to command's standard input"),
        "     *",   N_("to send user provided hidden text to command's standard input"),
-       N_("End with:"), NULL, 
+       N_("<span weight=\"bold\">End with:</span>"), NULL,
        "     |",   N_("to replace message body or selection with command's standard output"),
-       "     >",   N_("to insert command's standard output without replacing old text"),
-       "     &",   N_("to run command asynchronously"),
-       N_("Use:"), NULL, 
+       "     &gt;",   N_("to insert command's standard output without replacing old text"),
+       "     &amp;",   N_("to run command asynchronously"),
+       N_("<span weight=\"bold\">Use:</span>"), NULL, 
        "     %f",  N_("for the file of the selected message in RFC822/2822 format "),
        "     %F",  N_("for the list of the files of the selected messages in RFC822/2822 format"),
        "     %p",  N_("for the file of the selected decoded message MIME part"),
@@ -805,7 +805,7 @@ static gchar *actions_desc_strings[] = {
        "     %h",  N_("for a user provided hidden argument (e.g. password)"),
        "     %s",  N_("for the text selection"),
        "  %as{}",  N_("apply filtering actions between {} to selected messages"),
-       NULL
+       NULL, NULL
 };
 
 
@@ -813,7 +813,10 @@ static DescriptionWindow actions_desc_win = {
        NULL,
        NULL,
        2,
-       N_("Description of symbols"),
+       N_("Actions"),
+       N_("The Actions feature is a way for the user to launch "
+          "external commands to process a complete message file or just "
+          "one of its parts."),
         actions_desc_strings
 };
 
index 045ac01930f80cd00e2bb89b1a17d4bdc01dd637..9904a956edab8d08ce678edc8e46a3b1bb4a1907 100644 (file)
@@ -1067,7 +1067,7 @@ static gint prefs_filtering_action_deleted(GtkWidget *widget,
  * When adding new lines, remember to put 2 strings for each line
  */
 static gchar *exec_desc_strings[] = {
-       "%%",   "%",
+       "%%",   N_("literal %"),
        "%s",   N_("Subject"),
        "%f",   N_("From"),
        "%t",   N_("To"),
@@ -1076,10 +1076,10 @@ static gchar *exec_desc_strings[] = {
        "%i",   N_("Message-ID"),
        "%n",   N_("Newsgroups"),
        "%r",   N_("References"),
-       "%F",   N_("Filename - should not be modified"),
+       "%F",   N_("filename (should not be modified)"),
        "\\n",  N_("new line"),
        "\\",   N_("escape character for quotes"),
-       "\\\"",N_("quote character"),
+       "\\\"", N_("quote character"),
        NULL, NULL
 };
 
@@ -1087,8 +1087,11 @@ static DescriptionWindow exec_desc_win = {
        NULL,
         NULL, 
         2,
-        N_("Description of symbols"),
-        exec_desc_strings
+        N_("Filtering Action: 'Execute'"),
+       N_("'Execute' allows you to send a message or message element "
+          "to an external program or script.\n\n"
+          "The following symbols can be used:"),
+       exec_desc_strings
 };
 
 /*!
index 3cfbe20f7e191b3484720a746572e74d9123ddf1..8ce723561c9f40bc087c1b4ce3999f20c5929ed6 100644 (file)
@@ -1676,11 +1676,7 @@ static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
  * When adding new lines, remember to put 2 strings for each line
  */
 static gchar *test_desc_strings[] = {
-       N_("'Test' allows you to test a message or message element"), NULL,
-       N_("using an external program or script. The program will"), NULL,
-       N_("return either 0 or 1"), NULL,
-       N_("The following symbols can be used:"), NULL,
-       "%%",   "%",
+       "%%",   N_("literal %"),
        "%s",   N_("Subject"),
        "%f",   N_("From"),
        "%t",   N_("To"),
@@ -1689,7 +1685,7 @@ static gchar *test_desc_strings[] = {
        "%i",   N_("Message-ID"),
        "%n",   N_("Newsgroups"),
        "%r",   N_("References"),
-       "%F",   N_("Filename - should not be modified"),
+       "%F",   N_("filename (should not be modified)"),
        "\\n",  N_("new line"),
        "\\",   N_("escape character for quotes"),
        "\\\"", N_("quote character"),
@@ -1701,6 +1697,10 @@ static DescriptionWindow test_desc_win = {
         NULL, 
         2,
         N_("Match Type: 'Test'"),
+       N_("'Test' allows you to test a message or message element "
+          "using an external program or script. The program will "
+          "return either 0 or 1.\n\n"
+          "The following symbols can be used:"),
         test_desc_strings
 };
 
index f055ffc42c8ad56970343b4bf32c6a15baecf773..e974c88bc5b3718abcc79ad1791b73b81dacf11b 100644 (file)
  * When adding new lines, remember to put 2 strings for each line
  */
 static gchar *quote_desc_strings[] = {
-       "%D{fmt}",      N_("Customize date format (see man strftime)"), /* date expression */
+       "%D{fmt}",      N_("customized date format (see man strftime)"), /* date expression */
        "%d",           N_("Date"), /* date */
        "%f",           N_("From"), /* from */
-       "%N",           N_("Full Name of Sender"), /* full name */
-       "%F",           N_("First Name of Sender"), /* first name */
-       "%L",           N_("Last Name of Sender"), /* last name */
-       "%I",           N_("Initials of Sender"), /* initial of sender */
+       "%N",           N_("full name of sender"), /* full name */
+       "%F",           N_("first name of sender"), /* first name */
+       "%L",           N_("last name of sender"), /* last name */
+       "%I",           N_("initials of sender"), /* initial of sender */
        "%s",           N_("Subject"), /* subject */ 
        "%t",           N_("To"), /* to */ 
        "%c",           N_("Cc"), /* cc */ 
        "%n",           N_("Newsgroups"), /* newsgroups */ 
        "%r",           N_("References"), /* references */ 
        "%i",           N_("Message-ID"), /* message-id */ 
-       "%M",           N_("Message body"), /* message */ 
-       "%Q",           N_("Quoted message body"), /* quoted message */ 
-       "%m",           N_("Message body without signature"), /* message with no signature */ 
-       "%q",           N_("Quoted message body without signature"), /* quoted message with no signature */ 
-       "%X",           N_("Cursor position"), /* X marks the cursor spot */
+       "%M",           N_("message body"), /* message */
+       "%Q",           N_("quoted message body"), /* quoted message */
+       "%m",           N_("message body without signature"), /* message with no signature */
+       "%q",           N_("quoted message body without signature"), /* quoted message with no signature */
+       "%X",           N_("cursor position"), /* X marks the cursor spot */
        "",             NULL,
-       "?x{expr}",     N_("Insert expr if x is set\nx is one of the characters above after %"),
+       "?x{expr}",     N_("insert expr if x is set\nx is one of the characters above after %"),
        "",             NULL,
-       "\\%",          N_("Literal %"),
-       "\\\\",         N_("Literal backslash"),
-       "\\?",          N_("Literal question mark"),
-       "\\|",          N_("Literal pipe"),
-       "\\{",          N_("Literal opening curly brace"),
-       "\\}",          N_("Literal closing curly brace"),
+       "\\%",          N_("literal %"),
+       "\\\\",         N_("literal backslash"),
+       "\\?",          N_("literal question mark"),
+       "\\|",          N_("literal pipe"),
+       "\\{",          N_("literal opening curly brace"),
+       "\\}",          N_("literal closing curly brace"),
        "",             NULL,
-       "|f{file}",     N_("Insert File"),
-       "|p{command}",  N_("Insert program output"), /* insert program output */ 
+       "|f{file}",     N_("insert file"),
+       "|p{command}",  N_("insert program output"), /* insert program output */
        NULL,NULL
 };
 
@@ -75,6 +75,7 @@ static DescriptionWindow quote_desc_win = {
        NULL,
         2,
         N_("Description of symbols"),
+       N_("The following symbols can be used:"),
         quote_desc_strings
 };