Changed "other settings" to textareas

Related: #8
daem-on · Aug 1, 2022 · 6fd90ad · 6fd90ad
1 parent eeed4d8
commit 6fd90ad
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/export/processLine.ts b/src/export/processLine.ts
@@ -48,7 +48,7 @@ export function processLine(item: paperExportedPath, settings?: LineSettings) {
 		// if (s.size !== undefined && s.size !== 0)
 		// 	o.push("-size " + s.size);
 		if (s.otherSettings !== "")
-			o.push(s.otherSettings.replace(";", "\n"));
+			o.push(s.otherSettings.replace(/\n/g, " "));
 		optionsString = o.join(" ");
 	}
 

diff --git a/src/export/processPoint.ts b/src/export/processPoint.ts
@@ -30,7 +30,7 @@ export function processPoint(item: any) {
 		if (s.rotation !== 0)
 			options += " -orientation " + s.rotation;
 		if (s.otherSettings)
-			options += " " + s.otherSettings;
+			options += " " + s.otherSettings.replace(/\n/g, " ");
 	}
 
 	addText("point", position, options);

diff --git a/src/import/importTH2.ts b/src/import/importTH2.ts
@@ -144,7 +144,7 @@ function saveLineSettings() {
 
 	for (const key in o) {
 		if (Object.prototype.hasOwnProperty.call(o, key)) {
-			s.otherSettings += `-${key} ${o[key]} `;
+			s.otherSettings += `-${key} ${o[key]}\n`;
 		}
 	}
 }
@@ -311,7 +311,7 @@ function savePointSettings(point: paper.Shape, options: Record<string, string>)
 
 	for (const key in o) {
 		if (Object.prototype.hasOwnProperty.call(o, key)) {
-			s.otherSettings += `-${key} ${o[key]} `;
+			s.otherSettings += `-${key} ${o[key]}\n`;
 		}
 	}
 }

diff --git a/src/objectSettings/panels/lineOptionPanel.ts b/src/objectSettings/panels/lineOptionPanel.ts
@@ -87,10 +87,6 @@ const components: comp = {
 		type: "text",
 		label: "%id%"
 	},
-	otherSettings: {
-		type: "text",
-		label: "%otherSettings%"
-	},
 	clip: {
 		type: "list",
 		label: "%clip%",
@@ -109,6 +105,10 @@ const components: comp = {
 			["%default% ⦿", 0]
 		]
 	},
+	otherSettings: {
+		type: "textarea",
+		label: "%otherSettings%"
+	},
 };
 
 export default function(line: paper.Path): objectOptionPanelConfig {

diff --git a/src/objectSettings/panels/pointOptionPanel.ts b/src/objectSettings/panels/pointOptionPanel.ts
@@ -62,10 +62,6 @@ const components: comp = {
 		type: "text",
 		label: "%id%"
 	},
-	otherSettings: {
-		type: "text",
-		label: "%otherSettings%"
-	},
 	clip: {
 		type: "list",
 		label: "%clip%",
@@ -91,6 +87,10 @@ const components: comp = {
 			["%default% ⦿", 0]
 		]
 	},
+	otherSettings: {
+		type: "textarea",
+		label: "%otherSettings%"
+	},
 };
 
 export default function(shape: paper.Shape): objectOptionPanelConfig {