From a88b0ebc2d2f933c94e42aa689c42e836eedaf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20L=C3=B6nnemark?= <tobbez@ryara.net>
Date: Thu, 18 Apr 2024 22:41:23 +0200
Subject: [PATCH] Improve node input/widget conversion sub-menus (#3281)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make input/widget conversion sub-menus optional

* Improve input/widget conversion sub-menu text

- Fix incorrect text for conversion from widget to input, previously it
  effectively said "convert input to input"
- Use "input" instead of "🔘".  The former is clearer and consistent
  with the rest of the application.
- Use title case (consistent with the rest of the menu entries).
- Strip the trailing periods. There is already a visual indicator for
  sub-menus, and no other sub-menus use trailing periods.
---
 tests-ui/utils/ezgraph.js           |  4 +--
 web/extensions/core/widgetInputs.js | 42 ++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/tests-ui/utils/ezgraph.js b/tests-ui/utils/ezgraph.js
index 8bf8c5d8..97be7aa7 100644
--- a/tests-ui/utils/ezgraph.js
+++ b/tests-ui/utils/ezgraph.js
@@ -204,7 +204,7 @@ export class EzWidget {
 	convertToWidget() {
 		if (!this.isConvertedToInput)
 			throw new Error(`Widget ${this.widget.name} cannot be converted as it is already a widget.`);
-		var menu = this.node.menu["Convert 🔘 to widget.."].item.submenu.options;
+		var menu = this.node.menu["Convert Input to Widget"].item.submenu.options;
 		var index = menu.findIndex(a => a.content == `Convert ${this.widget.name} to widget`);
 		menu[index].callback.call();
 	}
@@ -212,7 +212,7 @@ export class EzWidget {
 	convertToInput() {
 		if (this.isConvertedToInput)
 			throw new Error(`Widget ${this.widget.name} cannot be converted as it is already an input.`);
-		var menu = this.node.menu["Convert input to 🔘.."].item.submenu.options;
+		var menu = this.node.menu["Convert Widget to Input"].item.submenu.options;
 		var index = menu.findIndex(a => a.content == `Convert ${this.widget.name} to input`);
 		menu[index].callback.call();
 	}
diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index e6db9f71..f1a1d22c 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -256,8 +256,18 @@ export function mergeIfValid(output, config2, forceUpdate, recreateWidget, confi
 	return { customConfig };
 }
 
+let useConversionSubmenusSetting;
 app.registerExtension({
 	name: "Comfy.WidgetInputs",
+	init() {
+		useConversionSubmenusSetting = app.ui.settings.addSetting({
+			id: "Comfy.NodeInputConversionSubmenus",
+			name: "Node widget/input conversion sub-menus",
+			tooltip: "In the node context menu, place the entries that convert between input/widget in sub-menus.",
+			type: "boolean",
+			defaultValue: true,
+		});
+	},
 	async beforeRegisterNodeDef(nodeType, nodeData, app) {
 		// Add menu options to conver to/from widgets
 		const origGetExtraMenuOptions = nodeType.prototype.getExtraMenuOptions;
@@ -295,20 +305,28 @@ app.registerExtension({
 				
 				//Convert.. main menu
 				if (toInput.length) {
-					options.push({
-						content: `Convert input to 🔘..`,
-						submenu: {
-							options: toInput,
-						},
-					});
+					if (useConversionSubmenusSetting.value) {
+						options.push({
+							content: "Convert Widget to Input",
+							submenu: {
+								options: toInput,
+							},
+						});
+					} else {
+						options.push(...toInput, null);
+					}
 				}
 				if (toWidget.length) {
-					options.push({
-						content: `Convert 🔘 to widget..`,
-						submenu: {
-							options: toWidget,
-						},
-					});
+					if (useConversionSubmenusSetting.value) {
+						options.push({
+							content: "Convert Input to Widget",
+							submenu: {
+								options: toWidget,
+							},
+						});
+					} else {
+						options.push(...toWidget, null);
+					}
 				}
 			}