Skip to content

Commit e39e875

Browse files
Roland-LannuzelRoland-Lannuzel
committed
UI improvements (buttons, window closed, tips)
1 parent 4ce0b64 commit e39e875

File tree

27 files changed

+232
-143
lines changed

27 files changed

+232
-143
lines changed

‎Project/Sources/Forms/D_AI_Prompt/ObjectMethods/btn_InsertAsStyledText.4dm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
var $doc : Object
22

33
$doc:=WP New:C1317(WP Selection range:C1340(*; "WParea"))
4-
WP Insert document body:C1411(Form:C1466.wpSelection; $doc; wk replace:K81:177)
4+
If (Form:C1466.wpSelection.type#2) // NOT an achored picture
5+
WP Insert document body:C1411(Form:C1466.wpSelection; $doc; wk replace:K81:177)
6+
End if
57

68

‎Project/Sources/Forms/D_AI_Prompt/ObjectMethods/btn_InsertAsText.4dm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
var $text : Text
22

33
$text:=WP Get text:C1575(WP Selection range:C1340(*; "WParea"); wk expressions as value:K81:255)
4-
WP SET TEXT:C1574(Form:C1466.wpSelection; $text; wk replace:K81:177)
4+
If (Form:C1466.wpSelection.type#2) // NOT an anchored picture.
5+
WP SET TEXT:C1574(Form:C1466.wpSelection; $text; wk replace:K81:177)
6+
End if
57

68

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@
3333
"sizingY": "move",
3434
"class": "prompt_area"
3535
},
36-
"spinner": {
37-
"type": "picture",
38-
"top": 528,
39-
"left": 620,
40-
"width": 32,
41-
"height": 32,
42-
"picture": "/RESOURCES/Images/AI/spinner.gif",
43-
"pictureFormat": "scaled",
44-
"visibility": "hidden",
45-
"sizingX": "move",
46-
"sizingY": "move"
47-
},
4836
"history_area": {
4937
"type": "rectangle",
5038
"top": 0,
@@ -531,11 +519,23 @@
531519
],
532520
"tooltip": ":xliff:EraseHistory",
533521
"sizingX": "move"
522+
},
523+
"spinner": {
524+
"type": "picture",
525+
"top": 558,
526+
"left": 620,
527+
"width": 32,
528+
"height": 32,
529+
"picture": "/RESOURCES/Images/AI/spinner.gif",
530+
"pictureFormat": "scaled",
531+
"visibility": "hidden",
532+
"sizingX": "move",
533+
"sizingY": "move"
534534
}
535535
}
536536
}
537537
],
538-
"geometryStamp": 1783,
538+
"geometryStamp": 1814,
539539
"editor": {
540540
"activeView": "View 1",
541541
"defaultView": "View 1",

‎Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnAI.4dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
If (oForm.aiKey#"")
2+
WP AI(Form:C1466.selection; oForm.aiKey)
3+
End if

‎Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnClear1.4dm‎

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@
10191019
"height": 20,
10201020
"visibility": "hidden"
10211021
},
1022-
"btnClear1": {
1022+
"btnAI": {
10231023
"type": "button",
10241024
"top": 550,
10251025
"left": 110,
@@ -1031,14 +1031,14 @@
10311031
"iconFrames": 4,
10321032
"style": "custom",
10331033
"popupPlacement": "none",
1034-
"method": "ObjectMethods/btnClear1.4dm",
1034+
"method": "ObjectMethods/btnAI.4dm",
10351035
"events": [
10361036
"onClick"
10371037
],
1038-
"tooltip": ":xliff:clear",
1038+
"tooltip": ":xliff:AI",
10391039
"text": ""
10401040
},
1041-
"Separator3": {
1041+
"Separator_AI": {
10421042
"type": "rectangle",
10431043
"top": 523,
10441044
"left": 5,
@@ -1047,15 +1047,15 @@
10471047
"borderRadius": 4,
10481048
"class": "separator"
10491049
},
1050-
"sepLbl_SpecialChars1": {
1050+
"sepLbl_AI": {
10511051
"type": "text",
10521052
"top": 524,
10531053
"left": 25,
10541054
"width": 210,
10551055
"height": 13,
10561056
"class": "separatorFont",
10571057
"textAlign": "center",
1058-
"text": "A.I."
1058+
"text": ":xliff:AI"
10591059
},
10601060
"background1": {
10611061
"type": "rectangle",
@@ -1098,7 +1098,7 @@
10981098
"btn_InsertSH",
10991099
"btn_RemoveSH",
11001100
"fontLongName",
1101-
"btnClear1"
1101+
"btnAI"
11021102
]
11031103
}
11041104
],
@@ -1143,5 +1143,5 @@
11431143
"version": "1",
11441144
"kind": "form"
11451145
},
1146-
"geometryStamp": 1416
1146+
"geometryStamp": 1425
11471147
}

