commit b5e6a09ef0121fb1e5697c8125edb062fbe98135
parent ae80fdb4f82ba61d7a53609857ad03bc6ab0197c
Author: Paul <paul@claws-mail.org>
Date: Thu, 10 Apr 2025 11:09:39 +0100
roll back part of last commit to avoid destroying users' cusrom hotkeys
Diffstat:
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -598,11 +598,11 @@ static void from_name_activate_cb(GtkWidget *widget, gpointer data);
static GtkActionEntry compose_popup_entries[] =
{
- {"Write", NULL, "Write", NULL, NULL, NULL },
- {"Write/Add", NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
- {"Write/Remove", NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
- {"Write/---", NULL, "---", NULL, NULL, NULL },
- {"Write/Properties", NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
+ {"Compose", NULL, "Write", NULL, NULL, NULL },
+ {"Compose/Add", NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
+ {"Compose/Remove", NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
+ {"Compose/---", NULL, "---", NULL, NULL, NULL },
+ {"Compose/Properties", NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
};
/* make sure to keep the key bindings in the tables below in sync with the default_menurc[] in prefs_other.c
@@ -2588,9 +2588,9 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
compose_colorize_signature(compose);
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Add", FALSE);
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Remove", FALSE);
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Properties", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Add", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/SendLater", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/Save", FALSE);
@@ -8214,13 +8214,13 @@ static Compose *compose_create(PrefsAccount *account,
gtk_action_group_add_actions(action_group, compose_popup_entries,
G_N_ELEMENTS(compose_popup_entries), (gpointer)compose);
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Popup", NULL, GTK_UI_MANAGER_MENUBAR)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup", "Write", "Write", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Add", "Write/Add", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Remove", "Write/Remove", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Separator1", "Write/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Write", "Properties", "Write/Properties", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup", "Compose", "Write", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Add", "Write/Add", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Remove", "Write/Remove", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Separator1", "Write/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Properties", "Write/Properties", GTK_UI_MANAGER_MENUITEM)
- popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(compose->ui_manager, "/Popup/Write")));
+ popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(compose->ui_manager, "/Popup/Compose")));
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", FALSE);
@@ -10204,10 +10204,10 @@ static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
}
}
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Remove", (attach_nr_selected > 0));
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", (attach_nr_selected > 0));
/* Properties menu item makes no sense with more than one row
* selected, the properties dialog can only edit one attachment. */
- cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Write/Properties", (attach_nr_selected == 1));
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", (attach_nr_selected == 1));
gtk_menu_popup_at_pointer(GTK_MENU(compose->popupmenu), NULL);
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -660,8 +660,8 @@ static GtkActionEntry mainwin_entries[] =
{"Message/---", NULL, "---", NULL, NULL, NULL },
- {"Message/WriteEmail", NULL, N_("Write a_n email message"), "<control>M", NULL, G_CALLBACK(mw_compose_mail_cb) },
- {"Message/WriteNews", NULL, N_("Write a news message"), NULL, NULL, G_CALLBACK(mw_compose_news_cb) },
+ {"Message/ComposeEmail", NULL, N_("Write a_n email message"), "<control>M", NULL, G_CALLBACK(mw_compose_mail_cb) },
+ {"Message/ComposeNews", NULL, N_("Write a news message"), NULL, NULL, G_CALLBACK(mw_compose_news_cb) },
{"Message/Reply", NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(main_window_reply_cb) }, /* COMPOSE_REPLY */
{"Message/ReplyTo", NULL, N_("Repl_y to"), NULL, NULL, NULL },
@@ -1724,8 +1724,8 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "CancelSending", "Message/CancelSending", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "WriteEmail", "Message/WriteEmail", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "WriteNews", "Message/WriteNews", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeEmail", "Message/ComposeEmail", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeNews", "Message/ComposeNews", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/ReplyTo", "All", "Message/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
@@ -3164,8 +3164,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
SET_SENSITIVE("Menu/Message/Receive/CancelReceiving", M_INC_ACTIVE);
SET_SENSITIVE("Menu/Message/SendQueue", M_HAVE_ACCOUNT, M_HAVE_QUEUED_MAILS);
SET_SENSITIVE("Menu/Message/CancelSending", M_SEND_ACTIVE);
- SET_SENSITIVE("Menu/Message/WriteEmail", M_HAVE_ACCOUNT);
- SET_SENSITIVE("Menu/Message/WriteNews", M_HAVE_NEWS_ACCOUNT);
+ SET_SENSITIVE("Menu/Message/ComposeEmail", M_HAVE_ACCOUNT);
+ SET_SENSITIVE("Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT);
SET_SENSITIVE("Menu/Message/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
SET_SENSITIVE("Menu/Message/FollowupReply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_NEWS, M_SUMMARY_ISLIST);
diff --git a/src/messageview.c b/src/messageview.c
@@ -298,7 +298,7 @@ static GtkActionEntry msgview_entries[] =
{"View/Quotes", NULL, N_("Quotes"), NULL, NULL, NULL },
/* Message menu */
- {"Message/Write", NULL, N_("Write _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
+ {"Message/Compose", NULL, N_("Write _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
{"Message/---", NULL, "---", NULL, NULL, NULL },
{"Message/Reply", NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY */
@@ -627,7 +627,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
#endif
/* Message menu */
- MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Write", "Message/Write", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Compose", "Message/Compose", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
diff --git a/src/textview.c b/src/textview.c
@@ -245,7 +245,7 @@ static GtkActionEntry textview_link_popup_entries[] =
static GtkActionEntry textview_mail_popup_entries[] =
{
{"TextviewPopupMail", NULL, "TextviewPopupMail", NULL, NULL, NULL },
- {"TextviewPopupMail/Write", NULL, N_("Write _new message"), NULL, NULL, G_CALLBACK(mail_to_uri_cb) },
+ {"TextviewPopupMail/Compose", NULL, N_("Write _new message"), NULL, NULL, G_CALLBACK(mail_to_uri_cb) },
{"TextviewPopupMail/ReplyTo", NULL, N_("_Reply to this address"), NULL, NULL, G_CALLBACK(reply_to_uri_cb) },
{"TextviewPopupMail/AddAB", NULL, N_("Add to _Address book"), NULL, NULL, G_CALLBACK(add_uri_to_addrbook_cb) },
{"TextviewPopupMail/Copy", NULL, N_("Copy this add_ress"), NULL, NULL, G_CALLBACK(copy_mail_to_uri_cb) },
@@ -383,7 +383,7 @@ TextView *textview_create(void)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
"/Menus/TextviewPopupLink", "Copy", "TextviewPopupLink/Copy", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
- "/Menus/TextviewPopupMail", "Write", "TextviewPopupMail/Write", GTK_UI_MANAGER_MENUITEM)
+ "/Menus/TextviewPopupMail", "Compose", "TextviewPopupMail/Compose", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
"/Menus/TextviewPopupMail", "ReplyTo", "TextviewPopupMail/ReplyTo", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(textview->ui_manager,
