renamed: 'Tools', move 'delete duplicate' to 'Tools', re-arrange 'Tools' menu
authorPaul Mangan <paul@claws-mail.org>
Fri, 22 Mar 2002 10:13:37 +0000 (10:13 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 22 Mar 2002 10:13:37 +0000 (10:13 +0000)
ChangeLog.claws
configure.in
src/compose.c
src/mainwindow.c
src/prefs_actions.c
src/prefs_common.c

index 285a265..68cbda1 100644 (file)
@@ -1,3 +1,16 @@
+2002-03-22 [paul]      0.7.4claws33
+
+       * src/compose.c
+         src/mainwindow.c
+         src/prefs_actions.c
+         src/prefs_common.c
+               rename 'Tool' to 'Tools'
+
+       * src/mainwindow.c
+               move 'Delete duplicated messages' from
+               'Message/' to 'Tools/'
+               re-arrange the order of 'Tools/' items
+
 2002-03-22 [paul]      0.7.4claws32
 
        * src/addr_compl.c
index 2f3a675..20cfc1d 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws32
+EXTRA_VERSION=claws33
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 1392c82..00c75d9 100644 (file)
@@ -621,11 +621,11 @@ static GtkItemFactoryEntry compose_entries[] =
 #endif /* USE_GPGME */
        {N_("/_Message/---"),           NULL,           NULL,   0, "<Separator>"},
        {N_("/_Message/_Request Return Receipt"),       NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
-       {N_("/_Tool"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/Show _ruler"),      NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
-       {N_("/_Tool/_Address book"),    "<shift><control>A", compose_address_cb , 0, NULL},
-       {N_("/_Tool/_Template"),        NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/Actio_ns"),         NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools"),                 NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/Show _ruler"),     NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
+       {N_("/_Tools/_Address book"),   "<shift><control>A", compose_address_cb , 0, NULL},
+       {N_("/_Tools/_Template"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/Actio_ns"),        NULL, NULL, 0, "<Branch>"},
        {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_About"),           NULL, about_show, 0, NULL}
 };
@@ -681,7 +681,7 @@ Compose *compose_bounce(PrefsAccount *account, MsgInfo *msginfo)
        menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
 #endif
        menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
-       menu_set_sensitive(ifactory, "/Tool/Template", FALSE);
+       menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
        
        gtk_widget_set_sensitive(c->insert_btn, FALSE);
        gtk_widget_set_sensitive(c->attach_btn, FALSE);
@@ -4407,7 +4407,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
        menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
 
-       tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tool/Template");
+       tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tools/Template");
 #if 0 /* NEW COMPOSE GUI */
        gtk_widget_hide(bcc_hbox);
        gtk_widget_hide(bcc_entry);
@@ -4435,7 +4435,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
 #endif
 
-       update_compose_actions_menu(ifactory, "/Tool/Actions", compose);
+       update_compose_actions_menu(ifactory, "/Tools/Actions", compose);
 
 
        undostruct = undo_init(text);
index 80e0814..4ac9e18 100644 (file)
@@ -655,9 +655,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Copy..."),              "<shift><control>O", copy_to_cb, 0, NULL},
        {N_("/_Message/_Delete"),               "<control>D", delete_cb,  0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Delete du_plicated messages"),
-                                               NULL, delete_duplicated_cb,   0, NULL},
-       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/_Mark"),           NULL, mark_cb,   0, NULL},
        {N_("/_Message/_Mark/_Unmark"),         "U", unmark_cb, 0, NULL},
@@ -667,28 +664,32 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
-       {N_("/_Tool"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/_Address book"),            "<shift><control>A", addressbook_open_cb, 0, NULL},
-       {N_("/_Tool/Add sender to address boo_k"),
+       {N_("/_Tools"),                         NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/_Selective Download"),     "<alt>S", sel_download_cb, 0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Address book"),           "<shift><control>A", addressbook_open_cb, 0, NULL},
+       {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
-       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tool/_Filter messages"),         NULL, filter_cb, 0, NULL},
-       {N_("/_Tool/_Create filter rule"),      NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/_Create filter rule/_Automatically"),
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Filter messages"),                NULL, filter_cb, 0, NULL},
+       {N_("/_Tools/_Create filter rule"),     NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/_Create filter rule/_Automatically"),
                                                NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
-       {N_("/_Tool/_Create filter rule/by _From"),
+       {N_("/_Tools/_Create filter rule/by _From"),
                                                NULL, create_filter_cb, FILTER_BY_FROM, NULL},
-       {N_("/_Tool/_Create filter rule/by _To"),
+       {N_("/_Tools/_Create filter rule/by _To"),
                                                NULL, create_filter_cb, FILTER_BY_TO, NULL},
-       {N_("/_Tool/_Create filter rule/by _Subject"),
+       {N_("/_Tools/_Create filter rule/by _Subject"),
                                                NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
-       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tool/Actio_ns"),                 NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tool/E_xecute"),                 "X", execute_summary_cb, 0, NULL},
-       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tool/_Log window"),              "<control>L", log_window_show_cb, 0, NULL},
-       {N_("/_Tool/_Selective Download"),      "<alt>S", sel_download_cb, 0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/Actio_ns"),                        NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/E_xecute"),                        "X", execute_summary_cb, 0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/Delete du_plicated messages"),
+                                               NULL, delete_duplicated_cb,   0, NULL},
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/_Log window"),             "<control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
@@ -1589,13 +1590,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Delete"                , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Mark"                  , M_TARGET_EXIST},
-               {"/Message/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
-               {"/Tool/Add sender to address book", M_SINGLE_TARGET_EXIST},
-               {"/Tool/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Tool/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"/Tool/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Tool/Actions"                   , M_MSG_EXIST},
+               {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
+               {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/Tools/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Tools/Actions"                   , M_MSG_EXIST},
                {"/Configuration", M_UNLOCKED},
 
                {NULL, 0}
index ea7e0f8..1371d6a 100644 (file)
@@ -888,7 +888,7 @@ static void prefs_actions_ok                (GtkWidget *widget, gpointer data)
 void update_mainwin_actions_menu(GtkItemFactory *ifactory, 
                                 MainWindow *mainwin)
 {
-       update_actions_menu(ifactory, "/Tool/Actions", 
+       update_actions_menu(ifactory, "/Tools/Actions", 
                            mainwin_actions_execute_cb, 
                            mainwin);
 }
index d07fb13..23cc7bd 100644 (file)
@@ -3576,9 +3576,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
                "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
 
-               "(menu-path \"<Main>/Tool/Address book\" \"<shift><control>A\")\n"
-               "(menu-path \"<Main>/Tool/Execute\" \"X\")\n"
-               "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\n"
 
                "(menu-path \"<Compose>/File/Close\" \"<control>W\")\n"
                "(menu-path \"<Compose>/Edit/Select all\" \"<control>A\")\n"
@@ -3628,9 +3628,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
                "(menu-path \"<Main>/Message/Mark/Mark as read\" \"<shift>R\")\n"
 
-               "(menu-path \"<Main>/Tool/Address book\" \"<shift><control>A\")\n"
-               "(menu-path \"<Main>/Tool/Execute\" \"X\")\n"
-               "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\n"
 
                "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
                "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
@@ -3679,9 +3679,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>N\")\n"
                "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
 
-               "(menu-path \"<Main>/Tool/Address book\" \"<shift><control>A\")\n"
-               "(menu-path \"<Main>/Tool/Execute\" \"X\")\n"
-               "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\n"
 
                "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
                "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
@@ -3731,9 +3731,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
                "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
 
-               "(menu-path \"<Main>/Tool/Address book\" \"<alt>A\")\n"
-               "(menu-path \"<Main>/Tool/Execute\" \"<alt>X\")\n"
-               "(menu-path \"<Main>/Tool/Log window\" \"<alt>L\")\n"
+               "(menu-path \"<Main>/Tools/Address book\" \"<alt>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"<alt>X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<alt>L\")\n"
 
                "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
                "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
@@ -3783,9 +3783,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"\")\n"
                "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
 
-               "(menu-path \"<Main>/Tool/Address book\" \"\")\n"
-               "(menu-path \"<Main>/Tool/Execute\" \"\")\n"
-               "(menu-path \"<Main>/Tool/Log window\" \"\")\n"
+               "(menu-path \"<Main>/Tools/Address book\" \"\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"\")\n"
 
                "(menu-path \"<Compose>/File/Close\" \"\")\n"
                "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"