Skip to content

Commit

Permalink
visibleTableBorders buttons added (sidebar and toolbar)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Roland-Lannuzel
Roland-Lannuzel committed Jun 26, 2024
1 parent 13bcea8 commit 0d6aff1
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 6 deletions.
14 changes: 13 additions & 1 deletion Project/Sources/Forms/WP_Palette_Sizes/form.4DForm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -608,5 +620,5 @@
"version": "1",
"kind": "form"
},
"geometryStamp": 526
"geometryStamp": 536
}
1 change: 1 addition & 0 deletions Project/Sources/Forms/WP_Palette_Sizes/method.4dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 15 additions & 2 deletions Project/Sources/Forms/WP_Toolbar/form.4DForm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -2147,7 +2159,8 @@
"btn_insertTime3",
"btn_visibleEmptyImages",
"btn_displayAsSymbol",
"btn_insertTextArea1"
"btn_insertTextArea1",
"btn_visibleTableBorders"
]
},
{
Expand Down Expand Up @@ -4463,5 +4476,5 @@
}
}
},
"geometryStamp": 7166
"geometryStamp": 7170
}
1 change: 1 addition & 0 deletions Project/Sources/Forms/WP_Toolbar/method.4dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 15 additions & 2 deletions Project/Sources/Forms/WP_ToolbarTemp/form.4DForm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -2147,7 +2159,8 @@
"btn_insertTime3",
"btn_visibleEmptyImages",
"btn_displayAsSymbol",
"btn_insertTextArea1"
"btn_insertTextArea1",
"btn_visibleTableBorders"
]
},
{
Expand Down Expand Up @@ -4474,5 +4487,5 @@
}
}
},
"geometryStamp": 7722
"geometryStamp": 7734
}
3 changes: 3 additions & 0 deletions Project/Sources/Forms/WP_ToolbarTemp/method.4dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Project/Sources/catalog.4DCatalog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<field name="title" uuid="19F64DF6BDDD4615A1EEC9F1978DBD56" type="10" limiting_length="255" never_null="true" id="3"/>
<field name="group" uuid="47208754D7924C1E8357A182DBB2A1CC" type="3" never_null="true" id="4"/>
<primary_key field_name="ID" field_uuid="25E1AC17AE3D4D5FBED8BEFDB6E6B6DC"/>
<table_extra input_form="InputToolBar" output_form="Output">
<table_extra input_form="InputSideBar" output_form="Output">
<editor_table_info displayable_fields_count="6">
<color red="255" green="255" blue="255" alpha="0"/>
<coordinates left="41.5" top="16.453125" width="120" height="167.33203125"/>
Expand Down
Binary file added Resources/Images/Toolbar1/View/TableBorders_24.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/Toolbar1/View/TableBorders_24@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/Toolbar1/View/TableBorders_24@2x_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/Toolbar1/View/TableBorders_24_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0d6aff1

Please sign in to comment.