From c31919c41814cda41733e69ce03462866686dc0e Mon Sep 17 00:00:00 2001 From: Chenlei Hu Date: Thu, 2 Jan 2025 20:19:00 -0500 Subject: [PATCH] Remove invertMenuScrolling extension (#2131) Co-authored-by: github-actions --- src/extensions/core/index.ts | 1 - src/extensions/core/invertMenuScrolling.ts | 41 ---------------------- src/locales/en/nodeDefs.json | 9 +++++ src/locales/en/settings.json | 3 -- src/locales/fr/nodeDefs.json | 9 +++++ src/locales/fr/settings.json | 3 -- src/locales/ja/nodeDefs.json | 9 +++++ src/locales/ja/settings.json | 3 -- src/locales/ko/nodeDefs.json | 9 +++++ src/locales/ko/settings.json | 3 -- src/locales/ru/nodeDefs.json | 9 +++++ src/locales/ru/settings.json | 3 -- src/locales/zh/nodeDefs.json | 9 +++++ src/locales/zh/settings.json | 3 -- 14 files changed, 54 insertions(+), 60 deletions(-) delete mode 100644 src/extensions/core/invertMenuScrolling.ts diff --git a/src/extensions/core/index.ts b/src/extensions/core/index.ts index 5d29b6122..517d6794a 100644 --- a/src/extensions/core/index.ts +++ b/src/extensions/core/index.ts @@ -6,7 +6,6 @@ import './electronAdapter' import './groupNode' import './groupNodeManage' import './groupOptions' -import './invertMenuScrolling' import './load3d' import './maskeditor' import './nodeTemplates' diff --git a/src/extensions/core/invertMenuScrolling.ts b/src/extensions/core/invertMenuScrolling.ts deleted file mode 100644 index 704a92aba..000000000 --- a/src/extensions/core/invertMenuScrolling.ts +++ /dev/null @@ -1,41 +0,0 @@ -// @ts-strict-ignore -import { LiteGraph } from '@comfyorg/litegraph' - -import { app } from '../../scripts/app' - -// Inverts the scrolling of context menus - -const id = 'Comfy.InvertMenuScrolling' -app.registerExtension({ - name: id, - init() { - const ctxMenu = LiteGraph.ContextMenu - const replace = () => { - // @ts-expect-error - LiteGraph.ContextMenu = function (values, options) { - options = options || {} - if (options.scroll_speed) { - options.scroll_speed *= -1 - } else { - options.scroll_speed = -0.1 - } - return ctxMenu.call(this, values, options) - } - LiteGraph.ContextMenu.prototype = ctxMenu.prototype - } - app.ui.settings.addSetting({ - id, - category: ['LiteGraph', 'Menu', 'InvertMenuScrolling'], - name: 'Invert Context Menu Scrolling', - type: 'boolean', - defaultValue: false, - onChange(value) { - if (value) { - replace() - } else { - LiteGraph.ContextMenu = ctxMenu - } - } - }) - } -}) diff --git a/src/locales/en/nodeDefs.json b/src/locales/en/nodeDefs.json index cf30ea37b..b80587512 100644 --- a/src/locales/en/nodeDefs.json +++ b/src/locales/en/nodeDefs.json @@ -2293,6 +2293,9 @@ }, "up_direction": { "name": "up_direction" + }, + "fov": { + "name": "fov" } }, "outputs": { @@ -2345,6 +2348,9 @@ }, "animation_speed": { "name": "animation_speed" + }, + "fov": { + "name": "fov" } }, "outputs": { @@ -4249,6 +4255,9 @@ }, "up_direction": { "name": "up_direction" + }, + "fov": { + "name": "fov" } } }, diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index cbbb0cc97..338cdd464 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -60,9 +60,6 @@ "Comfy_GroupSelectedNodes_Padding": { "name": "Group selected nodes padding" }, - "Comfy_InvertMenuScrolling": { - "name": "Invert Context Menu Scrolling" - }, "Comfy_LinkRelease_Action": { "name": "Action on link release (No modifier)", "options": { diff --git a/src/locales/fr/nodeDefs.json b/src/locales/fr/nodeDefs.json index 0f50cb3da..c89a7c150 100644 --- a/src/locales/fr/nodeDefs.json +++ b/src/locales/fr/nodeDefs.json @@ -2358,6 +2358,9 @@ "camera_type": { "name": "type_de_caméra" }, + "fov": { + "name": "fov" + }, "height": { "name": "hauteur" }, @@ -2410,6 +2413,9 @@ "camera_type": { "name": "type_de_caméra" }, + "fov": { + "name": "fov" + }, "height": { "name": "hauteur" }, @@ -4232,6 +4238,9 @@ "camera_type": { "name": "type_de_camera" }, + "fov": { + "name": "fov" + }, "light_intensity": { "name": "intensité_de_lumière" }, diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json index c474ae54a..b9ed44f64 100644 --- a/src/locales/fr/settings.json +++ b/src/locales/fr/settings.json @@ -60,9 +60,6 @@ "Comfy_Group_DoubleClickTitleToEdit": { "name": "Double-cliquer sur le titre du groupe pour le modifier" }, - "Comfy_InvertMenuScrolling": { - "name": "Inverser le défilement du menu contextuel" - }, "Comfy_LinkRelease_Action": { "name": "Action lors du relâchement du lien (sans modificateur)", "options": { diff --git a/src/locales/ja/nodeDefs.json b/src/locales/ja/nodeDefs.json index af20a2399..48586d891 100644 --- a/src/locales/ja/nodeDefs.json +++ b/src/locales/ja/nodeDefs.json @@ -2358,6 +2358,9 @@ "camera_type": { "name": "カメラタイプ" }, + "fov": { + "name": "fov" + }, "height": { "name": "高さ" }, @@ -2410,6 +2413,9 @@ "camera_type": { "name": "カメラタイプ" }, + "fov": { + "name": "fov" + }, "height": { "name": "高さ" }, @@ -4232,6 +4238,9 @@ "camera_type": { "name": "カメラタイプ" }, + "fov": { + "name": "fov" + }, "light_intensity": { "name": "光の強度" }, diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json index 5af5e2ac5..b81d87255 100644 --- a/src/locales/ja/settings.json +++ b/src/locales/ja/settings.json @@ -60,9 +60,6 @@ "Comfy_Group_DoubleClickTitleToEdit": { "name": "グループタイトルをダブルクリックして編集" }, - "Comfy_InvertMenuScrolling": { - "name": "コンテキストメニューのスクロールを反転する" - }, "Comfy_LinkRelease_Action": { "name": "リンクリリース時のアクション（修飾子なし）", "options": { diff --git a/src/locales/ko/nodeDefs.json b/src/locales/ko/nodeDefs.json index 2578e16d5..754b41ec0 100644 --- a/src/locales/ko/nodeDefs.json +++ b/src/locales/ko/nodeDefs.json @@ -2358,6 +2358,9 @@ "camera_type": { "name": "카메라 유형" }, + "fov": { + "name": "시야" + }, "height": { "name": "높이" }, @@ -2410,6 +2413,9 @@ "camera_type": { "name": "카메라 유형" }, + "fov": { + "name": "시야" + }, "height": { "name": "높이" }, @@ -4232,6 +4238,9 @@ "camera_type": { "name": "카메라 유형" }, + "fov": { + "name": "시야" + }, "light_intensity": { "name": "조명 강도" }, diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json index 9095849ab..7f36902da 100644 --- a/src/locales/ko/settings.json +++ b/src/locales/ko/settings.json @@ -60,9 +60,6 @@ "Comfy_Group_DoubleClickTitleToEdit": { "name": "그룹 제목을 두 번 클릭하여 편집" }, - "Comfy_InvertMenuScrolling": { - "name": "컨텍스트 메뉴 스크롤 반전" - }, "Comfy_LinkRelease_Action": { "name": "링크 해제 시 동작 (수정자 없음)", "options": { diff --git a/src/locales/ru/nodeDefs.json b/src/locales/ru/nodeDefs.json index 49dcdcfe4..f4718410a 100644 --- a/src/locales/ru/nodeDefs.json +++ b/src/locales/ru/nodeDefs.json @@ -2358,6 +2358,9 @@ "camera_type": { "name": "тип_камеры" }, + "fov": { + "name": "поле зрения" + }, "height": { "name": "высота" }, @@ -2410,6 +2413,9 @@ "camera_type": { "name": "тип_камеры" }, + "fov": { + "name": "поле зрения" + }, "height": { "name": "высота" }, @@ -4232,6 +4238,9 @@ "camera_type": { "name": "тип_камеры" }, + "fov": { + "name": "поле зрения" + }, "light_intensity": { "name": "интенсивность_света" }, diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json index d1519c501..71a0d0028 100644 --- a/src/locales/ru/settings.json +++ b/src/locales/ru/settings.json @@ -60,9 +60,6 @@ "Comfy_Group_DoubleClickTitleToEdit": { "name": "Дважды щелкните по заголовку группы, чтобы редактировать" }, - "Comfy_InvertMenuScrolling": { - "name": "Инвертировать прокрутку контекстного меню" - }, "Comfy_LinkRelease_Action": { "name": "Действие при отпускании ссылки (без модификатора)", "options": { diff --git a/src/locales/zh/nodeDefs.json b/src/locales/zh/nodeDefs.json index 3adb264fa..1ce2b3e16 100644 --- a/src/locales/zh/nodeDefs.json +++ b/src/locales/zh/nodeDefs.json @@ -2358,6 +2358,9 @@ "camera_type": { "name": "相机类型" }, + "fov": { + "name": "视场" + }, "height": { "name": "高度" }, @@ -2410,6 +2413,9 @@ "camera_type": { "name": "相机类型" }, + "fov": { + "name": "视场" + }, "height": { "name": "高度" }, @@ -4232,6 +4238,9 @@ "camera_type": { "name": "相机类型" }, + "fov": { + "name": "视场" + }, "light_intensity": { "name": "光照强度" }, diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json index 6ae2f0e02..b3945b8cc 100644 --- a/src/locales/zh/settings.json +++ b/src/locales/zh/settings.json @@ -60,9 +60,6 @@ "Comfy_Group_DoubleClickTitleToEdit": { "name": "双击组标题以编辑" }, - "Comfy_InvertMenuScrolling": { - "name": "反转上下文菜单滚动" - }, "Comfy_LinkRelease_Action": { "name": "释放连线时的操作", "options": {