feat: context menu type
This commit is contained in:
@@ -28,7 +28,7 @@ globalThis.ContextType = "BACKGROUND";
|
|||||||
/**
|
/**
|
||||||
* 添加右键菜单
|
* 添加右键菜单
|
||||||
*/
|
*/
|
||||||
async function addContextMenus() {
|
async function addContextMenus(contextMenuType = 1) {
|
||||||
// 添加前先删除,避免重复ID的错误
|
// 添加前先删除,避免重复ID的错误
|
||||||
try {
|
try {
|
||||||
await browser.contextMenus.removeAll();
|
await browser.contextMenus.removeAll();
|
||||||
@@ -36,38 +36,43 @@ async function addContextMenus() {
|
|||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
||||||
browser.contextMenus.create({
|
switch (contextMenuType) {
|
||||||
id: CMD_TOGGLE_TRANSLATE,
|
case 1:
|
||||||
title: browser.i18n.getMessage("toggle_translate"),
|
browser.contextMenus.create({
|
||||||
contexts: ["page", "selection"],
|
id: CMD_TOGGLE_TRANSLATE,
|
||||||
});
|
title: browser.i18n.getMessage("toggle_translate"),
|
||||||
browser.contextMenus.create({
|
contexts: ["page", "selection"],
|
||||||
id: CMD_TOGGLE_STYLE,
|
});
|
||||||
title: browser.i18n.getMessage("toggle_style"),
|
break;
|
||||||
contexts: ["page", "selection"],
|
case 2:
|
||||||
});
|
browser.contextMenus.create({
|
||||||
browser.contextMenus.create({
|
id: CMD_TOGGLE_TRANSLATE,
|
||||||
id: CMD_OPEN_TRANBOX,
|
title: browser.i18n.getMessage("toggle_translate"),
|
||||||
title: browser.i18n.getMessage("open_tranbox"),
|
contexts: ["page", "selection"],
|
||||||
contexts: ["page", "selection"],
|
});
|
||||||
});
|
browser.contextMenus.create({
|
||||||
browser.contextMenus.create({
|
id: CMD_TOGGLE_STYLE,
|
||||||
id: "options_separator",
|
title: browser.i18n.getMessage("toggle_style"),
|
||||||
type: "separator",
|
contexts: ["page", "selection"],
|
||||||
contexts: ["page", "selection"],
|
});
|
||||||
});
|
browser.contextMenus.create({
|
||||||
browser.contextMenus.create({
|
id: CMD_OPEN_TRANBOX,
|
||||||
id: CMD_OPEN_OPTIONS,
|
title: browser.i18n.getMessage("open_tranbox"),
|
||||||
title: browser.i18n.getMessage("open_options"),
|
contexts: ["page", "selection"],
|
||||||
contexts: ["page", "selection"],
|
});
|
||||||
});
|
browser.contextMenus.create({
|
||||||
}
|
id: "options_separator",
|
||||||
|
type: "separator",
|
||||||
/**
|
contexts: ["page", "selection"],
|
||||||
* 清除右键菜单
|
});
|
||||||
*/
|
browser.contextMenus.create({
|
||||||
function removeContextMenus() {
|
id: CMD_OPEN_OPTIONS,
|
||||||
browser.contextMenus.removeAll();
|
title: browser.i18n.getMessage("open_options"),
|
||||||
|
contexts: ["page", "selection"],
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -87,11 +92,8 @@ browser.runtime.onStartup.addListener(async () => {
|
|||||||
// 同步数据
|
// 同步数据
|
||||||
await trySyncSettingAndRules();
|
await trySyncSettingAndRules();
|
||||||
|
|
||||||
const {
|
const { clearCache, contextMenuType, subrulesList } =
|
||||||
clearCache,
|
await getSettingWithDefault();
|
||||||
contextMenus = true,
|
|
||||||
subrulesList,
|
|
||||||
} = await getSettingWithDefault();
|
|
||||||
|
|
||||||
// 清除缓存
|
// 清除缓存
|
||||||
if (clearCache) {
|
if (clearCache) {
|
||||||
@@ -99,12 +101,8 @@ browser.runtime.onStartup.addListener(async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 右键菜单
|
// 右键菜单
|
||||||
if (contextMenus) {
|
// firefox重启后菜单会消失,故重复添加
|
||||||
// firefox重启后菜单会消失,故重复添加
|
addContextMenus(contextMenuType);
|
||||||
addContextMenus();
|
|
||||||
} else {
|
|
||||||
removeContextMenus();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 同步订阅规则
|
// 同步订阅规则
|
||||||
trySyncAllSubRules({ subrulesList });
|
trySyncAllSubRules({ subrulesList });
|
||||||
@@ -142,12 +140,8 @@ browser.runtime.onMessage.addListener(
|
|||||||
saveRule(args);
|
saveRule(args);
|
||||||
break;
|
break;
|
||||||
case MSG_CONTEXT_MENUS:
|
case MSG_CONTEXT_MENUS:
|
||||||
const { contextMenus } = args;
|
const { contextMenuType } = args;
|
||||||
if (contextMenus) {
|
addContextMenus(contextMenuType);
|
||||||
addContextMenus();
|
|
||||||
} else {
|
|
||||||
removeContextMenus();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case MSG_COMMAND_SHORTCUTS:
|
case MSG_COMMAND_SHORTCUTS:
|
||||||
browser.commands
|
browser.commands
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ async function showFab(translator) {
|
|||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
function showTransbox({
|
function showTransbox({
|
||||||
contextMenus = true,
|
contextMenuType,
|
||||||
tranboxSetting = DEFAULT_TRANBOX_SETTING,
|
tranboxSetting = DEFAULT_TRANBOX_SETTING,
|
||||||
transApis,
|
transApis,
|
||||||
}) {
|
}) {
|
||||||
@@ -165,7 +165,7 @@ function showTransbox({
|
|||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<CacheProvider value={cache}>
|
<CacheProvider value={cache}>
|
||||||
<Slection
|
<Slection
|
||||||
contextMenus={contextMenus}
|
contextMenuType={contextMenuType}
|
||||||
tranboxSetting={tranboxSetting}
|
tranboxSetting={tranboxSetting}
|
||||||
transApis={transApis}
|
transApis={transApis}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -723,9 +723,21 @@ export const I18N = {
|
|||||||
zh: `此功能依赖准确的语言检测,建议启用远程语言检测。`,
|
zh: `此功能依赖准确的语言检测,建议启用远程语言检测。`,
|
||||||
en: `This feature relies on accurate language detection. It is recommended to enable remote language detection.`,
|
en: `This feature relies on accurate language detection. It is recommended to enable remote language detection.`,
|
||||||
},
|
},
|
||||||
add_context_menus: {
|
context_menus: {
|
||||||
zh: `添加右键菜单`,
|
zh: `右键菜单`,
|
||||||
en: `Add Context Menus`,
|
en: `Context Menus`,
|
||||||
|
},
|
||||||
|
hide_context_menus: {
|
||||||
|
zh: `隐藏右键菜单`,
|
||||||
|
en: `Hide Context Menus`,
|
||||||
|
},
|
||||||
|
simple_context_menus: {
|
||||||
|
zh: `简单右键菜单`,
|
||||||
|
en: `Simple_context_menus Context Menus`,
|
||||||
|
},
|
||||||
|
secondary_context_menus: {
|
||||||
|
zh: `二级右键菜单`,
|
||||||
|
en: `Secondary Context Menus`,
|
||||||
},
|
},
|
||||||
mulkeys_help: {
|
mulkeys_help: {
|
||||||
zh: `支持用换行或英文逗号“,”分隔多个KEY轮询调用。`,
|
zh: `支持用换行或英文逗号“,”分隔多个KEY轮询调用。`,
|
||||||
|
|||||||
@@ -452,7 +452,8 @@ export const DEFAULT_SETTING = {
|
|||||||
injectRules: true, // 是否注入订阅规则
|
injectRules: true, // 是否注入订阅规则
|
||||||
injectWebfix: true, // 是否注入修复补丁
|
injectWebfix: true, // 是否注入修复补丁
|
||||||
detectRemote: false, // 是否使用远程语言检测
|
detectRemote: false, // 是否使用远程语言检测
|
||||||
contextMenus: true, // 是否添加右键菜单
|
contextMenus: true, // 是否添加右键菜单(作废)
|
||||||
|
contextMenuType: 1, // 右键菜单类型(0不显示,1简单菜单,2多级菜单)
|
||||||
transTitle: false, // 是否同时翻译页面标题
|
transTitle: false, // 是否同时翻译页面标题
|
||||||
subrulesList: DEFAULT_SUBRULES_LIST, // 订阅列表
|
subrulesList: DEFAULT_SUBRULES_LIST, // 订阅列表
|
||||||
owSubrule: DEFAULT_OW_RULE, // 覆写订阅规则
|
owSubrule: DEFAULT_OW_RULE, // 覆写订阅规则
|
||||||
|
|||||||
@@ -95,8 +95,8 @@ export default function Action({ translator, fab }) {
|
|||||||
// 注册菜单
|
// 注册菜单
|
||||||
try {
|
try {
|
||||||
const menuCommandIds = [];
|
const menuCommandIds = [];
|
||||||
const { contextMenus = true } = translator.setting;
|
const { contextMenuType } = translator.setting;
|
||||||
contextMenus &&
|
contextMenuType !== 0 &&
|
||||||
menuCommandIds.push(
|
menuCommandIds.push(
|
||||||
GM.registerMenuCommand(
|
GM.registerMenuCommand(
|
||||||
"Toggle Translate",
|
"Toggle Translate",
|
||||||
|
|||||||
@@ -67,8 +67,8 @@ export default function Settings() {
|
|||||||
case "touchTranslate":
|
case "touchTranslate":
|
||||||
value = limitNumber(value, 0, 4);
|
value = limitNumber(value, 0, 4);
|
||||||
break;
|
break;
|
||||||
case "contextMenus":
|
case "contextMenuType":
|
||||||
isExt && sendBgMsg(MSG_CONTEXT_MENUS, { contextMenus: value });
|
isExt && sendBgMsg(MSG_CONTEXT_MENUS, { contextMenuType: value });
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
@@ -96,7 +96,7 @@ export default function Settings() {
|
|||||||
newlineLength = TRANS_NEWLINE_LENGTH,
|
newlineLength = TRANS_NEWLINE_LENGTH,
|
||||||
mouseKey = OPT_MOUSEKEY_DISABLE,
|
mouseKey = OPT_MOUSEKEY_DISABLE,
|
||||||
detectRemote = false,
|
detectRemote = false,
|
||||||
contextMenus = true,
|
contextMenuType = 1,
|
||||||
transTitle = false,
|
transTitle = false,
|
||||||
touchTranslate = 2,
|
touchTranslate = 2,
|
||||||
blacklist = DEFAULT_BLACKLIST.join(",\n"),
|
blacklist = DEFAULT_BLACKLIST.join(",\n"),
|
||||||
@@ -229,15 +229,16 @@ export default function Settings() {
|
|||||||
</FormControl>
|
</FormControl>
|
||||||
|
|
||||||
<FormControl size="small">
|
<FormControl size="small">
|
||||||
<InputLabel>{i18n("add_context_menus")}</InputLabel>
|
<InputLabel>{i18n("context_menus")}</InputLabel>
|
||||||
<Select
|
<Select
|
||||||
name="contextMenus"
|
name="contextMenuType"
|
||||||
value={contextMenus}
|
value={contextMenuType}
|
||||||
label={i18n("add_context_menus")}
|
label={i18n("context_menus")}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
>
|
>
|
||||||
<MenuItem value={false}>{i18n("disable")}</MenuItem>
|
<MenuItem value={0}>{i18n("hide_context_menus")}</MenuItem>
|
||||||
<MenuItem value={true}>{i18n("enable")}</MenuItem>
|
<MenuItem value={1}>{i18n("simple_context_menus")}</MenuItem>
|
||||||
|
<MenuItem value={2}>{i18n("secondary_context_menus")}</MenuItem>
|
||||||
</Select>
|
</Select>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,11 @@ import { isGm, isExt } from "../../libs/client";
|
|||||||
import { MSG_OPEN_TRANBOX, DEFAULT_TRANBOX_SHORTCUT } from "../../config";
|
import { MSG_OPEN_TRANBOX, DEFAULT_TRANBOX_SHORTCUT } from "../../config";
|
||||||
import { isMobile } from "../../libs/mobile";
|
import { isMobile } from "../../libs/mobile";
|
||||||
|
|
||||||
export default function Slection({ contextMenus, tranboxSetting, transApis }) {
|
export default function Slection({
|
||||||
|
contextMenuType,
|
||||||
|
tranboxSetting,
|
||||||
|
transApis,
|
||||||
|
}) {
|
||||||
const boxWidth = limitNumber(window.innerWidth, 300, 600);
|
const boxWidth = limitNumber(window.innerWidth, 300, 600);
|
||||||
const boxHeight = limitNumber(window.innerHeight, 200, 400);
|
const boxHeight = limitNumber(window.innerHeight, 200, 400);
|
||||||
|
|
||||||
@@ -106,7 +110,7 @@ export default function Slection({ contextMenus, tranboxSetting, transApis }) {
|
|||||||
// 注册菜单
|
// 注册菜单
|
||||||
try {
|
try {
|
||||||
const menuCommandIds = [];
|
const menuCommandIds = [];
|
||||||
contextMenus &&
|
contextMenuType !== 0 &&
|
||||||
menuCommandIds.push(
|
menuCommandIds.push(
|
||||||
GM.registerMenuCommand(
|
GM.registerMenuCommand(
|
||||||
"Translate Selected Text",
|
"Translate Selected Text",
|
||||||
@@ -125,7 +129,7 @@ export default function Slection({ contextMenus, tranboxSetting, transApis }) {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log("[registerMenuCommand]", err);
|
console.log("[registerMenuCommand]", err);
|
||||||
}
|
}
|
||||||
}, [handleTranbox, contextMenus]);
|
}, [handleTranbox, contextMenuType]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|||||||
Reference in New Issue
Block a user