From 0d6aff1dc0607280d49b824ab996252a57e43bb0 Mon Sep 17 00:00:00 2001 From: Roland Lannuzel Date: Wed, 26 Jun 2024 09:24:25 +0200 Subject: [PATCH] visibleTableBorders buttons added (sidebar and toolbar) --- .../Sources/Forms/WP_Palette_Sizes/form.4DForm | 14 +++++++++++++- .../Sources/Forms/WP_Palette_Sizes/method.4dm | 1 + Project/Sources/Forms/WP_Toolbar/form.4DForm | 17 +++++++++++++++-- Project/Sources/Forms/WP_Toolbar/method.4dm | 1 + .../Sources/Forms/WP_ToolbarTemp/form.4DForm | 17 +++++++++++++++-- .../Sources/Forms/WP_ToolbarTemp/method.4dm | 3 +++ Project/Sources/catalog.4DCatalog | 2 +- .../Images/Toolbar1/View/TableBorders_24.png | Bin 0 -> 747 bytes .../Toolbar1/View/TableBorders_24@2x.png | Bin 0 -> 1491 bytes .../Toolbar1/View/TableBorders_24@2x_dark.png | Bin 0 -> 1492 bytes .../Toolbar1/View/TableBorders_24_dark.png | Bin 0 -> 804 bytes 11 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 Resources/Images/Toolbar1/View/TableBorders_24.png create mode 100644 Resources/Images/Toolbar1/View/TableBorders_24@2x.png create mode 100644 Resources/Images/Toolbar1/View/TableBorders_24@2x_dark.png create mode 100644 Resources/Images/Toolbar1/View/TableBorders_24_dark.png 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 0000000000000000000000000000000000000000..48ac1059602b1d2bd4653c73fba5673371d3f8e2 GIT binary patch literal 747 zcmeAS@N?(olHy`uVBq!ia0vp^5oTS#cRVDu`8tD~RQw7Su~vC-dTf~>JZD0X(-fHt(**q-7ctF|bXa5ixvV#F zu5*ev$N8S;-}ijuYc{O>Q_aFP^I?U}yol`QN8WozHrx|+HH_5}%YV1adin!P$@v$< z*A#}mom)~_CwGd`^WFJNKRhGKO{5}!O<9-wY^TY2)&5eI{_6{Q&J^uj6Cq(dt7Jj5 z#NmZoUuimJw)N~NI^}Y+{3_?MTSMT8H=kh9 zhNT{RChIJAH+g*_^}BLv7XPk&zDp1Lq_Y??aS8;e|IFMvGvK4q^6fPtFP+-Tj)`18 zpJ*Q-E@|CudaiSGpK2^8)2=s%w)Sobx}13T_|@&Tb@wZ_Yktm>K0fow#=a*Xy{0t& zta#~u-PPCXLSxT2u_#+tjk6N$@rT({FJE@&o1yN0+3LK6;7LWVcMcC*gQjP0zZm|$ z(WHyXanBP0MfT{*NvU5t(&l!*TC^@dSj6X9D$rfB$_w%?ud9E!Vt2>An3&rxqOr@D z6z^YA`@ML-$28YF*Mq-mJz9Bui|osa%p&$zDvM2$AD#QV$Zbo}{uP3=bWU*mVP?6K z8x?x>VZBM!VV9|TUp~M5U>_AZ?d{)1f9vdl9&^~t_uA{iMQ-&wpC^W8S*_U}w_f+) zlds(~!f#ugQvro~_#z&jhZ1-7vo1CArEJ-L0TkxPEF^f?PAyyBFJsVuZ1wNVsOOT( zN|r7sWi|E$yfS)g_Uo1H1h+s?Oej4`(DvWdBX@C4ap3+Av9hY!ixQ09=L`N|jbo_g UTRF>aA}Gaqy85}Sb4q9e0A&0((*OVf literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..75f29c7bbff0784cbcee40d6821580c78ba60a61 GIT binary patch literal 1491 zcma)6XHb(_6#YJef?;aYO-;CdI5ox(K03 zs46A&wm=db1B50;q=-QXNDD1sAR538?yR%>Z)fhg_uO~>-1p|5N479Cl$C+W001Cs zY=pBCS4}Y*q_>JQHg+UkTqIpEcnkoP#z5C@ZV~rqez!Ju#^ZsX#atQyAGraNVg`x< z69WJwG9-SSXl6iu@P&IE+oZOYW z+@;Dr@Rer^0aX7WWRULh=rCDH1K@ku`%2nI@p5x>9qKrChdF7J_p47%t`$V{Y8Ab1 zp%P4J9z^1tkq-+{P*9L@dMKLDS%w_ocbfEi%VQ%t} z3L2Wi|qg4T*GOW!ZkFZEN5PNT&nOxrfe^qWFA%&&0$;r`=>%$2{M&b~)nj5? z960n4E>e52XCojynhM zpHL}e%iFFsbWn-6X2%FxQJh}*jTBG&oEHj>M_-49g^f*5Pw&KWPsFwK)YbA5rUXyo zW1xP4CNJI=PZiv!QFcU!0Mfz#jYtWQpPYnTY7xoXAjb>qq78YZy=^>F8nn~XjUHQW z<*!|O2qOnc@?WhSsko+-K1S~Bd{T}XFB+>#yHr~vS_`TXV7>SWHOO>`AkgnYUrt8j zeKjr3dI2_FC5XN&t^}R@E~c!h8Ub0KjbVANtN%n(G~xVtHD8b3f0t3VI8n~Db6xm! z&awHxwB8q?#@h{k-7Jo7H`UFNDp)^`ZoO2pb0xPj?-usm+0zUG79zBg%7DvN@0SQq z^{v)-jCs|HDeew*uoYPqCkhcc`=!+7FwcE%m@37iR##a6|K-1ZLm9}MQg|dEy08y= z{fkUMYT3({V5Z%aP(+c@znvO+Ud>T;wypY;-)KJ+9z=+nL~trl=D$@Dig=6q1RG9( z>TE=S$#T{eq+}E3@74ZSmXzRrI6{s2ij`f{H}aM2+$x*B3ftoFfkmd>EK)r9ag+zO6mnDc9m=|m?XFG=xxFz*rEOl% zWVC5uz}k&K$ae|M^rO%BE4EH9H>KlybaZvw)2LKR-nya4-)Ydpr}AT?VN3F+?eO06 zDQRhuG)C6}Mla|}X3-u2T*UBP=YV6$oi2ATs!~6rw*b!Ame&lDaj|)WgM(#9b)qh0 zv+mIJ;x!WCXo$3dNh$HHmVIi8lj>M7j$Ng@q$ZZc7gV z>DK^3z{Y%geiE3%UFJcbrKevJhSV)PsZa-{L=HpaIst*1EOU*e59;{5c6r$iq9#v3 p8W2m=p86v$+f=@rtU-WSR4kMhyfm>lo7wzXjnA9mim>*fe*y7A!1@3H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..67f404b4a061610721c787b88dcb4100e217d231 GIT binary patch literal 1492 zcmZ8hdr;C@82yn}sA*`mOo9ecVwU2nZD?AE_{zaoZVw93)D*Sc4bw^ldyty>$}Gz# znuTSQ36(}grR)2RnwYJv8JggWjL?*&W~Z5U=A8STbH9J?J>Sfi;_L0MuWPIe0D!)y z2f<%ctu+*ZmuXIX=1`%gXoooyodKXSL+@+QQjN!k?(;lMBmx#14F*6-G(cOUKpGlr z2mnipm;AV~F4p>?McUUeqgP>qI-q zx!2jnJW|ca2ixleFz18GQ`#@mB0HlydR(6PbM%P2XbSxrnO<3$)opWrqulDT-7Dd21)%V}D(?5(0p}t1|!x1RKjYF$5F$&19U!tzRvfNHFb4pOhRk0vO2~@fzjr;WJBd(wr3!!ZjJ&*?P_hf@ zl%0G-pzh>8xXHJ=zDIA?8PLZ4j4lXdGNoVj>S~cWwV}e@>?Q-b3QKLsuQMxQAgc~0 z#B5G@<~vq*Ri`@&UTfB7H)3Yv_iFWp5y>!YY=+I9&Z&U4`}x=nQ&nwHo5~CZlAf-@ z>mF%sg1g5AuKPH-e8q^~8Xkpm*PAk)i?N$l*KeSX&Snp^Wf3iuQ&Z#Niuv}fq`jZ= zFfr1iyv>8gleUhU|B#A4dX1jk)U<`lg<2k8&L=#uN-_u`3d!yEhyDoK9>L$+^6{zN z?U6+z|8^}S9a#CyU|!o0T&T`}Em+KNYsj4k7i;+^y9^kf?l`wmox6O4CeF7~ko*hJ z5)Be1?bD>asB};KCHGSN&@BPBih;ZnDj@rb35Z7M+?1Toj($vTW4zvXR$xTUN@8%{ zU@T`OApv%~`4xB--s~&`*%fHnb-C9yfdJp}zf3iDZX<%1_8?e>5wD}jFd@}JETmUS zUzo=4y13}9Kd&cPGWOYcUhg={mMh)bJbqU4`3AXqGV#l!%t65i;Y);^nK=*UK1W~i zcS-sbLZ2NUHO zxaK)TC1ugeyDNoNRoP4yhs|cExRt(0w;7}+e=@E+R4Eh)a*nc)bHw`$wdvY2Vg7+< z5ZW!ZlZ|fZ6pM*UJG#>EK$T5js|uIDm$g%*!UqQj-+{qkCQ4{YmPJ1`+08)OV3u=$ zL^5`AaF|iYhoDfX@AF^%-~7Yrbla*0_Nh+)IGopp@nfU7-r9lLeAF`N!&0~Sx{9}6 zrKAZAa@G-%bw5k;_AQ0(8pdQYbL1qJ6*a0kLAwLAsg@&8#)ZGU#A?wp;&jALDiUKE zeOI!9A(t(Nx<{Tv3_T`JL!nUH0V>z^&hSE9WI!Fbqm^+96T@H}dkFnZJ Yt!OUPAYF9x^taXO>FQ13;RDb73)01|HUIzs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9627a9bc3e789ce37dcf57387f2b8c60cf4ff32d GIT binary patch literal 804 zcmeAS@N?(olHy`uVBq!ia0vp^5umJ70kGX7zl$`taFztV{zlquvFGg}a6(<~Oxsq#Cv-i>Im zQDTw(Z96!F?%r^jp}*VZCTCBa z&RK`U9fe<{UhK$GIx{_1$yq`ATGalNRo~9AxotTAYhGmYw(?-#h&PKI0u`E>p85VO z`ED`gQL5JePno3?i>05hI=O!KXOGw?OZ2>W`i?ZNWL@oQFncaf$8|HSQ?q4{*X^lZ zv3|cjTd818zTv-bTlgj39`=~l`1|Kmo1J=DhXR;vZ-2k>OfxBSnZTcYJ2{f(8Eueb zxpaQIeA7bvck^YW#d(C3K@MfwJ0b3N_5#(#EInTW;>$WE4gwvi=KF}@*@9gw-rk*Z zX6cSDCfCMoq6WJ&Z^v7t=^vWeALHpNzKM-3Vl9I**g5BbAtrWz*DvkKwg0o?E%mbk z?(XWhTRnl5XI30@fZ_bgt~Yb;JwNG}a4%(Anirq@`bM=x;lzD!ge04a;+9-rb;GrB zQG?8f48dcMKNjr1>vwd1)UF(>x#v>MX1}%9pY&iwZcuabyt}euf3K&RS??5HpBwjZ zneg#Gx5ZKGwB->|w2|jdjh(-pKFIq9+pnGpK61%Nak7uk8HV#54<>)Rx_{O&)`Le* z=mnNBEf)8VUB36cT@`OhfSKU4(|Ur+5vP5c%p=dwyLmvSB<{+$yi;nyHUGmJ#aY%) UwQ8;4eFRFXp00i_>zopr0B(w0QUCw| literal 0 HcmV?d00001