Skip to content

Commit eaf43a8

Browse files
Roland-LannuzelRoland-Lannuzel
committed
ACI0105555 bug fix
New menu item added in the toolbar to set the text background to transparent (for windows maintly)
1 parent 1fad90f commit eaf43a8

File tree

5 files changed

+52
-38
lines changed

5 files changed

+52
-38
lines changed

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

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,6 @@
2828
null,
2929
{
3030
"objects": {
31-
"PaletteSubform": {
32-
"type": "subform",
33-
"top": 30,
34-
"left": 0,
35-
"width": 260,
36-
"height": 620,
37-
"detailForm": "WP_Palette_Fonts",
38-
"focusable": false,
39-
"deletableInList": false,
40-
"doubleClickInRowAction": "editSubrecord",
41-
"doubleClickInEmptyAreaAction": "addSubrecord",
42-
"selectionMode": "multiple",
43-
"printFrame": "variable",
44-
"method": "ObjectMethods/PaletteSubform.4dm",
45-
"events": [
46-
"onDataChange"
47-
],
48-
"borderStyle": "none",
49-
"scrollbarVertical": "visible",
50-
"scrollbarHorizontal": "hidden",
51-
"sizingX": "grow",
52-
"sizingY": "grow"
53-
},
5431
"background": {
5532
"type": "rectangle",
5633
"top": 0,
@@ -484,12 +461,35 @@
484461
"fontSize": 50,
485462
"textAngle": 270,
486463
"text": "4D WritePro Widget"
464+
},
465+
"PaletteSubform": {
466+
"type": "subform",
467+
"top": 30,
468+
"left": 0,
469+
"width": 260,
470+
"height": 620,
471+
"detailForm": "WP_Palette_Fonts",
472+
"focusable": false,
473+
"deletableInList": false,
474+
"doubleClickInRowAction": "editSubrecord",
475+
"doubleClickInEmptyAreaAction": "addSubrecord",
476+
"selectionMode": "multiple",
477+
"printFrame": "variable",
478+
"method": "ObjectMethods/PaletteSubform.4dm",
479+
"events": [
480+
"onDataChange"
481+
],
482+
"borderStyle": "none",
483+
"scrollbarVertical": "visible",
484+
"scrollbarHorizontal": "hidden",
485+
"sizingX": "grow",
486+
"sizingY": "grow"
487487
}
488488
}
489489
}
490490
],
491491
"editor": {
492-
"activeView": "View 1",
492+
"activeView": "Invisible By default",
493493
"defaultView": "View 1",
494494
"views": {
495495
"View 1": {},
@@ -507,13 +507,12 @@
507507
"visible": false
508508
},
509509
"Invisible By default": {
510-
"visible": false,
511510
"objects": [
512511
"Rect1",
513512
"Text"
514513
]
515514
}
516515
}
517516
},
518-
"geometryStamp": 536
517+
"geometryStamp": 538
519518
}

‎Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_colorShowDialog2.4dm‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
C_TEXT:C284($menuRef; $choice)
1+
var $menuRef; $choice : Text
22
$menuRef:=Create menu:C408
33

4-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("subscript"))
4+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("subscript"))
55
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "fontSubscript")
66
SET MENU ITEM ICON:C984($menuRef; -1; "Path:/RESOURCES/Images/MenuIcons/Subscript_24_1.png")
77

8-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("superscript"))
8+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("superscript"))
99
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "fontSuperscript")
1010
SET MENU ITEM ICON:C984($menuRef; -1; "Path:/RESOURCES/Images/MenuIcons/Superscript_24_1.png")
1111

1212
APPEND MENU ITEM:C411($menuRef; "-")
1313

14-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("Uppercase"))
14+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("Uppercase"))
1515
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=uppercase")
1616

17-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("Lowercase"))
17+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("Lowercase"))
1818
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=lowercase")
1919

20-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("Capitalize"))
20+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("Capitalize"))
2121
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=capitalize")
2222

23-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("SmallUppercase"))
23+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("SmallUppercase"))
2424
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=small-uppercase")
2525

26-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("TextTransformNone"))
26+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("TextTransformNone"))
2727
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=none")
2828

2929
APPEND MENU ITEM:C411($menuRef; "-")
30-
APPEND MENU ITEM:C411($menuRef; Get localized string:C991("FontsElipsis"))
30+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("FontsElipsis"))
3131
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "font/showDialog")
3232

3333
APPEND MENU ITEM:C411($menuRef; "-")
@@ -53,12 +53,19 @@ SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8;
5353
APPEND MENU ITEM:C411($menuRef; ak standard action title:K76:83)
5454
SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textShadowOffset")
5555

56+
If (Form:C1466.selection#Null:C1517)
57+
APPEND MENU ITEM:C411($menuRef; "-")
58+
APPEND MENU ITEM:C411($menuRef; Localized string:C991("TransparentBackground"))
59+
SET MENU ITEM PARAMETER:C1004($menuRef; -1; "TransparentBackground")
60+
End if
5661

5762
$choice:=Dynamic pop up menu:C1006($menuRef)
5863

5964
RELEASE MENU:C978($menuRef)
6065

61-
66+
If ($choice="TransparentBackground")
67+
WP_SetBackgroundColor(Form:C1466.selection; wk transparent:K81:134)
68+
End if
6269

6370

6471
//APPEND TO ARRAY($ptrArrayNames->; Get localized string("TextTransformNone"))

‎Project/Sources/TableForms/1/InputToolBarBasic/form.4DForm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"type": "button",
178178
"text": "Unactivate AI",
179179
"top": 739,
180-
"left": 588,
180+
"left": 321,
181181
"width": 121,
182182
"height": 27,
183183
"events": [
@@ -209,7 +209,7 @@
209209
"kind": "form"
210210
},
211211
"method": "method.4dm",
212-
"geometryStamp": 476,
212+
"geometryStamp": 477,
213213
"editor": {
214214
"activeView": "View 1",
215215
"defaultView": "View 1",

‎Resources/en.lproj/WPC.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,10 @@ This file is distributed under the same license as the product package.-->
830830
<source>Small uppercase</source>
831831
<target>Small uppercase</target>
832832
</trans-unit>
833+
<trans-unit id="5" resname="TransparentBackground">
834+
<source>Transparent background</source>
835+
<target>Transparent background</target>
836+
</trans-unit>
833837
</group>
834838
<group resname="PaletteStylesheets">
835839
<trans-unit id="169" resname="characterStylesheets">

‎Resources/fr.lproj/WPC.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,10 @@ This file is distributed under the same license as the product package.-->
830830
<source>Small uppercase</source>
831831
<target>Petites majuscules</target>
832832
</trans-unit>
833+
<trans-unit id="5" resname="TransparentBackground">
834+
<source>Transparent background</source>
835+
<target>Fond transparent</target>
836+
</trans-unit>
833837
</group>
834838
<group resname="PaletteStylesheets">
835839
<trans-unit id="169" resname="characterStylesheets">

0 commit comments

Comments
 (0)