', j.text);
+ eid("about-footer").innerHTML = eid("about-footer").innerHTML.replace('${emoji(obj.emoji, 18)} ${obj.text}
`
+ }
+ return ``
+}
+export function keyboardShortcuts(arr) {
+ let base = ``;
+
+ for (let i = 0; i < arr.length; i++) {
+ base += `
`;
+
+ return base;
+}
diff --git a/src/modules/pageRender/onDemand.js b/src/modules/pageRender/onDemand.js
index 9a89c61f..ef005eb8 100644
--- a/src/modules/pageRender/onDemand.js
+++ b/src/modules/pageRender/onDemand.js
@@ -13,8 +13,14 @@ export function changelogHistory() { // blockId 0
let separator = (i !== 0 && i !== historyLen) ? '' : '';
render += `
- ${separator}${history[i]["banner"] ? ``;
+ for (let c = 0; c < arr[i].items.length; c++) {
+ let combo = arr[i].items[c].combo.split('+').map(
+ key => `${key}`
+ ).join("+")
+ base += `
`
+ }
+ base += `${combo}: ${arr[i].items[c].name}
`
+ }
+ base += `
- 
+ ${separator}${history[i]["banner"] ?
+ `
${t("ServicesNote")}` + }, { + name: "keyboard", + title: `${emoji("⌨")} ${t("CollapseKeyboard")}`, + body: + `${t("KeyboardShortcutsIntro")} + ${keyboardShortcuts([{ + items: [{ + combo: "Shift+D", + name: t("PasteFromClipboard") + }, { + combo: "Shift+K", + name: t("ModeToggleAuto") + }, { + combo: "Shift+L", + name: t("ModeToggleAudio") + }] + }, { + items: [{ + combo: "Ctrl+V", + name: t("KeyboardShortcutQuickPaste") + }, { + combo: "Esc/Del", + name: t("KeyboardShortcutClear") + }, { + combo: "Esc", + name: t("KeyboardShortcutClosePopup") + }] + }, { + items: [{ + combo: "Shift+B", + name: t("AboutTab") + }, { + combo: "Shift+N", + name: t("ChangelogTab") + }, { + combo: "Shift+M", + name: t("TitlePopupSettings") + }] + }])}` }, { name: "support", - title: t("CollapseSupport"), - body: ` - ${t("SupportSelfTroubleshooting")}
+ title: `${emoji("❤️🩹")} ${t("CollapseSupport")}`, + body: + `${t("SupportSelfTroubleshooting")}
${t("FollowSupport")}
${socialLink( emoji("🐦"), "twitter", authorInfo.support.twitter.handle, authorInfo.support.twitter.url @@ -122,7 +161,7 @@ export default function(obj) { ${t("SupportNote")}` }, { name: "privacy", - title: t("CollapsePrivacy"), + title: `${emoji("🔒")} ${t("CollapsePrivacy")}`, body: t("PrivacyPolicy") }]) }] @@ -142,7 +181,12 @@ export default function(obj) { }, { text: changelogManager("banner") ? `
+ ![]()
`+
+ `
` : ''}
${history[i]["version"]}
${history[i]["title"]}
diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js
index fef7a22d..80c9a790 100644
--- a/src/modules/pageRender/page.js
+++ b/src/modules/pageRender/page.js
@@ -1,4 +1,4 @@
-import { checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink } from "./elements.js";
+import { checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink, urgentNotice, keyboardShortcuts } from "./elements.js";
import { services as s, authorInfo, version, repo, donations, supportedAudio } from "../config.js";
import { getCommitInfo } from "../sub/currentCommit.js";
import loc from "../../localization/manager.js";
@@ -98,13 +98,52 @@ export default function(obj) {
}, {
text: collapsibleList([{
name: "services",
- title: t("CollapseServices"),
+ title: `${emoji("🔗")} ${t("CollapseServices")}`,
body: `${enabledServices}${t("ServicesNote")}` + }, { + name: "keyboard", + title: `${emoji("⌨")} ${t("CollapseKeyboard")}`, + body: + `${t("KeyboardShortcutsIntro")} + ${keyboardShortcuts([{ + items: [{ + combo: "Shift+D", + name: t("PasteFromClipboard") + }, { + combo: "Shift+K", + name: t("ModeToggleAuto") + }, { + combo: "Shift+L", + name: t("ModeToggleAudio") + }] + }, { + items: [{ + combo: "Ctrl+V", + name: t("KeyboardShortcutQuickPaste") + }, { + combo: "Esc/Del", + name: t("KeyboardShortcutClear") + }, { + combo: "Esc", + name: t("KeyboardShortcutClosePopup") + }] + }, { + items: [{ + combo: "Shift+B", + name: t("AboutTab") + }, { + combo: "Shift+N", + name: t("ChangelogTab") + }, { + combo: "Shift+M", + name: t("TitlePopupSettings") + }] + }])}` }, { name: "support", - title: t("CollapseSupport"), - body: ` - ${t("SupportSelfTroubleshooting")}
+ title: `${emoji("❤️🩹")} ${t("CollapseSupport")}`, + body: + `${t("SupportSelfTroubleshooting")}
${t("FollowSupport")}
${socialLink( emoji("🐦"), "twitter", authorInfo.support.twitter.handle, authorInfo.support.twitter.url @@ -122,7 +161,7 @@ export default function(obj) { ${t("SupportNote")}` }, { name: "privacy", - title: t("CollapsePrivacy"), + title: `${emoji("🔒")} ${t("CollapsePrivacy")}`, body: t("PrivacyPolicy") }]) }] @@ -142,7 +181,12 @@ export default function(obj) { }, { text: changelogManager("banner") ? `
- 
+ ![]()
`+
+ `
`: '',
raw: true
}, {
@@ -192,9 +236,13 @@ export default function(obj) {
text: `${t('DonateSub')}
`,
raw: true
}, {
- text: `
-
- 
+ text: `
+ text: `
+ ![]()
`+
+ `
`,
raw: true
}, {
@@ -356,7 +404,6 @@ export default function(obj) {
title: t('SettingsAppearanceSubtitle'),
body: switcher({
name: "theme",
- subtitle: t('SettingsThemeSubtitle'),
items: [{
action: "auto",
text: t('SettingsThemeAuto')
@@ -448,7 +495,12 @@ export default function(obj) {
-
${emoji("💖", 18)} ${t("UrgentDonate")}
+ ${urgentNotice({
+ emoji: "🐱",
+ text: "report any issues!",
+ visible: true,
+ action: "popup('about', 1, 'changelog')"
+ })}
${t("AppTitleCobalt")}