‎Project/Sources/Forms/WP_Palette_Fonts/method.4dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Case of
5050

5151
// …to here
5252
UI_PaletteFonts
53+
UI_ManageAIbutton // may be moved somewhere else later
5354

5455
Else
5556
//something wrong with setup (ex: cursor was in the header and header has been deleted)

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@
589589
"style": "toolbar",
590590
"method": "ObjectMethods/tabBtn_Home.4dm",
591591
"focusable": false,
592-
"class": ""
592+
"class": "tabLabel"
593593
},
594594
"tabBtn_Insert": {
595595
"type": "button",
@@ -604,7 +604,7 @@
604604
"style": "toolbar",
605605
"method": "ObjectMethods/tabBtn_Insert.4dm",
606606
"focusable": false,
607-
"class": ""
607+
"class": "tabLabel"
608608
},
609609
"tabBtn_Margins": {
610610
"type": "button",
@@ -619,7 +619,7 @@
619619
"style": "toolbar",
620620
"method": "ObjectMethods/tabBtn_Margins.4dm",
621621
"focusable": false,
622-
"class": ""
622+
"class": "tabLabel"
623623
},
624624
"tabBtn_Borders": {
625625
"type": "button",
@@ -634,7 +634,7 @@
634634
"style": "toolbar",
635635
"method": "ObjectMethods/tabBtn_Borders.4dm",
636636
"focusable": false,
637-
"class": ""
637+
"class": "tabLabel"
638638
},
639639
"tabBtn_Images": {
640640
"type": "button",
@@ -649,7 +649,7 @@
649649
"style": "toolbar",
650650
"method": "ObjectMethods/tabBtn_Images.4dm",
651651
"focusable": false,
652-
"class": ""
652+
"class": "tabLabel"
653653
},
654654
"tabBtn_Printing": {
655655
"type": "button",
@@ -664,7 +664,7 @@
664664
"style": "toolbar",
665665
"method": "ObjectMethods/tabBtn_Printing.4dm",
666666
"focusable": false,
667-
"class": ""
667+
"class": "tabLabel"
668668
},
669669
"tabBtn_Tables": {
670670
"type": "button",
@@ -679,7 +679,7 @@
679679
"style": "toolbar",
680680
"method": "ObjectMethods/tabBtn_Tables.4dm",
681681
"focusable": false,
682-
"class": ""
682+
"class": "tabLabel"
683683
},
684684
"tabBtn_Spell": {
685685
"type": "button",
@@ -694,7 +694,7 @@
694694
"style": "toolbar",
695695
"method": "ObjectMethods/tabBtn_Spell.4dm",
696696
"focusable": false,
697-
"class": ""
697+
"class": "tabLabel"
698698
},
699699
"tabBtn_Protection": {
700700
"type": "button",
@@ -710,7 +710,7 @@
710710
"method": "ObjectMethods/tabBtn_Protection.4dm",
711711
"stroke": "automatic",
712712
"focusable": false,
713-
"class": ""
713+
"class": "tabLabel"
714714
},
715715
"tabBtn_ImportExport": {
716716
"type": "button",
@@ -725,7 +725,7 @@
725725
"style": "toolbar",
726726
"method": "ObjectMethods/tabBtn_ImportExport.4dm",
727727
"focusable": false,
728-
"class": ""
728+
"class": "tabLabel"
729729
},
730730
"tabBtn_FindAndReplace": {
731731
"type": "button",
@@ -740,7 +740,7 @@
740740
"style": "toolbar",
741741
"method": "ObjectMethods/tabBtn_FindAndReplace.4dm",
742742
"focusable": false,
743-
"class": ""
743+
"class": "tabLabel"
744744
},
745745
"cbBold1": {
746746
"type": "checkbox",
@@ -4268,8 +4268,9 @@
42684268
"events": [
42694269
"onClick"
42704270
],
4271-
"tooltip": ":xliff:clear",
4272-
"text": ""
4271+
"text": "",
4272+
"visibility": "hidden",
4273+
"tooltip": ":xliff:AI"
42734274
}
42744275
},
42754276
"entryOrder": [
@@ -4561,5 +4562,5 @@
45614562
}
45624563
}
45634564
},
4564-
"geometryStamp": 7565
4565+
"geometryStamp": 7596
45654566
}

0 commit comments

Comments
 (0)