Skip to content

Commit 6d490a4

Browse files
Roland-LannuzelRoland-Lannuzel
committed
integration of ACI0104082
1 parent f51fbf0 commit 6d490a4

File tree

18 files changed

+461
-166
lines changed

18 files changed

+461
-166
lines changed

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/bgndSizeHor.4dm‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1-
C_OBJECT:C1216($oCurrent)
2-
$oCurrent:=WP_FillCurrent("popup")
3-
WP_SetBackgroundSize($oCurrent)
1+
var $oCurrent : Object
2+
3+
Case of
4+
5+
: (Form event code:C388=On Getting Focus:K2:7)
6+
HIGHLIGHT TEXT:C210(*; OBJECT Get name:C1087(Object current:K67:2); 0; MAXLONG:K35:2)
7+
8+
: (Form event code:C388=On Data Change:K2:15)
9+
10+
$oCurrent:=WP_FillCurrent("popup")
11+
12+
UI_PaletteBackgrounds(OBJECT Get name:C1087(Object current:K67:2))
13+
14+
WP_SetBackgroundSize($oCurrent)
15+
// TEMP for check purpose
16+
// WP_GetBackgroundSize($oCurrent)
17+
18+
19+
End case

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/bgndSizeHorUnit.4dm‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/bgndSizeVert.4dm‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1-
C_OBJECT:C1216($oCurrent)
2-
$oCurrent:=WP_FillCurrent("popup")
3-
WP_SetBackgroundSize($oCurrent)
1+
var $oCurrent : Object
2+
3+
Case of
4+
5+
: (Form event code:C388=On Getting Focus:K2:7)
6+
HIGHLIGHT TEXT:C210(*; OBJECT Get name:C1087(Object current:K67:2); 0; MAXLONG:K35:2)
7+
8+
: (Form event code:C388=On Data Change:K2:15)
9+
10+
$oCurrent:=WP_FillCurrent("popup")
11+
12+
UI_PaletteBackgrounds(OBJECT Get name:C1087(Object current:K67:2))
13+
14+
WP_SetBackgroundSize($oCurrent)
15+
16+
//TEMP for check purpose
17+
//WP_GetBackgroundSize($oCurrent)
18+
19+
End case

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/bgndSizeVertUnit.4dm‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/btn_PictInfo.4dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WP PictureSettings(Form:C1466.selection)
1+
WP PictureSettings(Form:C1466.selection)

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/horizontalSizeUnits.4dm‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
C_OBJECT:C1216($oCurrent)
2+
$oCurrent:=WP_FillCurrent("popup")
3+
4+
UI_PaletteBackgrounds(OBJECT Get name:C1087(Object current:K67:2))
5+
6+
WP_SetBackgroundSize($oCurrent)
7+
8+
// TEMP for check purpose
9+
//WP_GetBackgroundSize($oCurrent)

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/verticalSizeUnits.4dm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
C_OBJECT:C1216($oCurrent)
2+
$oCurrent:=WP_FillCurrent("popup")
3+
4+
UI_PaletteBackgrounds(OBJECT Get name:C1087(Object current:K67:2))
5+
6+
WP_SetBackgroundSize($oCurrent)
7+
// TEMP for check purpose
8+
//WP_GetBackgroundSize($oCurrent)

