From f9f6fe80072aa4d96ccbff574cad016cae94a336 Mon Sep 17 00:00:00 2001 From: Roland Lannuzel Date: Tue, 17 Oct 2023 09:09:07 +0200 Subject: [PATCH] ACI0104129 --- .../ObjectMethods/btnDeleteRows.4dm | 3 -- .../ObjectMethods/btnInsertAboveRow.4dm | 1 - .../ObjectMethods/btnInsertBelowRow.4dm | 2 -- .../Forms/WP_Palette_Tables/form.4DForm | 4 +-- .../Sources/Methods/WP_GetBackgroundURL.4dm | 32 +++++++++---------- Project/Sources/catalog.4DCatalog | 2 +- 6 files changed, 17 insertions(+), 27 deletions(-) delete mode 100644 Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnDeleteRows.4dm delete mode 100644 Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertAboveRow.4dm delete mode 100644 Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertBelowRow.4dm diff --git a/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnDeleteRows.4dm b/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnDeleteRows.4dm deleted file mode 100644 index 7d3c87ed..00000000 --- a/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnDeleteRows.4dm +++ /dev/null @@ -1,3 +0,0 @@ - //WP DeleteInTable (WP Table get rows(Form.selection)) - - //s.a. deleteRows \ No newline at end of file diff --git a/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertAboveRow.4dm b/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertAboveRow.4dm deleted file mode 100644 index 61355921..00000000 --- a/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertAboveRow.4dm +++ /dev/null @@ -1 +0,0 @@ - //WP InsertInTable (WP Table get rows(Form.selection);"above") \ No newline at end of file diff --git a/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertBelowRow.4dm b/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertBelowRow.4dm deleted file mode 100644 index 91b12cad..00000000 --- a/Project/Sources/Forms/WP_Palette_Tables/ObjectMethods/btnInsertBelowRow.4dm +++ /dev/null @@ -1,2 +0,0 @@ - - //WP InsertInTable (WP Table get rows(Form.selection);"below") diff --git a/Project/Sources/Forms/WP_Palette_Tables/form.4DForm b/Project/Sources/Forms/WP_Palette_Tables/form.4DForm index 5f124250..bf50f82b 100644 --- a/Project/Sources/Forms/WP_Palette_Tables/form.4DForm +++ b/Project/Sources/Forms/WP_Palette_Tables/form.4DForm @@ -94,7 +94,6 @@ "icon": "/RESOURCES/Images/Sidebar/Arrow_Small_Top.png", "iconFrames": 4, "textPlacement": "right", - "method": "ObjectMethods/btnInsertAboveRow.4dm", "events": [ "onClick" ] @@ -113,7 +112,6 @@ "icon": "/RESOURCES/Images/Sidebar/Arrow_Small_Bottom.png", "iconFrames": 4, "textPlacement": "right", - "method": "ObjectMethods/btnInsertBelowRow.4dm", "events": [ "onClick" ] @@ -192,7 +190,6 @@ "icon": "/RESOURCES/Images/Sidebar/small_Trash.png", "iconFrames": 4, "textPlacement": "right", - "method": "ObjectMethods/btnDeleteRows.4dm", "events": [ "onClick" ] @@ -444,6 +441,7 @@ "View 7": {}, "View 8": {}, "View 9": { + "visible": false, "objects": [ "Rect2", "Text" diff --git a/Project/Sources/Methods/WP_GetBackgroundURL.4dm b/Project/Sources/Methods/WP_GetBackgroundURL.4dm index 9abbfd37..86150882 100644 --- a/Project/Sources/Methods/WP_GetBackgroundURL.4dm +++ b/Project/Sources/Methods/WP_GetBackgroundURL.4dm @@ -14,41 +14,39 @@ $range:=$1 If (Not:C34(OB Is empty:C1297($range))) - WP GET ATTRIBUTES:C1345($range;wk background image:K81:21;$url) + WP GET ATTRIBUTES:C1345($range; wk background image:K81:21; $url) Case of : ($url="data:image/@") - // data:image/x-png;base64,iVBORw0KGgoAAAANSUhEUgAAAK - $url:=Substring:C12($url;12) - // x-png;base64,iVBORw0KGgoAAAANSUhEUgAAAK - $p:=Position:C15(";base64,";$url) + // data:image/x-png;base64,iVBORw0KGgoAAAANSUhEUgAAAK + $url:=Substring:C12($url; 12) + // x-png;base64,iVBORw0KGgoAAAANSUhEUgAAAK + $p:=Position:C15(";base64,"; $url) If ($p>0) - $codec:="."+Substring:C12($url;1;$p-1) + $codec:="."+Substring:C12($url; 1; $p-1) If ($codec=".x-png") $codec:=".png" End if - $url:=Substring:C12($url;$p+8) - - BASE64 DECODE:C896($url;$blob) - - BLOB TO PICTURE:C682($blob;$picture;$codec) + $url:=Substring:C12($url; $p+8) + BASE64 DECODE:C896($url; $blob) + BLOB TO PICTURE:C682($blob; $picture; $codec) End if : ($url="data:@") - // data:;base64,R0lGODlhLAGQAff/APr6+g0NDRgY - $p:=Position:C15(";base64,";$url) + // data:;base64,R0lGODlhLAGQAff/APr6+g0NDRgY + $p:=Position:C15(";base64,"; $url) If ($p>0) - $url:=Substring:C12($url;$p+8) - BASE64 DECODE:C896($url;$blob) - BLOB TO PICTURE:C682($blob;$picture) + $url:=Substring:C12($url; $p+8) + BASE64 DECODE:C896($url; $blob) + BLOB TO PICTURE:C682($blob; $picture) End if End case - $ptr:=OBJECT Get pointer:C1124(Object named:K67:5;"bgndPictPreview") + $ptr:=OBJECT Get pointer:C1124(Object named:K67:5; "bgndPictPreview") $ptr->:=$picture End if diff --git a/Project/Sources/catalog.4DCatalog b/Project/Sources/catalog.4DCatalog index 9757449c..bd21f13b 100644 --- a/Project/Sources/catalog.4DCatalog +++ b/Project/Sources/catalog.4DCatalog @@ -14,7 +14,7 @@ - +