diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List.4dm
deleted file mode 100644
index ee662fe0..00000000
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List.4dm
+++ /dev/null
@@ -1,2 +0,0 @@
-Form:C1466.pictSettings[wk anchor horizontal align:K81:237]:=_anchorHorizontalAlign-1
-Form:C1466.pictSettings[wk anchor horizontal offset:K81:236]:=0
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List1.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List1.4dm
index bf6f9ece..9c1c3139 100644
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List1.4dm
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List1.4dm
@@ -1,2 +1,10 @@
-Form:C1466.pictSettings[wk anchor vertical align:K81:239]:=_anchorVerticalAlign-1
-Form:C1466.pictSettings[wk anchor vertical offset:K81:238]:=0
+//Case of
+//: (_anchorOrigin=1)
+//Form.pictSettings[wk anchor origin]:=wk paper box
+//: (_anchorOrigin=2)
+//Form.pictSettings[wk anchor origin]:=wk header box
+//: (_anchorOrigin=3)
+//Form.pictSettings[wk anchor origin]:=wk footer box
+//End case
+
+Form:C1466.pictSettings[wk anchor origin:K81:235]:=Form:C1466.anchorOrigin.originValues[Form:C1466.anchorOrigin.index]
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List2.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List2.4dm
deleted file mode 100644
index edee6ff0..00000000
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List2.4dm
+++ /dev/null
@@ -1,10 +0,0 @@
-Case of
- : (_anchorOrigin=1)
- Form:C1466.pictSettings[wk anchor origin:K81:235]:=wk paper box:K81:215
- : (_anchorOrigin=2)
- Form:C1466.pictSettings[wk anchor origin:K81:235]:=wk header box:K81:243
- : (_anchorOrigin=3)
- Form:C1466.pictSettings[wk anchor origin:K81:235]:=wk footer box:K81:244
-End case
-
-
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List3.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List3.4dm
new file mode 100644
index 00000000..4ba13cf0
--- /dev/null
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List3.4dm
@@ -0,0 +1 @@
+Form:C1466.pictSettings[wk anchor layout:K81:227]:=Form:C1466.anchorLayout.anchorValues[Form:C1466.anchorLayout.index]
\ No newline at end of file
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List4.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List4.4dm
new file mode 100644
index 00000000..9dcd2a7d
--- /dev/null
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List4.4dm
@@ -0,0 +1,2 @@
+Form:C1466.pictSettings[wk anchor horizontal align:K81:237]:=Form:C1466.anchorHorizontalAlign.index
+Form:C1466.pictSettings[wk anchor horizontal offset:K81:236]:=0
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List5.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List5.4dm
index fd176dbf..8c18ef36 100644
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List5.4dm
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/Popup Dropdown List5.4dm
@@ -1,24 +1,2 @@
-Case of
- : (_anchorLayout=1)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk behind text:K81:240 // wk behind text-image is anchored, behind the text
-
- : (_anchorLayout=2)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk in front of text:K81:241 // wk in front of text - image is anchored, in front of the text
-
- // new values v20 R5
- : (_anchorLayout=3)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk text wrap top bottom:K81:379
-
- : (_anchorLayout=4)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk text wrap square left:K81:382
-
- : (_anchorLayout=5)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk text wrap square right:K81:383
-
- : (_anchorLayout=6)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk text wrap square:K81:380
-
- : (_anchorLayout=7)
- Form:C1466.pictSettings[wk anchor layout:K81:227]:=wk text wrap square largest:K81:384
-
-End case
+Form:C1466.pictSettings[wk anchor vertical align:K81:239]:=Form:C1466.anchorVerticalAlign.index
+Form:C1466.pictSettings[wk anchor vertical offset:K81:238]:=0
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorPageDropDown.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorPageDropDown.4dm
index 960a9447..ea68b276 100644
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorPageDropDown.4dm
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorPageDropDown.4dm
@@ -1,27 +1,14 @@
-If (_anchorPage<=4)
- Case of
- : (_anchorPage=1)
- Form:C1466.pictSettings[wk anchor page:K81:231]:=wk anchor all:K81:229
-
- : (_anchorPage=2)
- Form:C1466.pictSettings[wk anchor page:K81:231]:=wk anchor first page:K81:232
-
- : (_anchorPage=3)
- Form:C1466.pictSettings[wk anchor page:K81:231]:=wk anchor left page:K81:233
-
- : (_anchorPage=4)
- Form:C1466.pictSettings[wk anchor page:K81:231]:=wk anchor right page:K81:234
-
- End case
+If (Form:C1466.anchorPage.index<=3)
+ Form:C1466.pictSettings[wk anchor page:K81:231]:=Form:C1466.anchorPage.anchorValues[Form:C1466.anchorPage.index] //wk anchor all
Form:C1466.display.anchorPage:=Form:C1466.pictSettings[wk anchor page:K81:231] // negative value = not displayed
GOTO OBJECT:C206(*; "")
-Else //_anchorPage=5
+Else //Form.anchorPage.index = 4
UI_PictureSettings // no wait. otherwise GOTO OBJECT(*; "anchorPageNumberInput") will not work
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorSectionDropDown.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorSectionDropDown.4dm
index 484eb7bc..db9ee2aa 100644
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorSectionDropDown.4dm
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/anchorSectionDropDown.4dm
@@ -1,13 +1,13 @@
Case of
- : (_anchorSection=1)
+ : (Form:C1466.anchorSection.index=0)
Form:C1466.pictSettings[wk anchor section:K81:228]:=wk anchor all:K81:229
Form:C1466.display.anchorSection:=wk anchor all:K81:229 // negative value = not displayed
GOTO OBJECT:C206(*; "")
- : (_anchorSection=2)
+ : (Form:C1466.anchorSection.index=1)
UI_PictureSettings // no wait. otherwise GOTO OBJECT(*; "anchorPageNumberInput") will not work
Form:C1466.display.anchorSection:=1
@@ -19,3 +19,4 @@ End case
SET TIMER:C645(-1)
+
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/pictureFormatList.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/pictureFormatList.4dm
deleted file mode 100644
index cf60c02e..00000000
--- a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/pictureFormatList.4dm
+++ /dev/null
@@ -1,2 +0,0 @@
-Form:C1466.pictSettings[wk image display mode:K81:340]:=_displayFormatValues{_displayFormatLabels}
-SET TIMER:C645(-1)
diff --git a/Project/Sources/Forms/D_PictureSettings/ObjectMethods/pictureFormatList1.4dm b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/pictureFormatList1.4dm
new file mode 100644
index 00000000..c509d8e5
--- /dev/null
+++ b/Project/Sources/Forms/D_PictureSettings/ObjectMethods/pictureFormatList1.4dm
@@ -0,0 +1,2 @@
+Form:C1466.pictSettings[wk image display mode:K81:340]:=Form:C1466.displayFormat.formatValues[Form:C1466.displayFormat.index]
+//SET TIMER(-1)
diff --git a/Project/Sources/Forms/D_PictureSettings/form.4DForm b/Project/Sources/Forms/D_PictureSettings/form.4DForm
index d5a80857..a9837ab2 100755
--- a/Project/Sources/Forms/D_PictureSettings/form.4DForm
+++ b/Project/Sources/Forms/D_PictureSettings/form.4DForm
@@ -20,22 +20,36 @@
"pages": [
{
"objects": {
- "BackgroundA_4": {
+ "BackgroundB_0": {
"type": "rectangle",
"top": 0,
"left": 0,
"width": 700,
- "height": 361,
- "fill": "#F6F6F6",
+ "height": 720,
+ "fill": "#FFFFFF",
"stroke": "transparent"
},
- "BackgroundB_0": {
+ "pictureFormatList1": {
+ "type": "dropdown",
+ "left": 165,
+ "top": 385,
+ "width": 270,
+ "height": 24,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.displayFormat",
+ "dataSourceTypeHint": "integer",
+ "method": "ObjectMethods/pictureFormatList1.4dm",
+ "focusable": false
+ },
+ "BackgroundA_4": {
"type": "rectangle",
"top": 0,
"left": 0,
"width": 700,
- "height": 720,
- "fill": "#FFFFFF",
+ "height": 361,
+ "fill": "#F6F6F6",
"stroke": "transparent"
},
"BackgroundA_5": {
@@ -247,20 +261,6 @@
"method": "ObjectMethods/Button3.4dm",
"focusable": false
},
- "pictureFormatList": {
- "type": "dropdown",
- "left": 165,
- "top": 385,
- "width": 270,
- "height": 24,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_displayFormatLabels",
- "dataSourceTypeHint": "integer",
- "method": "ObjectMethods/pictureFormatList.4dm",
- "focusable": false
- },
"formatLabel": {
"type": "text",
"text": ":xliff:PictureFormat",
@@ -600,23 +600,14 @@
"lockerButton",
"pictureWidthHeight1",
"Button3",
- "pictureFormatList",
"alternateText",
"lockerButton1",
- "lockerButton2"
+ "lockerButton2",
+ "pictureFormatList1"
]
},
{
"objects": {
- "BackgroundA_2": {
- "type": "rectangle",
- "top": 660,
- "left": 0,
- "width": 800,
- "height": 60,
- "fill": "#F6F6F6",
- "stroke": "transparent"
- },
"rectPage1": {
"type": "rectangle",
"top": 0,
@@ -632,6 +623,29 @@
"strokeWidth": 2,
"visibility": "hidden"
},
+ "Popup Dropdown List1": {
+ "type": "dropdown",
+ "left": 166,
+ "top": 620,
+ "width": 185,
+ "height": 20,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.anchorOrigin",
+ "method": "ObjectMethods/Popup Dropdown List1.4dm",
+ "focusable": false,
+ "dataSourceTypeHint": "object"
+ },
+ "BackgroundA_2": {
+ "type": "rectangle",
+ "top": 660,
+ "left": 0,
+ "width": 800,
+ "height": 60,
+ "fill": "#F6F6F6",
+ "stroke": "transparent"
+ },
"BackgroundA_1": {
"type": "rectangle",
"top": 450,
@@ -655,32 +669,6 @@
"onGettingFocus"
]
},
- "Popup Dropdown List1": {
- "type": "dropdown",
- "left": 165,
- "top": 590,
- "width": 185,
- "height": 20,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_anchorVerticalAlign",
- "method": "ObjectMethods/Popup Dropdown List1.4dm",
- "focusable": false
- },
- "Popup Dropdown List": {
- "type": "dropdown",
- "left": 165,
- "top": 560,
- "width": 185,
- "height": 20,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_anchorHorizontalAlign",
- "method": "ObjectMethods/Popup Dropdown List.4dm",
- "focusable": false
- },
"OffsetHorizontal": {
"type": "input",
"left": 500,
@@ -713,19 +701,6 @@
"height": 16,
"textAlign": "right"
},
- "Popup Dropdown List2": {
- "type": "dropdown",
- "left": 165,
- "top": 620,
- "width": 185,
- "height": 20,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_anchorOrigin",
- "method": "ObjectMethods/Popup Dropdown List2.4dm",
- "focusable": false
- },
"Text2": {
"type": "text",
"text": ":xliff:OriginHyphen",
@@ -735,19 +710,6 @@
"height": 16,
"textAlign": "right"
},
- "anchorPageDropDown": {
- "type": "dropdown",
- "left": 165,
- "top": 470,
- "width": 180,
- "height": 20,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_anchorPage",
- "method": "ObjectMethods/anchorPageDropDown.4dm",
- "focusable": false
- },
"anchorPagelabel": {
"type": "text",
"text": ":xliff:PageHyphen",
@@ -757,19 +719,6 @@
"height": 16,
"textAlign": "right"
},
- "anchorSectionDropDown": {
- "type": "dropdown",
- "left": 500,
- "top": 470,
- "width": 160,
- "height": 20,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_anchorSection",
- "method": "ObjectMethods/anchorSectionDropDown.4dm",
- "focusable": false
- },
"anchorSectionLabel": {
"type": "text",
"text": ":xliff:SectionHyphen",
@@ -829,19 +778,6 @@
"dataSourceTypeHint": "integer",
"numberFormat": "#####0;;"
},
- "Popup Dropdown List5": {
- "type": "dropdown",
- "left": 500,
- "top": 620,
- "width": 160,
- "height": 20,
- "events": [
- "onDataChange"
- ],
- "dataSource": "_anchorLayout",
- "method": "ObjectMethods/Popup Dropdown List5.4dm",
- "focusable": false
- },
"Text5": {
"type": "text",
"text": ":xliff:LayoutHyphen",
@@ -924,21 +860,93 @@
"height": 16,
"textAlign": "left",
"stroke": "#696969"
+ },
+ "Popup Dropdown List3": {
+ "type": "dropdown",
+ "left": 500,
+ "top": 620,
+ "width": 160,
+ "height": 20,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.anchorLayout",
+ "method": "ObjectMethods/Popup Dropdown List3.4dm",
+ "focusable": false,
+ "dataSourceTypeHint": "object"
+ },
+ "Popup Dropdown List4": {
+ "type": "dropdown",
+ "left": 165,
+ "top": 560,
+ "width": 185,
+ "height": 20,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.anchorHorizontalAlign",
+ "method": "ObjectMethods/Popup Dropdown List4.4dm",
+ "focusable": false,
+ "dataSourceTypeHint": "object"
+ },
+ "Popup Dropdown List5": {
+ "type": "dropdown",
+ "left": 165,
+ "top": 590,
+ "width": 185,
+ "height": 20,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.anchorVerticalAlign",
+ "method": "ObjectMethods/Popup Dropdown List5.4dm",
+ "focusable": false,
+ "dataSourceTypeHint": "object"
+ },
+ "anchorPageDropDown": {
+ "type": "dropdown",
+ "left": 165,
+ "top": 470,
+ "width": 180,
+ "height": 20,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.anchorPage",
+ "method": "ObjectMethods/anchorPageDropDown.4dm",
+ "focusable": false,
+ "stroke": "automatic",
+ "dataSourceTypeHint": "object"
+ },
+ "anchorSectionDropDown": {
+ "type": "dropdown",
+ "left": 500,
+ "top": 470,
+ "width": 160,
+ "height": 20,
+ "events": [
+ "onDataChange"
+ ],
+ "dataSource": "Form:C1466.anchorSection",
+ "method": "ObjectMethods/anchorSectionDropDown.4dm",
+ "focusable": false,
+ "stroke": "automatic",
+ "dataSourceTypeHint": "object"
}
},
"entryOrder": [
- "OffsetVertical",
- "Popup Dropdown List1",
- "Popup Dropdown List",
- "OffsetHorizontal",
- "Popup Dropdown List2",
- "anchorPageDropDown",
- "anchorSectionDropDown",
"anchorPageNumberInput",
"anchorSectionNumberInput",
- "Popup Dropdown List5",
+ "OffsetHorizontal",
+ "OffsetVertical",
+ "Popup Dropdown List3",
"Button2",
- "Button7"
+ "Button7",
+ "Popup Dropdown List4",
+ "Popup Dropdown List5",
+ "Popup Dropdown List1",
+ "anchorPageDropDown",
+ "anchorSectionDropDown"
]
},
{
@@ -1006,7 +1014,7 @@
}
}
],
- "geometryStamp": 11403,
+ "geometryStamp": 11511,
"editor": {
"activeView": "View 1",
"defaultView": "View 1",
diff --git a/Project/Sources/Forms/D_PictureSettings/method.4dm b/Project/Sources/Forms/D_PictureSettings/method.4dm
index fcc12c97..761e8a7e 100644
--- a/Project/Sources/Forms/D_PictureSettings/method.4dm
+++ b/Project/Sources/Forms/D_PictureSettings/method.4dm
@@ -1,27 +1,31 @@
-
+var $index : Integer
Case of
: (Form event code:C388=On Load:K2:1)
- ARRAY TEXT:C222(_displayFormatLabels; 0)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=scaledToFit").title)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=truncated").title)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=truncatedCentered").title)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=proportional").title)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=proportionalCentered").title)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=replicated").title)
- APPEND TO ARRAY:C911(_displayFormatLabels; Get action info:C1442("image/scalingMode?value=replicatedCentered").title)
+ Form:C1466.displayFormat:=New object:C1471
+ Form:C1466.displayFormat.values:=New collection:C1472
+ Form:C1466.displayFormat.formatValues:=New collection:C1472
+
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=scaledToFit").title)
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=truncated").title)
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=truncatedCentered").title)
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=proportional").title)
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=proportionalCentered").title)
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=replicated").title)
+ Form:C1466.displayFormat.values.push(Get action info:C1442("image/scalingMode?value=replicatedCentered").title)
- ARRAY TEXT:C222(_displayFormatValues; 0)
- APPEND TO ARRAY:C911(_displayFormatValues; wk scaled to fit:K81:342) //"scaledToFit") //wk scaled to fit
- APPEND TO ARRAY:C911(_displayFormatValues; wk truncated:K81:343) //"truncated") //wk truncated
- APPEND TO ARRAY:C911(_displayFormatValues; wk truncated centered:K81:344) // "truncatedCentered") //wk truncated centered
- APPEND TO ARRAY:C911(_displayFormatValues; wk proportional:K81:345) //"proportional") //wk proportional
- APPEND TO ARRAY:C911(_displayFormatValues; wk proportional centered:K81:346) //"proportionalCentered") //wk proportional centered)
- APPEND TO ARRAY:C911(_displayFormatValues; wk replicated:K81:347) //"replicated") //wk replicated)
- APPEND TO ARRAY:C911(_displayFormatValues; wk replicated centered:K81:348) //"replicatedCentered") //wk replicated centered
+ Form:C1466.displayFormat.formatValues.push(wk scaled to fit:K81:342)
+ Form:C1466.displayFormat.formatValues.push(wk truncated:K81:343)
+ Form:C1466.displayFormat.formatValues.push(wk truncated centered:K81:344)
+ Form:C1466.displayFormat.formatValues.push(wk proportional:K81:345)
+ Form:C1466.displayFormat.formatValues.push(wk proportional centered:K81:346)
+ Form:C1466.displayFormat.formatValues.push(wk replicated:K81:347)
+ Form:C1466.displayFormat.formatValues.push(wk replicated centered:K81:348)
- WP_GetPictureSettings
+ WP_GetPictureSettings // before next line of code otherwise Form.pictSettings[wk image display mode] is undefined
+
+ Form:C1466.displayFormat.index:=Form:C1466.displayFormat.formatValues.indexOf(Form:C1466.pictSettings[wk image display mode:K81:340])
If (Form:C1466.pictSettings.anchored=True:C214)
@@ -29,108 +33,111 @@ Case of
Form:C1466.display[wk anchor page:K81:231]:=1 // default values
Form:C1466.display[wk anchor section:K81:228]:=1 // default values
- ARRAY TEXT:C222(_anchorHorizontalAlign; 3)
- ARRAY TEXT:C222(_anchorVerticalAlign; 3)
- ARRAY TEXT:C222(_anchorOrigin; 3)
- ARRAY TEXT:C222(_anchorPage; 5) // 6 ?
-
- ARRAY TEXT:C222(_anchorLayout; 7)
-
-
- _anchorHorizontalAlign{1}:=Get action info:C1442("anchorHorizontalAlign?value=left").title // "Left"
- _anchorHorizontalAlign{2}:=Get action info:C1442("anchorHorizontalAlign?value=right").title //"Right"
- _anchorHorizontalAlign{3}:=Get action info:C1442("anchorHorizontalAlign?value=center").title //"Center"
- _anchorHorizontalAlign:=Form:C1466.pictSettings.anchorHorizontalAlign+1
-
- _anchorVerticalAlign{1}:=Get action info:C1442("anchorVerticalAlign?value=top").title // "Top" //0
- _anchorVerticalAlign{2}:=Get action info:C1442("anchorVerticalAlign?value=bottom").title // "Bottom" //1
- _anchorVerticalAlign{3}:=Get action info:C1442("anchorVerticalAlign?value=middle").title // "Middle" //2
- _anchorVerticalAlign:=Form:C1466.pictSettings.anchorVerticalAlign+1
-
- _anchorOrigin{1}:=Get action info:C1442("anchorOrigin?value=paper-box").title //"Paper"
- _anchorOrigin{2}:=Get action info:C1442("anchorOrigin?value=header-box").title //"Header"
- _anchorOrigin{3}:=Get action info:C1442("anchorOrigin?value=footer-box").title //"Footer"
-
- Case of
- : (Form:C1466.pictSettings[wk anchor origin:K81:235]=wk paper box:K81:215) //3
- _anchorOrigin:=1
-
- : (Form:C1466.pictSettings[wk anchor origin:K81:235]=wk header box:K81:243) //0
- _anchorOrigin:=2
-
- : (Form:C1466.pictSettings[wk anchor origin:K81:235]=wk footer box:K81:244) //1
- _anchorOrigin:=3
- End case
-
-
- //*************************************
-
- _anchorPage{1}:=Get action info:C1442("anchorPage?value=all").title //"All_f" // wk anchor all-anchors an image to all pages of the section(s)defined by wk anchor section
- _anchorPage{2}:=Get localized string:C991("FirstPage") // wk anchor first page-anchors an image to the first page subsection of the section(s)defined by wk anchor section
- _anchorPage{3}:=Get localized string:C991("LeftPages") // wk anchor left page-anchors an image to the left pages subsection of the section(s)defined by wk anchor section
- _anchorPage{4}:=Get localized string:C991("RightPages") // wk anchor right page-anchors an image to the right pages subsection of the section(s)defined by wk anchor section
- _anchorPage{5}:=Get localized string:C991("PageNumber") // a number(Longint>=0)indicating which page to anchor the image to.In this case, wk anchor section=wk anchor all.Section anchoring is ignored if an image is anchored to a single page.
-
-
- Case of
- : (Form:C1466.pictSettings[wk anchor page:K81:231]=wk anchor all:K81:229)
- _anchorPage:=1
- : (Form:C1466.pictSettings[wk anchor page:K81:231]=wk anchor first page:K81:232)
- _anchorPage:=2
- : (Form:C1466.pictSettings[wk anchor page:K81:231]=wk anchor left page:K81:233)
- _anchorPage:=3
- : (Form:C1466.pictSettings[wk anchor page:K81:231]=wk anchor right page:K81:234)
- _anchorPage:=4
- Else
- _anchorPage:=5
- End case
+
+ //***
+
+ Form:C1466.anchorPage:=New object:C1471
+ Form:C1466.anchorPage.values:=New collection:C1472
+ Form:C1466.anchorPage.anchorValues:=New collection:C1472
+
+ Form:C1466.anchorPage.values.push(Get action info:C1442("anchorPage?value=all").title)
+ Form:C1466.anchorPage.values.push(Get localized string:C991("FirstPage")) // wk anchor first page-anchors an image to the first page subsection of the section(s)defined by wk anchor section
+ Form:C1466.anchorPage.values.push(Get localized string:C991("LeftPages")) // wk anchor left page-anchors an image to the left pages subsection of the section(s)defined by wk anchor section
+ Form:C1466.anchorPage.values.push(Get localized string:C991("RightPages")) // wk anchor right page-anchors an image to the right pages subsection of the section(s)defined by wk anchor section
+ Form:C1466.anchorPage.values.push(Get localized string:C991("PageNumber")) // a number(Longint>=0)indicating which page to anchor the image to.In this case, wk anchor section=wk anchor all.Section anchoring is ignored if an image is anchored to a single page.
+
+ Form:C1466.anchorPage.anchorValues.push(wk anchor all:K81:229)
+ Form:C1466.anchorPage.anchorValues.push(wk anchor first page:K81:232)
+ Form:C1466.anchorPage.anchorValues.push(wk anchor left page:K81:233)
+ Form:C1466.anchorPage.anchorValues.push(wk anchor right page:K81:234)
+
+ $index:=Form:C1466.anchorPage.anchorValues.indexOf(Form:C1466.pictSettings[wk anchor page:K81:231])
+ If ($index>=0)
+ Form:C1466.anchorPage.index:=$index
+ Else
+ Form:C1466.anchorPage.index:=4
+ End if
+
Form:C1466.display.anchorPage:=Form:C1466.pictSettings[wk anchor page:K81:231] // display (negative = invisible in form)
+ //***
+
+ Form:C1466.anchorSection:=New object:C1471
+ Form:C1466.anchorSection.values:=New collection:C1472
+
If (Form:C1466.pictSettings[wk anchor section:K81:228]#wk anchor embedded:K81:230)
- ARRAY TEXT:C222(_anchorSection; 2)
- _anchorSection{1}:=Get action info:C1442("anchorSection?value=all").title // "All" // wk anchor all(default)-anchors an image to all sections in a document(image is only visible in page mode)
- _anchorSection{2}:=Get localized string:C991("SectionNumber") // "Section number" // a number(Longint>=1)indicating the section to anchor the image to.(image is only visible in page mode)
-
- Case of
- : (Form:C1466.pictSettings[wk anchor section:K81:228]=wk anchor all:K81:229)
- _anchorSection:=1
- Else
- _anchorSection:=2
- End case
+ Form:C1466.anchorSection.values.push(Get action info:C1442("anchorSection?value=all").title) // "All" // wk anchor all(default)-anchors an image to all sections in a document(image is only visible in page mode)
+ Form:C1466.anchorSection.values.push(Get localized string:C991("SectionNumber")) // "Section number" // a number(Longint>=1)indicating the section to anchor the image to.(image is only visible in page mode)
+ If (Form:C1466.pictSettings[wk anchor section:K81:228]=wk anchor all:K81:229)
+ Form:C1466.anchorSection.index:=0
+ Else
+ Form:C1466.anchorSection.index:=1
+ End if
Form:C1466.display.anchorSection:=Form:C1466.pictSettings[wk anchor section:K81:228]
-
Else
- ARRAY TEXT:C222(_anchorSection; 0)
- _anchorSection:=0
+ Form:C1466.anchorSection.index:=0
End if
- _anchorLayout{1}:=Get action info:C1442("anchorLayout?value=behind").title // "Behind the text"
- _anchorLayout{2}:=Get action info:C1442("anchorLayout?value=front").title // "In front of the text"
-
- _anchorLayout{3}:=Get action info:C1442("anchorLayout?value=wrapTopBottom").title // ""
- _anchorLayout{4}:=Get action info:C1442("anchorLayout?value=wrapSquareLeft").title // ""
- _anchorLayout{5}:=Get action info:C1442("anchorLayout?value=wrapSquareRight").title // "In front of the text"
- _anchorLayout{6}:=Get action info:C1442("anchorLayout?value=wrapSquare").title // "In front of the text"
- _anchorLayout{7}:=Get action info:C1442("anchorLayout?value=wrapSquareLargest").title // "In front of the text"
-
- Case of
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk behind text:K81:240) // wk behind text-image is anchored, behind the text
- _anchorLayout:=1
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk in front of text:K81:241) // wk in front of text - image is anchored, in front of the text
- _anchorLayout:=2
-
- // new values v20 R5
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk text wrap top bottom:K81:379) //
- _anchorLayout:=3
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk text wrap square left:K81:382) //
- _anchorLayout:=4
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk text wrap square right:K81:383)
- _anchorLayout:=5
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk text wrap square:K81:380)
- _anchorLayout:=6
- : (Form:C1466.pictSettings[wk anchor layout:K81:227]=wk text wrap square largest:K81:384)
- _anchorLayout:=7
- End case
+
+
+ //***
+ Form:C1466.anchorHorizontalAlign:=New object:C1471 // used as dropdown in the dialog
+ Form:C1466.anchorHorizontalAlign.values:=New collection:C1472()
+
+ Form:C1466.anchorHorizontalAlign.values.push(Get action info:C1442("anchorHorizontalAlign?value=left").title) // "Left"
+ Form:C1466.anchorHorizontalAlign.values.push(Get action info:C1442("anchorHorizontalAlign?value=right").title) //"Right"
+ Form:C1466.anchorHorizontalAlign.values.push(Get action info:C1442("anchorHorizontalAlign?value=center").title) //"Center"
+ Form:C1466.anchorHorizontalAlign.index:=Form:C1466.pictSettings.anchorHorizontalAlign
+
+ //***
+ Form:C1466.anchorVerticalAlign:=New object:C1471 // used as dropdown in the dialog
+ Form:C1466.anchorVerticalAlign.values:=New collection:C1472()
+
+ Form:C1466.anchorVerticalAlign.values.push(Get action info:C1442("anchorVerticalAlign?value=top").title) // "top"
+ Form:C1466.anchorVerticalAlign.values.push(Get action info:C1442("anchorVerticalAlign?value=bottom").title) //"bottom"
+ Form:C1466.anchorVerticalAlign.values.push(Get action info:C1442("anchorVerticalAlign?value=middle").title) //"middle"
+ Form:C1466.anchorVerticalAlign.index:=Form:C1466.pictSettings.anchorVerticalAlign
+
+
+ //***
+ Form:C1466.anchorLayout:=New object:C1471 // used as dropdown in the dialog
+ Form:C1466.anchorLayout.values:=New collection:C1472
+ Form:C1466.anchorLayout.anchorValues:=New collection:C1472
+
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=behind").title)
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=front").title)
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=wrapTopBottom").title)
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=wrapSquareLeft").title)
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=wrapSquareRight").title)
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=wrapSquare").title)
+ Form:C1466.anchorLayout.values.push(Get action info:C1442("anchorLayout?value=wrapSquareLargest").title)
+
+ Form:C1466.anchorLayout.anchorValues.push(wk behind text:K81:240)
+ Form:C1466.anchorLayout.anchorValues.push(wk in front of text:K81:241)
+ Form:C1466.anchorLayout.anchorValues.push(wk text wrap top bottom:K81:379)
+ Form:C1466.anchorLayout.anchorValues.push(wk text wrap square left:K81:382)
+ Form:C1466.anchorLayout.anchorValues.push(wk text wrap square right:K81:383)
+ Form:C1466.anchorLayout.anchorValues.push(wk text wrap square:K81:380)
+ Form:C1466.anchorLayout.anchorValues.push(wk text wrap square largest:K81:384)
+
+ Form:C1466.anchorLayout.index:=Form:C1466.anchorLayout.anchorValues.indexOf(Form:C1466.pictSettings[wk anchor layout:K81:227])
+
+
+ //***
+ Form:C1466.anchorOrigin:=New object:C1471
+ Form:C1466.anchorOrigin.values:=New collection:C1472
+ Form:C1466.anchorOrigin.originValues:=New collection:C1472
+
+ Form:C1466.anchorOrigin.values.push(Get action info:C1442("anchorOrigin?value=paper-box").title) //"Paper"
+ Form:C1466.anchorOrigin.values.push(Get action info:C1442("anchorOrigin?value=header-box").title) //"Header"
+ Form:C1466.anchorOrigin.values.push(Get action info:C1442("anchorOrigin?value=footer-box").title) //"Footer"
+
+ Form:C1466.anchorOrigin.originValues.push(wk paper box:K81:215) //3
+ Form:C1466.anchorOrigin.originValues.push(wk header box:K81:243) //0
+ Form:C1466.anchorOrigin.originValues.push(wk footer box:K81:244) //1
+
+ Form:C1466.anchorOrigin.index:=Form:C1466.anchorOrigin.originValues.indexOf(Form:C1466.pictSettings[wk anchor origin:K81:235])
+
End if
diff --git a/Project/Sources/Methods/Compiler_Arrays.4dm b/Project/Sources/Methods/Compiler_Arrays.4dm
index 54c9d38a..66858387 100644
--- a/Project/Sources/Methods/Compiler_Arrays.4dm
+++ b/Project/Sources/Methods/Compiler_Arrays.4dm
@@ -4,11 +4,6 @@ ARRAY TEXT:C222(WP_FontFamilly; 0)
ARRAY TEXT:C222(WP_fontFamillyJapanese; 0)
ARRAY TEXT:C222(WP_fontLongName; 0)
ARRAY TEXT:C222(WP_fontStyle; 0)
-ARRAY TEXT:C222(_anchorHorizontalAlign; 0)
-ARRAY TEXT:C222(_anchorLayout; 0)
-ARRAY TEXT:C222(_anchorOrigin; 0)
-ARRAY TEXT:C222(_anchorPage; 0)
-ARRAY TEXT:C222(_anchorSection; 0)
-ARRAY TEXT:C222(_anchorVerticalAlign; 0)
-ARRAY TEXT:C222(_displayFormatLabels; 0)
-ARRAY TEXT:C222(_displayFormatValues; 0)
\ No newline at end of file
+
+
+
diff --git a/Project/Sources/Methods/UI_PictureSettings.4dm b/Project/Sources/Methods/UI_PictureSettings.4dm
index 5d56273c..ff8e7c8a 100644
--- a/Project/Sources/Methods/UI_PictureSettings.4dm
+++ b/Project/Sources/Methods/UI_PictureSettings.4dm
@@ -80,10 +80,10 @@ If ($p>0)
OBJECT SET FORMAT:C236(*; "lockerButton"; $format)
End if
-$p:=Find in array:C230(_displayFormatValues; Form:C1466.pictSettings[wk image display mode:K81:340])
-If ($p>0)
- _displayFormatLabels:=$p
-End if
+//$p:=Find in array(_displayFormatValues; Form.pictSettings[wk image display mode])
+//If ($p>0)
+//_displayFormatLabels:=$p
+//End if
//--------------------------------------------------------------------------
@@ -146,13 +146,16 @@ End if
If (Form:C1466.pictSettings.anchored=True:C214)
- If (_anchorPage=5) // specific page number
+
+
+ If (Form:C1466.anchorPage.index=4) // specific page number
//OBJECT SET VISIBLE(*; "anchorPageNumber@"; True)
OBJECT SET ENTERABLE:C238(*; "anchorPageNumber@"; True:C214)
OBJECT SET ENABLED:C1123(*; "anchorPageNumber@"; True:C214)
- _anchorSection:=1 // forces ALL sections
+ Form:C1466.anchorSection.index:=0
+
OBJECT SET ENABLED:C1123(*; "anchorSectionDropDown"; False:C215)
Else
@@ -168,15 +171,14 @@ If (Form:C1466.pictSettings.anchored=True:C214)
Case of
- : (_anchorSection<=1) //wk anchor all or empty array
+ : (Form:C1466.anchorSection.index<=0) // wk anchor all or empty collection
//OBJECT SET VISIBLE(*; "anchorSectionNumber@"; False)
OBJECT SET ENTERABLE:C238(*; "anchorSectionNumber@"; False:C215)
OBJECT SET ENABLED:C1123(*; "anchorSectionNumber@"; False:C215)
//Form.display.anchorSection:=0
-
- : (_anchorSection=2) // section number
+ : (Form:C1466.anchorSection.index=1) // section number
//OBJECT SET VISIBLE(*; "anchorSectionNumber@"; True)
OBJECT SET ENTERABLE:C238(*; "anchorSectionNumber@"; True:C214)
diff --git a/Project/Sources/TableForms/1/InputToolBar/form.4DForm b/Project/Sources/TableForms/1/InputToolBar/form.4DForm
index 22f3c314..282a26a0 100644
--- a/Project/Sources/TableForms/1/InputToolBar/form.4DForm
+++ b/Project/Sources/TableForms/1/InputToolBar/form.4DForm
@@ -350,7 +350,7 @@
"enterable": true,
"showSelection": true,
"keyboardDialect": "fr-be",
- "contextMenu": "none"
+ "contextMenu": "automatic"
},
"Button11": {
"type": "button",
diff --git a/Project/Sources/catalog.4DCatalog b/Project/Sources/catalog.4DCatalog
index bd21f13b..d9eb0b99 100644
--- a/Project/Sources/catalog.4DCatalog
+++ b/Project/Sources/catalog.4DCatalog
@@ -1,6 +1,6 @@
-
+