‎Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Clear.4dm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ If ($oCurrent#Null:C1517)
1414
// reset attribute
1515
WP_SetBackgroundPicture($oCurrent; $pict)
1616

17+
//
18+
WP_GetBackgroundURL($oCurrent)
19+
WP_GetBackgroundSize($oCurrent)
20+
1721
End if

‎Project/Sources/Forms/WP_Palette_Backgrounds/form.4DForm‎

Lines changed: 115 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,31 @@
2727
null,
2828
{
2929
"objects": {
30+
"Rect2": {
31+
"type": "rectangle",
32+
"top": 0,
33+
"left": 0,
34+
"width": 260,
35+
"height": 620,
36+
"visibility": "hidden",
37+
"fill": "#CCCCCC",
38+
"stroke": "transparent",
39+
"borderRadius": 8
40+
},
41+
"Text": {
42+
"type": "text",
43+
"top": 20,
44+
"left": 10,
45+
"width": 41,
46+
"height": 600,
47+
"visibility": "hidden",
48+
"stroke": "#AAAAAA",
49+
"textAlign": "right",
50+
"fontFamily": ".Helvetica Neue DeskInterface",
51+
"fontSize": 28,
52+
"textAngle": 270,
53+
"text": "4D WritePro Backgrounds"
54+
},
3055
"Background": {
3156
"type": "rectangle",
3257
"top": 0,
@@ -95,8 +120,8 @@
95120
"bgndSizeHor": {
96121
"type": "input",
97122
"top": 565,
98-
"left": 125,
99-
"width": 35,
123+
"left": 95,
124+
"width": 55,
100125
"height": 14,
101126
"class": "Palette",
102127
"textAlign": "right",
@@ -105,14 +130,18 @@
105130
"dropping": "custom",
106131
"method": "ObjectMethods/bgndSizeHor.4dm",
107132
"events": [
133+
"onGettingFocus",
108134
"onDataChange"
109-
]
135+
],
136+
"dataSource": "oForm.bgndSizeHor",
137+
"dataSourceTypeHint": "number",
138+
"numberFormat": "####0.00;;"
110139
},
111140
"bgndSizeVert": {
112141
"type": "input",
113142
"top": 591,
114-
"left": 125,
115-
"width": 35,
143+
"left": 95,
144+
"width": 55,
116145
"height": 14,
117146
"class": "Palette",
118147
"textAlign": "right",
@@ -121,14 +150,18 @@
121150
"dropping": "custom",
122151
"method": "ObjectMethods/bgndSizeVert.4dm",
123152
"events": [
153+
"onGettingFocus",
124154
"onDataChange"
125-
]
155+
],
156+
"dataSource": "oForm.bgndSizeVert",
157+
"dataSourceTypeHint": "number",
158+
"numberFormat": "####0.00;;"
126159
},
127160
"lbl_HorSize": {
128161
"type": "text",
129162
"top": 565,
130163
"left": 10,
131-
"width": 110,
164+
"width": 80,
132165
"height": 13,
133166
"class": "Palette",
134167
"textAlign": "right",
@@ -139,7 +172,7 @@
139172
"type": "text",
140173
"top": 591,
141174
"left": 10,
142-
"width": 110,
175+
"width": 80,
143176
"height": 13,
144177
"class": "Palette",
145178
"textAlign": "right",
@@ -189,31 +222,35 @@
189222
"text": ":xliff:PositionsColon",
190223
"fontTheme": "additional"
191224
},
192-
"bgndSizeHorUnit": {
225+
"horizontalSizeUnits": {
193226
"type": "dropdown",
194227
"top": 563,
195-
"left": 170,
196-
"width": 65,
228+
"left": 160,
229+
"width": 75,
197230
"height": 19,
198231
"focusable": false,
199232
"class": "Palette",
200-
"method": "ObjectMethods/bgndSizeHorUnit.4dm",
201233
"events": [
202234
"onDataChange"
203-
]
235+
],
236+
"method": "ObjectMethods/horizontalSizeUnits.4dm",
237+
"dataSourceTypeHint": "object",
238+
"dataSource": "oForm.horizontalSizeUnits"
204239
},
205-
"bgndSizeVertUnit": {
240+
"verticalSizeUnits": {
206241
"type": "dropdown",
207242
"top": 589,
208-
"left": 170,
209-
"width": 65,
243+
"left": 160,
244+
"width": 75,
210245
"height": 19,
211246
"focusable": false,
212247
"class": "Palette",
213-
"method": "ObjectMethods/bgndSizeVertUnit.4dm",
214248
"events": [
215249
"onDataChange"
216-
]
250+
],
251+
"method": "ObjectMethods/verticalSizeUnits.4dm",
252+
"dataSourceTypeHint": "object",
253+
"dataSource": "oForm.verticalSizeUnits"
217254
},
218255
"btnAction": {
219256
"type": "button",
@@ -616,7 +653,49 @@
616653
"text": ":xliff:PictureHyphen",
617654
"fontTheme": "additional"
618655
},
619-
"Rect2": {
656+
"VirtualExpression": {
657+
"type": "input",
658+
"top": 74,
659+
"left": 405,
660+
"width": 220,
661+
"height": 23,
662+
"sizingX": "move",
663+
"sizingY": "move",
664+
"stroke": "#800000",
665+
"class": "Palette",
666+
"focusable": false,
667+
"fill": "transparent",
668+
"borderStyle": "none",
669+
"enterable": false,
670+
"contextMenu": "none",
671+
"dragging": "none",
672+
"dropping": "custom",
673+
"events": [
674+
"onDataChange"
675+
]
676+
},
677+
"TrueExpression": {
678+
"type": "input",
679+
"top": 110,
680+
"left": 405,
681+
"width": 220,
682+
"height": 23,
683+
"sizingX": "move",
684+
"sizingY": "move",
685+
"stroke": "#800000",
686+
"class": "Palette",
687+
"focusable": false,
688+
"fill": "transparent",
689+
"borderStyle": "none",
690+
"enterable": false,
691+
"contextMenu": "none",
692+
"dragging": "none",
693+
"dropping": "custom",
694+
"events": [
695+
"onDataChange"
696+
]
697+
},
698+
"Rect1": {
620699
"type": "rectangle",
621700
"top": 0,
622701
"left": 0,
@@ -627,7 +706,7 @@
627706
"stroke": "transparent",
628707
"borderRadius": 8
629708
},
630-
"Text": {
709+
"Text1": {
631710
"type": "text",
632711
"top": 20,
633712
"left": 10,
@@ -643,18 +722,18 @@
643722
}
644723
},
645724
"entryOrder": [
646-
"Popup_anchorLayout",
647-
"Popup_anchorVerticalAlign",
648-
"Popup_anchorHorizontalAlign",
725+
"bgndSizeHor",
726+
"bgndSizeVert",
727+
"bgndPictPreview",
728+
"horizontalSizeUnits",
729+
"verticalSizeUnits",
730+
"btnAction",
649731
"Popup_anchorToPage",
650732
"Popup_anchorToSection",
651733
"btn_PictInfo",
652-
"bgndPictPreview",
653-
"bgndSizeHor",
654-
"bgndSizeHorUnit",
655-
"btnAction",
656-
"bgndSizeVert",
657-
"bgndSizeVertUnit",
734+
"Popup_anchorVerticalAlign",
735+
"Popup_anchorHorizontalAlign",
736+
"Popup_anchorLayout",
658737
"btn_imageMoveToBack",
659738
"btn_imageMoveToFront",
660739
"Popup_backgroundPositionV",
@@ -666,7 +745,9 @@
666745
"xbtn_Clear",
667746
"xbtn_Apply",
668747
"btn_insertImage",
669-
"btn_insertTextArea"
748+
"btn_insertTextArea",
749+
"VirtualExpression",
750+
"TrueExpression"
670751
]
671752
}
672753
],
@@ -686,7 +767,9 @@
686767
"visible": false,
687768
"objects": [
688769
"Rect2",
689-
"Text"
770+
"Text",
771+
"Rect1",
772+
"Text1"
690773
]
691774
}
692775
}
@@ -695,5 +778,5 @@
695778
"version": "1",
696779
"kind": "form"
697780
},
698-
"geometryStamp": 1550
781+
"geometryStamp": 1554
699782
}

0 commit comments

Comments
 (0)