0.8.9claws5
authorChristoph Hohmann <reboot@gmx.ch>
Sat, 25 Jan 2003 15:23:38 +0000 (15:23 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sat, 25 Jan 2003 15:23:38 +0000 (15:23 +0000)
* src/gtk/description_window.c
        o allow description texts to expand over multiple columns
        o translate all columns
* src/prefs_actions.c
        change syntax description to use new multi column feature

Patch submitted by Ivan F. Martinez <ivanfm@users.sourceforge.net>

ChangeLog.claws
src/gtk/description_window.c
src/prefs_actions.c

index 442ffe7..52cf7b9 100644 (file)
@@ -1,4 +1,14 @@
-2003-01-24 [match]     0.8.9claws4
+2003-01-25 [christoph] 0.8.9claws5
+
+       * src/gtk/description_window.c
+               o allow description texts to expand over multiple columns
+               o translate all columns
+       * src/prefs_actions.c
+               change syntax description to use new multi column feature
+
+       Patch submitted by Ivan F. Martinez <ivanfm@users.sourceforge.net>
+
+2003-01-25 [match]     0.8.9claws4
 
        * src/vcard.c
                fixed bug with Quoted-Printable
                Note: - Please verify that no updates are missing
                      - Check where freeze/thaws should be added
 
-2003-01-07 [Ivan Francolin Martinez (ivanfm@users.sourceforge.net)]    0.8.8claws62
+2003-01-07 [christoph] 0.8.8claws62
 
        * src/prefs_actions.c
                don't translate empty strings
 
-2003-01-06 [Ivan Francolin Martinez (ivanfm@users.sourceforge.net)]    0.8.8claws61
+       Patch submitted by Ivan Francolin Martinez <ivanfm@users.sourceforge.net>
+
+2003-01-06 [christoph] 0.8.8claws61
 
        * src/prefs_actions.c
                mark strings for gettext
                use new description window for Execute action and
                match condition in Filtering
 
+       Patch submitted by Ivan Francolin Martinez <ivanfm@users.sourceforge.net>
+
 2003-01-06 [alfons]    0.8.8claws60
 
        keep myself inspired to re-organize matcher part 8; 
                add documentation so others may comprehend the
                UI part of the conditions
                
-2003-01-06 [Ivan Francolin Martinez (ivanfm@users.sourceforge.net)]    0.8.8claws59
+2003-01-06 [christoph] 0.8.8claws59
 
        * src/prefs_actions.c
                use new description window for syntax help
        * src/gtk/description_window.c
                fix display of descriptions with column count != 2
 
-2003-01-06 [Ivan Francolin Martinez (ivanfm@users.sourceforge.net)]    0.8.8claws58
+       Patch submitted by Ivan Francolin Martinez <ivanfm@users.sourceforge.net>
+
+2003-01-06 [christoph] 0.8.8claws58
 
        * src/quote_fmt.c
        * src/summaryview.[ch]
                currently used in quote_fmt and summaryview (new description
                for extended quick search)
 
+       Patch submitted by Ivan Francolin Martinez <ivanfm@users.sourceforge.net>
+
 2003-01-06 [paul]      0.8.8claws57
 
        * sync with 0.8.8cvs1
index 21925e1..7b567cd 100644 (file)
@@ -89,18 +89,20 @@ static void description_create(DescriptionWindow * dwindow)
                if(dwindow->symbol_table[i][0] != '\0') {
                        GtkWidget *label;
 
-                       label = gtk_label_new(dwindow->symbol_table[i]);
-                       gtk_misc_set_alignment (GTK_MISC(label), 0, 0);
-                       gtk_table_attach(GTK_TABLE(table), label,
-                                        0, 1, line, line+1,
-                                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                                        0, 0);
-                       for (j = 1; j < dwindow->columns; j++) {
-                               label = gtk_label_new(gettext(dwindow->symbol_table[i+j]));
+                       for (j = 0; j < dwindow->columns; j++) {
+                               gint col = j;
+                               gint colend = j+1;
+                               /* Expand using next NULL columns */
+                               while ((colend < dwindow->columns) && 
+                                      (dwindow->symbol_table[i+colend] == NULL)) {
+                                      colend++;
+                                      j++;
+                               }
+                               label = gtk_label_new(gettext(dwindow->symbol_table[i+col]));
                                gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
                                gtk_misc_set_alignment (GTK_MISC(label), 0, 0);
                                gtk_table_attach(GTK_TABLE(table), label,
-                                                j, j+1, line, line+1,
+                                                col, colend, line, line+1,
                                                 GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                                                 0, 0);
                        }
@@ -109,7 +111,7 @@ static void description_create(DescriptionWindow * dwindow)
                        
                        separator = gtk_hseparator_new();
                        gtk_table_attach(GTK_TABLE(table), separator,
-                                        0, 2, line, line+1,
+                                        0, dwindow->columns, line, line+1,
                                         GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                                         0, 4);
                }
index 5382d4a..f78545c 100644 (file)
@@ -1808,29 +1808,29 @@ static void catch_output(gpointer data, gint source, GdkInputCondition cond)
  * When adding new lines, remember to put one string for each line
  */
 static gchar *actions_desc_strings[] = {
-       N_("Menu name:"),
-       N_("   Use / in menu name to make submenus."),
-       "",
-       N_("Command line:"),
-       N_("* Begin with:"),
-       N_("     | to send message body or selection to command"),
-       N_("     > to send user provided text to command"),
-       N_("     * to send user provided hidden text to command"),
-       N_("* End with:"),
-       N_("     | to replace message body or selection with command output"),
-       N_("     > to insert command's output without replacing old text"),
-       N_("     & to run command asynchronously"),
-       N_("* Use:"),
-       N_("     %f for message file name"),
-       N_("     %F for the list of the file names of selected messages"),
-       N_("     %p for the selected message MIME part."),
+       N_("Menu name:"), NULL,
+       "      ",   N_("Use / in menu name to make submenus."),
+       "", NULL,
+       N_("Command line:"), NULL,
+       N_("* Begin with:"), NULL,
+       "     |",   N_("to send message body or selection to command"),
+       "     >",   N_("to send user provided text to command"),
+       "     *",   N_("to send user provided hidden text to command"),
+       N_("* End with:"), NULL, 
+       "     |",   N_("to replace message body or selection with command output"),
+       "     >",   N_("to insert command's output without replacing old text"),
+       "     &",   N_("to run command asynchronously"),
+       N_("* Use:"), NULL, 
+       "     %f",  N_("for message file name"),
+       "     %F",  N_("for the list of the file names of selected messages"),
+       "     %p",  N_("for the selected message MIME part."),
        NULL
 };
 
 
 static DescriptionWindow actions_desc_win = { 
         NULL, 
-        1,
+        2,
         N_("Description of symbols"),
         actions_desc_strings
 };