From bff013116434cf90003583298ca46aed077e0113 Mon Sep 17 00:00:00 2001
From: Mechiel Lukkien <mechiel@ueber.net>
Date: Fri, 15 Sep 2023 15:51:59 +0200
Subject: [PATCH] webmail: new shortcut "T" for showing html version of email,
 and t for text version

shortcut X used to be "show html version", but with threading support became
"toggle collapse", so there was a clash.
---
 webmail/webmail.js | 10 +++++-----
 webmail/webmail.ts | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webmail/webmail.js b/webmail/webmail.js
index 0c3d846..76a09f6 100644
--- a/webmail/webmail.js
+++ b/webmail/webmail.js
@@ -1868,8 +1868,8 @@ const cmdHelp = async () => {
 		['R', 'reply all'],
 		['f', 'forward message'],
 		['v', 'view attachments'],
-		['T', 'view text version'],
-		['X', 'view HTML version'],
+		['t', 'view text version'],
+		['T', 'view HTML version'],
 		['o', 'open message in new tab'],
 		['O', 'show raw message'],
 		['ctrl p', 'print message'],
@@ -2681,8 +2681,8 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
 		r: cmdReply,
 		R: cmdReplyAll,
 		v: cmdViewAttachments,
-		T: cmdShowText,
-		X: cmdShowHTMLCycle,
+		t: cmdShowText,
+		T: cmdShowHTMLCycle,
 		'ctrl I': cmdToggleHeaders,
 		'alt j': cmdDown,
 		'alt k': cmdUp,
@@ -2923,7 +2923,7 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
 			const text = haveText && !settings.showHTML;
 			dom._kids(msgmodeElem, dom.div(dom._class('pad'), style({ borderTop: '1px solid #ccc' }), !haveText ? dom.span('HTML-only message', attr.title(htmlNote), style({ backgroundColor: '#ffca91', padding: '0 .15em', marginRight: '.25em' })) : [], dom.span(dom._class('btngroup'), haveText ? textbtn = dom.clickbutton(text ? dom._class('active') : [], 'Text', clickCmd(cmdShowText, shortcuts)) : [], htmlbtn = dom.clickbutton(text ? [] : dom._class('active'), 'HTML', attr.title(htmlNote), async function click() {
 				// Shortcuts has a function that cycles through html and htmlexternal.
-				showShortcut('X');
+				showShortcut('T');
 				await cmdShowHTML();
 			}), htmlextbtn = dom.clickbutton('HTML with external resources', attr.title(htmlNote), clickCmd(cmdShowHTMLExternal, shortcuts)))));
 			if (text) {
diff --git a/webmail/webmail.ts b/webmail/webmail.ts
index 9c4b036..5b6c967 100644
--- a/webmail/webmail.ts
+++ b/webmail/webmail.ts
@@ -1014,8 +1014,8 @@ const cmdHelp = async () => {
 						['R', 'reply all'],
 						['f', 'forward message'],
 						['v', 'view attachments'],
-						['T', 'view text version'],
-						['X', 'view HTML version'],
+						['t', 'view text version'],
+						['T', 'view HTML version'],
 						['o', 'open message in new tab'],
 						['O', 'show raw message'],
 						['ctrl p', 'print message'],
@@ -2168,8 +2168,8 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
 		r: cmdReply,
 		R: cmdReplyAll,
 		v: cmdViewAttachments,
-		T: cmdShowText,
-		X: cmdShowHTMLCycle,
+		t: cmdShowText,
+		T: cmdShowHTMLCycle,
 		'ctrl I': cmdToggleHeaders,
 
 		'alt j': cmdDown,
@@ -2573,7 +2573,7 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
 						haveText ? textbtn=dom.clickbutton(text ? dom._class('active') : [], 'Text', clickCmd(cmdShowText, shortcuts)) : [],
 						htmlbtn=dom.clickbutton(text ? [] : dom._class('active'), 'HTML', attr.title(htmlNote), async function click() {
 							// Shortcuts has a function that cycles through html and htmlexternal.
-							showShortcut('X')
+							showShortcut('T')
 							await cmdShowHTML()
 						}),
 						htmlextbtn=dom.clickbutton('HTML with external resources', attr.title(htmlNote), clickCmd(cmdShowHTMLExternal, shortcuts)),