diff --git a/Project/Sources/Forms/WP_Palette_Sizes/form.4DForm b/Project/Sources/Forms/WP_Palette_Sizes/form.4DForm index 4114a0fb..b0fbb217 100644 --- a/Project/Sources/Forms/WP_Palette_Sizes/form.4DForm +++ b/Project/Sources/Forms/WP_Palette_Sizes/form.4DForm @@ -563,6 +563,18 @@ "fontSize": 28, "textAngle": 270, "text": "4D WritePro Sizes" + }, + "btn_visibleTableBorders": { + "type": "checkbox", + "top": 130, + "left": 204, + "width": 36, + "height": 24, + "action": "visibleTableBorders", + "focusable": false, + "icon": "/RESOURCES/Images/Toolbar1/View/TableBorders_24.png", + "iconFrames": 4, + "style": "toolbar" } } } @@ -608,5 +620,5 @@ "version": "1", "kind": "form" }, - "geometryStamp": 526 + "geometryStamp": 536 } \ No newline at end of file diff --git a/Project/Sources/Forms/WP_Palette_Sizes/method.4dm b/Project/Sources/Forms/WP_Palette_Sizes/method.4dm index 1fb280e8..28619733 100644 --- a/Project/Sources/Forms/WP_Palette_Sizes/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Sizes/method.4dm @@ -23,6 +23,7 @@ Case of //tip for HideEmptyImages OBJECT SET HELP TIP:C1181(*; "btn_visibleEmptyImages"; Get action info:C1442("visibleEmptyImages").title) + OBJECT SET HELP TIP:C1181(*; "btn_visibleTableBorders"; Get action info:C1442("visibleTableBorders").title) // 20R6 If (Form:C1466#Null:C1517) diff --git a/Project/Sources/Forms/WP_Toolbar/form.4DForm b/Project/Sources/Forms/WP_Toolbar/form.4DForm index a161d5da..886a1ec4 100644 --- a/Project/Sources/Forms/WP_Toolbar/form.4DForm +++ b/Project/Sources/Forms/WP_Toolbar/form.4DForm @@ -2112,6 +2112,18 @@ "popupPlacement": "none", "icon": "/RESOURCES/Images/TBcommon/Insert/InsertTextBox_32.png", "method": "ObjectMethods/btn_insertTextArea1.4dm" + }, + "btn_visibleTableBorders": { + "type": "checkbox", + "top": 30, + "left": 840, + "width": 30, + "height": 24, + "action": "visibleTableBorders", + "focusable": false, + "icon": "/RESOURCES/Images/Toolbar1/View/TableBorders_24.png", + "iconFrames": 4, + "style": "toolbar" } }, "entryOrder": [ @@ -2147,7 +2159,8 @@ "btn_insertTime3", "btn_visibleEmptyImages", "btn_displayAsSymbol", - "btn_insertTextArea1" + "btn_insertTextArea1", + "btn_visibleTableBorders" ] }, { @@ -4463,5 +4476,5 @@ } } }, - "geometryStamp": 7166 + "geometryStamp": 7170 } \ No newline at end of file diff --git a/Project/Sources/Forms/WP_Toolbar/method.4dm b/Project/Sources/Forms/WP_Toolbar/method.4dm index 8aa07a5f..bb6e8e3e 100644 --- a/Project/Sources/Forms/WP_Toolbar/method.4dm +++ b/Project/Sources/Forms/WP_Toolbar/method.4dm @@ -103,6 +103,7 @@ Case of OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareLeft"; Get action info:C1442("anchorLayout?value=wrapSquareLeft").title) OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareRight"; Get action info:C1442("anchorLayout?value=wrapSquareRight").title) OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareLargest"; Get action info:C1442("anchorLayout?value=wrapSquareLargest").title) + OBJECT SET HELP TIP:C1181(*; "btn_visibleTableBorders"; Get action info:C1442("visibleTableBorders").title) // 20R6 OBJECT SET TITLE:C194(*; "cb_distinctFirstPage"; Get action info:C1442("section/differentFirstPage").title) OBJECT SET TITLE:C194(*; "cb_distinctLeftRightPage"; Get action info:C1442("section/differentLeftRightPages").title) diff --git a/Project/Sources/Forms/WP_ToolbarTemp/form.4DForm b/Project/Sources/Forms/WP_ToolbarTemp/form.4DForm index 5d882469..e60b419c 100644 --- a/Project/Sources/Forms/WP_ToolbarTemp/form.4DForm +++ b/Project/Sources/Forms/WP_ToolbarTemp/form.4DForm @@ -2112,6 +2112,18 @@ "popupPlacement": "none", "icon": "/RESOURCES/Images/TBcommon/Insert/InsertTextBox_32.png", "method": "ObjectMethods/btn_insertTextArea1.4dm" + }, + "btn_visibleTableBorders": { + "type": "checkbox", + "top": 30, + "left": 840, + "width": 30, + "height": 24, + "action": "visibleTableBorders", + "focusable": false, + "icon": "/RESOURCES/Images/Toolbar1/View/TableBorders_24.png", + "iconFrames": 4, + "style": "toolbar" } }, "entryOrder": [ @@ -2147,7 +2159,8 @@ "btn_insertTime3", "btn_visibleEmptyImages", "btn_displayAsSymbol", - "btn_insertTextArea1" + "btn_insertTextArea1", + "btn_visibleTableBorders" ] }, { @@ -4474,5 +4487,5 @@ } } }, - "geometryStamp": 7722 + "geometryStamp": 7734 } \ No newline at end of file diff --git a/Project/Sources/Forms/WP_ToolbarTemp/method.4dm b/Project/Sources/Forms/WP_ToolbarTemp/method.4dm index 1865c629..bb6e8e3e 100644 --- a/Project/Sources/Forms/WP_ToolbarTemp/method.4dm +++ b/Project/Sources/Forms/WP_ToolbarTemp/method.4dm @@ -77,6 +77,8 @@ Case of OBJECT SET VISIBLE:C603(*; "mac_@"; True:C214) Else OBJECT SET VISIBLE:C603(*; "win_@"; True:C214) + OBJECT SET VISIBLE:C603(*; "btn_mac_@"; False:C215) // RL 2024/03/28 (spell check page) + OBJECT SET VISIBLE:C603(*; "sep_Mac_@"; False:C215) // RL 2024/03/28 (spell check page) End if @@ -101,6 +103,7 @@ Case of OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareLeft"; Get action info:C1442("anchorLayout?value=wrapSquareLeft").title) OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareRight"; Get action info:C1442("anchorLayout?value=wrapSquareRight").title) OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareLargest"; Get action info:C1442("anchorLayout?value=wrapSquareLargest").title) + OBJECT SET HELP TIP:C1181(*; "btn_visibleTableBorders"; Get action info:C1442("visibleTableBorders").title) // 20R6 OBJECT SET TITLE:C194(*; "cb_distinctFirstPage"; Get action info:C1442("section/differentFirstPage").title) OBJECT SET TITLE:C194(*; "cb_distinctLeftRightPage"; Get action info:C1442("section/differentLeftRightPages").title) diff --git a/Project/Sources/catalog.4DCatalog b/Project/Sources/catalog.4DCatalog index bd21f13b..9757449c 100644 --- a/Project/Sources/catalog.4DCatalog +++ b/Project/Sources/catalog.4DCatalog @@ -14,7 +14,7 @@ - + diff --git a/Resources/Images/Toolbar1/View/TableBorders_24.png b/Resources/Images/Toolbar1/View/TableBorders_24.png new file mode 100644 index 00000000..48ac1059 Binary files /dev/null and b/Resources/Images/Toolbar1/View/TableBorders_24.png differ diff --git a/Resources/Images/Toolbar1/View/TableBorders_24@2x.png b/Resources/Images/Toolbar1/View/TableBorders_24@2x.png new file mode 100644 index 00000000..75f29c7b Binary files /dev/null and b/Resources/Images/Toolbar1/View/TableBorders_24@2x.png differ diff --git a/Resources/Images/Toolbar1/View/TableBorders_24@2x_dark.png b/Resources/Images/Toolbar1/View/TableBorders_24@2x_dark.png new file mode 100644 index 00000000..67f404b4 Binary files /dev/null and b/Resources/Images/Toolbar1/View/TableBorders_24@2x_dark.png differ diff --git a/Resources/Images/Toolbar1/View/TableBorders_24_dark.png b/Resources/Images/Toolbar1/View/TableBorders_24_dark.png new file mode 100644 index 00000000..9627a9bc Binary files /dev/null and b/Resources/Images/Toolbar1/View/TableBorders_24_dark.png differ