ACI0104566 (2 checkboxes removed from the export dial / Word) + optio…

…ns for setions (header / footers)
4d · Feb 8, 2024 · 65727d6 · 65727d6
1 parent 5d49d6c
commit 65727d6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 27 deletions.
diff --git a/Project/Sources/Forms/D_Export/form.4DForm b/Project/Sources/Forms/D_Export/form.4DForm
@@ -170,7 +170,7 @@
 			"objects": {
 				"BackgroundB_2": {
 					"type": "rectangle",
-					"top": 90,
+					"top": 40,
 					"left": 0,
 					"width": 830,
 					"height": 70,
@@ -179,7 +179,7 @@
 				},
 				"BackgroundA_2": {
 					"type": "rectangle",
-					"top": 160,
+					"top": 310,
 					"left": 0,
 					"width": 830,
 					"height": 60,
@@ -191,7 +191,7 @@
 					"top": 0,
 					"left": 0,
 					"width": 830,
-					"height": 90,
+					"height": 50,
 					"fill": "#F2F2F2",
 					"stroke": "transparent"
 				},
@@ -211,7 +211,7 @@
 				},
 				"Button6": {
 					"type": "button",
-					"top": 180,
+					"top": 130,
 					"left": 290,
 					"width": 90,
 					"height": 20,
@@ -226,7 +226,7 @@
 				},
 				"Button7": {
 					"type": "button",
-					"top": 180,
+					"top": 130,
 					"left": 400,
 					"width": 120,
 					"height": 20,
@@ -245,18 +245,18 @@
 				"Text11": {
 					"type": "text",
 					"text": "DOCX",
-					"top": 0,
+					"top": -9,
 					"left": 560,
 					"width": 263,
-					"height": 95,
+					"height": 45,
 					"fontSize": 80,
 					"stroke": "#ffd700",
 					"textAlign": "right",
 					"visibility": "hidden"
 				},
 				"Limit_P2": {
 					"type": "line",
-					"top": 220,
+					"top": 170,
 					"left": 0,
 					"width": 1000,
 					"height": 1,
@@ -270,7 +270,7 @@
 				"cbRecomputeFormulas2": {
 					"type": "checkbox",
 					"text": ":xliff:recomputeFormulas",
-					"top": 110,
+					"top": 60,
 					"left": 220,
 					"width": 300,
 					"height": 17,
@@ -285,7 +285,7 @@
 				"Text2": {
 					"type": "text",
 					"text": ":xliff:optionsComma",
-					"top": 110,
+					"top": 60,
 					"left": 30,
 					"width": 180,
 					"height": 17,
@@ -294,7 +294,7 @@
 				"cbVisibleEmptyImages1": {
 					"type": "checkbox",
 					"text": ":xliff:blackFrame",
-					"top": 130,
+					"top": 80,
 					"left": 220,
 					"width": 300,
 					"height": 17,
@@ -334,8 +334,8 @@
 					"type": "checkbox",
 					"text": ":xliff:headers",
 					"top": 40,
-					"left": 220,
-					"width": 300,
+					"left": 880,
+					"width": 130,
 					"height": 17,
 					"events": [
 						"onClick"
@@ -348,8 +348,8 @@
 					"type": "checkbox",
 					"text": ":xliff:footers",
 					"top": 60,
-					"left": 220,
-					"width": 300,
+					"left": 880,
+					"width": 130,
 					"height": 17,
 					"events": [
 						"onClick"
@@ -374,7 +374,7 @@
 				},
 				"Line13": {
 					"type": "line",
-					"top": 160,
+					"top": 170,
 					"left": 0,
 					"width": 880,
 					"height": 0,
@@ -1552,7 +1552,7 @@
 	"width": 540,
 	"height": 520,
 	"method": "method.4dm",
-	"geometryStamp": 5027,
+	"geometryStamp": 5178,
 	"editor": {
 		"activeView": "View 1",
 		"defaultView": "View 1",

diff --git a/Project/Sources/Forms/D_Export/method.4dm b/Project/Sources/Forms/D_Export/method.4dm
@@ -1,3 +1,6 @@
+// ACI ACI0104566
+// Form.visibleHeaders et Form.visibleFooters checkboxes removed from the WORD export panel
+// (these options are always true for word)
 
 var $x1; $y1; $x2; $y2; $height : Integer
 var $limit : Text

diff --git a/Project/Sources/Methods/MENU_Display.4dm b/Project/Sources/Methods/MENU_Display.4dm
@@ -248,10 +248,14 @@ Case of
 			End if 
 
 		End if 
-	: ($content="Sections")
+	: ($content="Sections") | ($content="ContinuousSections")
 
 		APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
-		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertSectionBreak")
+		If ($content="Sections")
+			SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertSectionBreak")
+		Else   //($content="ContinuousSections")
+			SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertContinuousSectionBreak")
+		End if 
 
 		APPEND MENU ITEM:C411($menu; "-")
 
@@ -261,19 +265,13 @@ Case of
 		APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
 		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentLeftRightPages")
 
-	: ($content="ContinuousSections")
-
-		APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
-		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertContinuousSectionBreak")
-
 		APPEND MENU ITEM:C411($menu; "-")
 
 		APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
-		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentFirstPage")
+		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "header/remove")
 
 		APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
-		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentLeftRightPages")
-
+		SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "footer/remove")
 
 End case 
 

diff --git a/Project/Sources/catalog_editor.json b/Project/Sources/catalog_editor.json
@@ -0,0 +1,29 @@
+{
+	"tables": {
+		"Sample": {
+			"color": {
+				"red": "255",
+				"green": "255",
+				"blue": "255",
+				"alpha": "0"
+			},
+			"coordinates": {
+				"left": "41.5",
+				"top": "16.453125",
+				"width": "120",
+				"height": "167.33203125"
+			},
+			"displayable_fields_count": 6,
+			"fields": {
+				"wp": {
+					"color": {
+						"red": "255",
+						"green": "255",
+						"blue": "255",
+						"alpha": "0"
+					}
+				}
+			}
+		}
+	}
+}