2006-03-12 [paul] 2.0.0cvs136
[claws.git] / src / prefs_summaries.c
index f6c1757ca4e34b4bb26210c255e12e24f03de99d..8b23b67bcc99f7a75c1d59ac9b05bc369fb578c0 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005 Colin Leroy <colin@colino.net> & The Sylpheed-Claws Team
+ * Copyright (C) 2005-2006 Colin Leroy <colin@colino.net> & The Sylpheed-Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -257,8 +257,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                               &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK, NULL, NULL);
 
        gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0);
        gtk_widget_show(confirm_area);
@@ -367,8 +367,8 @@ static void prefs_keybind_select(void)
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
-       gtkut_stock_button_set_create (&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                      &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create (&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                      &ok_btn, GTK_STOCK_OK,
                                       NULL, NULL);
        gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_focus (ok_btn);
@@ -441,15 +441,18 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        gint n_menurc;
 
        static struct KeyBind default_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         ""},
+               {"<Main>/File/Empty all Trash folders",         "<shift>D"},
                {"<Main>/File/Save as...",                      "<control>S"},
-               {"<Main>/File/Print...",                        ""},
+               {"<Main>/File/Print...",                        "<control>P"},
+               {"<Main>/File/Work offline",                    "<control>W"},
+               {"<Main>/File/Synchronise folders",             "<control><shift>S"},
                {"<Main>/File/Exit",                            "<control>Q"},
 
                {"<Main>/Edit/Copy",                            "<control>C"},
                {"<Main>/Edit/Select all",                      "<control>A"},
                {"<Main>/Edit/Find in current message...",      "<control>F"},
                {"<Main>/Edit/Search folder...",                "<shift><control>F"},
+               {"<Main>/Edit/Quick search",                    "slash"},
 
                {"<Main>/View/Show or hide/Message View",       "V"},
                {"<Main>/View/Thread view",                     "<control>T"},
@@ -475,7 +478,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                /* {"<Main>/Message/Forward as attachment",      ""}, */
                {"<Main>/Message/Move...",                      "<control>O"},
                {"<Main>/Message/Copy...",                      "<shift><control>O"},
-               {"<Main>/Message/Delete",                       "<control>D"},
+               {"<Main>/Message/Move to trash",                "<control>D"},
                {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
                {"<Main>/Message/Mark/Unmark",                  "U"},
                {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
@@ -485,17 +488,43 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Tools/Execute",                        "X"},
                {"<Main>/Tools/Log window",                     "<shift><control>L"},
 
+               {"<Compose>/Message/Send",                              "<control>Return"},
+               {"<Compose>/Message/Send later",                        "<shift><control>S"},
+               {"<Compose>/Message/Attach file",                       "<control>M"},
+               {"<Compose>/Message/Insert file",                       "<control>I"},
+               {"<Compose>/Message/Insert signature",                  "<control>G"},
+               {"<Compose>/Message/Save",                              "<control>S"},
                {"<Compose>/Message/Close",                             "<control>W"},
+               {"<Compose>/Edit/Undo",                                 "<control>Z"},
+               {"<Compose>/Edit/Redo",                                 "<control>Y"},
+               {"<Compose>/Edit/Cut",                                  "<control>X"},
+               {"<Compose>/Edit/Copy",                                 "<control>C"},
+               {"<Compose>/Edit/Paste",                                "<control>V"},
                {"<Compose>/Edit/Select all",                           "<control>A"},
-               {"<Compose>/Edit/Advanced/Move a word backward",        ""},
+               {"<Compose>/Edit/Advanced/Move a character backward",   "<control>B"},
+               {"<Compose>/Edit/Advanced/Move a character forward",    "<control>F"},
+               {"<Compose>/Edit/Advanced/Move a word backward,"        ""},
                {"<Compose>/Edit/Advanced/Move a word forward",         ""},
                {"<Compose>/Edit/Advanced/Move to beginning of line",   ""},
+               {"<Compose>/Edit/Advanced/Move to end of line",         "<control>E"},
+               {"<Compose>/Edit/Advanced/Move to previous line",       "<control>P"},
+               {"<Compose>/Edit/Advanced/Move to next line",           "<control>N"},
+               {"<Compose>/Edit/Advanced/Delete a character backward", "<control>H"},
+               {"<Compose>/Edit/Advanced/Delete a character forward",  "<control>D"},
                {"<Compose>/Edit/Advanced/Delete a word backward",      ""},
                {"<Compose>/Edit/Advanced/Delete a word forward",       ""},
+               {"<Compose>/Edit/Advanced/Delete line",                 "<control>U"},
+               {"<Compose>/Edit/Advanced/Delete entire line",          ""},
+               {"<Compose>/Edit/Advanced/Delete to end of line",       "<control>K"},
+               {"<Compose>/Edit/Wrap current paragraph",               "<control>L"},
+               {"<Compose>/Edit/Wrap all long lines",                  "<control><alt>L"},
+               {"<Compose>/Edit/Auto wrapping",                        "<shift><control>L"},
+               {"<Compose>/Edit/Edit with external editor",            "<shift><control>X"},
+               {"<Compose>/Tools/Address book",                        "<shift><control>A"},
        };
 
        static struct KeyBind mew_wl_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",                 "<shift>D"},
+               {"<Main>/File/Empty all Trash folders",         "<shift>D"},
                {"<Main>/File/Save as...",                      "Y"},
                {"<Main>/File/Print...",                        "<shift>numbersign"},
                {"<Main>/File/Exit",                            "<shift>Q"},
@@ -701,6 +730,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
+       GtkTooltips *tip_datefmt;
        GtkWidget *hbox_dispitem;
        GtkWidget *frame_dispitem;
        GtkWidget *button_dispitem;
@@ -720,6 +750,9 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *optmenu_nextunreadmsgdialog;
        GtkWidget *table;
        GtkWidget *vbox5;
+       GtkTooltips *tooltips;
+
+       tooltips = gtk_tooltips_new();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -731,7 +764,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_transhdr,
-                _("Translate header name (such as 'From:', 'Subject:')"));
+                _("Translate header names"));
+       gtk_tooltips_set_tip(tooltips, chkbtn_transhdr,
+                            "The display of standard headers (such as 'From:', 'Subject:') "
+                            "will be translated into your language.", NULL);
 
        PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
                           _("Display unread number next to folder name"));
@@ -791,6 +827,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_datefmt), "clicked",
                          G_CALLBACK (date_format_create), NULL);
+       tip_datefmt = gtk_tooltips_new();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tip_datefmt),
+                            button_datefmt,
+                            _("Date format help"), NULL);
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);