diff --git a/Project/Sources/Classes/TableWizard.4dm b/Project/Sources/Classes/TableWizard.4dm index 4bc986de..cb07e0fa 100644 --- a/Project/Sources/Classes/TableWizard.4dm +++ b/Project/Sources/Classes/TableWizard.4dm @@ -244,10 +244,10 @@ Function formulaUI($action : Text; $formatType : Integer; $insert : Object) $range:=WP Selection range:C1340(*; $insert.areaName) - WP INSERT FORMULA:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177) // ∆∆∆ Feature 125 + WP Insert formula:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177) // ∆∆∆ Feature 125 If ($insert.doNext="insertSpace") If (Shift down:C543) - WP INSERT BREAK:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180) + WP Insert break:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180) Else WP SET TEXT:C1574($range; " "; wk append:K81:179; wk include in range:K81:180) End if @@ -554,10 +554,10 @@ Function formulaInsert($insert : Object) //$json : Text) //$insert:=JSON Parse($json) $range:=WP Selection range:C1340(*; $insert.areaName) - WP INSERT FORMULA:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177) + WP Insert formula:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177) If (Shift down:C543) - WP INSERT BREAK:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180) + WP Insert break:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180) Else WP SET TEXT:C1574($range; " "; wk append:K81:179; wk include in range:K81:180) End if @@ -739,7 +739,7 @@ Function templateUI($action : Text) OBJECT SET ENABLED:C1123(*; $item; $enterable) End for each - OBJECT SET TITLE:C194(*; "cb_horizontalRuler"; Get action info:C1442("visibleHorizontalRuler").title) + OBJECT SET TITLE:C194(*; "cb_horizontalRuler"; Action info:C1442("visibleHorizontalRuler").title) Function themeGetList()->$collection : Collection @@ -1472,17 +1472,17 @@ Function themeUI() Function themeGetFontFamily()->$fontFamilly : Object - C_OBJECT:C1216($o; $wp) - C_LONGINT:C283($i) + var $o; $wp : Object + var $i : Integer ARRAY TEXT:C222($_fontFamily; 0) FONT LIST:C460($_fontFamily) // no enough for japaneese! check below - $o:=Get system info:C1571 + $o:=System info:C1571 If ($o.osLanguage="ja") $wp:=WP New:C1317 For ($i; 1; Size of array:C274($_fontFamily)) WP SET ATTRIBUTES:C1342($wp; wk font family:K81:65; $_fontFamily{$i}) - WP GET ATTRIBUTES:C1345($wp; wk font family:K81:65; $_fontFamily{$i}) + WP Get attributes:C1345($wp; wk font family:K81:65; $_fontFamily{$i}) End for End if @@ -1661,7 +1661,7 @@ Function WP_BuildTable()->$area : Object : ($description="header@") If ($previousContent#Null:C1517) - WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177) + WP Insert document body:C1411($range; $previousContent; wk replace:K81:177) Else If ($description="header1") // 1st header row has default value (title) $insertedText:=Form:C1466.wizard.translate("attribute"; Form:C1466.template.columns[$i].header; True:C214) @@ -1672,9 +1672,9 @@ Function WP_BuildTable()->$area : Object : ($description="data") // Data If ($previousContent#Null:C1517) - WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177) + WP Insert document body:C1411($range; $previousContent; wk replace:K81:177) Else - WP INSERT FORMULA:C1703($range; Formula from string:C1601(Form:C1466.template.columns[$i].source; 1); wk replace:K81:177) // ∆∆∆ Feature 125 + WP Insert formula:C1703($range; Formula from string:C1601(Form:C1466.template.columns[$i].source; 1); wk replace:K81:177) // ∆∆∆ Feature 125 End if : ($description="break@") // break @@ -1683,23 +1683,23 @@ Function WP_BuildTable()->$area : Object WP SET ATTRIBUTES:C1342($row; "breakFormula"; Formula from string:C1601(Form:C1466.template.breaks[$id].source; 1)) //wk break formula // ∆∆∆ Feature 125 If ($previousContent#Null:C1517) - WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177) + WP Insert document body:C1411($range; $previousContent; wk replace:K81:177) End if : ($description="bcor") // bottom carry over row If ($previousContent#Null:C1517) - WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177) + WP Insert document body:C1411($range; $previousContent; wk replace:K81:177) End if : ($description="extra@") // extra rows If ($previousContent#Null:C1517) - WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177) + WP Insert document body:C1411($range; $previousContent; wk replace:K81:177) End if : ($description="placeholder") // placeholder If ($previousContent#Null:C1517) - WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177) + WP Insert document body:C1411($range; $previousContent; wk replace:K81:177) End if End case @@ -1937,16 +1937,16 @@ Function WP_GetMaxTableWidth->$width : Integer Else $document:=Form:C1466.range.owner - WP GET ATTRIBUTES:C1345($document; wk layout unit:K81:78; $unit) // memo unit + WP Get attributes:C1345($document; wk layout unit:K81:78; $unit) // memo unit WP SET ATTRIBUTES:C1342($document; wk layout unit:K81:78; wk unit pt:K81:136) $section:=WP Get section:C1581(Form:C1466.range) - WP GET ATTRIBUTES:C1345($section; wk page orientation:K81:264; $orientation) + WP Get attributes:C1345($section; wk page orientation:K81:264; $orientation) If ($orientation=0) // portrait - WP GET ATTRIBUTES:C1345($document; wk page width:K81:262; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right) + WP Get attributes:C1345($document; wk page width:K81:262; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right) Else // landscape - WP GET ATTRIBUTES:C1345($document; wk page height:K81:263; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right) + WP Get attributes:C1345($document; wk page height:K81:263; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right) End if $width:=$width-$left-$right @@ -1996,13 +1996,13 @@ Function JSONvalidate($type : Text; $files : Collection)->$result : Boolean $alert:="" $tempObject:=JSON Parse:C1218($file.getText()) If (ok=0) - $alert:=Get localized string:C991("JSONparseError") + $alert:=Localized string:C991("JSONparseError") $files.remove($i; 1) Else $parsing:=JSON Validate:C1456($tempObject; $schema) If (Not:C34($parsing.success)) - $alert:=Get localized string:C991("JSONvalidationError") + $alert:=Localized string:C991("JSONvalidationError") $files.remove($i; 1) End if End if diff --git a/Project/Sources/Classes/WPdocument.4dm b/Project/Sources/Classes/WPdocument.4dm deleted file mode 100644 index f4465364..00000000 --- a/Project/Sources/Classes/WPdocument.4dm +++ /dev/null @@ -1,528 +0,0 @@ -Class constructor($document : Object) // 4D_WriteDocument) - - If (Count parameters:C259=0) - This:C1470.document:=WP New:C1317 - Else - This:C1470.document:=$document - End if - - //mark:-GET TEXT -- SET TEXT - -Function getText($expressions : Integer)->$text : Text - If (Count parameters:C259=0) - $expressions:=wk expressions as value:K81:255 - End if - $text:=WP Get text:C1575(This:C1470.document; $expressions) - -Function setText($newText : Text; $textPosition : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP SET TEXT:C1574(This:C1470.document; $newText; $textPosition; $rangeUpdate) - - - //mark:-TEXT PARAGRAPH PICTURE TABLE RANGE - -Function textRange($start : Integer; $end : Integer)->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Text range:C1341(This:C1470.document; $start; $end)) - -Function paragraphRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Paragraph range:C1346(This:C1470.document)) - -Function pictureRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Picture range:C1347(This:C1470.document)) - -Function tableRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Table range:C1553(This:C1470.document)) - - //mark:-SECTION(S) - -Function getSection($index)->$section : cs:C1710.WPsection - $section:=cs:C1710.WPsection.new(WP Get section:C1581(This:C1470.document; $index)) - -Function getSections()->$sections : Collection - - var $i; $n : Integer - $sections:=WP Get sections:C1580(This:C1470.document) - $n:=$sections.length-1 - For ($i; 0; $n) - $sections[$i]:=cs:C1710.WPsection.new($sections[$i]) - End for - - - //mark:-PAGE COUNT (CALCULATED ATTRIBUTE) - -Function get pageCount()->$count : Integer - $count:=WP Get page count:C1412(This:C1470.document) - - - //mark:-INTERFACE - -Function selectionRange($areaName : Text)->$range : cs:C1710.WPrange - If (Count parameters:C259=1) - $range:=cs:C1710.WPrange.new(WP Selection range:C1340(*; $areaName)) - End if - -Function setViewProperties($areaName : Text; $properties : Object) - WP SET VIEW PROPERTIES:C1648(*; $areaName; $properties) - -Function getViewProperties($name : Text)->$properties : Object - $properties:=WP Get view properties:C1649(*; $name) - -Function select($areaName : Text; $startRange : Integer; $endRange : Integer) - WP SELECT:C1348(*; $areaName; $startRange; $endRange) - - - //mark:-GET FRAME -- GET FRAME - -Function getFrame()->$result : Object - var $frameType : Integer - var $textBoxID : Text - - $frameType:=WP Get frame:C1519(This:C1470.document; textBoxID) - $result:={frameType: $frameType} - If (frameType=wk text box:K81:373) - $result.textBoxID:=$textBoxID - End if - -Function setFrame($frameSelector : Integer; $textBoxID : Text) - Case of - : (Count parameters:C259>=2) - WP SET FRAME:C1518(This:C1470.document; $frameSelector; $textBoxID) - : (Count parameters:C259>=1) - WP SET FRAME:C1518(This:C1470.document; $frameSelector) - End case - - //mark:-GET LINKS -- SET LINK - -Function getLinks()->$links : Collection - var $link : Object - $links:=WP Get links:C1643(This:C1470.document) - For each ($link; $links) - $link.range:=cs:C1710.WPrange.new($link.range) // transform 4D_WriteRange to cs.WPrange - End for each - -Function setLink($linkObject) - WP SET LINK:C1642(This:C1470.document; $linkObject) - - - //mark:-NEW TEXT BOX - -Function newTextBox($pageNumber : Integer)->$textBox : cs:C1710.WPelement - $textBox:=cs:C1710.WPelement.new(WP New text box:C1797(This:C1470.document; $pageNumber)) - - //mark:-FORMULAS - -Function insertFormula($formula : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT FORMULA:C1703(This:C1470.document; $formula; $mode; $rangeUpdate) - -Function computeFormulas() - WP COMPUTE FORMULAS:C1707(This:C1470.document) - -Function freezeFormulas($recompute : Integer) - If (Count parameters:C259=0) - $recompute:=wk recompute expressions:K81:311 - End if - WP FREEZE FORMULAS:C1708(This:C1470.document; $recompute) - -Function getFormulas()->$formulas : Collection - var $i; $n : Integer - $formulas:=WP Get formulas:C1702(This:C1470.document) - // REPLACE ALL 4D_WriteRange by cs.WPrange - $n:=$formulas.length-1 - For ($i; 0; $n) - $formulas[$i].range:=cs:C1710.WPrange.new($formulas[$i].range) - End for - - - //mark:-BREAKS - -Function getBreaks($breakType : Integer)->$breaks : Collection - var $i; $n : Integer - Case of - : (Count parameters:C259=0) - $breaks:=WP Get breaks:C1768(This:C1470.document) - : (Count parameters:C259>=1) - $breaks:=WP Get breaks:C1768(This:C1470.document; $breakType) - End case - // REPLACE ALL 4D_WriteRange by cs.WPrange - $n:=$breaks.length-1 - For ($i; 0; $n) - $breaks[$i]:=cs:C1710.WPrange.new($breaks[$i]) - End for - -Function insertBreak($breakType : Integer; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT BREAK:C1413(This:C1470.document; $breakType; $mode; $rangeUpdate) - - //mark:-ATTRIBUTES - -Function resetAttributes($attributeNames : Collection) // collection of attribute names (strings) - - var $attributeName : Text - For each ($attributeName; $attributeNames) - WP RESET ATTRIBUTES:C1344(This:C1470.document; $attributeName) - End for each - - -Function setAttributes($attributes : Object) // - - var $attributeName : Text - For each ($attributeName; $attributes) - WP SET ATTRIBUTES:C1342(This:C1470.document; $attributeName; $attributes[$attributeName]) - End for each - -Function getAttributes($attributeNames : Collection)->$attributes : Object // collection of attribute names (strings) - - var $attributeName : Text - var $attributeValue : Variant - - $attributes:=New object:C1471 - - For each ($attributeName; $attributeNames) - WP GET ATTRIBUTES:C1345(This:C1470.document; $attributeName; $attributeValue) - $attributes[$attributeName]:=$attributeValue - End for each - - - - //mark:-BODY -Function getBody()->$body : cs:C1710.WPelement // ∆∆∆ - $body:=cs:C1710.WPelement.new(WP Get body:C1516(This:C1470.document)) - - - //mark:-HEADERS AND FOOTERS - -Function getHeader($sectionIndex : Integer; $subSectionType : Integer)->$header : cs:C1710.WPelement - var $docHeader : Object //4D_WriteElement - Case of - : (Count parameters:C259=1) - $docHeader:=WP Get header:C1503(This:C1470.document; $sectionIndex) - : (Count parameters:C259=2) - $docHeader:=WP Get header:C1503(This:C1470.document; $sectionIndex; $subSectionType) - End case - If ($docHeader#Null:C1517) - $header:=cs:C1710.WPelement.new($docHeader) - End if - -Function getFooter($sectionIndex : Integer; $subSectionType : Integer)->$footer : cs:C1710.WPelement - var $docFooter : Object //4D_WriteElement - Case of - : (Count parameters:C259=1) - $docFooter:=WP Get footer:C1504(This:C1470.document; $sectionIndex) - : (Count parameters:C259=2) - $docFooter:=WP Get footer:C1504(This:C1470.document; $sectionIndex; $subSectionType) - End case - If ($docFooter#Null:C1517) - $footer:=cs:C1710.WPelement.new($docFooter) - End if - - //mark:- BOOKMARKS - -Function getBookmarks($withRanges : Boolean)->$bookmarks : Collection // of texts or objects - - var $i : Integer - var $range : cs:C1710.WPrange - - If (Count parameters:C259=0) - $withRanges:=False:C215 - End if - - ARRAY TEXT:C222($bookmarkNames; 0) - WP GET BOOKMARKS:C1417(This:C1470.document; $bookmarkNames) - $bookmarks:=New collection:C1472 - If ($withRanges) - For ($i; 1; Size of array:C274($bookmarkNames)) - $range:=cs:C1710.WPrange.new(WP Bookmark range:C1416(This:C1470.document; $bookmarkNames{$i})) // ∆∆∆ transform 4D_WriteRange into cs.WRrange - $bookmarks.push({name: $bookmarkNames{$i}; range: $range}) - End for - Else - ARRAY TO COLLECTION:C1563($bookmarks; $bookmarkNames) - End if - -Function newBookmark($range : cs:C1710.WPrange; $name : Text) - - WP NEW BOOKMARK:C1415($range.range; $name) - - -Function deleteBookmarks($bookmarks : Variant) - - var $bookmarkName : Text - Case of - : (Value type:C1509($bookmarks)=Is collection:K8:32) - For each ($bookmarkName; $bookmarks) - WP DELETE BOOKMARK:C1419(This:C1470.document; $bookmarkName) - End for each - - : (Value type:C1509($bookmarks)=Is text:K8:3) - WP DELETE BOOKMARK:C1419(This:C1470.document; $bookmarks) - End case - -Function bookmarkRange($name)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Bookmark range:C1416(This:C1470.document; $name)) - - - //mark:-FIND ALL - FIND NEXT - FIND PREVIOUS - -Function findAll($searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$rangeCollection : Collection //∆∆∆ - var $range : Object - var $i; $n : Integer - Case of - : (Count parameters:C259=2) - $rangeCollection:=WP Find all:C1755(This:C1470.document; $searchValue; $searchCondition) - : (Count parameters:C259=3) - $rangeCollection:=WP Find all:C1755(This:C1470.document; $searchValue; $searchCondition; $replaceValue) - End case - // REPLACE ALL 4D_WriteRange by cs.WPrange - $n:=$rangeCollection.length-1 - For ($i; 0; $n) - $rangeCollection[$i]:=cs:C1710.WPrange.new($rangeCollection[$i]) - End for - -Function findNext($searchAfter : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchAfter; cs:C1710.WPrange)) - $searchAfter:=$searchAfter.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find next:C1764(This:C1470.document; $searchAfter; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find next:C1764(This:C1470.document; $searchAfter; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - -Function findPrevious($searchBefore : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchBefore; cs:C1710.WPrange)) - $searchBefore:=$searchBefore.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find previous:C1765(This:C1470.document; $searchBefore; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find previous:C1765(This:C1470.document; $searchBefore; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - - //mark:-GET ELEMENTS - -Function getElementByID($id : Text)->$element : cs:C1710.WPelement - $element:=WP Get element by ID:C1549(This:C1470.document; $id) - -Function getElements($elementType : Integer)->$elements : Collection - var $i; $n : Integer - Case of - : (Count parameters:C259=0) - $elements:=WP Get elements:C1550(This:C1470.document) - : (Count parameters:C259=1) - $elements:=WP Get elements:C1550(This:C1470.document; $elementType) - End case - //replace 4D_WriteElement by cs.WPelement or cs.WPtable - $n:=$elements.length-1 - For ($i; 0; $n) - If ($elementType=wk type table:K81:222) // table specificaly requested - $elements[$i]:=cs:C1710.WPtable.new($elements[$i]) - Else - $elements[$i]:=cs:C1710.WPelement.new($elements[$i]) - End if - End for - - //mark:-GET POSITION - -Function getPosition($layout : Integer)->$information : Object - If (Count parameters:C259=0) - $layout:=wk 4D Write Pro layout:K81:176 - End if - $information:=WP Get position:C1577(This:C1470.document; $layout) - - - //mark:-PRINT - -Function usePageSetup() - WP USE PAGE SETUP:C1358(This:C1470.document) - -Function print($printOptions : Integer) - Case of - : (Count parameters:C259=0) - WP PRINT:C1343(This:C1470.document) - : (Count parameters:C259=1) - WP PRINT:C1343(This:C1470.document; $printOptions) - End case - - //mark:-PICTURE - -Function insertPicture($picture : Picture; $insertMode : Integer)->$pictureElement : cs:C1710.WPelement - var $pictElements : Collection - var $range : Object - - WP INSERT PICTURE:C1437(This:C1470.document; $picture; $insertMode) - - - Case of - : ($insertMode=wk prepend:K81:178) | ($insertMode=wk replace:K81:177) - $range:=WP Text range:C1341(This:C1470.document; 1; 2) - - : ($insertMode=wk append:K81:179) - $range:=WP Text range:C1341(This:C1470.document; wk start text:K81:165; wk end text:K81:164) - $range:=WP Text range:C1341(This:C1470.document; $range.end-1; $range.end) - - End case - - $pictureElement:=cs:C1710.WPelement.new(WP Get elements:C1550($range; wk type image:K81:192)[0]) - - -Function newAnchoredPicture($picture : Variant)->$pictureElement : cs:C1710.WPelement - - Case of - : (Count parameters:C259=0) - $pictureElement:=cs:C1710.WPelement.new(WP Add picture:C1536(This:C1470.document)) - : (Count parameters:C259=1) - $pictureElement:=cs:C1710.WPelement.new(WP Add picture:C1536(This:C1470.document; $picture)) - End case - - //mark:-IMPORT EXPORT INSERT - -Function exportDocument($filePath : Text; $format : Integer; $option : Object) - - Case of - : (Count parameters:C259=1) - WP EXPORT DOCUMENT:C1337(This:C1470.document; $filePath) - - : (Count parameters:C259=2) - WP EXPORT DOCUMENT:C1337(This:C1470.document; $filePath; $format) - - : (Count parameters:C259=3) - WP EXPORT DOCUMENT:C1337(This:C1470.document; $filePath; $format; $option) - - End case - -Function exportVariable($format : Integer; $option : Object)->$exported : Variant - - // if $format = html or SVG, destination shall be TEXT, otherwise it will be BLOB - var $destination : Variant - Case of - - : (Count parameters:C259=1) - WP EXPORT VARIABLE:C1319(This:C1470.document; $destination; $format) - - : (Count parameters:C259=2) - WP EXPORT DOCUMENT:C1337(This:C1470.document; $destination; $format; $option) - - End case - $exported:=$destination - - -Function importDocument($filePath : Text; $option : Variant) - - var $importedDoc : Object - Case of - : (Count parameters:C259=1) - $importedDoc:=WP Import document:C1318($filePath) - - : (Count parameters:C259=2) - $importedDoc:=WP Import document:C1318($filePath; $option) - - End case - This:C1470.document:=$importedDoc - -Function insertBody($wpDoc : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT DOCUMENT:C1411(This:C1470.document; $wpDoc; $mode; $rangeUpdate) - - - //mark:-STYLE SHEET(S) - -Function newStyleSheet($styleSheetType : Integer; $styleSheetName : Text)->$styleSheet : cs:C1710.WPstyleSheet - - $styleSheet:=cs:C1710.WPstyleSheet.new(WP New style sheet:C1650(This:C1470.document; $styleSheetType; $styleSheetName)) - -Function getStyleSheet($styleSheetName : Text)->$styleSheet : cs:C1710.WPstyleSheet - - $styleSheet:=cs:C1710.WPstyleSheet.new(WP Get style sheet:C1656(This:C1470.document; $styleSheetName)) - -Function getStyleSheets($styleSheetType : Integer)->$styleSheets : Collection - - var $i; $n : Integer - - $styleSheets:=WP Get style sheets:C1655(This:C1470.document; $styleSheetType) - $n:=$styleSheets.length-1 - For ($i; 0; $n) - $styleSheets[$i]:=cs:C1710.WPstyleSheet.new($styleSheets[$i]) - End for - -Function importStyleSheets($sourceDocument : cs:C1710.WPdocument) - - WP IMPORT STYLE SHEETS:C1673(This:C1470.document; $sourceDocument) - -Function deleteStyleSheet($styleSheetName : Text) - WP DELETE STYLE SHEET:C1652(This:C1470.document; $styleSheetName) - - //mark:-TABLES INSERT - -Function insertTable($mode : Integer; $rangeUpdate : Integer; $nbCols : Integer; $nbRows : Integer)->$table : cs:C1710.WPtable - - Case of - : (Count parameters:C259=0) - $mode:=wk append:K81:179 - $rangeUpdate:=wk include in range:K81:180 - : (Count parameters:C259=1) - $rangeUpdate:=wk include in range:K81:180 - End case - $table:=cs:C1710.WPtable.new(WP Insert table:C1473(This:C1470.document; $mode; $rangeUpdate; $nbCols; $nbRows)) - - //mark:-TABLES DELETE ROWS & COLUMNS - -Function tableDeleteColumns() // all tables will be deleted - WP TABLE DELETE COLUMNS:C1694(This:C1470.document) - -Function tableDeleteRows() // all tables will be deleted - WP TABLE DELETE ROWS:C1693(This:C1470.document) - - //mark:-TABLE GET CELLS, ROWS & COLUMNS - -Function tableGetCells()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get cells:C1477(This:C1470.document)) - -Function tableGetColumns()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get columns:C1476(This:C1470.document)) - -Function tableGetRows()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get rows:C1475(This:C1470.document)) - - - //mark:-TABLE INSERT ROWS & COLUMNS - -Function tableInsertColumns($columnCount : Integer)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table insert columns:C1692(This:C1470.document; $columnCount)) - -Function tableInsertRows($rowCount : Integer)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table insert rows:C1691(This:C1470.document; $rowCount)) - - - //mark:-TABLE SPLIT & MERGE - -Function tableSplitCells() - WP TABLE SPLIT CELLS:C1816(This:C1470.document) // all tables will be n x n - -Function tableMergeCells() // all tables will be 1x1 - WP TABLE MERGE CELLS:C1815(This:C1470.document) - - - //mark:-CONTEXTS - -Function setDataContext($context : Object) - WP SET DATA CONTEXT:C1786(This:C1470.document; $context) - -Function getDataContext()->$context : Object - $context:=WP Get data context:C1787(This:C1470.document) - \ No newline at end of file diff --git a/Project/Sources/Classes/WPelement.4dm b/Project/Sources/Classes/WPelement.4dm deleted file mode 100644 index 28ef1e1c..00000000 --- a/Project/Sources/Classes/WPelement.4dm +++ /dev/null @@ -1,337 +0,0 @@ -Class constructor($element : Object) //4D_WriteElement) - This:C1470.element:=$element - This:C1470.document:=This:C1470.element.owner - - //mark:-GET TEXT -- SET TEXT - -Function getText($expressions : Integer)->$text : Text - If (Count parameters:C259=0) - $expressions:=wk expressions as value:K81:255 - End if - $text:=WP Get text:C1575(This:C1470.element; $expressions) - -Function setText($newText : Text; $textPosition : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP SET TEXT:C1574(This:C1470.element; $newText; $textPosition; $rangeUpdate) - - //mark:- DELETE - -Function delete() - - var $section : cs:C1710.WPsection - Case of - : (This:C1470.element.type=300) // textbox - WP DELETE TEXT BOX:C1798(This:C1470.element) - - : (This:C1470.element.type=3) // header or footer - - Case of - : (This:C1470.element.styleSheet="@firstHeader") // first header - $section:=This:C1470.getSubsection() - WP DELETE HEADER:C1588($section.section) - : (This:C1470.element.styleSheet="@leftHeader") // left header - $section:=This:C1470.getSubsection() - WP DELETE HEADER:C1588($section.section) - : (This:C1470.element.styleSheet="@rightHeader") // left header - $section:=This:C1470.getSubsection() - WP DELETE HEADER:C1588($section.section) - - : (This:C1470.element.styleSheet="@firstFooter") // first header - $section:=This:C1470.getSubsection() - WP DELETE FOOTER:C1589($section.section) - : (This:C1470.element.styleSheet="@leftFooter") // left header - $section:=This:C1470.getSubsection() - WP DELETE FOOTER:C1589($section.section) - : (This:C1470.element.styleSheet="@rightFooter") // left header - $section:=This:C1470.getSubsection() - WP DELETE FOOTER:C1589($section.section) - - : (This:C1470.element.styleSheet="@header") // header - $section:=This:C1470.getSection() - WP DELETE HEADER:C1588($section.section) - : (This:C1470.element.styleSheet="@footer") // header - $section:=This:C1470.getSection() - WP DELETE FOOTER:C1589($section.section) - - End case - - : (This:C1470.element.type=2) // inline picture - WP DELETE PICTURE:C1701(This:C1470.element) - - End case - - //mark:-GET LINKS -- SET LINK - -Function getLinks()->$links : Collection - var $link : Object - $links:=WP Get links:C1643(This:C1470.element) - For each ($link; $links) - $link.range:=cs:C1710.WPrange.new($link.range) // transform 4D_WriteRange to cs.WPrange - End for each - -Function setLink($linkObject) - WP SET LINK:C1642(This:C1470.element; $linkObject) - - - //mark:-FORMULAS - -Function insertFormula($formula : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT FORMULA:C1703(This:C1470.element; $formula; $mode; $rangeUpdate) - -Function computeFormulas - WP COMPUTE FORMULAS:C1707(This:C1470.element) - -Function freezeFormulas($recompute : Integer) - If (Count parameters:C259=0) - $recompute:=wk recompute expressions:K81:311 - End if - WP FREEZE FORMULAS:C1708(This:C1470.element; $recompute) - -Function getFormulas()->$formulas : Collection - var $i; $n : Integer - $formulas:=WP Get formulas:C1702(This:C1470.element) - // REPLACE ALL _Range by cs.WPrange - $n:=$formulas.length-1 - For ($i; 0; $n) - $formulas[$i].range:=cs:C1710.WPrange.new($formulas[$i].range) - End for - - //mark:-BREAKS - -Function getBreaks($breakType : Integer)->$breaks : Collection - - Case of - : (Count parameters:C259=0) - $breaks:=WP Get breaks:C1768(This:C1470.element) - : (Count parameters:C259>=1) - $breaks:=WP Get breaks:C1768(This:C1470.element; $breakType) - End case - -Function insertBreak($breakType : Integer; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT BREAK:C1413(This:C1470.element; $mode; $rangeUpdate) - - - //mark:-HEADERS AND FOOTERS - -Function getHeader()->$header : cs:C1710.WPelement - $header:=cs:C1710.WPelement.new(WP Get header:C1503(This:C1470.element)) - -Function getFooter()->$footer : cs:C1710.WPelement - $footer:=cs:C1710.WPelement.new(WP Get footer:C1504(This:C1470.element)) - - - //mark:-ATTRIBUTES - -Function resetAttributes($attributeNames : Collection) // collection of attribute names (strings) - - var $attributeName : Text - For each ($attributeName; $attributeNames) - WP RESET ATTRIBUTES:C1344(This:C1470.element; $attributeName) - End for each - - -Function setAttributes($attributes : Object) // - - var $attributeName : Text - For each ($attributeName; $attributes) - WP SET ATTRIBUTES:C1342(This:C1470.element; $attributeName; $attributes[$attributeName]) - End for each - -Function getAttributes($attributeNames : Collection)->$attributes : Object // collection of attribute names (strings) - - var $attributeName : Text - var $attributeValue : Variant - - $attributes:=New object:C1471 - - For each ($attributeName; $attributeNames) - WP GET ATTRIBUTES:C1345(This:C1470.element; $attributeName; $attributeValue) - $attributes[$attributeName]:=$attributeValue - End for each - - - //mark:-TEXT PARAGRAPH PICTURE TABLE RANGE - -Function textRange($start : Integer; $end : Integer)->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Text range:C1341(This:C1470.element; $start; $end)) - -Function paragraphRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Paragraph range:C1346(This:C1470.element)) - -Function pictureRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Picture range:C1347(This:C1470.element)) - -Function tableRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Table range:C1553(This:C1470.element)) - - //mark:-SECTION(S) and SUBSECTION - -Function getSection()->$section : cs:C1710.WPsection - $section:=cs:C1710.WPsection.new(WP Get section:C1581(This:C1470.element)) - -Function getSections()->$sections : Collection - - var $i; $n : Integer - $sections:=WP Get sections:C1580(This:C1470.element) - $n:=$sections.length-1 - For ($i; 0; $n) - $sections[$i]:=cs:C1710.WPsection.new($sections[$i]) - End for - -Function getSubsection()->$subsection : cs:C1710.WPsection - $subsection:=cs:C1710.WPsection.new(WP Get subsection:C1582(This:C1470.element)) - - //mark:-FIND ALL - FIND NEXT - FIND PREVIOUS - -Function findAll($searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$rangeCollection : Collection //∆∆∆ - var $range : Object - var $i; $n : Integer - Case of - : (Count parameters:C259=2) - $rangeCollection:=WP Find all:C1755(This:C1470.element; $searchValue; $searchCondition) - : (Count parameters:C259=3) - $rangeCollection:=WP Find all:C1755(This:C1470.element; $searchValue; $searchCondition; $replaceValue) - End case - // REPLACE ALL _Range by cs.WPrange - $n:=$rangeCollection.length-1 - For ($i; 0; $n) - $rangeCollection[$i]:=cs:C1710.WPrange.new($rangeCollection[$i]) - End for - -Function findNext($searchAfter : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchAfter; cs:C1710.WPrange)) - $searchAfter:=$searchAfter.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find next:C1764(This:C1470.element; $searchAfter; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find next:C1764(This:C1470.element; $searchAfter; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - -Function findPrevious($searchBefore : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchBefore; cs:C1710.WPrange)) - $searchBefore:=$searchBefore.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find previous:C1765(This:C1470.element; $searchBefore; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find previous:C1765(This:C1470.element; $searchBefore; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - - //mark:-GET ELEMENTS - -Function getElements($elementType : Integer)->$elements : Collection - var $i; $n : Integer - Case of - : (Count parameters:C259=0) - $elements:=WP Get elements:C1550(This:C1470.element) - : (Count parameters:C259=1) - $elements:=WP Get elements:C1550(This:C1470.element; $elementType) - End case - // replace 4D_WriteElement by cs.WPelement or cs.WPtable - $n:=$elements.length-1 - For ($i; 0; $n) - If ($elementType=wk type table:K81:222) // table specificaly requested - $elements[$i]:=cs:C1710.WPtable.new($elements[$i]) - Else - $elements[$i]:=cs:C1710.WPelement.new($elements[$i]) - End if - End for - - //mark:-GET POSITION - -Function getPosition($layout : Integer)->$information : Object - If (Count parameters:C259=0) - $layout:=wk 4D Write Pro layout:K81:176 - End if - $information:=WP Get position:C1577(This:C1470.element; $layout) - - //mark:-PICTURE - -Function insertPicture($picture : Picture; $insertMode : Integer)->$pictureElement : cs:C1710.WPelement - - var $pictElements : Collection - var $pictCol : Collection - var $container : Object - var $range : Object - - $range:=WP Text range:C1341(This:C1470.element; wk start text:K81:165; wk end text:K81:164) - WP INSERT PICTURE:C1437(This:C1470.element; $picture; $insertMode) - - $container:=$range.container#Null:C1517 ? $range.container : This:C1470.document - - Case of - : ($insertMode=wk prepend:K81:178) - $range:=WP Text range:C1341($container; $range.start; $range.start+1) - - : ($insertMode=wk replace:K81:177) // the range should NOT change) - $range:=WP Text range:C1341($container; $range.start; $range.end) - - : ($insertMode=wk append:K81:179) - $range:=WP Text range:C1341($container; $range.end; $range.end+1) - - End case - - $pictCol:=WP Get elements:C1550($range; wk type image:K81:192) - ASSERT:C1129($pictCol.length>0) - If ($pictCol.length>0) - $pictureElement:=cs:C1710.WPelement.new(WP Get elements:C1550($range; wk type image:K81:192)[0]) - End if - - //mark:-TABLES - -Function insertTable($mode : Integer; $rangeUpdate : Integer; $nbCols : Integer; $nbRows : Integer)->$table : cs:C1710.WPtable - - Case of - : (Count parameters:C259=0) - $mode:=wk append:K81:179 - $rangeUpdate:=wk include in range:K81:180 - : (Count parameters:C259=1) - $rangeUpdate:=wk include in range:K81:180 - End case - - $table:=cs:C1710.WPtable.new(WP Insert table:C1473(This:C1470.element; $mode; $rangeUpdate; $nbCols; $nbRows)) - - - - //mark:- INSERT DOCUMENT - -Function insertDocument($wpDoc : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT DOCUMENT:C1411(This:C1470.element; $wpDoc; $mode; $rangeUpdate) - - - - //mark:-INTERFACE - -Function select($startRange : Integer; $endRange : Integer) - Case of - : (Count parameters:C259=0) - WP SELECT:C1348(This:C1470.element) - : (Count parameters:C259=2) - WP SELECT:C1348(This:C1470.element; $startRange; $endRange) - End case - - //mark:-UTILITIES - -Function isFontStyleSUpported($fontStyle : Text)->$supported : Boolean - $supported:=WP Is font style supported:C1363(This:C1470.element; $fontStyle) - \ No newline at end of file diff --git a/Project/Sources/Classes/WPrange.4dm b/Project/Sources/Classes/WPrange.4dm deleted file mode 100644 index e30f055c..00000000 --- a/Project/Sources/Classes/WPrange.4dm +++ /dev/null @@ -1,320 +0,0 @@ -Class constructor($range : Object) //4D_WriteRange) - This:C1470.range:=$range - This:C1470.document:=This:C1470.range.owner - - //mark:-GET TEXT -- SET TEXT - -Function getText($expressions : Integer)->$text : Text - If (Count parameters:C259=0) - $expressions:=wk expressions as value:K81:255 - End if - $text:=WP Get text:C1575(This:C1470.range; $expressions) - -Function setText($newText : Text; $textPosition : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP SET TEXT:C1574(This:C1470.range; $newText; $textPosition; $rangeUpdate) - - - //mark:-GET LINKS -- SET LINK - -Function getLinks()->$links : Collection - var $link : Object - $links:=WP Get links:C1643(This:C1470.range) - For each ($link; $links) - $link.range:=cs:C1710.WPrange.new($link.range) // transform 4D_WriteRange to cs.WPrange - End for each - -Function setLink($linkObject) - WP SET LINK:C1642(This:C1470.range; $linkObject) - - //mark:-FORMULAS - -Function insertFormula($formula : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT FORMULA:C1703(This:C1470.range; $formula; $mode; $rangeUpdate) - -Function computeFormulas - WP COMPUTE FORMULAS:C1707(This:C1470.range) - -Function freezeFormulas($recompute : Integer) - If (Count parameters:C259=0) - $recompute:=wk recompute expressions:K81:311 - End if - WP FREEZE FORMULAS:C1708(This:C1470.range; $recompute) - -Function getFormulas()->$formulas : Collection - var $i; $n : Integer - $formulas:=WP Get formulas:C1702(This:C1470.range) - // REPLACE ALL 4D_WriteRange by cs.WPrange - $n:=$formulas.length-1 - For ($i; 0; $n) - $formulas[$i].range:=cs:C1710.WPrange.new($formulas[$i].range) - End for - - //mark:-BREAKS - -Function getBreaks($breakType : Integer)->$breaks : Collection - - Case of - : (Count parameters:C259=0) - $breaks:=WP Get breaks:C1768(This:C1470.range) - : (Count parameters:C259>=1) - $breaks:=WP Get breaks:C1768(This:C1470.range; $breakType) - End case - -Function insertBreak($breakType : Integer; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT BREAK:C1413(This:C1470.range; $mode; $rangeUpdate) - - - //mark:-HEADERS AND FOOTERS - -Function getHeader()->$header : cs:C1710.WPelement - $header:=cs:C1710.WPelement.new(WP Get header:C1503(This:C1470.range)) - -Function getFooter()->$footer : cs:C1710.WPelement - $footer:=cs:C1710.WPelement.new(WP Get footer:C1504(This:C1470.range)) - - - //mark:-ATTRIBUTES - -Function resetAttributes($attributeNames : Collection) // collection of attribute names (strings) - - var $attributeName : Text - For each ($attributeName; $attributeNames) - WP RESET ATTRIBUTES:C1344(This:C1470.range; $attributeName) - End for each - - -Function setAttributes($attributes : Object) // - - var $attributeName : Text - For each ($attributeName; $attributes) - WP SET ATTRIBUTES:C1342(This:C1470.range; $attributeName; $attributes[$attributeName]) - End for each - -Function getAttributes($attributeNames : Collection)->$attributes : Object // collection of attribute names (strings) - - var $attributeName : Text - var $attributeValue : Variant - - $attributes:=New object:C1471 - - For each ($attributeName; $attributeNames) - WP GET ATTRIBUTES:C1345(This:C1470.range; $attributeName; $attributeValue) - $attributes[$attributeName]:=$attributeValue - End for each - - - //mark:-TEXT PARAGRAPH PICTURE TABLE RANGE - -Function textRange($start : Integer; $end : Integer)->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Text range:C1341(This:C1470.range; $start; $end)) - -Function paragraphRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Paragraph range:C1346(This:C1470.range)) - -Function pictureRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Picture range:C1347(This:C1470.range)) - -Function tableRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Table range:C1553(This:C1470.range)) - - - //mark:-SECTION(S) and SUBSECTION - -Function getSection()->$section : cs:C1710.WPsection - $section:=cs:C1710.WPsection.new(WP Get section:C1581(This:C1470.range)) - -Function getSections()->$sections : Collection - - var $i; $n : Integer - $sections:=WP Get sections:C1580(This:C1470.range) - $n:=$sections.length-1 - For ($i; 0; $n) - $sections[$i]:=cs:C1710.WPsection.new($sections[$i]) - End for - -Function getSubsection()->$subsection : cs:C1710.WPsection - $subsection:=cs:C1710.WPsection.new(WP Get subsection:C1582(This:C1470.range)) - - - //mark:-FIND ALL - FIND NEXT - FIND PREVIOUS - -Function findAll($searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$rangeCollection : Collection //∆∆∆ - var $range : Object - var $i; $n : Integer - Case of - : (Count parameters:C259=2) - $rangeCollection:=WP Find all:C1755(This:C1470.range; $searchValue; $searchCondition) - : (Count parameters:C259=3) - $rangeCollection:=WP Find all:C1755(This:C1470.range; $searchValue; $searchCondition; $replaceValue) - End case - // REPLACE ALL 4D_WriteRange by cs.WPrange - $n:=$rangeCollection.length-1 - For ($i; 0; $n) - $rangeCollection[$i]:=cs:C1710.WPrange.new($rangeCollection[$i]) - End for - -Function findNext($searchAfter : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchAfter; cs:C1710.WPrange)) - $searchAfter:=$searchAfter.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find next:C1764(This:C1470.range; $searchAfter; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find next:C1764(This:C1470.range; $searchAfter; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - -Function findPrevious($searchBefore : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchBefore; cs:C1710.WPrange)) - $searchBefore:=$searchBefore.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find previous:C1765(This:C1470.range; $searchBefore; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find previous:C1765(This:C1470.range; $searchBefore; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - - //mark:-GET ELEMENTS - -Function getElements($elementType : Integer)->$elements : Collection - var $i; $n : Integer - Case of - : (Count parameters:C259=0) - $elements:=WP Get elements:C1550(This:C1470.range) - : (Count parameters:C259=1) - $elements:=WP Get elements:C1550(This:C1470.range; $elementType) - End case - // replace 4D_WriteElement by cs.WPelement or cs.WPtable - $n:=$elements.length-1 - For ($i; 0; $n) - If ($elementType=wk type table:K81:222) // table specificaly requested - $elements[$i]:=cs:C1710.WPtable.new($elements[$i]) - Else - $elements[$i]:=cs:C1710.WPelement.new($elements[$i]) - End if - End for - - //mark:-GET POSITION - -Function getPosition($layout : Integer)->$information : Object - If (Count parameters:C259=0) - $layout:=wk 4D Write Pro layout:K81:176 - End if - $information:=WP Get position:C1577(This:C1470.range; $layout) - - - //mark:-PICTURE - -Function insertPicture($picture : Picture; $insertMode : Integer; $rangeUpdateMode : Integer)->$pictureElement : cs:C1710.WPelement - var $pictureElements : Collection - var $range; $originalRange : Object - var $container : Object - - If (Count parameters:C259<3) - $rangeUpdateMode:=wk include in range:K81:180 - End if - If ($rangeUpdateMode=wk exclude from range:K81:181) - $range:=OB Copy:C1225(This:C1470.range) - Else - $range:=This:C1470.range - End if - - WP INSERT PICTURE:C1437($range; $picture; $insertMode) - $container:=$range.container#Null:C1517 ? $range.container : $range.owner - - Case of - : ($insertMode=wk prepend:K81:178) - $range:=WP Text range:C1341($container; $range.start; $range.start+1) - : ($insertMode=wk replace:K81:177) - $range:=WP Text range:C1341($container; $range.start; $range.start+1) - : ($insertMode=wk append:K81:179) - $range:=WP Text range:C1341($container; $range.end-1; $range.end) - End case - - $pictureElements:=WP Get elements:C1550($range; wk type image:K81:192) - ASSERT:C1129($pictureElements.length>0) - If ($pictureElements.length>0) - $pictureElement:=cs:C1710.WPelement.new($pictureElements[0]) - End if - - //mark:-TABLES - -Function insertTable($mode : Integer; $rangeUpdate : Integer; $nbCols : Integer; $nbRows : Integer)->$table : cs:C1710.WPtable - - Case of - : (Count parameters:C259=0) - $mode:=wk append:K81:179 - $rangeUpdate:=wk include in range:K81:180 - : (Count parameters:C259=1) - $rangeUpdate:=wk include in range:K81:180 - End case - - $table:=cs:C1710.WPtable.new(WP Insert table:C1473(This:C1470.range; $mode; $rangeUpdate; $nbCols; $nbRows)) - - //mark:- INSERT DOCUMENT - -Function insertDocument($wpDoc : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT DOCUMENT:C1411(This:C1470.range; $wpDoc; $mode; $rangeUpdate) - - //mark:-TABLES DELETE ROWS & COLUMNS - -Function tableDeleteColumns() // all tables will be deleted - WP TABLE DELETE COLUMNS:C1694(This:C1470.range) - -Function tableDeleteRows() // all tables will be deleted - WP TABLE DELETE ROWS:C1693(This:C1470.range) - - //mark:-TABLE GET CELLS, ROWS & COLUMNS - -Function tableGetCells()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get cells:C1477(This:C1470.range)) - -Function tableGetColumns()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get columns:C1476(This:C1470.range)) - -Function tableGetRows()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get rows:C1475(This:C1470.range)) - - - //mark:-TABLE INSERT ROWS & COLUMNS - -Function tableInsertColumns($columnCount : Integer)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table insert columns:C1692(This:C1470.range; $columnCount)) - -Function tableInsertRows($rowCount : Integer)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table insert rows:C1691(This:C1470.range; $rowCount)) - - - //mark:-TABLE SPLIT & MERGE - -Function tableSplitCells() - WP TABLE SPLIT CELLS:C1816(This:C1470.range) // all tables will be n x n - -Function tableMergeCells() // all tables will be 1x1 - WP TABLE MERGE CELLS:C1815(This:C1470.range) - - //mark:-UTILITIES - -Function isFontStyleSUpported($fontStyle : Text)->$supported : Boolean - $supported:=WP Is font style supported:C1363(This:C1470.range; $fontStyle) - - \ No newline at end of file diff --git a/Project/Sources/Classes/WPsection.4dm b/Project/Sources/Classes/WPsection.4dm deleted file mode 100644 index ff1c1e2e..00000000 --- a/Project/Sources/Classes/WPsection.4dm +++ /dev/null @@ -1,354 +0,0 @@ -Class constructor($target : Object; $index : Integer) // $target is a 4D_WriteSection - - This:C1470.section:=$target - - - //mark:-PAGE COUNT (CALCULATED ATTRIBUTE) - -Function get pageCount->$count : Integer - If (Not:C34(Undefined:C82(This:C1470.section))) - $count:=WP Get page count:C1412(This:C1470.section) - End if - - //mark:-GET TEXT -- SET TEXT - -Function getText($expressions : Integer)->$text : Text - If (Count parameters:C259=0) - $expressions:=wk expressions as value:K81:255 - End if - $text:=WP Get text:C1575(This:C1470.section; $expressions) - -Function setText($newText : Text; $textPosition : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP SET TEXT:C1574(This:C1470.section; $newText; $textPosition; $rangeUpdate) - - - //mark:-HEADERS AND FOOTERS - -Function newHeader()->$header : cs:C1710.WPelement - $header:=cs:C1710.WPelement.new(WP New header:C1586(This:C1470.section)) - -Function getHeader()->$header : cs:C1710.WPelement - $header:=cs:C1710.WPelement.new(WP Get header:C1503(This:C1470.section)) - - -Function newFooter()->$footer : cs:C1710.WPelement - $footer:=cs:C1710.WPelement.new(WP New footer:C1587(This:C1470.section)) - -Function getFooter()->$footer : cs:C1710.WPelement - $footer:=cs:C1710.WPelement.new(WP Get footer:C1504(This:C1470.section)) - - - - //mark:-SUBSECTION - -Function getSubsection($subsectionType : Integer)->$subsection : cs:C1710.WPsection - $subsection:=cs:C1710.WPsection.new(WP Get subsection:C1582(This:C1470.section; $subsectionType)) - -Function newSubsection($subsectionType : Integer)->$subsection : cs:C1710.WPsection - $subsection:=cs:C1710.WPsection.new(WP New subsection:C1583(This:C1470.section; $subsectionType)) - - - //mark:-GET LINKS -- SET LINK - -Function getLinks()->$links : Collection - var $link : Object - $links:=WP Get links:C1643(This:C1470.section) - For each ($link; $links) - $link.range:=cs:C1710.WPrange.new($link.range) // transform 4D_WriteRange to cs.WPrange - End for each - - -Function setLink($linkObject) - WP SET LINK:C1642(This:C1470.section; $linkObject) - - - //mark:-FORMULAS - -Function insertFormula($formula : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT FORMULA:C1703(This:C1470.section; $formula; $mode; $rangeUpdate) - -Function computeFormulas - WP COMPUTE FORMULAS:C1707(This:C1470.section) - -Function freezeFormulas($recompute : Integer) - If (Count parameters:C259=0) - $recompute:=wk recompute expressions:K81:311 - End if - WP FREEZE FORMULAS:C1708(This:C1470.section; $recompute) - -Function getFormulas()->$formulas : Collection - var $i; $n : Integer - $formulas:=WP Get formulas:C1702(This:C1470.section) - // REPLACE ALL _Range by cs.WPrange - $n:=$formulas.length-1 - For ($i; 0; $n) - $formulas[$i].range:=cs:C1710.WPrange.new($formulas[$i].range) - End for - - //mark:-BREAKS - -Function getBreaks($breakType : Integer)->$breaks : Collection - - Case of - : (Count parameters:C259=0) - $breaks:=WP Get breaks:C1768(This:C1470.section) - : (Count parameters:C259>=1) - $breaks:=WP Get breaks:C1768(This:C1470.section; $breakType) - End case - -Function insertBreak($breakType : Integer; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT BREAK:C1413(This:C1470.section; $mode; $rangeUpdate) - - //mark:-ATTRIBUTES - -Function resetAttributes($attributeNames : Collection) // collection of attribute names (strings) - - var $attributeName : Text - For each ($attributeName; $attributeNames) - WP RESET ATTRIBUTES:C1344(This:C1470.section; $attributeName) - End for each - - -Function setAttributes($attributes : Object) // - - var $attributeName : Text - For each ($attributeName; $attributes) - WP SET ATTRIBUTES:C1342(This:C1470.section; $attributeName; $attributes[$attributeName]) - End for each - -Function getAttributes($attributeNames : Collection)->$attributes : Object // collection of attribute names (strings) - - var $attributeName : Text - var $attributeValue : Variant - - $attributes:=New object:C1471 - - For each ($attributeName; $attributeNames) - WP GET ATTRIBUTES:C1345(This:C1470.section; $attributeName; $attributeValue) - $attributes[$attributeName]:=$attributeValue - End for each - - - //mark:-TEXT PARAGRAPH PICTURE TABLE RANGE - -Function textRange($start : Integer; $end : Integer)->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Text range:C1341(This:C1470.section; $start; $end)) - -Function paragraphRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Paragraph range:C1346(This:C1470.section)) - -Function pictureRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Picture range:C1347(This:C1470.section)) - -Function tableRange()->$range : cs:C1710.WPrange //∆∆∆ - $range:=cs:C1710.WPrange.new(WP Table range:C1553(This:C1470.section)) - - - - //mark:-FIND ALL - FIND NEXT - FIND PREVIOUS - -Function findAll($searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$rangeCollection : Collection //∆∆∆ - var $range : Object - var $i; $n : Integer - Case of - : (Count parameters:C259=2) - $rangeCollection:=WP Find all:C1755(This:C1470.section; $searchValue; $searchCondition) - : (Count parameters:C259=3) - $rangeCollection:=WP Find all:C1755(This:C1470.section; $searchValue; $searchCondition; $replaceValue) - End case - // REPLACE ALL 4D_WriteRange by cs.WPrange - $n:=$rangeCollection.length-1 - For ($i; 0; $n) - $rangeCollection[$i]:=cs:C1710.WPrange.new($rangeCollection[$i]) - End for - -Function findNext($searchAfter : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - - var $result : Object - - If (OB Instance of:C1731($searchAfter; cs:C1710.WPrange)) - $searchAfter:=$searchAfter.range //cs.WPrange -> 4D_WriteRange - End if - - Case of - : (Count parameters:C259=3) - $result:=WP Find next:C1764(This:C1470.section; $searchAfter; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find next:C1764(This:C1470.section; $searchAfter; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - -Function findPrevious($searchBefore : Object; $searchValue : Text; $searchCondition : Integer; $replaceValue : Text)->$range : cs:C1710.WPrange - var $result : Object - If (OB Instance of:C1731($searchBefore; cs:C1710.WPrange)) - $searchBefore:=$searchBefore.range //cs.WPrange -> 4D_WriteRange - End if - Case of - : (Count parameters:C259=3) - $result:=WP Find previous:C1765(This:C1470.section; $searchBefore; $searchValue; $searchCondition) - : (Count parameters:C259=4) - $result:=WP Find previous:C1765(This:C1470.section; $searchBefore; $searchValue; $searchCondition; $replaceValue) - End case - // replace 4D_WriteRange by cs.WPrange - $range:=cs:C1710.WPrange($result) - - //mark:-GET ELEMENTS - -Function getElements($elementType : Integer)->$elements : Collection - var $i; $n : Integer - Case of - : (Count parameters:C259=0) - $elements:=WP Get elements:C1550(This:C1470.section) - : (Count parameters:C259=1) - $elements:=WP Get elements:C1550(This:C1470.section; $elementType) - End case - // replace 4D_WriteElement by cs.WPelement or cs.WPtable - $n:=$elements.length-1 - For ($i; 0; $n) - If ($elementType=wk type table:K81:222) // table specificaly requested - $elements[$i]:=cs:C1710.WPtable.new($elements[$i]) - Else - $elements[$i]:=cs:C1710.WPelement.new($elements[$i]) - End if - End for - - //mark:-GET POSITION - -Function getPosition($layout : Integer)->$information : Object - If (Count parameters:C259=0) - $layout:=wk 4D Write Pro layout:K81:176 - End if - $information:=WP Get position:C1577(This:C1470.section; $layout) - - - //mark:-PICTURE - -Function insertPicture($picture : Picture; $insertMode : Integer)->$pictureElement : cs:C1710.WPelement - var $pictElements : Collection - var $range : Object - - WP INSERT PICTURE:C1437(This:C1470.section; $picture; $insertMode) - $range:=WP Text range:C1341(This:C1470.section; wk start text:K81:165; wk end text:K81:164) - $pictElements:=WP Get elements:C1550($range; wk type image:K81:192) - - Case of - : ($insertMode=wk prepend:K81:178) | ($insertMode=wk replace:K81:177) - $pictureElement:=cs:C1710.WPelement.new($pictElements[0]) - - : ($insertMode=wk append:K81:179) - $pictureElement:=cs:C1710.WPelement.new($pictElements[$pictElements.length-1]) - End case - - //mark:-DELETE - -Function delete($subsectionType) - var $subsection : cs:C1710.WPsection - - Case of - : (Count parameters:C259=0) - - If (Not:C34(Undefined:C82(This:C1470.section.parent))) // subsection type - Case of - : (This:C1470.section.type=1) // first page - $subsectionType:=wk first page:K81:203 - : (This:C1470.section.type=2) // left page - $subsectionType:=wk left page:K81:204 - : (This:C1470.section.type=3) // right page - $subsectionType:=wk right page:K81:205 - End case - WP DELETE SUBSECTION:C1584(This:C1470.section.parent; $subsectionType) - Else //section type - //WP DELETE SECTION(This.section) // in the future - End if - - : (Count parameters:C259=1) // to be used with sections only, not subsections - - If (Undefined:C82(This:C1470.section.parent)) //section type - WP DELETE SUBSECTION:C1584(This:C1470.section; $subsectionType) - End if - - End case - - - //mark:- INSERT DOCUMENT - -Function insertDocument($wpDoc : Object; $mode : Integer; $rangeUpdate : Integer) - If (Count parameters:C259<3) - $rangeUpdate:=wk include in range:K81:180 - End if - WP INSERT DOCUMENT:C1411(This:C1470.section; $wpDoc; $mode; $rangeUpdate) - - - - //mark:-TABLE INSERT - -Function insertTable($mode : Integer; $rangeUpdate : Integer; $nbCols : Integer; $nbRows : Integer)->$table : cs:C1710.WPtable - - Case of - : (Count parameters:C259=0) - $mode:=wk append:K81:179 - $rangeUpdate:=wk include in range:K81:180 - : (Count parameters:C259=1) - $rangeUpdate:=wk include in range:K81:180 - End case - - $table:=cs:C1710.WPtable.new(WP Insert table:C1473(This:C1470.section; $mode; $rangeUpdate; $nbCols; $nbRows)) - - //mark:-TABLES DELETE ROWS & COLUMNS - -Function tableDeleteColumns() // all tables will be deleted - WP TABLE DELETE COLUMNS:C1694(This:C1470.section) - -Function tableDeleteRows() // all tables will be deleted - WP TABLE DELETE ROWS:C1693(This:C1470.section) - - //mark:-TABLE GET CELLS, ROWS & COLUMNS - -Function tableGetCells()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get cells:C1477(This:C1470.section)) - -Function tableGetColumns()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get columns:C1476(This:C1470.section)) - -Function tableGetRows()->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table get rows:C1475(This:C1470.section)) - - - //mark:-TABLE INSERT ROWS & COLUMNS - -Function tableInsertColumns($columnCount : Integer)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table insert columns:C1692(This:C1470.section; $columnCount)) - -Function tableInsertRows($rowCount : Integer)->$range : cs:C1710.WPrange - $range:=cs:C1710.WPrange.new(WP Table insert rows:C1691(This:C1470.section; $rowCount)) - - - //mark:-TABLE SPLIT & MERGE - -Function tableSplitCells() - WP TABLE SPLIT CELLS:C1816(This:C1470.section) // all tables will be n x n - -Function tableMergeCells() // all tables will be 1x1 - WP TABLE MERGE CELLS:C1815(This:C1470.section) - - - //mark:-INTERFACE - -Function select($startRange : Integer; $endRange : Integer) - Case of - : (Count parameters:C259=0) - WP SELECT:C1348(This:C1470.section) - : (Count parameters:C259=2) - WP SELECT:C1348(This:C1470.section; $startRange; $endRange) - End case - \ No newline at end of file diff --git a/Project/Sources/Classes/WPstyleSheet.4dm b/Project/Sources/Classes/WPstyleSheet.4dm deleted file mode 100644 index 70fc9fb7..00000000 --- a/Project/Sources/Classes/WPstyleSheet.4dm +++ /dev/null @@ -1,42 +0,0 @@ -Class constructor($styleSheet : Object) //4D_WriteStyleSheet) - This:C1470.styleSheet:=$styleSheet - - - //mark:-ATTRIBUTES - -Function resetAttributes($attributeNames : Collection) // collection of attribute names (strings) - - var $attributeName : Text - For each ($attributeName; $attributeNames) - WP RESET ATTRIBUTES:C1344(This:C1470.styleSheet; $attributeName) - End for each - - -Function setAttributes($attributes : Object) // - - var $attributeName : Text - For each ($attributeName; $attributes) - WP SET ATTRIBUTES:C1342(This:C1470.styleSheet; $attributeName; $attributes[$attributeName]) - End for each - -Function getAttributes($attributeNames : Collection)->$attributes : Object // collection of attribute names (strings) - - var $attributeName : Text - var $attributeValue : Variant - - $attributes:=New object:C1471 - - For each ($attributeName; $attributeNames) - WP GET ATTRIBUTES:C1345(This:C1470.styleSheet; $attributeName; $attributeValue) - $attributes[$attributeName]:=$attributeValue - End for each - - - //mark:-DELETE -Function delete() - - WP DELETE STYLE SHEET:C1652(This:C1470.styleSheet) - - - - \ No newline at end of file diff --git a/Project/Sources/Classes/WPtable.4dm b/Project/Sources/Classes/WPtable.4dm deleted file mode 100644 index c9a1925e..00000000 --- a/Project/Sources/Classes/WPtable.4dm +++ /dev/null @@ -1,142 +0,0 @@ - - -Class extends WPelement - -Class constructor($table : Object) //4D_WriteElement) - - Super:C1705($table) - This:C1470.table:=$table - - - - //mark:-DELETE - -Function deleteColumns($colNumber : Integer; $columnCount : Integer) - If (Count parameters:C259<2) - $columnCount:=1 - End if - WP TABLE DELETE COLUMNS:C1694(This:C1470.table; $colNumber; $columnCount) - -Function deleteRows($rowNumber : Integer; $rowCount : Integer) - If (Count parameters:C259<2) - $rowCount:=1 - End if - WP TABLE DELETE ROWS:C1693(This:C1470.table; $rowNumber; $rowCount) - - //mark:-GET -Function getCells($startCol : Integer; $startRow : Integer; $columnCount : Integer; $rowCount : Integer)->$range : cs:C1710.WPrange - If (Count parameters:C259<4) - $rowCount:=1 - If (Count parameters:C259<3) - $columnCount:=1 - End if - End if - $range:=cs:C1710.WPrange.new(WP Table get cells:C1477(This:C1470.table; $startCol; $startRow; $columnCount; $rowCount)) - -Function getColumns($startCol : Integer; $columnCount : Integer)->$range : cs:C1710.WPrange - If (Count parameters:C259<2) - $columnCount:=1 - End if - $range:=cs:C1710.WPrange.new(WP Table get columns:C1476(This:C1470.table; $startCol; $columnCount)) - -Function getRows($startRow : Integer; $rowCount : Integer)->$range : cs:C1710.WPrange - If (Count parameters:C259<2) - $rowCount:=1 - End if - $range:=cs:C1710.WPrange.new(WP Table get rows:C1475(This:C1470.table; $startRow; $rowCount)) - - - //mark:-APPEND ROW - INSERT ROWS & COLUMNS- - -Function appendRow( ... : Variant)->$range : Object - - var $parameters : Collection - var $f : 4D:C1709.Function - var $formulaString : Text - var $i; $n : Integer - var $o : Object - - // ce que je veux faire : - //If (False) - //$range:=WP Table append row(This.table; $1; $2; $3) //; ... ) - //End if - - // OK UNIQUEMENT SI LE NOMBRE DE PARAMTRES EST EXACT, sinon KO - //If (False) - //$parameters:=Copy parameters - //$parameters.insert(0; This.table) - - //$f:=Formula($range:=WP Table append row($1; $2; $3; $4; $5)) - - //$range:=$f.apply(Null; $parameters) - //End if - - - // solution (temporaire ?) - - $parameters:=Copy parameters:C1790 - $formulaString:="This.range:=WP Table append row(This.table; " - - $o:=New object:C1471() - $o.table:=This:C1470.table - - $n:=$parameters.length-1 - For ($i; 0; $n) - $o["p"+String:C10($i+1)]:=$parameters[$i] - $formulaString+="This.p"+String:C10($i+1) - If ($i=$n) - $formulaString+=")" - Else - $formulaString+=";" - End if - End for - - - $f:=Formula from string:C1601($formulaString) - $range:=$f.call($o) // $range returns undefined - $range:=$o.range // $o.range is not :-) - - -Function insertColumns($colNumber : Integer; $columnCount : Integer)->$range : cs:C1710.WPrange - If (Count parameters:C259<2) - $columnCount:=1 - End if - $range:=cs:C1710.WPrange.new(WP Table insert columns:C1692(This:C1470.table; $colNumber; $columnCount)) - -Function insertRows($rowNumber : Integer; $rowCount : Integer)->$range : cs:C1710.WPrange - If (Count parameters:C259<2) - $rowCount:=1 - End if - $range:=cs:C1710.WPrange.new(WP Table insert rows:C1691(This:C1470.table; $rowNumber; $rowCount)) - - - //mark:-SPLIT MERGE - -Function splitCells($startColumn : Integer; $startRow : Integer; $columnCount : Integer; $rowCount : Integer) - If (Count parameters:C259=0) - WP TABLE SPLIT CELLS:C1816(This:C1470.table; 1; 1; MAXLONG:K35:2; MAXLONG:K35:2) // means split the whole table - Else - - If (Count parameters:C259<4) - $rowCount:=1 - If (Count parameters:C259<3) - $columnCount:=1 - End if - End if - WP TABLE SPLIT CELLS:C1816(This:C1470.table; $startColumn; $startRow; $columnCount; $rowCount) - End if - -Function mergeCells($startColumn : Integer; $startRow : Integer; $columnCount : Integer; $rowCount : Integer) - If (Count parameters:C259=0) - WP TABLE MERGE CELLS:C1815(This:C1470.table; 1; 1; MAXLONG:K35:2; MAXLONG:K35:2) // means merge the whole table (1x1) - Else - If (Count parameters:C259<4) - $rowCount:=1 - If (Count parameters:C259<3) - $columnCount:=1 - End if - End if - WP TABLE MERGE CELLS:C1815(This:C1470.table; $startColumn; $startRow; $columnCount; $rowCount) - End if - - \ No newline at end of file diff --git a/Project/Sources/Forms/D_Request/method.4dm b/Project/Sources/Forms/D_Request/method.4dm index 68880703..5de3d853 100644 --- a/Project/Sources/Forms/D_Request/method.4dm +++ b/Project/Sources/Forms/D_Request/method.4dm @@ -1,6 +1,6 @@ //dial created 2020/06/03 to fix the ACI0100879 -C_LONGINT:C283($width; $height; $x1; $x2; $y1; $y2) +var $width; $height; $x1; $x2; $y1; $y2 : Integer Case of : (FORM Event:C1606.code=On Load:K2:1) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button.4dm deleted file mode 100644 index cdeafe1f..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button.4dm +++ /dev/null @@ -1,23 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $attributes : Object -var $range : cs:C1710.WPrange - -Form:C1466.wp:=WP New:C1317 - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$area.setText("Alpha Bravo "*50) - -$attributes:={borderStyle: wk dashed:K81:117; borderColor: "red"; borderWidth: "4pt"} -$area.setAttributes($attributes) - -$range:=$area.textRange(1; 10) -$range.setText("XXXXXXXXXX") - -$range:=$area.textRange(11; 20) -$range.setText("YYYYYYYYYY") - - - - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button1.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button1.4dm deleted file mode 100644 index d01e61b8..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button1.4dm +++ /dev/null @@ -1,18 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $attributes : Object - -$area:=cs:C1710.WPdocument.new() -$area.setText("Charlie Delta "*50) - -$attributes:={borderStyle: wk solid:K81:115; borderColor: "green"; borderWidth: "3pt"} -$area.setAttributes($attributes) - - -Form:C1466.wp:=$area.document - -//$attributes:={} -//$attributes:=$area.getAttributes(["borderStyle"; "borderColor"; "borderWidth"]) - - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button10.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button10.4dm deleted file mode 100644 index 5d8078e6..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button10.4dm +++ /dev/null @@ -1,16 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $textBox : cs:C1710.WPelement -var $formulas : Collection -var $range : cs:C1710.WPrange -var $i; $n : Integer - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$formulas:=$area.getFormulas() -$n:=$formulas.length-1 -For ($i; 0; $n) - $formulas[$i].range.setAttributes({color: "red"; backgroundColor: "yellow"}) -End for - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button100.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button100.4dm deleted file mode 100644 index 49651840..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button100.4dm +++ /dev/null @@ -1,17 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $element : cs:C1710.WPelement - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$element:=$doc.getHeader(1) - -If ($element#Null:C1517) - If (Shift down:C543) - $element.select(10; 10+(Random:C100%50)) - Else - $element.select() - End if -Else - ALERT:C41("null element") -End if - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button101.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button101.4dm deleted file mode 100644 index 52ca256e..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button101.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $section : Object - -$section:=WP Get section:C1581(Form:C1466.wp; 2) -If (Shift down:C543) - WP SELECT:C1348($section; 10; 10+(Random:C100%20)) -Else - WP SELECT:C1348($section) -End if \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button102.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button102.4dm deleted file mode 100644 index 291abf7c..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button102.4dm +++ /dev/null @@ -1,17 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $section : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(2) - -If ($section#Null:C1517) - If (Shift down:C543) - $section.select(10; 10+(Random:C100%50)) - Else - $section.select() - End if -Else - ALERT:C41("null element") -End if - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button11.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button11.4dm deleted file mode 100644 index 7330f2e2..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button11.4dm +++ /dev/null @@ -1,17 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $textBox : cs:C1710.WPelement -var $breaks : Collection -var $range : cs:C1710.WPrange -var $i; $n : Integer - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$breaks:=$area.getBreaks() - -$n:=$breaks.length-1 -For ($i; $n; 0; -1) - $breaks[$i].setText("•••") -End for - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button12.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button12.4dm deleted file mode 100644 index 470ac460..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button12.4dm +++ /dev/null @@ -1,22 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $element : cs:C1710.WPelement - -var $elements : Collection -var $i : Integer - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$elements:=$area.getElements(wk type paragraph:K81:191) - -$i:=0 -For each ($element; $elements) - If ($i%2=0) - $element.setAttributes({textAlign: wk left:K81:95; color: "indigo"}) - Else - $element.setAttributes({textAlign: wk right:K81:96; color: "darkgrey"}) - End if - $i+=1 -End for each - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button13.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button13.4dm deleted file mode 100644 index a00c3bcb..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button13.4dm +++ /dev/null @@ -1,17 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $pictElem : cs:C1710.WPelement -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$pictElem:=$area.insertPicture($picture; wk prepend:K81:178) -$pictElem.setAttributes({width: "2cm"; height: "2cm"; marginLeft: "1cm"; marginRight: "1cm"; borderStyle: 1; borderColor: "red"}) - - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button14.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button14.4dm deleted file mode 100644 index d9301106..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button14.4dm +++ /dev/null @@ -1,22 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $pictElem : cs:C1710.WPelement -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$pictElem:=$area.insertPicture($picture; wk replace:K81:177) - -$pictElem.setAttributes({width: "3cm"; height: "3cm"; marginLeft: "5mm"; marginRight: "5mm"; borderRadius: "10pt"; borderStyle: 3; borderColor: "indigo"}) - - - - -Form:C1466.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button15.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button15.4dm deleted file mode 100644 index 9f1f4ff5..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button15.4dm +++ /dev/null @@ -1,19 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $pictElem : cs:C1710.WPelement -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$pictElem:=$area.insertPicture($picture; wk append:K81:179) - -$pictElem.setAttributes({width: "1cm"; height: "1cm"; marginLeft: "5mm"; marginRight: "5mm"; borderStyle: 2; borderColor: "purple"}) - - -Form:C1466.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button16.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button16.4dm deleted file mode 100644 index 9cc24ba0..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button16.4dm +++ /dev/null @@ -1,19 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem : cs:C1710.WPelement -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$section:=$area.getSection(1) - -$pictElem:=$section.insertPicture($picture; wk prepend:K81:178) -$pictElem.setAttributes({width: "2cm"; height: "2cm"; marginLeft: "1cm"; marginRight: "1cm"; borderStyle: 1; borderColor: "red"}) - - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button17.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button17.4dm deleted file mode 100644 index c7e3767c..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button17.4dm +++ /dev/null @@ -1,23 +0,0 @@ -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem : cs:C1710.WPelement -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$section:=$area.getSection(1) - -$pictElem:=$section.insertPicture($picture; wk replace:K81:177) - -$pictElem.setAttributes({width: "3cm"; height: "3cm"; marginLeft: "5mm"; marginRight: "5mm"; borderRadius: "10pt"; borderStyle: 3; borderColor: "indigo"}) - - - - -Form:C1466.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button18.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button18.4dm deleted file mode 100644 index eb59e1ec..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button18.4dm +++ /dev/null @@ -1,24 +0,0 @@ -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem : cs:C1710.WPelement -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -If (Shift down:C543) - $section:=$area.getSection(2) -Else - $section:=$area.getSection(1) -End if - -$pictElem:=$section.insertPicture($picture; wk append:K81:179) - -$pictElem.setAttributes({width: "1cm"; height: "1cm"; marginLeft: "5mm"; marginRight: "5mm"; borderStyle: 2; borderColor: "purple"}) - -Form:C1466.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button19.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button19.4dm deleted file mode 100644 index 892cfe5a..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button19.4dm +++ /dev/null @@ -1,34 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem : cs:C1710.WPelement -var $header : cs:C1710.WPelement -var $textRange : cs:C1710.WPrange - -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$area.getHeader(1) -ASSERT:C1129($header#Null:C1517; "No header") - -$header.setText("ABCDEF"; wk replace:K81:177) -$textRange:=$header.textRange(2; 4) - -If (Shift down:C543) - $pictElem:=$textRange.insertPicture($picture; wk prepend:K81:178; wk exclude from range:K81:181) -Else - $pictElem:=$textRange.insertPicture($picture; wk prepend:K81:178; wk include in range:K81:180) -End if - -$textRange.setAttributes({fontBold: True:C214; backgroundColor: "Yellow"}) - - -If ($pictElem#Null:C1517) - $pictElem.setAttributes({width: "1cm"; height: "1cm"; marginLeft: "2mm"; marginRight: "2mm"; borderStyle: 2; borderColor: "purple"}) -End if - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button2.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button2.4dm deleted file mode 100644 index 99b49015..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button2.4dm +++ /dev/null @@ -1,24 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -var $name : Text - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -//$range:=$area.textRange(1; 10) - -$range:=cs:C1710.WPrange.new(WP Selection range:C1340(*; "WParea")) - - -$name:=$range.getText() - -If ($name#"") - //$area.newBookmark(WP Selection range(*; "WParea"); $name) - If (Shift down:C543) - $area.newBookmark($range; $name) - Else - $area.newBookmark(WP Selection range:C1340(*; "WParea"); $name) - End if -End if - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button20.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button20.4dm deleted file mode 100644 index 62d0af3f..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button20.4dm +++ /dev/null @@ -1,31 +0,0 @@ -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem : cs:C1710.WPelement -var $header : cs:C1710.WPelement -var $textRange : cs:C1710.WPrange - -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$area.getHeader(1) -$textRange:=$header.textRange(2; 4) -$textRange.setAttributes({fontBold: True:C214; backgroundColor: "Yellow"}) - -If (Shift down:C543) - $pictElem:=$textRange.insertPicture($picture; wk replace:K81:177; wk exclude from range:K81:181) -Else - $pictElem:=$textRange.insertPicture($picture; wk replace:K81:177; wk include in range:K81:180) -End if - -If ($pictElem#Null:C1517) - $pictElem.setAttributes({width: "1cm"; height: "1cm"; marginLeft: "2mm"; marginRight: "2mm"; borderStyle: 2; borderColor: "purple"}) -End if - -Form:C1466.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button21.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button21.4dm deleted file mode 100644 index 037bfeec..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button21.4dm +++ /dev/null @@ -1,34 +0,0 @@ -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem : cs:C1710.WPelement -var $header : cs:C1710.WPelement -var $textRange : cs:C1710.WPrange - -var $picture : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath - -READ PICTURE FILE:C678($path; $picture) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$area.getHeader(1) -$textRange:=$header.textRange(2; 4) -$textRange.setAttributes({fontBold: True:C214; backgroundColor: "Yellow"}) - -If (Shift down:C543) - $pictElem:=$textRange.insertPicture($picture; wk append:K81:179; wk exclude from range:K81:181) -Else - $pictElem:=$textRange.insertPicture($picture; wk append:K81:179; wk include in range:K81:180) -End if - - -If ($pictElem#Null:C1517) - $pictElem.setAttributes({width: "1cm"; height: "1cm"; marginLeft: "2mm"; marginRight: "2mm"; borderStyle: 2; borderColor: "purple"}) -End if - - - -//Form.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button22.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button22.4dm deleted file mode 100644 index 5309419a..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button22.4dm +++ /dev/null @@ -1,37 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem; $newPictElem : cs:C1710.WPelement -var $header : cs:C1710.WPelement -var $textRange : cs:C1710.WPrange - -var $picture1; $picture2 : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath -READ PICTURE FILE:C678($path; $picture1) -$path:=File:C1566("/RESOURCES/Images/drag.png").platformPath -READ PICTURE FILE:C678($path; $picture2) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$area.getHeader(1) -If ($header=Null:C1517) - $section:=$area.getSection(1) - $header:=$section.newHeader() -End if - - -$header.setText("ABCDEF"; wk append:K81:179) - -$textRange:=$header.textRange(1; 2) -$textRange.setAttributes({fontBold: True:C214}) - -$textRange:=$header.textRange(2; 3) // second char -$pictElem:=$textRange.insertPicture($picture1; wk prepend:K81:178; wk include in range:K81:180) - - - -// TEST -$newPictElem:=$pictElem.insertPicture($picture2; wk prepend:K81:178) - -$newPictElem.setAttributes({borderStyle: 1; borderColor: "red"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button23.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button23.4dm deleted file mode 100644 index 23314e6a..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button23.4dm +++ /dev/null @@ -1,37 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem; $newPictElem : cs:C1710.WPelement -var $header : cs:C1710.WPelement -var $textRange : cs:C1710.WPrange - -var $picture1; $picture2 : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath -READ PICTURE FILE:C678($path; $picture1) -$path:=File:C1566("/RESOURCES/Images/drag.png").platformPath -READ PICTURE FILE:C678($path; $picture2) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$area.getHeader(1) -If ($header=Null:C1517) - $section:=$area.getSection(1) - $header:=$section.newHeader() -End if - - -$header.setText("ABCDEF"; wk append:K81:179) - -$textRange:=$header.textRange(1; 2) -$textRange.setAttributes({fontBold: True:C214}) - -$textRange:=$header.textRange(2; 3) // second char -$pictElem:=$textRange.insertPicture($picture1; wk prepend:K81:178; wk include in range:K81:180) - - - -// TEST - -$newPictElem:=$pictElem.insertPicture($picture2; wk replace:K81:177) -$newPictElem.setAttributes({borderStyle: 1; borderColor: "red"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button24.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button24.4dm deleted file mode 100644 index 357e5d32..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button24.4dm +++ /dev/null @@ -1,37 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $section : cs:C1710.WPsection -var $pictElem; $newPictElem : cs:C1710.WPelement -var $header : cs:C1710.WPelement -var $textRange : cs:C1710.WPrange - -var $picture1; $picture2 : Picture -var $path : Text - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath -READ PICTURE FILE:C678($path; $picture1) -$path:=File:C1566("/RESOURCES/Images/drag.png").platformPath -READ PICTURE FILE:C678($path; $picture2) - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$area.getHeader(1) -If ($header=Null:C1517) - $section:=$area.getSection(1) - $header:=$section.newHeader() -End if - - -$header.setText("ABCDEF"; wk append:K81:179) - -$textRange:=$header.textRange(1; 2) -$textRange.setAttributes({fontBold: True:C214}) - -$textRange:=$header.textRange(2; 3) // second char -$pictElem:=$textRange.insertPicture($picture1; wk prepend:K81:178; wk include in range:K81:180) - - - -// TEST - -$newPictElem:=$pictElem.insertPicture($picture2; wk append:K81:179) -$newPictElem.setAttributes({borderStyle: 1; borderColor: "red"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button25.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button25.4dm deleted file mode 100644 index e60fbf15..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button25.4dm +++ /dev/null @@ -1,11 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $table : cs:C1710.WPtable - -var $name : Text - -$area:=cs:C1710.WPdocument.new() -$table:=$area.insertTable(wk append:K81:179; wk include in range:K81:180; 3; 6) - -Form:C1466.wp:=$area.document diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button26.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button26.4dm deleted file mode 100644 index a4750028..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button26.4dm +++ /dev/null @@ -1,16 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $table : cs:C1710.WPtable -var $section : cs:C1710.WPsection - -var $name : Text - -$area:=cs:C1710.WPdocument.new() -$area.insertBreak(wk section break:K81:187; wk append:K81:179) -$area.insertBreak(wk section break:K81:187; wk append:K81:179) - -$section:=$area.getSection(2) -$table:=$section.insertTable(wk append:K81:179; wk include in range:K81:180; 3; 6) - -Form:C1466.wp:=$area.document diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button27.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button27.4dm deleted file mode 100644 index cf14390f..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button27.4dm +++ /dev/null @@ -1,14 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $table : cs:C1710.WPtable - -var $name : Text - -$area:=cs:C1710.WPdocument.new() -$area.setText("ABCD"; wk append:K81:179) -$range:=$area.textRange(1; 2) - -$range.insertTable(wk append:K81:179; wk include in range:K81:180; 3; 6) - -Form:C1466.wp:=$area.document diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button28.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button28.4dm deleted file mode 100644 index 3d0a3a12..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button28.4dm +++ /dev/null @@ -1,28 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $table : cs:C1710.WPtable -var $pict : cs:C1710.WPelement - -var $picture : Picture -var $name; $path : Text - -$area:=cs:C1710.WPdocument.new() -$area.setText("ABCD"; wk append:K81:179) - - -$path:=File:C1566("/RESOURCES/Images/HLbullet.png").platformPath -READ PICTURE FILE:C678($path; $picture) - -$pict:=$area.insertPicture($picture; wk append:K81:179) - -Case of - : (Shift down:C543) - $table:=$pict.insertTable(wk prepend:K81:178; wk include in range:K81:180; 3; 6) - : (Macintosh option down:C545) - $table:=$pict.insertTable(wk replace:K81:177; wk include in range:K81:180; 3; 6) - Else - $table:=$pict.insertTable(wk append:K81:179; wk include in range:K81:180; 3; 6) -End case - -Form:C1466.wp:=$area.document diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button29.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button29.4dm deleted file mode 100644 index 5919d3be..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button29.4dm +++ /dev/null @@ -1,19 +0,0 @@ - - -var $doc : cs:C1710.WPdocument -var $section; $subsection : cs:C1710.WPsection -var $headFoot : cs:C1710.WPelement - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$subsection:=$section.getSubsection(wk left page:K81:204) - -$headFoot:=$subsection.newHeader() -$headFoot.setAttributes({borderStyle: 1; borderWidth: "1pt"; margin: "4pt"; textAlign: wk left:K81:95; color: "Blue"; fontSize: "24pt"}) -$headFoot.setText("LEFT PAGE HEADER") - -$headFoot:=$subsection.newFooter() -$headFoot.setAttributes({borderStyle: 2; borderWidth: "1pt"; margin: "4pt"; textAlign: wk left:K81:95; color: "Blue"; fontSize: "24pt"}) -$headFoot.setText("LEFT PAGE FOOTER") - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button3.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button3.4dm deleted file mode 100644 index d907ba3c..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button3.4dm +++ /dev/null @@ -1,9 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $bookmarks : Collection - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$bookmarks:=$area.getBookmarks(False:C215) - -$bookmarks:=$area.getBookmarks(True:C214) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button30.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button30.4dm deleted file mode 100644 index 00e4a7a2..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button30.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$doc.getHeader(1) -If ($header#Null:C1517) - $header.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button31.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button31.4dm deleted file mode 100644 index 45f351ea..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button31.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$footer:=$doc.getFooter(1) -If ($footer#Null:C1517) - $footer.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button32.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button32.4dm deleted file mode 100644 index f42cd850..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button32.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$doc.getHeader(1; wk first page:K81:203) -If ($header#Null:C1517) - $header.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button33.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button33.4dm deleted file mode 100644 index d47a59c0..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button33.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$footer:=$doc.getFooter(1; wk first page:K81:203) -If ($footer#Null:C1517) - $footer.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button34.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button34.4dm deleted file mode 100644 index 648d358f..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button34.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$doc.getHeader(1; wk left page:K81:204) -If ($header#Null:C1517) - $header.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button35.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button35.4dm deleted file mode 100644 index a8527387..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button35.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$footer:=$doc.getFooter(1; wk left page:K81:204) -If ($footer#Null:C1517) - $footer.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button36.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button36.4dm deleted file mode 100644 index a00280ca..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button36.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$header:=$doc.getHeader(1; wk right page:K81:205) -If ($header#Null:C1517) - $header.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button37.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button37.4dm deleted file mode 100644 index c7fa6720..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button37.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$footer:=$doc.getFooter(1; wk right page:K81:205) -If ($footer#Null:C1517) - $footer.delete() -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button38.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button38.4dm deleted file mode 100644 index 2506da2a..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button38.4dm +++ /dev/null @@ -1,11 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$subsection:=$section.getSubsection(wk first page:K81:203) - -$subsection.delete() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button39.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button39.4dm deleted file mode 100644 index 436ce16d..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button39.4dm +++ /dev/null @@ -1,11 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$subsection:=$section.getSubsection(wk right page:K81:205) - -$subsection.delete() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button4.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button4.4dm deleted file mode 100644 index faea2699..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button4.4dm +++ /dev/null @@ -1,13 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $request : Text - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$request:=Request:C163("name") -If (ok=1) - $range:=$area.bookmarkRange($request) - ALERT:C41(JSON Stringify:C1217($range)) - ALERT:C41($range.getText()) -End if diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button40.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button40.4dm deleted file mode 100644 index d4ffb8a7..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button40.4dm +++ /dev/null @@ -1,11 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$subsection:=$section.getSubsection(wk left page:K81:204) - -$subsection.delete() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button41.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button41.4dm deleted file mode 100644 index b4a25c87..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button41.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$section.delete(wk first page:K81:203) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button42.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button42.4dm deleted file mode 100644 index abebce26..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button42.4dm +++ /dev/null @@ -1,10 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$section.delete(wk right page:K81:205) - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button43.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button43.4dm deleted file mode 100644 index 6fc9848d..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button43.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $header; $footer : cs:C1710.WPelement -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$section.delete(wk left page:K81:204) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button44.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button44.4dm deleted file mode 100644 index a766747a..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button44.4dm +++ /dev/null @@ -1,11 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$subsection:=$section.newSubsection(wk first page:K81:203) - -$subsection.setAttributes({backgroundColor: "#FFFFF0"}) - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button45.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button45.4dm deleted file mode 100644 index 58a3d1df..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button45.4dm +++ /dev/null @@ -1,14 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) - -$subsection:=$section.newSubsection(wk right page:K81:205) -$subsection.setAttributes({backgroundColor: "#F8F8FF"}) - -$subsection:=$section.getSubsection(wk left page:K81:204) // GET not NEW :-) -$subsection.setAttributes({backgroundColor: "#F8FFF8"}) - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button46.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button46.4dm deleted file mode 100644 index 8e2820d0..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button46.4dm +++ /dev/null @@ -1,14 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $section; $subsection : cs:C1710.WPsection - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) - -$subsection:=$section.newSubsection(wk left page:K81:204) -$subsection.setAttributes({backgroundColor: "lightgreen"}) - -$subsection:=$section.getSubsection(wk right page:K81:205) // GET not NEW :-) -$subsection.setAttributes({backgroundColor: "lightblue"}) - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button47.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button47.4dm deleted file mode 100644 index 172b31ad..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button47.4dm +++ /dev/null @@ -1,14 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $i : Integer - -$wp:=cs:C1710.WPdocument.new() - -For ($i; 1; 10) - $wp.setText(String:C10($i); wk append:K81:179) - If ($i#10) - $wp.insertBreak(wk page break:K81:188; wk append:K81:179) - End if -End for - -Form:C1466.wp:=$wp.document - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button48.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button48.4dm deleted file mode 100644 index 6a4af863..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button48.4dm +++ /dev/null @@ -1,21 +0,0 @@ - - -var $doc : cs:C1710.WPdocument -var $section; $subsection : cs:C1710.WPsection -var $header; $footer : cs:C1710.WPelement - - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) // à partir d'un doc existant s'il existe - -$section:=$doc.getSection(1) - -$subsection:=$section.getSubsection(wk first page:K81:203) - -$header:=$subsection.newHeader() -$header.setAttributes({borderStyle: 1; borderWidth: "2pt"; margin: "12pt"; textAlign: wk center:K81:99; color: "Blue"; fontSize: "24pt"}) -$header.setText("First page header") - -$footer:=$subsection.newFooter() -$footer.setAttributes({borderStyle: 2; borderWidth: "3pt"; margin: "6pt"; textAlign: wk center:K81:99; color: "Green"; fontSize: "24pt"}) -$footer.setText("First page footer") - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button49.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button49.4dm deleted file mode 100644 index 356c7070..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button49.4dm +++ /dev/null @@ -1,19 +0,0 @@ - - -var $doc : cs:C1710.WPdocument -var $section; $subsection : cs:C1710.WPsection -var $headFoot : cs:C1710.WPelement - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$doc.getSection(1) -$subsection:=$section.getSubsection(wk right page:K81:205) - -$headFoot:=$subsection.newHeader() -$headFoot.setAttributes({borderStyle: 1; borderWidth: "1pt"; margin: "4pt"; textAlign: wk right:K81:96; color: "Blue"; fontSize: "24pt"}) -$headFoot.setText("RIGHT PAGE HEADER") - -$headFoot:=$subsection.newFooter() -$headFoot.setAttributes({borderStyle: 2; borderWidth: "1pt"; margin: "4pt"; textAlign: wk right:K81:96; color: "Blue"; fontSize: "24pt"}) -$headFoot.setText("RIGHT PAGE FOOTER") - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button5.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button5.4dm deleted file mode 100644 index 11c15aa4..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button5.4dm +++ /dev/null @@ -1,11 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $docPages : Integer - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$docPages:=$area.pageCount - - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button50.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button50.4dm deleted file mode 100644 index 584fdc49..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button50.4dm +++ /dev/null @@ -1,11 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] -For ($i; 1; 5) - $table.appendRow(Random:C100; Random:C100; Random:C100; Random:C100; Random:C100) -End for diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button51.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button51.4dm deleted file mode 100644 index c1ebcb96..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button51.4dm +++ /dev/null @@ -1,26 +0,0 @@ -var $wp : Object -var $table : Object -var $columns : Object -var $i : Integer - - - -$wp:=cs:C1710.WPdocument.new() - -If (False:C215) - $table:=$wp.insertTable(wk append:K81:179; wk include in range:K81:180; 0; 0) - $table.appendRow(7; "ABC"; Current time:C178; Current date:C33; True:C214) - - $columns:=$table.getColumns(1; 10) - $columns.setAttributes({width: "2.5cm"; textAlign: 2}) - -Else - - $table:=$wp.insertTable(wk append:K81:179; wk include in range:K81:180; 0; 0) - $table.appendRow(7; "ABC"; Current time:C178; Current date:C33; True:C214) - - $table.getColumns(1; 10).setAttributes({width: "2.5cm"; textAlign: 2}) - -End if - -Form:C1466.wp:=$wp.document diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button52.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button52.4dm deleted file mode 100644 index e7778066..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button52.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$wp.tableInsertColumns(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button53.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button53.4dm deleted file mode 100644 index 25bc59ec..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button53.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$wp.tableInsertRows(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button54.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button54.4dm deleted file mode 100644 index 29b97947..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button54.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$wp.tableDeleteColumns(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button55.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button55.4dm deleted file mode 100644 index 79021d2d..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button55.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$wp.tableDeleteRows(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button56.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button56.4dm deleted file mode 100644 index 103c8bdd..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button56.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$range:=$wp.tableGetColumns() -$range.setAttributes({color: "blue"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button57.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button57.4dm deleted file mode 100644 index 52983210..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button57.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$range:=$wp.tableGetRows() -$range.setAttributes({color: "green"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button58.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button58.4dm deleted file mode 100644 index 636e4eba..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button58.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$range:=$wp.tableGetCells() -$range.setAttributes({color: "purple"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button59.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button59.4dm deleted file mode 100644 index 8a509e1c..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button59.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$wp.tableSplitCells() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button6.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button6.4dm deleted file mode 100644 index aea4919b..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button6.4dm +++ /dev/null @@ -1,14 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $section : cs:C1710.WPsection -var $count : Integer - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$section:=$area.getSection(2) - -$count:=$section.pageCount - - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button60.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button60.4dm deleted file mode 100644 index cafa3b08..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button60.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : Object -var $table : Object - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$wp.tableMergeCells() \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button61.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button61.4dm deleted file mode 100644 index 514f5aec..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button61.4dm +++ /dev/null @@ -1,6 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $sec : cs:C1710.WPsection - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) -$sec.tableInsertColumns(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button62.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button62.4dm deleted file mode 100644 index 79dc63c5..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button62.4dm +++ /dev/null @@ -1,6 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $sec : cs:C1710.WPsection - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) -$sec.tableInsertRows(1) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button63.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button63.4dm deleted file mode 100644 index 21b5af2f..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button63.4dm +++ /dev/null @@ -1,6 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) -$sec.tableDeleteColumns() \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button64.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button64.4dm deleted file mode 100644 index a003828d..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button64.4dm +++ /dev/null @@ -1,6 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) -$sec.tableDeleteRows() \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button65.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button65.4dm deleted file mode 100644 index 2f7234b5..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button65.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) - -$range:=$sec.tableGetColumns() -$range.setAttributes({color: "red"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button66.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button66.4dm deleted file mode 100644 index ed8e2e08..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button66.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) - -$range:=$sec.tableGetRows() -$range.setAttributes({color: "green"}) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button67.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button67.4dm deleted file mode 100644 index ea12bb79..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button67.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) - -$range:=$sec.tableGetCells() -$range.setAttributes({color: "purple"}) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button68.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button68.4dm deleted file mode 100644 index b22579a3..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button68.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) - -$sec.tableSplitCells() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button69.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button69.4dm deleted file mode 100644 index f4c357ca..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button69.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $wp : Object -var $sec : cs:C1710.WPsection - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$sec:=$wp.getSection(2) - -$sec.tableMergeCells() \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button7.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button7.4dm deleted file mode 100644 index fe4e3e82..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button7.4dm +++ /dev/null @@ -1,18 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $range : cs:C1710.WPrange -var $sections : Collection -var $s : cs:C1710.WPsection - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$sections:=$area.getSections() -For each ($s; $sections) - ALERT:C41($s.getText()) -End for each - -$sections:=$area.getSections(False:C215) - - - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button70.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button70.4dm deleted file mode 100644 index 5b972541..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button70.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range.tableInsertColumns(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button71.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button71.4dm deleted file mode 100644 index a2f4438a..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button71.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range.tableInsertRows(1) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button72.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button72.4dm deleted file mode 100644 index b7f2079b..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button72.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range.tableDeleteColumns() diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button73.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button73.4dm deleted file mode 100644 index 54547d81..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button73.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range.tableDeleteRows() diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button74.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button74.4dm deleted file mode 100644 index cd44bb55..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button74.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range:=$range.tableGetColumns() - -$range.setAttributes({color: "red"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button75.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button75.4dm deleted file mode 100644 index d2635eac..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button75.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") -$range:=$range.tableGetRows() - -$range.setAttributes({color: "blue"}) \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button76.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button76.4dm deleted file mode 100644 index 0c38a9e1..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button76.4dm +++ /dev/null @@ -1,10 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range:=$range.tableGetCells() - -$range.setAttributes({backgroundColor: "lightgreen"}) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button77.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button77.4dm deleted file mode 100644 index 142e3b8e..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button77.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range:=$range.tableGetCells() - -$range.tableSplitCells() diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button78.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button78.4dm deleted file mode 100644 index ff23f71e..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button78.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $range : cs:C1710.WPrange - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$wp.selectionRange("WParea") - -$range:=$range.tableGetCells() - -$range.tableMergeCells() diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button79.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button79.4dm deleted file mode 100644 index 58a2e914..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button79.4dm +++ /dev/null @@ -1,13 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - -$range:=$table.insertColumns(2; 2) - -$range.setAttributes({backgroundColor: "lightgreen"}) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button8.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button8.4dm deleted file mode 100644 index 26c67ee2..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button8.4dm +++ /dev/null @@ -1,18 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $textBox : cs:C1710.WPelement - -$area:=cs:C1710.WPdocument.new() - - - -$textBox:=$area.newTextBox(1) - -$textBox.setAttributes({width: "5cm"; height: "3cm"; marginLeft: "4cm"; marginTop: "3cm"}) - -$textBox.setText("Hey, I am a text box!") - - -Form:C1466.wp:=$area.document - -//ALERT($textBox.getText()) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button80.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button80.4dm deleted file mode 100644 index 90aa74d0..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button80.4dm +++ /dev/null @@ -1,15 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - -$range:=$table.insertRows(3; 2) -$range.setAttributes({backgroundColor: "blue"}) - - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button81.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button81.4dm deleted file mode 100644 index b405b475..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button81.4dm +++ /dev/null @@ -1,8 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - -$table.deleteColumns(2; 2) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button82.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button82.4dm deleted file mode 100644 index 9b6c82df..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button82.4dm +++ /dev/null @@ -1,9 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] -$table.deleteRows(3; 2) - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button83.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button83.4dm deleted file mode 100644 index d2c3b279..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button83.4dm +++ /dev/null @@ -1,14 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.getColumns(2; 2) -$range.setAttributes({backgroundColor: "lightgreen"}) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button84.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button84.4dm deleted file mode 100644 index 1b71e141..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button84.4dm +++ /dev/null @@ -1,14 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.getRows(2; 2) -$range.setAttributes({backgroundColor: "lightblue"}) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button85.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button85.4dm deleted file mode 100644 index 0e654c6f..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button85.4dm +++ /dev/null @@ -1,14 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.getCells(2; 2; 2; 2) -$range.setAttributes({backgroundColor: "Yellow"}) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button86.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button86.4dm deleted file mode 100644 index 61146053..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button86.4dm +++ /dev/null @@ -1,13 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.splitCells(2; 2; 2; 2) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button87.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button87.4dm deleted file mode 100644 index 486407b9..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button87.4dm +++ /dev/null @@ -1,13 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.mergeCells(2; 2; 2; 2) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button88.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button88.4dm deleted file mode 100644 index 9e8d13b0..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button88.4dm +++ /dev/null @@ -1,13 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.splitCells() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button89.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button89.4dm deleted file mode 100644 index fad37da1..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button89.4dm +++ /dev/null @@ -1,13 +0,0 @@ -var $wp : cs:C1710.WPdocument -var $table : cs:C1710.WPtable -var $range : cs:C1710.WPrange - -var $i : Integer - -$wp:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$table:=$wp.getElements(wk type table:K81:222)[0] - - -$range:=$table.mergeCells() - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button9.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button9.4dm deleted file mode 100644 index 91488ad1..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button9.4dm +++ /dev/null @@ -1,13 +0,0 @@ - -var $area : cs:C1710.WPdocument -var $textBox : cs:C1710.WPelement -var $rangeCollection : Collection -var $range : cs:C1710.WPrange - -$area:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$rangeCollection:=$area.findAll("tempus"; wk whole word:K81:333; "green") - -For each ($range; $rangeCollection) - $range.setAttributes({color: "green"; fontBold: True:C214}) -End for each \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button90.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button90.4dm deleted file mode 100644 index af0a760d..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button90.4dm +++ /dev/null @@ -1,11 +0,0 @@ - -var $properties : Object - -If (Shift down:C543) - $properties:={visibleHorizontalRuler: True:C214; visibleVerticalRuler: False:C215} -Else - $properties:={visibleHorizontalRuler: False:C215; visibleVerticalRuler: True:C214} -End if - -WP SET VIEW PROPERTIES:C1648(*; "WParea"; $properties) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button91.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button91.4dm deleted file mode 100644 index 54ed91a3..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button91.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $properties : Object - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$properties:=$doc.getViewProperties("WParea") -ALERT:C41(JSON Stringify:C1217($properties; *)) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button92.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button92.4dm deleted file mode 100644 index bae37a90..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button92.4dm +++ /dev/null @@ -1,14 +0,0 @@ - - -var $doc : cs:C1710.WPdocument -var $properties : Object - -If (Shift down:C543) - $properties:={visibleHorizontalRuler: True:C214; visibleVerticalRuler: False:C215} -Else - $properties:={visibleHorizontalRuler: False:C215; visibleVerticalRuler: True:C214} -End if - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$doc.setViewProperties("WParea"; $properties) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button93.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button93.4dm deleted file mode 100644 index 94e70124..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button93.4dm +++ /dev/null @@ -1,5 +0,0 @@ -var $range : Object - -$range:=WP Selection range:C1340(*; "WParea") -ALERT:C41(JSON Stringify:C1217($range; *)) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button94.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button94.4dm deleted file mode 100644 index 62185788..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button94.4dm +++ /dev/null @@ -1,7 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $range : Object - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$range:=$doc.selectionRange("WParea") -ALERT:C41(JSON Stringify:C1217($range; *)) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button95.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button95.4dm deleted file mode 100644 index 86c874ba..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button95.4dm +++ /dev/null @@ -1,4 +0,0 @@ - - -WP SELECT:C1348(*; "WParea"; 10; 10+(Random:C100%50)) - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button96.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button96.4dm deleted file mode 100644 index b1621eea..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button96.4dm +++ /dev/null @@ -1,6 +0,0 @@ -var $doc : cs:C1710.WPdocument - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) -$doc.select("WParea"; 10; 10+(Random:C100%50)) - - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button97.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button97.4dm deleted file mode 100644 index a32ebdc9..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button97.4dm +++ /dev/null @@ -1,11 +0,0 @@ -var $body : Object - -$body:=WP Get body:C1516(Form:C1466.wp) - -If (Shift down:C543) - WP SELECT:C1348(*; "WParea"; $body) // OK -Else - WP SELECT:C1348($body; 10; 10+(Random:C100%50)) //OK -End if - -//WP SELECT(*; "WParea"; $body; 10; 20) // BUG \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button98.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button98.4dm deleted file mode 100644 index 36a60814..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button98.4dm +++ /dev/null @@ -1,17 +0,0 @@ -var $doc : cs:C1710.WPdocument -var $element : cs:C1710.WPelement - -$doc:=cs:C1710.WPdocument.new(Form:C1466.wp) - -$element:=$doc.getBody() - -If ($element#Null:C1517) - If (Shift down:C543) - $element.select(10; 10+(Random:C100%50)) - Else - $element.select() //"WParea") - End if -Else - ALERT:C41("null element") -End if - diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button99.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button99.4dm deleted file mode 100644 index 7260370e..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/Button99.4dm +++ /dev/null @@ -1,6 +0,0 @@ -var $header : Object - -$header:=WP Get header:C1503(Form:C1466.wp; 1) -//WP SELECT(*; "WParea"; $header; 10; 20) - -WP SELECT:C1348($header; 10; 20) diff --git a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/WParea.4dm b/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/WParea.4dm deleted file mode 100644 index 36e6f9f7..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/ObjectMethods/WParea.4dm +++ /dev/null @@ -1 +0,0 @@ -WP UpdateWidget ("WPwidget";"WParea") diff --git a/Project/Sources/Forms/D_TEST_CLASSES/form.4DForm b/Project/Sources/Forms/D_TEST_CLASSES/form.4DForm deleted file mode 100755 index cac8d309..00000000 --- a/Project/Sources/Forms/D_TEST_CLASSES/form.4DForm +++ /dev/null @@ -1,1791 +0,0 @@ -{ - "$4d": { - "version": "1", - "kind": "form" - }, - "windowSizingX": "variable", - "windowSizingY": "variable", - "windowMinWidth": 0, - "windowMinHeight": 0, - "windowMaxWidth": 32767, - "windowMaxHeight": 32767, - "rightMargin": 20, - "bottomMargin": 20, - "events": [ - "onLoad", - "onPageChange", - "onValidate", - "onClick", - "onDoubleClick", - "onOutsideCall", - "onBeginDragOver", - "onDragOver", - "onDrop", - "onAfterKeystroke", - "onMenuSelect", - "onPluginArea", - "onAfterEdit", - "onTimer", - "onBoundVariableChange" - ], - "windowTitle": "window title", - "destination": "detailScreen", - "pages": [ - { - "objects": { - "Tab Control": { - "type": "tab", - "text": "Tab control", - "top": 10, - "left": 20, - "width": 1540, - "height": 860, - "dataSourceTypeHint": "arrayText", - "labels": [ - "A", - "B", - "C", - "D", - "E" - ], - "action": "gotoPage" - }, - "WParea": { - "type": "write", - "top": 50, - "left": 40, - "width": 660, - "height": 800, - "sizingX": "grow", - "sizingY": "grow", - "dataSource": "Form:C1466.wp", - "hideFocusRing": true, - "scrollbarVertical": "automatic", - "scrollbarHorizontal": "automatic", - "borderStyle": "none", - "method": "ObjectMethods/WParea.4dm", - "events": [ - "onLoad", - "onLosingFocus", - "onGettingFocus", - "onSelectionChange", - "onAfterEdit" - ] - }, - "WPwidget": { - "type": "subform", - "top": 51, - "left": 717, - "width": 260, - "height": 800, - "sizingX": "move", - "sizingY": "grow", - "detailForm": "WP_Palette", - "focusable": false, - "deletableInList": false, - "doubleClickInRowAction": "editSubrecord", - "doubleClickInEmptyAreaAction": "addSubrecord", - "selectionMode": "multiple", - "printFrame": "variable" - } - } - }, - { - "objects": { - "Button": { - "type": "button", - "text": "With parameter", - "top": 101, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button1": { - "type": "button", - "text": "Without parameter", - "top": 134, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button1.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button2": { - "type": "button", - "text": "new bookmark", - "top": 183, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button2.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button3": { - "type": "button", - "text": "Get bookmarks", - "top": 214, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button3.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button4": { - "type": "button", - "text": "Bookmark range", - "top": 264, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button4.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button5": { - "type": "button", - "text": "PAGE COUNT(DOC)", - "top": 314, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button5.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button6": { - "type": "button", - "text": "PAGE COUNT(SECTION 2)", - "top": 339, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button6.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button7": { - "type": "button", - "text": "Get sectionS", - "top": 384, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button7.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button8": { - "type": "button", - "text": "new TEXTBOX", - "top": 421, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button8.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button9": { - "type": "button", - "text": "Find all", - "top": 718, - "left": 1005, - "width": 307, - "height": 20, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button9.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button10": { - "type": "button", - "text": "Get formulas", - "top": 744, - "left": 1005, - "width": 307, - "height": 20, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button10.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button11": { - "type": "button", - "text": "Get BREAKS", - "top": 772, - "left": 1005, - "width": 307, - "height": 20, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button11.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button12": { - "type": "button", - "text": "Get elements", - "top": 800, - "left": 1005, - "width": 307, - "height": 20, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button12.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button13": { - "type": "button", - "text": "PREPEND", - "top": 495, - "left": 1005, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button13.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button14": { - "type": "button", - "text": "REPLACE", - "top": 526, - "left": 1005, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button14.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button15": { - "type": "button", - "text": "APPEND picture APP", - "top": 557, - "left": 1005, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button15.4dm", - "focusable": false, - "sizingX": "move" - }, - "Text": { - "type": "text", - "text": "DOC", - "top": 471, - "left": 1010, - "width": 54, - "height": 16, - "sizingX": "move" - }, - "Button16": { - "type": "button", - "text": "PREPEND", - "top": 495, - "left": 1094, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button16.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button17": { - "type": "button", - "text": "REPLACE", - "top": 526, - "left": 1094, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button17.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button18": { - "type": "button", - "text": "APPEND picture APP", - "top": 557, - "left": 1094, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button18.4dm", - "focusable": false, - "sizingX": "move" - }, - "Text1": { - "type": "text", - "text": "SECTION", - "top": 471, - "left": 1099, - "width": 64, - "height": 16, - "sizingX": "move" - }, - "Button19": { - "type": "button", - "text": "PREPEND", - "top": 495, - "left": 1183, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button19.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button20": { - "type": "button", - "text": "REPLACE", - "top": 526, - "left": 1183, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button20.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button21": { - "type": "button", - "text": "APPEND picture APP", - "top": 557, - "left": 1183, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button21.4dm", - "focusable": false, - "sizingX": "move" - }, - "Text2": { - "type": "text", - "text": "RANGE", - "top": 471, - "left": 1188, - "width": 64, - "height": 16, - "sizingX": "move" - }, - "Button22": { - "type": "button", - "text": "PREPEND", - "top": 495, - "left": 1273, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button22.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button23": { - "type": "button", - "text": "REPLACE", - "top": 526, - "left": 1273, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button23.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button24": { - "type": "button", - "text": "APPEND picture APP", - "top": 557, - "left": 1273, - "width": 77, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button24.4dm", - "focusable": false, - "sizingX": "move" - }, - "Text3": { - "type": "text", - "text": "ELEMENT", - "top": 471, - "left": 1278, - "width": 64, - "height": 16, - "sizingX": "move" - }, - "Button47": { - "type": "button", - "text": "NEW", - "top": 61, - "left": 1055, - "width": 307, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button47.4dm", - "focusable": false, - "fontWeight": "bold", - "sizingX": "move" - }, - "Text8": { - "type": "text", - "text": "IMAGES", - "top": 481, - "left": 1052, - "width": 339, - "height": 16, - "fontWeight": "bold", - "textAlign": "center" - } - } - }, - { - "objects": { - "Button30": { - "type": "button", - "text": "Get/Delete header", - "top": 209, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button30.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button31": { - "type": "button", - "text": "Get/Delete footer", - "top": 239, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button31.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button32": { - "type": "button", - "text": "Get/Delete header 1st", - "top": 279, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button32.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button33": { - "type": "button", - "text": "Get/Delete footer 1st", - "top": 309, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button33.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button34": { - "type": "button", - "text": "Get/Delete header left", - "top": 349, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button34.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button35": { - "type": "button", - "text": "Get/Delete footer left", - "top": 379, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button35.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button36": { - "type": "button", - "text": "Get/Delete header right", - "top": 419, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button36.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button37": { - "type": "button", - "text": "Get/Delete footer right", - "top": 449, - "left": 1005, - "width": 260, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button37.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button38": { - "type": "button", - "text": "Delete sub first page", - "top": 583, - "left": 1022, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button38.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button39": { - "type": "button", - "text": "Delete sub right page", - "top": 612, - "left": 1022, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button39.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button40": { - "type": "button", - "text": "Delete sub left page", - "top": 641, - "left": 1022, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button40.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button41": { - "type": "button", - "text": "Delete sec;first page", - "top": 583, - "left": 1244, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button41.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button42": { - "type": "button", - "text": "Delete sec;right page", - "top": 612, - "left": 1244, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button42.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button43": { - "type": "button", - "text": "Delete sec;left page", - "top": 641, - "left": 1244, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button43.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button44": { - "type": "button", - "text": "New sub first page", - "top": 53, - "left": 1004, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button44.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button45": { - "type": "button", - "text": "New sub right page", - "top": 82, - "left": 1004, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button45.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button46": { - "type": "button", - "text": "New sub left page", - "top": 111, - "left": 1004, - "width": 150, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button46.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button48": { - "type": "button", - "text": "New Head/Foot 1st page", - "top": 53, - "left": 1174, - "width": 180, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button48.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button29": { - "type": "button", - "text": "New Head/Foot left page", - "top": 83, - "left": 1174, - "width": 180, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button29.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button49": { - "type": "button", - "text": "New Head/Foot left page", - "top": 113, - "left": 1174, - "width": 180, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button49.4dm", - "focusable": false, - "sizingX": "move" - } - } - }, - { - "objects": { - "Button25": { - "type": "button", - "text": "insert table DOC", - "top": 119, - "left": 1225, - "width": 127, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button25.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button26": { - "type": "button", - "text": "insert table section", - "top": 119, - "left": 1363, - "width": 167, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button26.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button27": { - "type": "button", - "text": "insert table range", - "top": 152, - "left": 1225, - "width": 127, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button27.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button28": { - "type": "button", - "text": "insert table elem", - "top": 152, - "left": 1363, - "width": 167, - "height": 25, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button28.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button50": { - "type": "button", - "text": "getElements\\rappend row (loop)", - "top": 231, - "left": 998, - "width": 187, - "height": 42, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button50.4dm", - "sizingX": "move", - "focusable": false - }, - "Button51": { - "type": "button", - "text": "insertTable\\rappend row\\rgetColumns\\rsetAttributes", - "top": 119, - "left": 997, - "width": 188, - "height": 102, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button51.4dm", - "sizingX": "move", - "focusable": false - }, - "Button52": { - "type": "button", - "text": "Insert cols(1)", - "top": 321, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button52.4dm", - "sizingX": "move", - "focusable": false - }, - "Button53": { - "type": "button", - "text": "Insert rows(1)", - "top": 347, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button53.4dm", - "sizingX": "move", - "focusable": false - }, - "Button54": { - "type": "button", - "text": "Delete cols(1)", - "top": 391, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button54.4dm", - "sizingX": "move", - "focusable": false - }, - "Button55": { - "type": "button", - "text": "Delete rows(1)", - "top": 417, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button55.4dm", - "sizingX": "move", - "focusable": false - }, - "Button56": { - "type": "button", - "text": "Get cols()", - "top": 461, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button56.4dm", - "sizingX": "move", - "focusable": false - }, - "Button57": { - "type": "button", - "text": "Get rows()", - "top": 484, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button57.4dm", - "sizingX": "move", - "focusable": false - }, - "Button58": { - "type": "button", - "text": "Get cells()", - "top": 508, - "left": 998, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button58.4dm", - "sizingX": "move", - "focusable": false - }, - "Button59": { - "type": "button", - "text": "Split()", - "top": 544, - "left": 997, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button59.4dm", - "sizingX": "move", - "focusable": false - }, - "Button60": { - "type": "button", - "text": "Merge()", - "top": 568, - "left": 998, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button60.4dm", - "sizingX": "move", - "focusable": false - }, - "Text4": { - "type": "text", - "text": "DOC", - "top": 295, - "left": 1013, - "width": 65, - "height": 16, - "fontWeight": "bold", - "textAlign": "center" - }, - "Button61": { - "type": "button", - "text": "Insert cols(1)", - "top": 324, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button61.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button62": { - "type": "button", - "text": "Insert rows(1)", - "top": 350, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button62.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button63": { - "type": "button", - "text": "Delete cols(1)", - "top": 394, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button63.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button64": { - "type": "button", - "text": "Delete rows(1)", - "top": 420, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button64.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button65": { - "type": "button", - "text": "Get cols()", - "top": 464, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button65.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button66": { - "type": "button", - "text": "Get rows()", - "top": 487, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button66.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button67": { - "type": "button", - "text": "Get cells()", - "top": 511, - "left": 1135, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button67.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button68": { - "type": "button", - "text": "Split()", - "top": 547, - "left": 1134, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button68.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button69": { - "type": "button", - "text": "Merge()", - "top": 571, - "left": 1135, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button69.4dm", - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic" - }, - "Text5": { - "type": "text", - "text": "SECTION", - "top": 298, - "left": 1150, - "width": 65, - "height": 16, - "fontWeight": "bold", - "textAlign": "center", - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button70": { - "type": "button", - "text": "Insert cols(1)", - "top": 324, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button70.4dm", - "fontWeight": "normal" - }, - "Button71": { - "type": "button", - "text": "Insert rows(1)", - "top": 350, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button71.4dm", - "fontWeight": "normal" - }, - "Button72": { - "type": "button", - "text": "Delete cols(1)", - "top": 394, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button72.4dm", - "fontWeight": "normal" - }, - "Button73": { - "type": "button", - "text": "Delete rows(1)", - "top": 420, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button73.4dm", - "fontWeight": "normal" - }, - "Button74": { - "type": "button", - "text": "Get cols()", - "top": 464, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button74.4dm", - "fontWeight": "normal" - }, - "Button75": { - "type": "button", - "text": "Get rows()", - "top": 487, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button75.4dm", - "fontWeight": "normal" - }, - "Button76": { - "type": "button", - "text": "Get cells()", - "top": 511, - "left": 1259, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button76.4dm", - "fontWeight": "normal" - }, - "Button77": { - "type": "button", - "text": "Split()", - "top": 547, - "left": 1258, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button77.4dm", - "fontWeight": "normal" - }, - "Button78": { - "type": "button", - "text": "Merge()", - "top": 571, - "left": 1259, - "width": 103, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button78.4dm", - "fontWeight": "normal" - }, - "Text6": { - "type": "text", - "text": "RANGE", - "top": 298, - "left": 1274, - "width": 65, - "height": 16, - "fontWeight": "bold", - "textAlign": "center", - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button79": { - "type": "button", - "text": "Insert cols(2;2)", - "top": 324, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button79.4dm", - "fontWeight": "normal" - }, - "Button80": { - "type": "button", - "text": "Insert rows(3;2)", - "top": 350, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button80.4dm", - "fontWeight": "normal" - }, - "Button81": { - "type": "button", - "text": "Delete cols(2;2)", - "top": 394, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button81.4dm", - "fontWeight": "normal" - }, - "Button82": { - "type": "button", - "text": "Delete rows(3;2)", - "top": 420, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button82.4dm", - "fontWeight": "normal" - }, - "Button83": { - "type": "button", - "text": "Get cols(2; 2)", - "top": 464, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button83.4dm", - "fontWeight": "normal" - }, - "Button84": { - "type": "button", - "text": "Get rows(2; 2)", - "top": 487, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button84.4dm", - "fontWeight": "normal" - }, - "Button85": { - "type": "button", - "text": "Get cells(2;2;2;2)", - "top": 511, - "left": 1379, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button85.4dm", - "fontWeight": "normal" - }, - "Button86": { - "type": "button", - "text": "Split(2;2;2;2)", - "top": 547, - "left": 1378, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button86.4dm", - "fontWeight": "normal" - }, - "Button87": { - "type": "button", - "text": "Merge(2;2;2;2)", - "top": 571, - "left": 1379, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button87.4dm", - "fontWeight": "normal" - }, - "Text7": { - "type": "text", - "text": "TABLE", - "top": 298, - "left": 1394, - "width": 65, - "height": 16, - "fontWeight": "bold", - "textAlign": "center", - "fontStyle": "normal", - "stroke": "automatic" - }, - "Button88": { - "type": "button", - "text": "Split()", - "top": 624, - "left": 1379, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button88.4dm", - "fontWeight": "normal" - }, - "Button89": { - "type": "button", - "text": "Merge()", - "top": 648, - "left": 1380, - "width": 163, - "height": 22, - "events": [ - "onClick" - ], - "sizingX": "move", - "focusable": false, - "fontStyle": "normal", - "stroke": "automatic", - "method": "ObjectMethods/Button89.4dm", - "fontWeight": "normal" - }, - "Text8": { - "type": "text", - "text": "PICTURES", - "top": 437, - "left": 983, - "width": 339, - "height": 16, - "fontWeight": "bold", - "textAlign": "center" - }, - "Button90": { - "type": "button", - "text": "DELETE 3RD INLINE PICTURE", - "top": 602, - "left": 985, - "width": 345, - "height": 19, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button90.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button92": { - "type": "button", - "text": "DELETE 3RD ANCHORED PICTURE", - "top": 624, - "left": 985, - "width": 345, - "height": 19, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button92.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button93": { - "type": "button", - "text": "DELETE 1st picture (anchored or not)", - "top": 646, - "left": 985, - "width": 345, - "height": 19, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button93.4dm", - "focusable": false, - "sizingX": "move" - }, - "Button91": { - "type": "button", - "text": "Get Links", - "top": 830, - "left": 1005, - "width": 307, - "height": 20, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button91.4dm", - "focusable": false, - "sizingX": "move" - } - } - }, - { - "objects": { - "Button90": { - "type": "button", - "text": "Set view properties (4D WP)", - "top": 56, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button90.4dm", - "focusable": false - }, - "Button92": { - "type": "button", - "text": "Set view properties (\"area\";properties)", - "top": 102, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button92.4dm", - "focusable": false - }, - "Button91": { - "type": "button", - "text": "Get view properties (\"area\") ->properties", - "top": 132, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button91.4dm", - "focusable": false - }, - "Button93": { - "type": "button", - "text": "Selection range 4DWP", - "top": 206, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button93.4dm", - "focusable": false - }, - "Button94": { - "type": "button", - "text": "Selection range WPdocument", - "top": 239, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button94.4dm", - "focusable": false - }, - "Button95": { - "type": "button", - "text": "Select 4D", - "top": 299, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button95.4dm", - "focusable": false - }, - "Button96": { - "type": "button", - "text": "SELECT WPdocument", - "top": 332, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button96.4dm", - "focusable": false - }, - "Button97": { - "type": "button", - "text": "SELECT in Body (4D)", - "top": 396, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button97.4dm", - "focusable": false, - "stroke": "automatic" - }, - "Button98": { - "type": "button", - "text": "SELECT WPelement", - "top": 427, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button98.4dm", - "focusable": false, - "stroke": "automatic" - }, - "Button99": { - "type": "button", - "text": "SELECT in Header (4D)", - "top": 486, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button99.4dm", - "focusable": false, - "stroke": "automatic" - }, - "Button100": { - "type": "button", - "text": "SELECT WPelement", - "top": 517, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button100.4dm", - "focusable": false, - "stroke": "automatic" - }, - "Button101": { - "type": "button", - "text": "SELECT in Section (4D)", - "top": 576, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button101.4dm", - "focusable": false, - "stroke": "automatic" - }, - "Button102": { - "type": "button", - "text": "SELECT WPsection({$from;$to})", - "top": 607, - "left": 1025, - "width": 479, - "height": 26, - "events": [ - "onClick" - ], - "method": "ObjectMethods/Button102.4dm", - "focusable": false, - "stroke": "automatic" - } - } - } - ], - "geometryStamp": 584, - "editor": { - "activeView": "View 1", - "defaultView": "View 1", - "views": { - "View 1": {} - } - }, - "method": "method.4dm" -} \ No newline at end of file diff --git a/Project/Sources/Forms/D_TEST_CLASSES/method.4dm b/Project/Sources/Forms/D_TEST_CLASSES/method.4dm deleted file mode 100644 index e69de29b..00000000 diff --git a/Project/Sources/Forms/D_TableWizard/form.4DForm b/Project/Sources/Forms/D_TableWizard/form.4DForm index ffb27b1e..c99f70b3 100755 --- a/Project/Sources/Forms/D_TableWizard/form.4DForm +++ b/Project/Sources/Forms/D_TableWizard/form.4DForm @@ -373,7 +373,7 @@ "listboxType": "collection", "dataSource": "Form:C1466.template.columns", "rowHeight": "26px", - "metaSource": "metaWizzard(This:C1470.backgroundColor; This:C1470.fontColor)", + "metaSource": "", "sizingX": "fixed", "currentItemSource": "Form:C1466.currentRow", "selectionMode": "single", @@ -991,6 +991,14 @@ "textAlign": "left", "sizingX": "fixed", "sizingY": "fixed" + }, + "Text": { + "type": "text", + "text": "Note : metaWizzard(This.backgroundColor; This.fontColor) : removed from column \"LB_columns\"", + "top": 716, + "left": 6, + "width": 619, + "height": 16 } }, "entryOrder": [ @@ -1023,7 +1031,7 @@ ] } ], - "geometryStamp": 6225, + "geometryStamp": 6228, "editor": { "activeView": "View 1", "defaultView": "View 1", diff --git a/Project/Sources/Forms/WP_CustomColors/ObjectMethods/SVGPalette.4dm b/Project/Sources/Forms/WP_CustomColors/ObjectMethods/SVGPalette.4dm index 9c84da0a..37115c29 100644 --- a/Project/Sources/Forms/WP_CustomColors/ObjectMethods/SVGPalette.4dm +++ b/Project/Sources/Forms/WP_CustomColors/ObjectMethods/SVGPalette.4dm @@ -1,21 +1,20 @@ -C_TEXT:C284($rgbColor) -C_TEXT:C284($id) +var $rgbColor; $id : Text Case of : (Form event code:C388=On Mouse Move:K2:35) - $id:=SVG Find element ID by coordinates:C1054(Self:C308->;mousex;mousey) + $id:=SVG Find element ID by coordinates:C1054(Self:C308->; mousex; mousey) If ($id#"") - SVG GET ATTRIBUTE:C1056(Self:C308->;$id;"fill";$rgbColor) - wp_customColor:=TOOL_ColorRgbTextToColorRgbLong ($rgbColor) - OBJECT SET RGB COLORS:C628(*;"sample";0;wp_customColor) + SVG GET ATTRIBUTE:C1056(Self:C308->; $id; "fill"; $rgbColor) + wp_customColor:=TOOL_ColorRgbTextToColorRgbLong($rgbColor) + OBJECT SET RGB COLORS:C628(*; "sample"; 0; wp_customColor) End if : (Form event code:C388=On Clicked:K2:4) - $id:=SVG Find element ID by coordinates:C1054(Self:C308->;mousex;mousey) + $id:=SVG Find element ID by coordinates:C1054(Self:C308->; mousex; mousey) If ($id#"") - SVG GET ATTRIBUTE:C1056(Self:C308->;$id;"fill";$rgbColor) - wp_customColor:=TOOL_ColorRgbTextToColorRgbLong ($rgbColor) + SVG GET ATTRIBUTE:C1056(Self:C308->; $id; "fill"; $rgbColor) + wp_customColor:=TOOL_ColorRgbTextToColorRgbLong($rgbColor) ACCEPT:C269 End if diff --git a/Project/Sources/Forms/WP_CustomColors/method.4dm b/Project/Sources/Forms/WP_CustomColors/method.4dm index dcacbc6f..29fd6a6d 100644 --- a/Project/Sources/Forms/WP_CustomColors/method.4dm +++ b/Project/Sources/Forms/WP_CustomColors/method.4dm @@ -1,6 +1,6 @@ -C_LONGINT:C283($x1; $y1; $x2; $y2; $memoX2) -C_TEXT:C284($path) -C_POINTER:C301($ptr) +var $x1; $y1; $x2; $y2; $memoX2 : Integer +var $path : Text +var $ptr : Pointer Case of : (Form event code:C388=On Deactivate:K2:10) diff --git a/Project/Sources/Forms/WP_Palette/ObjectMethods/Button.4dm b/Project/Sources/Forms/WP_Palette/ObjectMethods/Button.4dm index c4940b96..8bb07a10 100644 --- a/Project/Sources/Forms/WP_Palette/ObjectMethods/Button.4dm +++ b/Project/Sources/Forms/WP_Palette/ObjectMethods/Button.4dm @@ -1,4 +1,4 @@ -C_TEXT:C284($path) +var $path : Text If (Form:C1466#Null:C1517) //ACI0100560 If (Not:C34(Undefined:C82(Form:C1466.selection))) //ACI0100560 diff --git a/Project/Sources/Forms/WP_Palette/ObjectMethods/PaletteSubform.4dm b/Project/Sources/Forms/WP_Palette/ObjectMethods/PaletteSubform.4dm index 91d7b33a..9cda15b3 100644 --- a/Project/Sources/Forms/WP_Palette/ObjectMethods/PaletteSubform.4dm +++ b/Project/Sources/Forms/WP_Palette/ObjectMethods/PaletteSubform.4dm @@ -1,18 +1,18 @@ -C_POINTER:C301($ptrSource;$ptrTarget) +var $ptrSource; $ptrTarget : Pointer Case of : (Form event code:C388=On Data Change:K2:15) - // Generated either from the "top" or the "bottom" - $ptrSource:=OBJECT Get pointer:C1124(Object named:K67:5;"PaletteSubform") // self + // Generated either from the "top" or the "bottom" + $ptrSource:=OBJECT Get pointer:C1124(Object named:K67:5; "PaletteSubform") // self - // If comming from the "bottom" it must be reflected to the "top" - // to check that, lets see if there is an "exec" in the object - // if "exec" exists it means it has been modified by the "bottom" + // If comming from the "bottom" it must be reflected to the "top" + // to check that, lets see if there is an "exec" in the object + // if "exec" exists it means it has been modified by the "bottom" If (Not:C34(Undefined:C82($ptrSource->))) - If (OB Is defined:C1231($ptrSource->;"exec")) + If (OB Is defined:C1231($ptrSource->; "exec")) $ptrTarget:=OBJECT Get pointer:C1124(Object subform container:K67:4) // parent $ptrTarget->:=$ptrSource-> diff --git a/Project/Sources/Forms/WP_Palette/method.4dm b/Project/Sources/Forms/WP_Palette/method.4dm index e8b96153..d348c23d 100644 --- a/Project/Sources/Forms/WP_Palette/method.4dm +++ b/Project/Sources/Forms/WP_Palette/method.4dm @@ -1,11 +1,11 @@ -C_COLLECTION:C1488($_buttonNames) -C_BOOLEAN:C305($setupOK) -C_LONGINT:C283($width) -C_OBJECT:C1216($o) -C_POINTER:C301($ptrSource; $ptrTarget) +var $_buttonNames : Collection +var $setupOK : Boolean +var $width : Integer +var $o : Object +var $ptrSource; $ptrTarget : Pointer -C_OBJECT:C1216(oForm) +//C_OBJECT(oForm) Case of diff --git a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/TextLineHeightUnit.4dm b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/TextLineHeightUnit.4dm index 87cdbab3..78ae11af 100644 --- a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/TextLineHeightUnit.4dm +++ b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/TextLineHeightUnit.4dm @@ -1,7 +1,7 @@ //ACI0098389 (new item added) -C_LONGINT:C283($textLineHeight) +var $textLineHeight : Integer If (Self:C308->=1) //% $textLineHeight:=100 diff --git a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/backgroundColor.4dm b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/backgroundColor.4dm index 789af3c8..56dfb31e 100644 --- a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/backgroundColor.4dm +++ b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/backgroundColor.4dm @@ -1,5 +1,5 @@ -C_LONGINT:C283($color) +var $color : Integer Case of : (Form event code:C388=On Getting Focus:K2:7) diff --git a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btnInvisible3.4dm b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btnInvisible3.4dm index a6f4bece..d3272db5 100644 --- a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btnInvisible3.4dm +++ b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btnInvisible3.4dm @@ -1,9 +1,7 @@ - -C_LONGINT:C283($color) -C_OBJECT:C1216($oCurrent) +var $color : Integer +var $oCurrent : Object $oCurrent:=Form:C1466.paragraphRange - $color:=Call_CustomColorPalette(True:C214; "backgroundColor") Case of diff --git a/Project/Sources/Forms/WP_Palette_Alignments/method.4dm b/Project/Sources/Forms/WP_Palette_Alignments/method.4dm index 3ff7b70d..797b6ec7 100644 --- a/Project/Sources/Forms/WP_Palette_Alignments/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Alignments/method.4dm @@ -1,6 +1,6 @@ -C_POINTER:C301($ptrTextLineHeightUnit) -C_BOOLEAN:C305($setupOK) -C_LONGINT:C283($typeSelection) +var $ptrTextLineHeightUnit : Pointer +var $setupOK : Boolean +var $typeSelection : Boolean $typeSelection:=Form:C1466.selection.type diff --git a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/horizontalSizeUnits.4dm b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/horizontalSizeUnits.4dm index 9effe8ac..727820c1 100644 --- a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/horizontalSizeUnits.4dm +++ b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/horizontalSizeUnits.4dm @@ -1,4 +1,5 @@ -C_OBJECT:C1216($oCurrent) +var $oCurrent : Object + $oCurrent:=WP_FillCurrent("popup") UI_PaletteBackgrounds(OBJECT Get name:C1087(Object current:K67:2)) diff --git a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/verticalSizeUnits.4dm b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/verticalSizeUnits.4dm index fe34cc1a..c28606a4 100644 --- a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/verticalSizeUnits.4dm +++ b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/verticalSizeUnits.4dm @@ -1,4 +1,5 @@ -C_OBJECT:C1216($oCurrent) +var $oCurrent : Object + $oCurrent:=WP_FillCurrent("popup") UI_PaletteBackgrounds(OBJECT Get name:C1087(Object current:K67:2)) diff --git a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Apply.4dm b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Apply.4dm index 2ce10903..2a562023 100644 --- a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Apply.4dm +++ b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Apply.4dm @@ -1,7 +1,7 @@ -C_PICTURE:C286($pict) -C_POINTER:C301($ptr) -C_OBJECT:C1216($oCurrent) +var $pict : Picture +var $ptr : Pointer +var $oCurrent : Object $oCurrent:=WP_FillCurrent("popup") diff --git a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Clear.4dm b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Clear.4dm index b8bab0fc..16a6f1e8 100644 --- a/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Clear.4dm +++ b/Project/Sources/Forms/WP_Palette_Backgrounds/ObjectMethods/xbtn_Clear.4dm @@ -1,7 +1,7 @@ -C_PICTURE:C286($pict) -C_POINTER:C301($ptr) -C_OBJECT:C1216($oCurrent) +var $pict : Picture +var $ptr : Pointer +var $oCurrent : Object $oCurrent:=WP_FillCurrent("popup") diff --git a/Project/Sources/Forms/WP_Palette_Backgrounds/method.4dm b/Project/Sources/Forms/WP_Palette_Backgrounds/method.4dm index ffa5b6bb..a09f9180 100644 --- a/Project/Sources/Forms/WP_Palette_Backgrounds/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Backgrounds/method.4dm @@ -1,10 +1,9 @@ -C_LONGINT:C283($paletteID) -C_BOOLEAN:C305($setupOK) -C_OBJECT:C1216($oCurrent) +var $paletteID; $typeSelection : Integer +var $setupOK : Boolean +var $oCurrent : Object $paletteID:=5 -C_LONGINT:C283($typeSelection) $typeSelection:=Form:C1466.selection.type Case of @@ -26,15 +25,15 @@ Case of oForm.horizontalSizeUnits:=New object:C1471 // Dropdown Hor. oForm.horizontalSizeUnits.values:=New collection:C1472() - oForm.horizontalSizeUnits.values.push(Get localized string:C991("auto")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("cover")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("contain")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("pct")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("mm")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("cm")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("inches")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("pt")) - oForm.horizontalSizeUnits.values.push(Get localized string:C991("pixels")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("auto")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("cover")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("contain")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("pct")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("mm")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("cm")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("inches")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("pt")) + oForm.horizontalSizeUnits.values.push(Localized string:C991("pixels")) oForm.horizontalSizeUnits.css:=New collection:C1472() oForm.horizontalSizeUnits.css.push("auto") @@ -56,13 +55,13 @@ Case of oForm.verticalSizeUnits:=New object:C1471 // Dropdown Vert. oForm.verticalSizeUnits.values:=New collection:C1472() - oForm.verticalSizeUnits.values.push(Get localized string:C991("auto")) - oForm.verticalSizeUnits.values.push(Get localized string:C991("pct")) - oForm.verticalSizeUnits.values.push(Get localized string:C991("mm")) - oForm.verticalSizeUnits.values.push(Get localized string:C991("cm")) - oForm.verticalSizeUnits.values.push(Get localized string:C991("inches")) - oForm.verticalSizeUnits.values.push(Get localized string:C991("pt")) - oForm.verticalSizeUnits.values.push(Get localized string:C991("pixels")) + oForm.verticalSizeUnits.values.push(Localized string:C991("auto")) + oForm.verticalSizeUnits.values.push(Localized string:C991("pct")) + oForm.verticalSizeUnits.values.push(Localized string:C991("mm")) + oForm.verticalSizeUnits.values.push(Localized string:C991("cm")) + oForm.verticalSizeUnits.values.push(Localized string:C991("inches")) + oForm.verticalSizeUnits.values.push(Localized string:C991("pt")) + oForm.verticalSizeUnits.values.push(Localized string:C991("pixels")) oForm.verticalSizeUnits.css:=New collection:C1472() oForm.verticalSizeUnits.css.push("auto") diff --git a/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/LB_Bookmarks.4dm b/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/LB_Bookmarks.4dm index 494226b6..e7b900d9 100644 --- a/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/LB_Bookmarks.4dm +++ b/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/LB_Bookmarks.4dm @@ -1,6 +1,6 @@ -C_OBJECT:C1216($document) -C_POINTER:C301($ptrListbox; $ptrNames) -C_LONGINT:C283($p) +var $document : Object +var $ptrListbox; $ptrNames : Pointer +var $p : Integer $ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_Bookmarks") $ptrNames:=OBJECT Get pointer:C1124(Object named:K67:5; "lb_bookmarkNames") diff --git a/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/btnAdd.4dm b/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/btnAdd.4dm index b2015804..f4a6dee1 100644 --- a/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/btnAdd.4dm +++ b/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/btnAdd.4dm @@ -1,40 +1,37 @@ -C_TEXT:C284($name) -C_TEXT:C284($str) -C_OBJECT:C1216($range) -C_LONGINT:C283($i;$n;$p) -C_POINTER:C301($ptrListbox;$ptrNames) - -$ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5;"LB_Bookmarks") -$ptrNames:=OBJECT Get pointer:C1124(Object named:K67:5;"lb_bookmarkNames") - +var $name; $str : Text +var $range : Object +var $i; $n; $p : Integer +var $ptrListbox; $ptrNames : Pointer +$ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_Bookmarks") +$ptrNames:=OBJECT Get pointer:C1124(Object named:K67:5; "lb_bookmarkNames") If (areaName#"") & (areaName=OBJECT Get name:C1087(Object with focus:K67:3)) - $range:=WP Selection range:C1340(*;areaName) + $range:=WP Selection range:C1340(*; areaName) If (OB Is defined:C1231($range)) - $str:=Get localized string:C991("NewBookmark") - $str:=Replace string:C233($str;" ";"_") + $str:=Localized string:C991("NewBookmark") + $str:=Replace string:C233($str; " "; "_") $i:=0 Repeat $i:=$i+1 $name:=$str+String:C10($i) - $p:=Find in array:C230($ptrNames->;$name) + $p:=Find in array:C230($ptrNames->; $name) Until ($p<0) - WP NEW BOOKMARK:C1415($range;$name) - WP_GetBookmarks // re-order by apparition in the document. + WP NEW BOOKMARK:C1415($range; $name) + WP_GetBookmarks // re-order by apparition in the document. $n:=Size of array:C274($ptrNames->) - $p:=Find in array:C230($ptrNames->;$name) + $p:=Find in array:C230($ptrNames->; $name) - ARRAY BOOLEAN:C223($ptrListbox->;0) - ARRAY BOOLEAN:C223($ptrListbox->;$n) + ARRAY BOOLEAN:C223($ptrListbox->; 0) + ARRAY BOOLEAN:C223($ptrListbox->; $n) $ptrListbox->{$p}:=True:C214 - EDIT ITEM:C870(*;"lb_bookmarkNames";$p) + EDIT ITEM:C870(*; "lb_bookmarkNames"; $p) End if Else diff --git a/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/lb_bookmarkNames.4dm b/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/lb_bookmarkNames.4dm index b38bb867..7a9eb908 100644 --- a/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/lb_bookmarkNames.4dm +++ b/Project/Sources/Forms/WP_Palette_BookMarks/ObjectMethods/lb_bookmarkNames.4dm @@ -1,6 +1,5 @@ -C_OBJECT:C1216($document) -C_OBJECT:C1216($range) -C_TEXT:C284($newName) +var $document; $range : Object +var $newName : Text Case of @@ -11,15 +10,15 @@ Case of : (Form event code:C388=On Data Change:K2:15) $document:=Form:C1466.selection[wk owner:K81:168] - $range:=WP Bookmark range:C1416($document;bookmarkMemoName) + $range:=WP Bookmark range:C1416($document; bookmarkMemoName) $newName:=Self:C308->{Self:C308->} - $newName:=Replace string:C233($newName;" ";"_") - WP NEW BOOKMARK:C1415($range;$newName) - WP DELETE BOOKMARK:C1419($document;bookmarkMemoName) + $newName:=Replace string:C233($newName; " "; "_") + WP NEW BOOKMARK:C1415($range; $newName) + WP DELETE BOOKMARK:C1419($document; bookmarkMemoName) - WP_GetBookmarks + WP_GetBookmarks - UI_PaletteBookMarks + UI_PaletteBookMarks End case \ No newline at end of file diff --git a/Project/Sources/Forms/WP_Palette_BookMarks/method.4dm b/Project/Sources/Forms/WP_Palette_BookMarks/method.4dm index d147e8cd..1b18bd8e 100644 --- a/Project/Sources/Forms/WP_Palette_BookMarks/method.4dm +++ b/Project/Sources/Forms/WP_Palette_BookMarks/method.4dm @@ -1,11 +1,11 @@ -C_LONGINT:C283(wp_tabList) +_O_C_LONGINT:C283(wp_tabList) -C_BOOLEAN:C305($setupOK) +var $setupOK : Boolean -C_LONGINT:C283($paletteID) +_O_C_LONGINT:C283($paletteID) $paletteID:=3 -C_LONGINT:C283($typeSelection) +_O_C_LONGINT:C283($typeSelection) $typeSelection:=Form:C1466.selection.type Case of diff --git a/Project/Sources/Forms/WP_Palette_FindAndReplace/method.4dm b/Project/Sources/Forms/WP_Palette_FindAndReplace/method.4dm index 4dd15c7f..a5429bba 100644 --- a/Project/Sources/Forms/WP_Palette_FindAndReplace/method.4dm +++ b/Project/Sources/Forms/WP_Palette_FindAndReplace/method.4dm @@ -1,9 +1,8 @@ +var $setupOK : Boolean +var $paletteID : Integer -C_BOOLEAN:C305($setupOK) -C_LONGINT:C283($paletteID) $paletteID:=10 - Case of : (Form event code:C388=On Load:K2:1) diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/BackgroundColor.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/BackgroundColor.4dm index ee47866b..35f4275d 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/BackgroundColor.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/BackgroundColor.4dm @@ -1,20 +1,20 @@ -C_LONGINT:C283($color) +var $color : Integer Case of : (Form event code:C388=On Getting Focus:K2:7) - OBJECT SET VISIBLE:C603(*;"FakeFocusBackgroundColor";True:C214) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";False:C215) + OBJECT SET VISIBLE:C603(*; "FakeFocusBackgroundColor"; True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; False:C215) : (Form event code:C388=On Losing Focus:K2:8) - OBJECT SET VISIBLE:C603(*;"FakeFocusBackgroundColor";False:C215) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusBackgroundColor"; False:C215) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; True:C214) : (Form event code:C388=On After Edit:K2:43) - OBJECT GET RGB COLORS:C1074(Self:C308->;$color) // get the color of the text - OBJECT SET RGB COLORS:C628(Self:C308->;$color;$color) // set the same color on the background + OBJECT GET RGB COLORS:C1074(Self:C308->; $color) // get the color of the text + OBJECT SET RGB COLORS:C628(Self:C308->; $color; $color) // set the same color on the background - WP_SetBackgroundColor (Form:C1466.selection;$color) + WP_SetBackgroundColor(Form:C1466.selection; $color) End case diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorSample.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorSample.4dm index 912f726b..4e58b4fc 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorSample.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorSample.4dm @@ -1,16 +1,16 @@ -C_LONGINT:C283($color) +var $color : Integer Case of : (Form event code:C388=On Getting Focus:K2:7) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; True:C214) : (Form event code:C388=On Losing Focus:K2:8) - //OBJECT SET VISIBLE(*;"FakeFocusFontColor";False) + //OBJECT SET VISIBLE(*;"FakeFocusFontColor";False) : (Form event code:C388=On After Edit:K2:43) - OBJECT GET RGB COLORS:C1074(Self:C308->;$color) // get the color of the text - OBJECT SET RGB COLORS:C628(Self:C308->;$color;$color) // set the same color on the background + OBJECT GET RGB COLORS:C1074(Self:C308->; $color) // get the color of the text + OBJECT SET RGB COLORS:C628(Self:C308->; $color; $color) // set the same color on the background - WP_SetTextColor (Form:C1466.selection;$color) + WP_SetTextColor(Form:C1466.selection; $color) End case diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorShadow.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorShadow.4dm index 5f58c087..e1a488a9 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorShadow.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/ColorShadow.4dm @@ -1,20 +1,20 @@ -C_LONGINT:C283($color) -C_LONGINT:C283($offset) +var $color : Integer +_O_C_LONGINT:C283($offset) Case of : (Form event code:C388=On Getting Focus:K2:7) - OBJECT SET VISIBLE:C603(*;"FakeFocusShadowColor";True:C214) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";False:C215) + OBJECT SET VISIBLE:C603(*; "FakeFocusShadowColor"; True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; False:C215) : (Form event code:C388=On Losing Focus:K2:8) - OBJECT SET VISIBLE:C603(*;"FakeFocusShadowColor";False:C215) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusShadowColor"; False:C215) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; True:C214) : (Form event code:C388=On After Edit:K2:43) - OBJECT GET RGB COLORS:C1074(Self:C308->;$color) // get the color of the text - OBJECT SET RGB COLORS:C628(Self:C308->;$color;$color) // set the same color on the background + OBJECT GET RGB COLORS:C1074(Self:C308->; $color) // get the color of the text + OBJECT SET RGB COLORS:C628(Self:C308->; $color; $color) // set the same color on the background - $offset:=(OBJECT Get pointer:C1124(Object named:K67:5;"shadowOffsetInput"))-> - WP_SetTextShadow (Form:C1466.selection;$offset;$color) + $offset:=(OBJECT Get pointer:C1124(Object named:K67:5; "shadowOffsetInput"))-> + WP_SetTextShadow(Form:C1466.selection; $offset; $color) End case diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/LinethroughColor.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/LinethroughColor.4dm index 1aa9d039..5e60c0ef 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/LinethroughColor.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/LinethroughColor.4dm @@ -1,4 +1,4 @@ -C_LONGINT:C283($color) +var $color : Integer Case of : (Form event code:C388=On Getting Focus:K2:7) diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/UnderlineColor.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/UnderlineColor.4dm index 939a72cd..dca56ea8 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/UnderlineColor.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/UnderlineColor.4dm @@ -1,25 +1,23 @@ -C_LONGINT:C283($color) -C_LONGINT:C283($style) - -C_POINTER:C301($ptrStyleNames;$ptrStyleValues) +var $color; $style : Integer +var $ptrStyleNames; $ptrStyleValues : Pointer Case of : (Form event code:C388=On Getting Focus:K2:7) - OBJECT SET VISIBLE:C603(*;"FakeFocusUnderlineColor";True:C214) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";False:C215) + OBJECT SET VISIBLE:C603(*; "FakeFocusUnderlineColor"; True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; False:C215) : (Form event code:C388=On Losing Focus:K2:8) - OBJECT SET VISIBLE:C603(*;"FakeFocusUnderlineColor";False:C215) - OBJECT SET VISIBLE:C603(*;"FakeFocusFontColor";True:C214) + OBJECT SET VISIBLE:C603(*; "FakeFocusUnderlineColor"; False:C215) + OBJECT SET VISIBLE:C603(*; "FakeFocusFontColor"; True:C214) : (Form event code:C388=On After Edit:K2:43) - OBJECT GET RGB COLORS:C1074(Self:C308->;$color) // get the color of the text - OBJECT SET RGB COLORS:C628(Self:C308->;$color;$color) // set the same color on the background + OBJECT GET RGB COLORS:C1074(Self:C308->; $color) // get the color of the text + OBJECT SET RGB COLORS:C628(Self:C308->; $color; $color) // set the same color on the background - $ptrStyleNames:=OBJECT Get pointer:C1124(Object named:K67:5;"underlineStylesNames") - $ptrStyleValues:=OBJECT Get pointer:C1124(Object named:K67:5;"underlineStylesValues") + $ptrStyleNames:=OBJECT Get pointer:C1124(Object named:K67:5; "underlineStylesNames") + $ptrStyleValues:=OBJECT Get pointer:C1124(Object named:K67:5; "underlineStylesValues") $style:=$ptrStyleValues->{$ptrStyleNames->} - WP_SetTextUnderline (Form:C1466.selection;$style;$color) + WP_SetTextUnderline(Form:C1466.selection; $style; $color) End case diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible1.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible1.4dm index 069e492a..b7c8a0ae 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible1.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible1.4dm @@ -1,4 +1,4 @@ -C_LONGINT:C283($color) +var $color : Integer $color:=Call_CustomColorPalette(False:C215; "ColorSample") // false means do not allow transparency diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible2.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible2.4dm index a4bc8b60..a30391c4 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible2.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible2.4dm @@ -1,24 +1,24 @@ -C_LONGINT:C283($color) +var $color : Integer -$color:=Call_CustomColorPalette (True:C214;"BackgroundColor") // true means allow transparency +$color:=Call_CustomColorPalette(True:C214; "BackgroundColor") // true means allow transparency Case of : ($color=-1) - // do nothing + // do nothing : ($color>=0) - // play selectde color - WP_SetBackgroundColor (Form:C1466.selection;$color) - OBJECT SET RGB COLORS:C628(*;"BackgroundColor";$color;$color) + // play selectde color + WP_SetBackgroundColor(Form:C1466.selection; $color) + OBJECT SET RGB COLORS:C628(*; "BackgroundColor"; $color; $color) : ($color=-2) // open color picker… OPEN COLOR PICKER:C1304 - GOTO OBJECT:C206(*;"BackgroundColor") // gives the focus to the object that will manage the color… + GOTO OBJECT:C206(*; "BackgroundColor") // gives the focus to the object that will manage the color… : ($color=-3) - //apply transparency - WP_SetBackgroundColor (Form:C1466.selection;wk transparent:K81:134) + //apply transparency + WP_SetBackgroundColor(Form:C1466.selection; wk transparent:K81:134) End case -WP_GetBackgroundColor (Form:C1466.selection) +WP_GetBackgroundColor(Form:C1466.selection) diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible3.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible3.4dm index c919727b..e8d93afd 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible3.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible3.4dm @@ -1,5 +1,5 @@ -C_LONGINT:C283($color) +var $color : Integer $color:=Call_CustomColorPalette(False:C215; "UnderlineColor") // false means do not allow transparency" diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible4.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible4.4dm index 418361c3..d6331a93 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible4.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible4.4dm @@ -1,7 +1,6 @@ -C_LONGINT:C283($color) -C_LONGINT:C283($offset) +var $color; $offset : Integer -$color:=Call_CustomColorPalette (False:C215;"ColorShadow") // false means do not allow transparency +$color:=Call_CustomColorPalette(False:C215; "ColorShadow") // false means do not allow transparency If ($color#-1) @@ -10,18 +9,18 @@ If ($color#-1) Case of : ($color>=0) - OBJECT SET RGB COLORS:C628(*;"ColorShadow";$color;$color) + OBJECT SET RGB COLORS:C628(*; "ColorShadow"; $color; $color) $offset:=oForm.shadowOffset If ($offset<1) $offset:=1 oForm.shadowOffset:=1 End if - WP_SetTextShadow (Form:C1466.selection;$offset;$color) + WP_SetTextShadow(Form:C1466.selection; $offset; $color) : ($color=-2) // other… OPEN COLOR PICKER:C1304 - GOTO OBJECT:C206(*;"ColorShadow") // gives the focus to the object that will manage the color… + GOTO OBJECT:C206(*; "ColorShadow") // gives the focus to the object that will manage the color… End case diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible5.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible5.4dm index 1917f780..539bfbef 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible5.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/btnInvisible5.4dm @@ -1,4 +1,4 @@ -C_LONGINT:C283($color) +var $color : Integer $color:=Call_CustomColorPalette(False:C215; "UnderlineColor") // false means do not allow transparency" diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/cbShadow1.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/cbShadow1.4dm index 322a9060..067ea8e7 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/cbShadow1.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/cbShadow1.4dm @@ -1,6 +1,6 @@ -C_LONGINT:C283($color) -C_LONGINT:C283($offset) +var $color : Integer +_O_C_LONGINT:C283($offset) If (oForm.cbShadow=2) oForm.cbShadow:=0 @@ -12,8 +12,8 @@ If (oForm.cbShadow=1) If ($offset=0) $offset:=1 End if - OBJECT GET RGB COLORS:C1074(*;"ColorShadow";$color;$color) - WP_SetTextShadow (Form:C1466.selection;$offset;$color) + OBJECT GET RGB COLORS:C1074(*; "ColorShadow"; $color; $color) + WP_SetTextShadow(Form:C1466.selection; $offset; $color) Else - WP_SetTextShadow (Form:C1466.selection;$offset;wk transparent:K81:134) + WP_SetTextShadow(Form:C1466.selection; $offset; wk transparent:K81:134) End if diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontSizeRuler.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontSizeRuler.4dm index af7403db..9b1326a6 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontSizeRuler.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontSizeRuler.4dm @@ -1,4 +1,4 @@ -C_LONGINT:C283($fontSize) +var $fontSize : Integer $fontSize:=oForm.fontSize WP_SetFontSize(Form:C1466.selection; $fontSize) diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontStyle.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontStyle.4dm index 86954b3e..3a04bd4b 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontStyle.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/fontStyle.4dm @@ -1,4 +1,4 @@ -C_TEXT:C284($font) +var $font : Text $font:=WP_fontLongName{WP_fontStyle} WP_SetFont(Form:C1466.selection; $font) diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetInput.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetInput.4dm index 4f5cf666..49e9391f 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetInput.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetInput.4dm @@ -1,9 +1,9 @@ -C_LONGINT:C283($color) -C_LONGINT:C283($offset) +var $color : Integer +_O_C_LONGINT:C283($offset) -OBJECT GET RGB COLORS:C1074(*;"ColorShadow";$color;$color) +OBJECT GET RGB COLORS:C1074(*; "ColorShadow"; $color; $color) $offset:=oForm.shadowOffset -WP_SetTextShadow (Form:C1466.selection;$offset;$color) +WP_SetTextShadow(Form:C1466.selection; $offset; $color) oForm.cbShadow:=1 diff --git a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetRuler.4dm b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetRuler.4dm index 4f5cf666..49e9391f 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetRuler.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/ObjectMethods/shadowOffsetRuler.4dm @@ -1,9 +1,9 @@ -C_LONGINT:C283($color) -C_LONGINT:C283($offset) +var $color : Integer +_O_C_LONGINT:C283($offset) -OBJECT GET RGB COLORS:C1074(*;"ColorShadow";$color;$color) +OBJECT GET RGB COLORS:C1074(*; "ColorShadow"; $color; $color) $offset:=oForm.shadowOffset -WP_SetTextShadow (Form:C1466.selection;$offset;$color) +WP_SetTextShadow(Form:C1466.selection; $offset; $color) oForm.cbShadow:=1 diff --git a/Project/Sources/Forms/WP_Palette_Fonts/method.4dm b/Project/Sources/Forms/WP_Palette_Fonts/method.4dm index 3a2d2404..61d74271 100644 --- a/Project/Sources/Forms/WP_Palette_Fonts/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Fonts/method.4dm @@ -1,6 +1,6 @@ -C_LONGINT:C283($paletteID) -C_BOOLEAN:C305($setupOK) -C_LONGINT:C283($typeSelection) +_O_C_LONGINT:C283($paletteID) +var $setupOK : Boolean +_O_C_LONGINT:C283($typeSelection) $paletteID:=1 $typeSelection:=Form:C1466.selection.type diff --git a/Project/Sources/Forms/WP_Palette_Frames/method.4dm b/Project/Sources/Forms/WP_Palette_Frames/method.4dm index ab88da0c..5ff66269 100644 --- a/Project/Sources/Forms/WP_Palette_Frames/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Frames/method.4dm @@ -1,4 +1,4 @@ -C_BOOLEAN:C305($setupOK) +var $setupOK : Boolean Case of : (Form event code:C388=On Load:K2:1) diff --git a/Project/Sources/Forms/WP_Palette_Protection/method.4dm b/Project/Sources/Forms/WP_Palette_Protection/method.4dm index 6f984255..b407cebc 100755 --- a/Project/Sources/Forms/WP_Palette_Protection/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Protection/method.4dm @@ -1,4 +1,4 @@ -C_BOOLEAN:C305($setupOK) +var $setupOK : Boolean //$paletteID:=11 diff --git a/Project/Sources/Forms/WP_Palette_Sizes/method.4dm b/Project/Sources/Forms/WP_Palette_Sizes/method.4dm index 28619733..04267922 100644 --- a/Project/Sources/Forms/WP_Palette_Sizes/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Sizes/method.4dm @@ -1,10 +1,8 @@ +var $setupOK : Boolean +var $paletteID; $typeSelection : Integer -C_LONGINT:C283($paletteID) $paletteID:=4 -C_BOOLEAN:C305($setupOK) - -C_LONGINT:C283($typeSelection) $typeSelection:=Form:C1466.selection.type Case of @@ -22,8 +20,8 @@ Case of oForm.skinAppliedSub:=UI_ApplySkin //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 + OBJECT SET HELP TIP:C1181(*; "btn_visibleEmptyImages"; Action info:C1442("visibleEmptyImages").title) + OBJECT SET HELP TIP:C1181(*; "btn_visibleTableBorders"; Action info:C1442("visibleTableBorders").title) // 20R6 If (Form:C1466#Null:C1517) diff --git a/Project/Sources/Forms/WP_Palette_StyleSheets/ObjectMethods/LB_StyleSheets.4dm b/Project/Sources/Forms/WP_Palette_StyleSheets/ObjectMethods/LB_StyleSheets.4dm index 354fe83d..9ba17a0f 100644 --- a/Project/Sources/Forms/WP_Palette_StyleSheets/ObjectMethods/LB_StyleSheets.4dm +++ b/Project/Sources/Forms/WP_Palette_StyleSheets/ObjectMethods/LB_StyleSheets.4dm @@ -1,30 +1,29 @@ -C_LONGINT:C283($col;$n;$p) -C_OBJECT:C1216($memo) -C_OBJECT:C1216($styleSheet) -C_POINTER:C301($ptrLB;$ptrStylesheetNames) -C_TEXT:C284($stylesheetName;$newName) +var $col; $n; $p : Integer +var $memo; $styleSheet : Object +var $ptrLB; $ptrStylesheetNames : Pointer +var $stylesheetName; $newName : Text -$ptrLB:=OBJECT Get pointer:C1124(Object named:K67:5;"LB_StyleSheets") -$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") +$ptrLB:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_StyleSheets") +$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") -LISTBOX GET CELL POSITION:C971(*;"LB_StyleSheets";$col;$n) +LISTBOX GET CELL POSITION:C971(*; "LB_StyleSheets"; $col; $n) If ($n>0) & ($n<=Size of array:C274($ptrStylesheetNames->)) Case of - //: (Form event code=On Clicked) + //: (Form event code=On Clicked) - //If (Contextual click) & (Shift down) & (Macintosh option down) - //WP_StylesheetEdit - //End if + //If (Contextual click) & (Shift down) & (Macintosh option down) + //WP_StylesheetEdit + //End if : (Form event code:C388=On Selection Change:K2:29) | (Form event code:C388=On Clicked:K2:4) $stylesheetName:=$ptrStylesheetNames->{$n} - WP SET ATTRIBUTES:C1342(Form:C1466.selection;wk style sheet:K81:63;$stylesheetName) + WP SET ATTRIBUTES:C1342(Form:C1466.selection; wk style sheet:K81:63; $stylesheetName) SET TIMER:C645(-1) @@ -32,7 +31,7 @@ If ($n>0) & ($n<=Size of array:C274($ptrStylesheetNames->)) $stylesheetName:=$ptrStylesheetNames->{$n} If ($stylesheetName="Normal") - $0:=-1 + $0:=-1 // not enterable Else $memo:=New object:C1471 $memo.name:=$stylesheetName @@ -45,19 +44,19 @@ If ($n>0) & ($n<=Size of array:C274($ptrStylesheetNames->)) $memo:=Form:C1466.memo $newName:=$ptrStylesheetNames->{$memo.position} - $p:=Count in array:C907($ptrStylesheetNames->;$newName) + $p:=Count in array:C907($ptrStylesheetNames->; $newName) If ($p>1) BEEP:C151 $ptrStylesheetNames->{$memo.position}:=$memo.name Else - // rename the style sheet - $styleSheet:=WP Get style sheet:C1656(Form:C1466.document;Form:C1466.memo.name) + // rename the style sheet + $styleSheet:=WP Get style sheet:C1656(Form:C1466.document; Form:C1466.memo.name) If ($styleSheet#Null:C1517) $styleSheet.name:=$newName - WP_GetStyleSheets // reload list + WP_GetStyleSheets // reload list End if End if diff --git a/Project/Sources/Forms/WP_Palette_StyleSheets/method.4dm b/Project/Sources/Forms/WP_Palette_StyleSheets/method.4dm index 855c482e..ad309de3 100644 --- a/Project/Sources/Forms/WP_Palette_StyleSheets/method.4dm +++ b/Project/Sources/Forms/WP_Palette_StyleSheets/method.4dm @@ -1,6 +1,6 @@ //C_LONGINT(wp_tabList) -C_BOOLEAN:C305($setupOK) +var $setupOK : Boolean //C_LONGINT($paletteID) //$paletteID:=3 diff --git a/Project/Sources/Forms/WP_Palette_Tables/method.4dm b/Project/Sources/Forms/WP_Palette_Tables/method.4dm index 56432fef..07b749ae 100644 --- a/Project/Sources/Forms/WP_Palette_Tables/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Tables/method.4dm @@ -1,4 +1,4 @@ -C_BOOLEAN:C305($setupOK) +var $setupOK : Boolean //$paletteID:=11 @@ -9,11 +9,11 @@ Case of oForm:=New object:C1471 End if - OBJECT SET TITLE:C194(*; "btnInsertTable"; Get localized string:C991("InsertTable")+" "+Char:C90(9660)) - OBJECT SET TITLE:C194(*; "btnTableSettings"; Get localized string:C991("Properties")+" "+Char:C90(9660)) - OBJECT SET TITLE:C194(*; "btnRowSettings"; Get localized string:C991("Properties")+" "+Char:C90(9660)) - OBJECT SET TITLE:C194(*; "btnColumnSettings"; Get localized string:C991("Properties")+" "+Char:C90(9660)) - OBJECT SET TITLE:C194(*; "btnCellSettings"; Get localized string:C991("Properties")+" "+Char:C90(9660)) + OBJECT SET TITLE:C194(*; "btnInsertTable"; Localized string:C991("InsertTable")+" "+Char:C90(9660)) + OBJECT SET TITLE:C194(*; "btnTableSettings"; Localized string:C991("Properties")+" "+Char:C90(9660)) + OBJECT SET TITLE:C194(*; "btnRowSettings"; Localized string:C991("Properties")+" "+Char:C90(9660)) + OBJECT SET TITLE:C194(*; "btnColumnSettings"; Localized string:C991("Properties")+" "+Char:C90(9660)) + OBJECT SET TITLE:C194(*; "btnCellSettings"; Localized string:C991("Properties")+" "+Char:C90(9660)) oForm.skinAppliedSub:=UI_ApplySkin diff --git a/Project/Sources/Forms/WP_Palette_Tabulations/form.4DForm b/Project/Sources/Forms/WP_Palette_Tabulations/form.4DForm index 583f8975..9f40fe3f 100644 --- a/Project/Sources/Forms/WP_Palette_Tabulations/form.4DForm +++ b/Project/Sources/Forms/WP_Palette_Tabulations/form.4DForm @@ -476,7 +476,7 @@ "bTabType4" ] }, - "activeView": "View 9", + "activeView": "View 1", "defaultView": "View 1", "views": { "View 1": {}, @@ -500,6 +500,7 @@ "View 7": {}, "View 8": {}, "View 9": { + "visible": false, "objects": [ "Rect2", "Text" diff --git a/Project/Sources/Forms/WP_Palette_Tabulations/method.4dm b/Project/Sources/Forms/WP_Palette_Tabulations/method.4dm index fae7babb..a6d337c8 100644 --- a/Project/Sources/Forms/WP_Palette_Tabulations/method.4dm +++ b/Project/Sources/Forms/WP_Palette_Tabulations/method.4dm @@ -1,11 +1,11 @@ -C_LONGINT:C283(wp_tabList) +_O_C_LONGINT:C283(wp_tabList) -C_BOOLEAN:C305($setupOK) +var $setupOK : Boolean -C_LONGINT:C283($paletteID) +_O_C_LONGINT:C283($paletteID) $paletteID:=3 -C_LONGINT:C283($typeSelection) +_O_C_LONGINT:C283($typeSelection) $typeSelection:=Form:C1466.selection.type @@ -34,11 +34,11 @@ Case of CLEAR LIST:C377(wp_tabList; *) wp_tabList:=New list:C375 - APPEND TO LIST:C376(wp_tabList; Get localized string:C991("Left"); 0) - APPEND TO LIST:C376(wp_tabList; Get localized string:C991("Right"); 1) - APPEND TO LIST:C376(wp_tabList; Get localized string:C991("Center"); 2) - APPEND TO LIST:C376(wp_tabList; Get localized string:C991("Decimal"); 3) - APPEND TO LIST:C376(wp_tabList; Get localized string:C991("Bars"); 4) + APPEND TO LIST:C376(wp_tabList; Localized string:C991("Left"); 0) + APPEND TO LIST:C376(wp_tabList; Localized string:C991("Right"); 1) + APPEND TO LIST:C376(wp_tabList; Localized string:C991("Center"); 2) + APPEND TO LIST:C376(wp_tabList; Localized string:C991("Decimal"); 3) + APPEND TO LIST:C376(wp_tabList; Localized string:C991("Bars"); 4) OBJECT SET LIST BY REFERENCE:C1266(*; "lb_types"; Required list:K42:20; wp_tabList) diff --git a/Project/Sources/Methods/Call_CustomColorPalette.4dm b/Project/Sources/Methods/Call_CustomColorPalette.4dm index 18c72d04..c8216403 100644 --- a/Project/Sources/Methods/Call_CustomColorPalette.4dm +++ b/Project/Sources/Methods/Call_CustomColorPalette.4dm @@ -1,19 +1,17 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($1) -C_TEXT:C284($2) +#DECLARE($wp_allowTransparency : Boolean; $objectName : Text)->$customColor : Integer -C_LONGINT:C283($0) - -C_LONGINT:C283($x1; $y1; $x2; $y2) -C_LONGINT:C283($x; $y; $z) -C_LONGINT:C283($win) -C_TEXT:C284($objectName) +var $x1; $y1; $x2; $y2 : Integer +var $x; $y; $z : Integer +var $win : Integer If (Count parameters:C259>=1) - wp_allowTransparency:=$1 + wp_allowTransparency:=$wp_allowTransparency + If (Count parameters:C259>=2) $objectName:=$2 End if + Else wp_allowTransparency:=True:C214 End if @@ -24,25 +22,21 @@ If ($objectName#"") $y:=$y2 $x:=$x-100+(($x2-$x1)/2) // half width of the WP_CustomColors form Else - GET MOUSE:C468($x; $y; $z) + MOUSE POSITION:C468($x; $y; $z) End if CONVERT COORDINATES:C1365($x; $y; XY Current form:K27:5; XY Main window:K27:8) -wp_customColor:=-1 // default value when window is closed by outside click +$customColor:=-1 // default value when window is closed by outside click If (Test path name:C476(Get 4D folder:C485(Current resources folder:K5:16)+"Colors.svg")=Is a document:K24:1) $win:=Open form window:C675("WP_CustomColors"; Pop up form window:K39:11; $x; $y) //Pop up form window) DIALOG:C40("WP_CustomColors") + $customColor:=wp_customColor Else - - wp_customColor:=Select RGB color:C956(0x00808080) - + $customColor:=Select RGB color:C956(0x00808080) End if -$0:=wp_customColor - - diff --git a/Project/Sources/Methods/CheckAutomaticAction.4dm b/Project/Sources/Methods/CheckAutomaticAction.4dm index a1984e23..146f9de6 100644 --- a/Project/Sources/Methods/CheckAutomaticAction.4dm +++ b/Project/Sources/Methods/CheckAutomaticAction.4dm @@ -1,14 +1,11 @@ //%attributes = {"invisible":true} -C_COLLECTION:C1488($1;$_actions) // automatic actions to test -C_BOOLEAN:C305($0;$result) // returns true if at least one action is available) -C_TEXT:C284($action) -C_OBJECT:C1216($status) +#DECLARE($_actions : Collection)->$result : Boolean + +var $action : Text +var $status : Object -$_actions:=$1 $result:=False:C215 -For each ($action;$_actions) Until ($result=True:C214) // exit as soon as one action is available - $status:=Get action info:C1442($action;ak main form:K76:69) +For each ($action; $_actions) Until ($result=True:C214) // exit as soon as one action is available + $status:=Action info:C1442($action; ak main form:K76:69) $result:=$result | ($status.enabled) End for each - -$0:=$result diff --git a/Project/Sources/Methods/Compiler_Methods.4dm b/Project/Sources/Methods/Compiler_Methods.4dm index 8e292a6d..888d601f 100644 --- a/Project/Sources/Methods/Compiler_Methods.4dm +++ b/Project/Sources/Methods/Compiler_Methods.4dm @@ -1,174 +1,25 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305(_or; $0) -C_OBJECT:C1216(_or; ${1}) -C_OBJECT:C1216(WP_SetTextLineHeight; $1) -C_REAL:C285(WP_SetTextLineHeight; $2) -C_TEXT:C284(WP_SetTextLineHeight; $3) -C_REAL:C285(WP_SetTabIndent; $1) -C_OBJECT:C1216(WP_GetTextTransform; $1) -C_OBJECT:C1216(WP_StylesheetSetAttributes; $1) -C_BOOLEAN:C305(SetupLocalVariables; $0) -C_OBJECT:C1216(WP_SetTextIndent; $1) -C_REAL:C285(WP_SetTextIndent; $2) -C_TEXT:C284(WP_SetTextIndent; $3) -C_TEXT:C284(WP_ShiftIndent; $1) -C_OBJECT:C1216(WP_SetTextUnderline; $1) -C_LONGINT:C283(WP_SetTextUnderline; $2) -C_LONGINT:C283(WP_SetTextUnderline; $3) -C_TEXT:C284(UI_TranslateConstant; $0) -C_TEXT:C284(UI_TranslateConstant; $1) -C_LONGINT:C283(UI_TranslateConstant; $2) -C_LONGINT:C283(TOOL_RGBtoHLS; $1) -C_POINTER:C301(TOOL_RGBtoHLS; $2) -C_POINTER:C301(TOOL_RGBtoHLS; $3) -C_POINTER:C301(TOOL_RGBtoHLS; $4) -C_OBJECT:C1216(WP_SetTextColor; $1) -C_LONGINT:C283(WP_SetTextColor; $2) -C_OBJECT:C1216(WP_SetTextLinetrough; $1) -C_LONGINT:C283(WP_SetTextLinetrough; $2) -C_OBJECT:C1216(WP_GetFontVertAlign; $1) -C_TEXT:C284(WP SwitchToolbar; $1) -C_TEXT:C284(WP SwitchToolbar; $2) -C_OBJECT:C1216(WP_SetFontVertAlign; $1) -C_LONGINT:C283(WP_SetFontVertAlign; $2) -C_COLLECTION:C1488(WP_GetStyleAttributesByType; $0) -C_LONGINT:C283(WP_GetStyleAttributesByType; $1) -C_OBJECT:C1216(WP_SetTableProtection; $1) -C_LONGINT:C283(WP_SetTableProtection; $2) -C_REAL:C285(WP_Convert; $0) -C_REAL:C285(WP_Convert; $1) -C_TEXT:C284(WP_Convert; $2) -C_TEXT:C284(WP_Convert; $3) -C_TEXT:C284(WP_Set4Ddate; $1) -C_LONGINT:C283(WP_Set4Ddate; $2) -C_LONGINT:C283(WP_Set4Ddate; $3) -C_OBJECT:C1216(WP_GetTextLineHeight; $1) -C_TEXT:C284(WP_FR_InitOptions; $1) -C_OBJECT:C1216(WP_GetTextUnderline; $1) -C_TEXT:C284(TB_SwitchSkin; $1) -C_BOOLEAN:C305(UI_isProtected; $0) -C_BOOLEAN:C305(UI_isProtected; $1) -C_COLLECTION:C1488(WP_ShowTabPages; $1) -C_TEXT:C284(TOOL_ColorRgbLongToColorRgbText; $0) -C_LONGINT:C283(TOOL_ColorRgbLongToColorRgbText; $1) -C_TEXT:C284(WP_BorderMenu; $1) -C_BOOLEAN:C305(WP_BorderMenu; $2) -C_OBJECT:C1216(WP_SetTextTransform; $1) -C_LONGINT:C283(WP_SetTextTransform; $2) -C_OBJECT:C1216(WP_GetTabInfo; $1) -C_OBJECT:C1216(WP_SetAlign; $1) -C_LONGINT:C283(WP_SetAlign; $2) -C_OBJECT:C1216(WP_GetBackgroundColor; $1) -C_TEXT:C284(WP_GetExpressions_Unused; $1) -C_LONGINT:C283(WP_GetExpressions_Unused; $2) -C_LONGINT:C283(WP_GetExpressions_Unused; $3) -C_POINTER:C301(WP_GetExpressions_Unused; $4) -C_POINTER:C301(WP_GetExpressions_Unused; $5) -C_POINTER:C301(WP_GetExpressions_Unused; $6) -C_POINTER:C301(WP_GetExpressions_Unused; $7) -C_TEXT:C284(WP_Request; $0) -C_TEXT:C284(WP_Request; $1) -C_TEXT:C284(WP_Request; $2) -C_TEXT:C284(WP_Request; $3) -C_TEXT:C284(WP_Request; $4) -C_TEXT:C284(WP_Request; $5) -C_LONGINT:C283(WP_GetStylesheetType; $0) -C_OBJECT:C1216(WP RemoveDocumentIndex; $1) -C_LONGINT:C283(TOOL_HLStoRGB; $0) -C_LONGINT:C283(TOOL_HLStoRGB; $1) -C_LONGINT:C283(TOOL_HLStoRGB; $2) -C_LONGINT:C283(TOOL_HLStoRGB; $3) -C_POINTER:C301(TOOL_HLStoRGB; $4) -C_POINTER:C301(TOOL_HLStoRGB; $5) -C_POINTER:C301(TOOL_HLStoRGB; $6) -C_LONGINT:C283(FR_Script; $0) -C_TEXT:C284(FR_Script; $1) -C_TEXT:C284(WP_xxx_Set4Dexpression; $1) -C_TEXT:C284(WP_xxx_Set4Dexpression; $2) -C_LONGINT:C283(WP_xxx_Set4Dexpression; $3) -C_LONGINT:C283(WP_xxx_Set4Dexpression; $4) -C_LONGINT:C283(WP_SetTabType; $1) -C_TEXT:C284(WP_SwitchToolbar; $1) -C_BOOLEAN:C305(_bool; $0) -C_TEXT:C284(_bool; $1) -C_OBJECT:C1216(WP_GetDocInfos; $1) -C_OBJECT:C1216(WP_GetTextIndent; $1) -C_OBJECT:C1216(WP_SetFontFamily; $1) -C_TEXT:C284(WP_SetFontFamily; $2) -C_BOOLEAN:C305(UI_ApplySkin; $0) -C_OBJECT:C1216(WP_SetFont; $1) -C_TEXT:C284(WP_SetFont; $2) -C_OBJECT:C1216(StylesheetEditMeta; $0) -C_OBJECT:C1216(WP_SetBackgroundColor; $1) -C_LONGINT:C283(WP_SetBackgroundColor; $2) -C_POINTER:C301(TOOL_WPIAlignButtons; $1) -C_POINTER:C301(TOOL_WPIAlignButtons; $2) -C_LONGINT:C283(TOOL_WPIAlignButtons; $3) -C_LONGINT:C283(TOOL_WPIAlignButtons; $4) -C_TEXT:C284(TOOL_WPIAlignButtons; $5) -C_TEXT:C284(TOOL_WPIAlignButtons; $6) -C_LONGINT:C283(TOOL_WPIAlignButtons; $7) -C_POINTER:C301(TOOL_WPIAlignButtons; $8) -C_POINTER:C301(TOOL_WPIAlignButtons; $9) -C_POINTER:C301(TOOL_WPIAlignButtons; $10) -C_POINTER:C301(TOOL_WPIAlignButtons; $11) -C_POINTER:C301(TOOL_WPIAlignButtons; $12) -C_TEXT:C284(UI_Tables; $1) -C_COLLECTION:C1488(WP_GetStyleAttributesByGroup; $0) -C_TEXT:C284(WP_GetStyleAttributesByGroup; $1) -C_OBJECT:C1216(WP_SetCellProtection; $1) -C_LONGINT:C283(WP_SetCellProtection; $2) -C_LONGINT:C283(WP_StyleFillEditLB; $1) -C_LONGINT:C283(WP_StyleFillEditLB; $2) -C_PICTURE:C286(getIcon; $0) -C_TEXT:C284(getIcon; $1) -C_TEXT:C284(WP_CopyPasteMenu; $1) -C_TEXT:C284(WP_PictureSaveSettings; $1) -C_OBJECT:C1216(WP_SelectBookmark; $1) -C_TEXT:C284(WP_SelectBookmark; $2) -C_TEXT:C284(WP_SelectBookmark; $3) -C_LONGINT:C283(WP_SelectBookmark; $4) -C_OBJECT:C1216(WP_SetSizes; $1) -C_TEXT:C284(WP_SetSizes; $2) -C_TEXT:C284(TB_GotoPage; $1) -C_BOOLEAN:C305(CheckAutomaticAction; $0) -C_COLLECTION:C1488(CheckAutomaticAction; $1) -C_LONGINT:C283(TOOL_ColorRgbTextToColorRgbLong; $0) -C_TEXT:C284(TOOL_ColorRgbTextToColorRgbLong; $1) -C_OBJECT:C1216(WP_SetFontItalic; $1) -C_LONGINT:C283(WP_SetFontItalic; $2) -C_TEXT:C284(UI_Selector; $1) -C_COLLECTION:C1488(distinctKeepOrder; $1) -C_TEXT:C284(WP ShowTabPages; $1) -C_COLLECTION:C1488(WP ShowTabPages; $2) -C_BOOLEAN:C305(_and; $0) -C_OBJECT:C1216(_and; ${1}) -C_LONGINT:C283(Call_CustomColorPalette; $0) -C_BOOLEAN:C305(Call_CustomColorPalette; $1) -C_TEXT:C284(Call_CustomColorPalette; $2) -C_OBJECT:C1216(WP_GetTextShadow; $1) -C_OBJECT:C1216(WP_SetDocInfos; $1) -C_OBJECT:C1216(WP_GetProtections; $1) -C_PICTURE:C286(zGetSamplePict; $0) -C_PICTURE:C286(zGetSamplePictBW; $0) -C_LONGINT:C283(RndRGB; $0) -C_TEXT:C284(TOOL_IncrementString; $0) -C_TEXT:C284(TOOL_IncrementString; $1) -C_OBJECT:C1216(WP_SetParagraphProtection; $1) -C_LONGINT:C283(WP_SetParagraphProtection; $2) -C_OBJECT:C1216(WP_SetTextShadow; $1) -C_LONGINT:C283(WP_SetTextShadow; $2) -C_LONGINT:C283(WP_SetTextShadow; $3) -C_OBJECT:C1216(WP_StylesheetCopyAttributes; $1) -C_OBJECT:C1216(WP_GetBackgroundURL; $1) -C_OBJECT:C1216(WP_SetFontBold; $1) -C_LONGINT:C283(WP_SetFontBold; $2) -C_OBJECT:C1216(WP SetDocumentIndex; $1) -C_OBJECT:C1216(WP_GetDecoInfo; $1) -C_OBJECT:C1216(WP_SetRowProtection; $1) -C_LONGINT:C283(WP_SetRowProtection; $2) -C_OBJECT:C1216(WP_GetSizes; $1) -C_TEXT:C284(WP_GetSizes; $2) -C_OBJECT:C1216(WP_SetDocumentProtection; $1) -C_BOOLEAN:C305(WP_SetDocumentProtection; $2) -C_TEXT:C284(WP_Ruler; $1) \ No newline at end of file +_O_C_TEXT:C284(WP_SetTextLineHeight; $3) +_O_C_LONGINT:C283(WP_SetTextUnderline; $3) +_O_C_TEXT:C284(WP_Request; $0) +_O_C_TEXT:C284(WP_Request; $1) +_O_C_TEXT:C284(WP_Request; $2) +_O_C_TEXT:C284(WP_Request; $3) +_O_C_TEXT:C284(WP_Request; $4) +_O_C_TEXT:C284(WP_Request; $5) +_O_C_LONGINT:C283(WP_GetStylesheetType; $0) +_O_C_OBJECT:C1216(WP RemoveDocumentIndex; $1) +_O_C_LONGINT:C283(FR_Script; $0) +_O_C_TEXT:C284(FR_Script; $1) +_O_C_OBJECT:C1216(StylesheetEditMeta; $0) +_O_C_LONGINT:C283(WP_StyleFillEditLB; $2) +_O_C_PICTURE:C286(getIcon; $0) +_O_C_TEXT:C284(getIcon; $1) +_O_C_COLLECTION:C1488(distinctKeepOrder; $1) +_O_C_LONGINT:C283(Call_CustomColorPalette; $0) +_O_C_BOOLEAN:C305(Call_CustomColorPalette; $1) +_O_C_TEXT:C284(Call_CustomColorPalette; $2) +_O_C_PICTURE:C286(zGetSamplePict; $0) +_O_C_PICTURE:C286(zGetSamplePictBW; $0) +_O_C_OBJECT:C1216(WP SetDocumentIndex; $1) +_O_C_TEXT:C284(WP_GetSizes; $2) \ No newline at end of file diff --git a/Project/Sources/Methods/Compiler_Variables.4dm b/Project/Sources/Methods/Compiler_Variables.4dm index 04288eb9..c05b1511 100644 --- a/Project/Sources/Methods/Compiler_Variables.4dm +++ b/Project/Sources/Methods/Compiler_Variables.4dm @@ -1,37 +1,45 @@ //%attributes = {"invisible":true} -C_TEXT:C284(areaName) -C_TEXT:C284(bookmarkMemoName) -C_LONGINT:C283(Button) -C_OBJECT:C1216(dummyObject) -C_BOOLEAN:C305(EXPANDED) -C_LONGINT:C283(frameType) -C_LONGINT:C283(ITEMREF) -C_TEXT:C284(ITEMTEXT) -C_POINTER:C301(masterTable) -C_REAL:C285(maxTabValue) -C_TEXT:C284(numFormat) -C_OBJECT:C1216(oForm) -C_OBJECT:C1216(oSettings1) -C_OBJECT:C1216(oSettings2) -C_OBJECT:C1216(oTempArea) -C_OBJECT:C1216(rows) -C_VARIANT:C1683(stylesheet4D) -C_LONGINT:C283(SUBLIST) -C_PICTURE:C286(svgPict) -C_OBJECT:C1216(tabDefault) -C_LONGINT:C283(tabsSelectedRow) -C_LONGINT:C283(templateID) -C_VARIANT:C1683(textBoxID) -C_TEXT:C284(unitName) -C_TEXT:C284(userUnit) -C_BOOLEAN:C305(vError) -C_TEXT:C284(vSVG) -C_OBJECT:C1216(WParea) -C_OBJECT:C1216(wpStyleSample) -C_BOOLEAN:C305(wp_allowTransparency) -C_LONGINT:C283(wp_customColor) -C_LONGINT:C283(wp_tabList) -C_TEXT:C284(_sizes) -C_LONGINT:C283(_StylesheetTabs) -C_COLLECTION:C1488(_tabs) -C_TEXT:C284(_toolbars) \ No newline at end of file +var svgPict : Picture +var oForm : Object + + +var areaName : Text +var bookmarkMemoName : Text +var ITEMTEXT : Text +var numFormat : Text +var unitName : Text +var userUnit : Text +var vSVG : Text +var _toolbars : Text +var _sizes : Text + +var Button : Integer +var frameType : Integer +var ITEMREF : Integer +var SUBLIST : Integer +var templateID : Integer +var tabsSelectedRow : Integer +var wp_customColor : Integer +var wp_tabList : Integer +var _StylesheetTabs : Integer + +var dummyObject : Object +var tabDefault : Object +var oSettings1 : Object +var oSettings2 : Object +var oTempArea : Object +var rows : Object +var WParea : Object +var wpStyleSample : Object + +var EXPANDED : Boolean +var vError : Boolean +var wp_allowTransparency : Boolean + +var masterTable : Pointer + +var maxTabValue : Real + +var textBoxID + +var _tabs : Collection \ No newline at end of file diff --git a/Project/Sources/Methods/ContextMemnu_Display.4dm b/Project/Sources/Methods/ContextMemnu_Display.4dm new file mode 100644 index 00000000..60ea8e70 --- /dev/null +++ b/Project/Sources/Methods/ContextMemnu_Display.4dm @@ -0,0 +1,96 @@ +//%attributes = {} +#DECLARE($areaName : Text; $menuKinds : Collection) // ex : ["table";"picture";"paragraph"] + +var $concerned : Collection +var $selection : Object +var $kind; $concernedType; $menu; $choice : Text +var $tablecount : Integer + +//var $isInTable : Boolean + +If (Form event code:C388=On Clicked:K2:4) && (Contextual click:C713) + + $concerned:=New collection:C1472 + $selection:=WP Selection range:C1340(*; $areaName) + + For each ($kind; $menuKinds) + Case of + : ($kind="spell") + $concerned.push("spell") // always + : ($kind="paragraph") + $concerned.push("paragraph") // always + + : ($kind="table") + $tablecount:=WP Get elements:C1550($selection; wk type table:K81:222).length + If ($tablecount>0) + $concerned.push("table") + End if + + End case + End for each + + $menu:=Create menu:C408 + + // etc. + + If ($concerned.length>0) + For each ($concernedType; $concerned) + + + Case of + + : ($concernedType="paragraph") + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "textAlign") + //APPEND MENU ITEM($menu; ak standard action title) + //SET MENU ITEM PROPERTY($menu; -1; Associated standard action; "textAlign?value=right") + //APPEND MENU ITEM($menu; ak standard action title) + //SET MENU ITEM PROPERTY($menu; -1; Associated standard action; "textAlign?value=center") + //APPEND MENU ITEM($menu; ak standard action title) + //SET MENU ITEM PROPERTY($menu; -1; Associated standard action; "textAlign?value=justify") + + APPEND MENU ITEM:C411($menu; "-") + + + : ($concernedType="table") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "table") + APPEND MENU ITEM:C411($menu; "-") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertRowAbove") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertRowBelow") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "deleteRows") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertColumnToTheLeft") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertColumnToTheRight") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "deleteColumns") + + APPEND MENU ITEM:C411($menu; "-") + + : ($concernedType="spell") + + APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) + SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "spell") + + APPEND MENU ITEM:C411($menu; "-") + + End case + + End for each + End if + + $choice:=Dynamic pop up menu:C1006($menu) + RELEASE MENU:C978($menu) + +End if \ No newline at end of file diff --git a/Project/Sources/Methods/FR_Script.4dm b/Project/Sources/Methods/FR_Script.4dm index a61087e1..e20665f5 100644 --- a/Project/Sources/Methods/FR_Script.4dm +++ b/Project/Sources/Methods/FR_Script.4dm @@ -1,41 +1,29 @@ //%attributes = {"invisible":true} -var $1; $action : Text +#DECLARE($action : Text)->$nbOccurences : Integer -var $options; $nbOccurences : Integer +var $options : Integer var $range; $target : Object var $rangeCollection : Collection - -var $0 : Integer // nb of occurences found - - -$action:=$1 $options:=0 - If (Not:C34(oForm.FR.caseSensitive)) $options:=$options+wk case insensitive:K81:329 End if - If (Not:C34(oForm.FR.diacriticSensitive)) $options:=$options+wk diacritic insensitive:K81:330 End if - If (Not:C34(oForm.FR.kanaSensitive)) $options:=$options+wk kana insensitive:K81:331 End if - If (Not:C34(oForm.FR.widthSensitive)) $options:=$options+wk width insensitive:K81:332 End if - If (oForm.FR.fullWord) $options:=$options+wk whole word:K81:333 //ak whole word (32) End if - If (oForm.FR.keepCharStyle=True:C214) $options:=$options+wk keep character style:K81:337 //wk keep character style (262144) End if - If (oForm.FR.keyboardBased) $options:=$options+wk use keyboard language:K81:338 End if @@ -102,5 +90,4 @@ Case of oForm.FR.displayReplacements:=True:C214 End case -$0:=$nbOccurences diff --git a/Project/Sources/Methods/InitFontLists.4dm b/Project/Sources/Methods/InitFontLists.4dm index ccfb25a5..2778a034 100644 --- a/Project/Sources/Methods/InitFontLists.4dm +++ b/Project/Sources/Methods/InitFontLists.4dm @@ -1,7 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($o; $wp) -C_LONGINT:C283($i) - +var $o; $wp : Object +var $i : Integer ARRAY TEXT:C222(WP_fontFamilly; 0) ARRAY TEXT:C222(WP_fontFamillyJapanese; 0) @@ -10,7 +9,7 @@ ARRAY TEXT:C222(WP_fontLongName; 0) FONT LIST:C460(WP_FontFamilly) // no enough for japaneese, check below -$o:=Get system info:C1571 +$o:=System info:C1571 If ($o.osLanguage="ja") ARRAY TEXT:C222(WP_fontFamillyJapanese; Size of array:C274(WP_fontFamilly)) @@ -18,7 +17,7 @@ If ($o.osLanguage="ja") $wp:=WP New:C1317 For ($i; 1; Size of array:C274(WP_fontFamilly)) WP SET ATTRIBUTES:C1342($wp; wk font family:K81:65; WP_fontFamilly{$i}) - WP GET ATTRIBUTES:C1345($wp; wk font family:K81:65; WP_fontFamillyJapanese{$i}) + WP Get attributes:C1345($wp; wk font family:K81:65; WP_fontFamillyJapanese{$i}) End for End if diff --git a/Project/Sources/Methods/MENU_Display.4dm b/Project/Sources/Methods/MENU_Display.4dm index b85225f1..ae5c2f68 100644 --- a/Project/Sources/Methods/MENU_Display.4dm +++ b/Project/Sources/Methods/MENU_Display.4dm @@ -1,18 +1,13 @@ //%attributes = {"invisible":true} #DECLARE($content : Text)->$action : Text -//var $1; $content : Text -//var $0 : Text - var $menu; $item; $url : Text var $_menuItems; $_tables : Collection var $o : Object var $_formulas : Collection var $section; $subSectionFirst; $subSectionLeft; $subSectionRight : Object -If (Count parameters:C259>=1) - $content:=$1 -Else // test +If (Count parameters:C259<1) $content:="export" //"new/import/export" End if @@ -36,25 +31,25 @@ $menu:=Create menu:C408 // create IMPORT submenu first Case of : ($content="export") - APPEND MENU ITEM:C411($menu; Get localized string:C991("4DWriteProEllipsis")) //"As .4dwp Document") + APPEND MENU ITEM:C411($menu; Localized string:C991("4DWriteProEllipsis")) //"As .4dwp Document") SET MENU ITEM PARAMETER:C1004($menu; -1; "export4dwritePro") - APPEND MENU ITEM:C411($menu; Get localized string:C991("WordEllipsis")) //"As .docx document") + APPEND MENU ITEM:C411($menu; Localized string:C991("WordEllipsis")) //"As .docx document") SET MENU ITEM PARAMETER:C1004($menu; -1; "exportDocx") - APPEND MENU ITEM:C411($menu; Get localized string:C991("HtmlEllipsis")) //"As .html Document") + APPEND MENU ITEM:C411($menu; Localized string:C991("HtmlEllipsis")) //"As .html Document") SET MENU ITEM PARAMETER:C1004($menu; -1; "exportHTML") - APPEND MENU ITEM:C411($menu; Get localized string:C991("HtmlMimeEllipsis")) + APPEND MENU ITEM:C411($menu; Localized string:C991("HtmlMimeEllipsis")) SET MENU ITEM PARAMETER:C1004($menu; -1; "exportHTMLmime") - APPEND MENU ITEM:C411($menu; Get localized string:C991("PdfEllipsis")) //"As .pdf document") + APPEND MENU ITEM:C411($menu; Localized string:C991("PdfEllipsis")) //"As .pdf document") SET MENU ITEM PARAMETER:C1004($menu; -1; "exportPDF") - APPEND MENU ITEM:C411($menu; Get localized string:C991("TextEllipsis")) //"As .text Document") + APPEND MENU ITEM:C411($menu; Localized string:C991("TextEllipsis")) //"As .text Document") SET MENU ITEM PARAMETER:C1004($menu; -1; "exportText") - APPEND MENU ITEM:C411($menu; Get localized string:C991("svgEllipsis")) //"As .svg Document") + APPEND MENU ITEM:C411($menu; Localized string:C991("svgEllipsis")) //"As .svg Document") SET MENU ITEM PARAMETER:C1004($menu; -1; "exportSVG") : ($content="paragraphSettings") @@ -71,7 +66,7 @@ Case of APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; wk line height:K81:51) - APPEND MENU ITEM:C411($menu; Get localized string:C991("resetFontAttributes")) + APPEND MENU ITEM:C411($menu; Localized string:C991("resetFontAttributes")) SET MENU ITEM PARAMETER:C1004($menu; -1; "ResetCharacterAttributes") APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) // added by RL 2024/03/21 @@ -79,55 +74,55 @@ Case of : ($content="InsertFormula") - APPEND MENU ITEM:C411($menu; Get localized string:C991("title")) + APPEND MENU ITEM:C411($menu; Localized string:C991("title")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentTitle") - APPEND MENU ITEM:C411($menu; Get localized string:C991("author")) + APPEND MENU ITEM:C411($menu; Localized string:C991("author")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentAuthor") - APPEND MENU ITEM:C411($menu; Get localized string:C991("subject")) + APPEND MENU ITEM:C411($menu; Localized string:C991("subject")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentSubject") - APPEND MENU ITEM:C411($menu; Get localized string:C991("company")) + APPEND MENU ITEM:C411($menu; Localized string:C991("company")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentCompany") - APPEND MENU ITEM:C411($menu; Get localized string:C991("notes")) + APPEND MENU ITEM:C411($menu; Localized string:C991("notes")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentNotes") - APPEND MENU ITEM:C411($menu; Get localized string:C991("creationDate")) + APPEND MENU ITEM:C411($menu; Localized string:C991("creationDate")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentCreationStamp") - APPEND MENU ITEM:C411($menu; Get localized string:C991("modificationDate")) + APPEND MENU ITEM:C411($menu; Localized string:C991("modificationDate")) SET MENU ITEM PARAMETER:C1004($menu; -1; "documentModificationStamp") : ($content="FreezeFormulas") - APPEND MENU ITEM:C411($menu; Get localized string:C991("FreezeDocument")) + APPEND MENU ITEM:C411($menu; Localized string:C991("FreezeDocument")) SET MENU ITEM PARAMETER:C1004($menu; -1; "freezeDocument") - APPEND MENU ITEM:C411($menu; Get localized string:C991("FreezeSelection")) + APPEND MENU ITEM:C411($menu; Localized string:C991("FreezeSelection")) SET MENU ITEM PARAMETER:C1004($menu; -1; "freezeSelection") $_tables:=WP_GetTablesWithDataSource If ($_tables.length>0) - APPEND MENU ITEM:C411($menu; Get localized string:C991("FreezeTables")) + APPEND MENU ITEM:C411($menu; Localized string:C991("FreezeTables")) SET MENU ITEM PARAMETER:C1004($menu; -1; "freezeTables") Else - APPEND MENU ITEM:C411($menu; "("+Get localized string:C991("FreezeTables")) + APPEND MENU ITEM:C411($menu; "("+Localized string:C991("FreezeTables")) End if : ($content="ComputeFormulas") - APPEND MENU ITEM:C411($menu; Get localized string:C991("ComputeDocument")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ComputeDocument")) SET MENU ITEM PARAMETER:C1004($menu; -1; "computeDocument") - APPEND MENU ITEM:C411($menu; Get localized string:C991("ComputeSelection")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ComputeSelection")) SET MENU ITEM PARAMETER:C1004($menu; -1; "computeSelection") $_tables:=WP_GetTablesWithDataSource If ($_tables.length>0) - APPEND MENU ITEM:C411($menu; Get localized string:C991("ComputeTables")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ComputeTables")) SET MENU ITEM PARAMETER:C1004($menu; -1; "computeTables") Else - APPEND MENU ITEM:C411($menu; "("+Get localized string:C991("ComputeTables")) + APPEND MENU ITEM:C411($menu; "("+Localized string:C991("ComputeTables")) End if //: ($content="DisplayFormulas") @@ -161,7 +156,7 @@ Case of If ($item="-") APPEND MENU ITEM:C411($menu; "-") Else - $o:=Get action info:C1442($item) + $o:=Action info:C1442($item) If ($o.enabled) APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; $item) // <----only when action is possible @@ -224,28 +219,28 @@ Case of If (Form:C1466.selection#Null:C1517) - WP GET ATTRIBUTES:C1345(Form:C1466.selection; wk image url:K81:218; $url) + WP Get attributes:C1345(Form:C1466.selection; wk image url:K81:218; $url) $_formulas:=WP Get formulas:C1702(Form:C1466.selection) If ($_formulas.length>0) oForm.imageSource:=$_formulas[0].formula.source // //ACI0104098 - APPEND MENU ITEM:C411($menu; Get localized string:C991("editImageFormula")) + APPEND MENU ITEM:C411($menu; Localized string:C991("editImageFormula")) SET MENU ITEM PARAMETER:C1004($menu; -1; "pictureInsertFormula") Else If ($url#"") & ($url#"data:@") oForm.imageURL:=$url - APPEND MENU ITEM:C411($menu; Get localized string:C991("editImageURL")) + APPEND MENU ITEM:C411($menu; Localized string:C991("editImageURL")) SET MENU ITEM PARAMETER:C1004($menu; -1; "pictureEditURL") Else APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertImage") // no ITEM PARAMETER IN THIS CASE - APPEND MENU ITEM:C411($menu; Get localized string:C991("insertImageURL")) + APPEND MENU ITEM:C411($menu; Localized string:C991("insertImageURL")) SET MENU ITEM PARAMETER:C1004($menu; -1; "pictureInsertURL") - APPEND MENU ITEM:C411($menu; Get localized string:C991("insertImageFormula")) + APPEND MENU ITEM:C411($menu; Localized string:C991("insertImageFormula")) SET MENU ITEM PARAMETER:C1004($menu; -1; "pictureInsertFormula") End if End if @@ -291,28 +286,28 @@ Case of $subSectionRight:=WP Get subsection:C1582($section; wk right page:K81:205) If ($subSectionFirst#Null:C1517) || ($subSectionLeft#Null:C1517) - APPEND MENU ITEM:C411($menu; Get localized string:C991("ResetSectionAndSubsections")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ResetSectionAndSubsections")) SET MENU ITEM PARAMETER:C1004($menu; -1; "sectionResetAll") End if - APPEND MENU ITEM:C411($menu; Get localized string:C991("ResetSection")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ResetSection")) SET MENU ITEM PARAMETER:C1004($menu; -1; "sectionReset") APPEND MENU ITEM:C411($menu; "-") If ($subSectionFirst#Null:C1517) - APPEND MENU ITEM:C411($menu; Get localized string:C991("ResetFirstPage")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ResetFirstPage")) SET MENU ITEM PARAMETER:C1004($menu; -1; "sectionResetFirstPage") End if If ($subSectionLeft#Null:C1517) // && ($subSectionRight#Null) // second condition always true if first is true - APPEND MENU ITEM:C411($menu; Get localized string:C991("ResetLeftAndRightPages")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ResetLeftAndRightPages")) SET MENU ITEM PARAMETER:C1004($menu; -1; "sectionResetLeftRightPage") - APPEND MENU ITEM:C411($menu; Get localized string:C991("ResetLeftPage")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ResetLeftPage")) SET MENU ITEM PARAMETER:C1004($menu; -1; "sectionResetLeftPage") - APPEND MENU ITEM:C411($menu; Get localized string:C991("ResetRightPage")) + APPEND MENU ITEM:C411($menu; Localized string:C991("ResetRightPage")) SET MENU ITEM PARAMETER:C1004($menu; -1; "sectionResetRightPage") End if @@ -322,7 +317,3 @@ End case $action:=Dynamic pop up menu:C1006($menu) RELEASE MENU:C978($menu) - - - -//$0:=$action diff --git a/Project/Sources/Methods/RndRGB.4dm b/Project/Sources/Methods/RndRGB.4dm index b440ccde..7599ed64 100644 --- a/Project/Sources/Methods/RndRGB.4dm +++ b/Project/Sources/Methods/RndRGB.4dm @@ -1,3 +1,4 @@ //%attributes = {"invisible":true} -C_LONGINT:C283($0) -$0:=((Random:C100%256) << 16)+((Random:C100%256) << 8)+((Random:C100%256) << 0) \ No newline at end of file + +#DECLARE()->$rndRGB : Integer +$rndRGB:=((Random:C100%256) << 16)+((Random:C100%256) << 8)+((Random:C100%256) << 0) \ No newline at end of file diff --git a/Project/Sources/Methods/SetupLocalVariables.4dm b/Project/Sources/Methods/SetupLocalVariables.4dm index b01e0b4e..d24bb01f 100644 --- a/Project/Sources/Methods/SetupLocalVariables.4dm +++ b/Project/Sources/Methods/SetupLocalVariables.4dm @@ -1,20 +1,17 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($0) -C_BOOLEAN:C305($ok) -C_LONGINT:C283($typeSelection) +#DECLARE()->$result : Boolean -C_OBJECT:C1216(oTempArea) +var $ok : Boolean -//C_OBJECT(skin) +var $typeSelection : Integer -C_TEXT:C284(userUnit) //• -C_TEXT:C284(numFormat) //• -C_TEXT:C284(unitName) //• - -C_POINTER:C301(masterTable) // 27 sept 2018 (was not used before ?) - -C_REAL:C285(maxTabValue) +var oTempArea : Object +var userUnit : Text //• +var numFormat : Text //• +var unitName : Text //• +var masterTable : Pointer // 27 sept 2018 (was not used before ?) +var maxTabValue : Real If (OB Is empty:C1297(oTempArea)) oTempArea:=WP New:C1317 @@ -59,7 +56,7 @@ If (Form:C1466.selection#Null:C1517) && (Not:C34(Undefined:C82(Form:C1466.select Form:C1466.context:=WP Get data context:C1787(Form:C1466.document) - WP GET ATTRIBUTES:C1345(Form:C1466.document; wk layout unit:K81:78; userUnit) + WP Get attributes:C1345(Form:C1466.document; wk layout unit:K81:78; userUnit) //userUnit:=wk unit cm Case of @@ -115,4 +112,4 @@ If (Form:C1466.masterTable#Null:C1517) masterTable:=Form:C1466.masterTable End if -$0:=$ok +$result:=$ok diff --git a/Project/Sources/Methods/StyleSheetBuildSample.4dm b/Project/Sources/Methods/StyleSheetBuildSample.4dm index 7d33bace..3ebabe50 100644 --- a/Project/Sources/Methods/StyleSheetBuildSample.4dm +++ b/Project/Sources/Methods/StyleSheetBuildSample.4dm @@ -1,21 +1,15 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($apply) -C_LONGINT:C283($page) -C_OBJECT:C1216($styleSheet) -C_OBJECT:C1216($normalStyleSheet) -C_OBJECT:C1216($sampleRange) -C_OBJECT:C1216($item) - -C_TEXT:C284($category) - -C_COLLECTION:C1488($col) +var $apply : Boolean +var $page : Integer +var $styleSheet; $normalStyleSheet; $sampleRange; $item : Object +var $category : Text +var $col : Collection $styleSheet:=Form:C1466.stylesheet -$normalStyleSheet:=WP Get style sheet:C1656(Form:C1466.stylesheet.owner;"Normal") - +$normalStyleSheet:=WP Get style sheet:C1656(Form:C1466.stylesheet.owner; "Normal") - // Sample text at the bottom of the form +// Sample text at the bottom of the form Case of : ($styleSheet.type=wk type paragraph:K81:191) $sampleRange:=WP Paragraph range:C1346(wpStyleSample) @@ -24,17 +18,15 @@ Case of $sampleRange:=wpStyleSample End case +WP SET ATTRIBUTES:C1342($sampleRange; wk style sheet:K81:63; "Normal") - -WP SET ATTRIBUTES:C1342($sampleRange;wk style sheet:K81:63;"Normal") - -For ($page;1;3) +For ($page; 1; 3) - $category:=Choose:C955($page;"bug";"fonts";"paragraphs";"margins") + $category:=Choose:C955($page; "bug"; "fonts"; "paragraphs"; "margins") $col:=Form:C1466.tabs[$category] - For each ($item;$col) + For each ($item; $col) If (Not:C34(OB Is empty:C1297($item))) If ($styleSheet[$item.property]#Null:C1517) & ($item.check=False:C215) @@ -48,7 +40,7 @@ For ($page;1;3) $apply:=True:C214 End if If ($apply) - WP SET ATTRIBUTES:C1342($sampleRange;$item.property;$item.value) + WP SET ATTRIBUTES:C1342($sampleRange; $item.property; $item.value) End if End if End if diff --git a/Project/Sources/Methods/StylesheetEditMeta.4dm b/Project/Sources/Methods/StylesheetEditMeta.4dm index e86818ca..7792a531 100644 --- a/Project/Sources/Methods/StylesheetEditMeta.4dm +++ b/Project/Sources/Methods/StylesheetEditMeta.4dm @@ -1,5 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($meta) +var $meta : Object + $meta:=New object:C1471 If (OB Is empty:C1297(This:C1470)) @@ -7,14 +8,14 @@ If (OB Is empty:C1297(This:C1470)) Else If (Not:C34(This:C1470.check)) //((This.value#This.normalValue) | - $meta.cell:=New object:C1471("colLabel";New object:C1471("fontWeight";"bold");"colStylesheet";New object:C1471("fontWeight";"normal";"stroke";"black");"colNormal";New object:C1471("stroke";"grey")) + $meta.cell:=New object:C1471("colLabel"; New object:C1471("fontWeight"; "bold"); "colStylesheet"; New object:C1471("fontWeight"; "normal"; "stroke"; "black"); "colNormal"; New object:C1471("stroke"; "grey")) Else - $meta.cell:=New object:C1471("colLabel";New object:C1471("fontWeight";"normal");"colStylesheet";New object:C1471("fontWeight";"normal";"stroke";"grey");"colNormal";New object:C1471("stroke";"black")) + $meta.cell:=New object:C1471("colLabel"; New object:C1471("fontWeight"; "normal"); "colStylesheet"; New object:C1471("fontWeight"; "normal"; "stroke"; "grey"); "colNormal"; New object:C1471("stroke"; "black")) End if End if - //C_TEXT(vMeta) - //vMeta:=JSON Stringify($meta) +//C_TEXT(vMeta) +//vMeta:=JSON Stringify($meta) $0:=$meta diff --git a/Project/Sources/Methods/TB_GotoPage.4dm b/Project/Sources/Methods/TB_GotoPage.4dm index e07f5d79..d4cb9b93 100644 --- a/Project/Sources/Methods/TB_GotoPage.4dm +++ b/Project/Sources/Methods/TB_GotoPage.4dm @@ -1,11 +1,9 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1; $btnName) -C_LONGINT:C283($id) -C_LONGINT:C283($page; $p) +#DECLARE($btnName : Text) -If (Count parameters:C259=1) - $btnName:=$1 -Else +var $id; $page; $p : Integer + +If (Count parameters:C259=0) $btnName:=OBJECT Get name:C1087(Object current:K67:2) // physical button name ("btn_Home") End if diff --git a/Project/Sources/Methods/TB_SwitchSkin.4dm b/Project/Sources/Methods/TB_SwitchSkin.4dm index a9608399..c8519246 100644 --- a/Project/Sources/Methods/TB_SwitchSkin.4dm +++ b/Project/Sources/Methods/TB_SwitchSkin.4dm @@ -1,29 +1,23 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1) // new toolbar folder : "Toolbar1" -C_TEXT:C284($folderName) -C_TEXT:C284($format) +#DECLARE($folderName : Text) -C_LONGINT:C283($i;$n;$p1;$p2) - - // Images/Toolbar1/Home/Bold_24.png - - -$folderName:=$1 +var $format : Text +var $i; $n; $p1; $p2 : Integer FORM GET OBJECTS:C898($_objectNames) $n:=Size of array:C274($_objectNames) -For ($i;1;$n) +For ($i; 1; $n) - $format:=OBJECT Get format:C894(*;$_objectNames{$i}) - //Button 3D;#Images/Toolbar1/Home/Cut_24.png;0;5;0;1;3;0;0;0;0;0;4 + $format:=OBJECT Get format:C894(*; $_objectNames{$i}) + //Button 3D;#Images/Toolbar1/Home/Cut_24.png;0;5;0;1;3;0;0;0;0;0;4 - $p1:=Position:C15("#Images/";$format) + $p1:=Position:C15("#Images/"; $format) If ($p1>0) - $p2:=Position:C15("/";$format;$p1+8) // second "/" + $p2:=Position:C15("/"; $format; $p1+8) // second "/" If ($p2>0) - $format:=Substring:C12($format;1;$p1+7)+$folderName+Substring:C12($format;$p2) - OBJECT SET FORMAT:C236(*;$_objectNames{$i};$format) + $format:=Substring:C12($format; 1; $p1+7)+$folderName+Substring:C12($format; $p2) + OBJECT SET FORMAT:C236(*; $_objectNames{$i}; $format) End if End if diff --git a/Project/Sources/Methods/TOOL_ColorRgbLongToColorRgbText.4dm b/Project/Sources/Methods/TOOL_ColorRgbLongToColorRgbText.4dm index 69c4b0b9..302b52e2 100644 --- a/Project/Sources/Methods/TOOL_ColorRgbLongToColorRgbText.4dm +++ b/Project/Sources/Methods/TOOL_ColorRgbLongToColorRgbText.4dm @@ -1,12 +1,3 @@ //%attributes = {"invisible":true} -C_LONGINT:C283($1) -C_TEXT:C284($0) - -C_LONGINT:C283($color) -C_TEXT:C284($color_t) - -$color:=$1 - +#DECLARE($color : Integer)->$color_t : Text $color_t:="RGB("+String:C10(($color & 0x00FF0000) >> 16)+","+String:C10(($color & 0xFF00) >> 8)+","+String:C10($color & 0x00FF)+")" - -$0:=$color_t diff --git a/Project/Sources/Methods/TOOL_ColorRgbTextToColorRgbLong.4dm b/Project/Sources/Methods/TOOL_ColorRgbTextToColorRgbLong.4dm index 755651f0..d277e18e 100644 --- a/Project/Sources/Methods/TOOL_ColorRgbTextToColorRgbLong.4dm +++ b/Project/Sources/Methods/TOOL_ColorRgbTextToColorRgbLong.4dm @@ -1,28 +1,23 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1) -C_LONGINT:C283($0) +#DECLARE($color_t : Text)->$color : Integer -C_LONGINT:C283($color;$red;$green;$blue) -C_LONGINT:C283($p1;$p2;$p3) +var $red; $green; $blue : Integer +var $p1; $p2; $p3 : Integer -C_TEXT:C284($color_t) - -$color_t:=$1 If ($color_t="RGB(@") - $p1:=Position:C15(",";$color_t) - $p2:=Position:C15(",";$color_t;$p1+1) - $p3:=Position:C15(")";$color_t;$p2+1) + $p1:=Position:C15(","; $color_t) + $p2:=Position:C15(","; $color_t; $p1+1) + $p3:=Position:C15(")"; $color_t; $p2+1) - $red:=Num:C11(Substring:C12($color_t;5;$p1-5)) - $green:=Num:C11(Substring:C12($color_t;$p1+1;$p2-$p1)) - $blue:=Num:C11(Substring:C12($color_t;$p2+1;$p3-$p2)) + $red:=Num:C11(Substring:C12($color_t; 5; $p1-5)) + $green:=Num:C11(Substring:C12($color_t; $p1+1; $p2-$p1)) + $blue:=Num:C11(Substring:C12($color_t; $p2+1; $p3-$p2)) $color:=($red << 16)+($green << 8)+$blue Else $color:=Num:C11($color_t) End if -$0:=$color diff --git a/Project/Sources/Methods/TOOL_HLStoRGB.4dm b/Project/Sources/Methods/TOOL_HLStoRGB.4dm index 7ca71a62..7f7b74be 100644 --- a/Project/Sources/Methods/TOOL_HLStoRGB.4dm +++ b/Project/Sources/Methods/TOOL_HLStoRGB.4dm @@ -1,83 +1,67 @@ //%attributes = {"invisible":true} - //$Color:=Color_HSL_to_RGB ($Hue;$Saturation;$Light) +//$color:=Color_HSL_to_RGB ($hue;$saturation;$Light{;$ptrRed;$ptrBlue;$ptrGreen}) -C_LONGINT:C283($1;$2;$3) -C_POINTER:C301($4;$5;$6) // optionnal -C_LONGINT:C283($0) +#DECLARE($hue : Integer; $luminosity : Integer; $saturation : Integer; $ptrRed : Pointer; $ptrBlue : Pointer; $ptrGreen : Pointer)->$color : Integer -C_LONGINT:C283($Hue;$Saturation;$Luminosity) -C_LONGINT:C283($Red;$Green;$Blue) -C_LONGINT:C283($Min;$Max;$Delta) -C_LONGINT:C283($Color) +var $Red; $Green; $Blue : Integer +var $Min; $Max; $Delta : Integer -C_POINTER:C301($ptrRed;$ptrGreen;$ptrBlue) - -While ($Hue<0) - $Hue:=360-$Hue +While ($hue<0) + $hue:=360-$hue End while -$Hue:=$1%360 //0 à 360° - +$hue:=$hue%360 //0 à 360° -$Luminosity:=$2 //0 à 100% -$Saturation:=$3 //0 à 100% - -$Max:=$Luminosity*255/100 //RGB vont de 0 à 255 -$Min:=$Max*((100-$Saturation)/100) +$Max:=$luminosity*255/100 //RGB vont de 0 à 255 +$Min:=$Max*((100-$saturation)/100) $Delta:=$Max-$Min Case of - : ($Hue>=300) - $Hue:=$Hue-300 + : ($hue>=300) + $hue:=$hue-300 $Red:=$Max $Green:=$Min - $Blue:=$Max-($Delta*($Hue/60)) //Bleu décroissant + $Blue:=$Max-($Delta*($hue/60)) //Bleu décroissant - : ($Hue>=240) - $Hue:=$Hue-240 + : ($hue>=240) + $hue:=$hue-240 $Blue:=$Max $Green:=$Min - $Red:=$Min+($Delta*($Hue/60)) //Rouge croissant + $Red:=$Min+($Delta*($hue/60)) //Rouge croissant - : ($Hue>=180) - $Hue:=$Hue-180 + : ($hue>=180) + $hue:=$hue-180 $Blue:=$Max $Red:=$Min - $Green:=$Max-($Delta*($Hue/60)) //Vert décroissant + $Green:=$Max-($Delta*($hue/60)) //Vert décroissant - : ($Hue>=120) - $Hue:=$Hue-120 + : ($hue>=120) + $hue:=$hue-120 $Green:=$Max $Red:=$Min - $Blue:=$Min+($Delta*($Hue/60)) //bleu croissant + $Blue:=$Min+($Delta*($hue/60)) //bleu croissant - : ($Hue>=60) - $Hue:=$Hue-60 + : ($hue>=60) + $hue:=$hue-60 $Green:=$Max $Blue:=$Min - $Red:=$Max-($Delta*($Hue/60)) //Rouge décroissant + $Red:=$Max-($Delta*($hue/60)) //Rouge décroissant - : ($Hue>=0) - $Hue:=$Hue-0 //pour la symétrie des autres cas :-) + : ($hue>=0) + $hue:=$hue-0 //pour la symétrie des autres cas :-) $Red:=$Max $Blue:=$Min - $Green:=$Min+($Delta*($Hue/60)) //vert croissant + $Green:=$Min+($Delta*($hue/60)) //vert croissant End case If (Count parameters:C259>=6) - - $ptrRed:=$4 - $ptrGreen:=$5 - $ptrBlue:=$6 - $ptrRed->:=$Red $ptrGreen->:=$Green $ptrBlue->:=$Blue - End if -$Color:=($red << 16)+($Green << 8)+$Blue -$0:=$Color +$color:=($red << 16)+($Green << 8)+$Blue + diff --git a/Project/Sources/Methods/TOOL_IncrementString.4dm b/Project/Sources/Methods/TOOL_IncrementString.4dm index 9da456c8..109bddb5 100644 --- a/Project/Sources/Methods/TOOL_IncrementString.4dm +++ b/Project/Sources/Methods/TOOL_IncrementString.4dm @@ -1,18 +1,16 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1;$original) -C_TEXT:C284($0) +#DECLARE($original : Text)->$result : Text -C_BOOLEAN:C305($lastIsNumber) -C_TEXT:C284($stringNum) -C_LONGINT:C283($l) +var $lastIsNumber : Boolean +var $stringNum : Text +var $l : Integer -$original:=$1 $l:=Length:C16($original) - // "abcd" -> "abcd1" - // "abcd0" -> "abcd1" - // "abcd123" -> "abcd124" - // "18" -> "19" +// "abcd" -> "abcd1" +// "abcd0" -> "abcd1" +// "abcd123" -> "abcd124" +// "18" -> "19" $stringNum:="" Repeat @@ -20,8 +18,8 @@ Repeat If ($lastIsNumber) $stringNum:=$original[[$l]]+$stringNum $l:=$l-1 - $original:=Substring:C12($original;1;$l) + $original:=Substring:C12($original; 1; $l) End if Until ($l<=0) | ($lastIsNumber=False:C215) -$0:=$original+String:C10(Num:C11($stringNum)+1) +$result:=$original+String:C10(Num:C11($stringNum)+1) diff --git a/Project/Sources/Methods/TOOL_RGBtoHLS.4dm b/Project/Sources/Methods/TOOL_RGBtoHLS.4dm index 5b936c33..49ce4e2f 100644 --- a/Project/Sources/Methods/TOOL_RGBtoHLS.4dm +++ b/Project/Sources/Methods/TOOL_RGBtoHLS.4dm @@ -1,88 +1,87 @@ //%attributes = {"invisible":true} - //Color_RGB_to_HSL($Color;->Hue;->Luminosity;->Salturation) +//Color_RGB_to_HSL($Color;->Hue;->Luminosity;->Salturation) -C_LONGINT:C283($1) //color coded as 0xRRGGBB -C_POINTER:C301($2;$3;$4) //Ptr on H, L, S +#DECLARE($color : Integer; $huePtr : Pointer; $luminosityPtr : Pointer; $saturationPtr : Pointer) -C_LONGINT:C283($Red;$Green;$Blue) -C_LONGINT:C283($Hue;$Saturation;$Luminosity) +var $Red; $Green; $Blue : Integer +var $hue; $saturation; $luminosity : Integer -$Red:=(($1 & 0x00FF0000) >> 16)*100/255 -$Green:=(($1 & 0xFF00) >> 8)*100/255 -$Blue:=($1 & 0x00FF)*100/255 +$Red:=(($color & 0x00FF0000) >> 16)*100/255 +$Green:=(($color & 0xFF00) >> 8)*100/255 +$Blue:=($color & 0x00FF)*100/255 Case of : ($Green=$Blue) & ($Red>$Green) //0° - $Luminosity:=$Red - $Saturation:=100*($Luminosity-$Blue)/$Luminosity - $Hue:=0 + $luminosity:=$Red + $saturation:=100*($luminosity-$Blue)/$luminosity + $hue:=0 : ($Red>$Green) & ($Green>$Blue) //1° to 59° - $Luminosity:=$Red - $Saturation:=100*($Luminosity-$Blue)/$Luminosity - $Hue:=0+(60*(($Green-$Blue)/($Red-$Blue))) //plus le vert croit, plus le HUE croit + $luminosity:=$Red + $saturation:=100*($luminosity-$Blue)/$luminosity + $hue:=0+(60*(($Green-$Blue)/($Red-$Blue))) //plus le vert croit, plus le HUE croit : ($Green=$Red) & ($Red>$Blue) //60° - $Luminosity:=$Red - $Saturation:=100*($Luminosity-$Blue)/$Luminosity - $Hue:=60 + $luminosity:=$Red + $saturation:=100*($luminosity-$Blue)/$luminosity + $hue:=60 : ($Green>$Red) & ($Red>$Blue) //61° to 119° - $Luminosity:=$Green - $Saturation:=100*($Luminosity-$Blue)/$Luminosity - $Hue:=60+(60*(($Green-$Red)/($Green-$Blue))) //plus le Rouge décroit, plus le HUE croit + $luminosity:=$Green + $saturation:=100*($luminosity-$Blue)/$luminosity + $hue:=60+(60*(($Green-$Red)/($Green-$Blue))) //plus le Rouge décroit, plus le HUE croit : ($Blue=$Red) & ($Green>$Blue) //120° - $Luminosity:=$Green - $Saturation:=100*($Luminosity-$Red)/$Luminosity - $Hue:=120 + $luminosity:=$Green + $saturation:=100*($luminosity-$Red)/$luminosity + $hue:=120 : ($Green>$Blue) & ($Blue>$Red) //121° to 179° - $Luminosity:=$Green - $Saturation:=100*($Luminosity-$Red)/$Luminosity - $Hue:=120+(60*(($Blue-$Red)/($Green-$Red))) //plus le bleu croit, plus le HUE croit + $luminosity:=$Green + $saturation:=100*($luminosity-$Red)/$luminosity + $hue:=120+(60*(($Blue-$Red)/($Green-$Red))) //plus le bleu croit, plus le HUE croit : ($Blue=$Green) & ($Green>$Red) //180° - $Luminosity:=$Green - $Saturation:=100*($Luminosity-$Red)/$Luminosity - $Hue:=180 //180 + $luminosity:=$Green + $saturation:=100*($luminosity-$Red)/$luminosity + $hue:=180 //180 : ($Blue>$Green) & ($Green>$Red) //181° to 239° - $Luminosity:=$Blue - $Saturation:=100*($Luminosity-$Red)/$Luminosity - $Hue:=180+(60*(($Blue-$Green)/($Blue-$Red))) //plus le Vert décroit, plus le HUE croit + $luminosity:=$Blue + $saturation:=100*($luminosity-$Red)/$luminosity + $hue:=180+(60*(($Blue-$Green)/($Blue-$Red))) //plus le Vert décroit, plus le HUE croit : ($Red=$Green) & ($Blue>$Red) //240° - $Luminosity:=$Blue - $Saturation:=100*($Luminosity-$Green)/$Luminosity - $Hue:=240 + $luminosity:=$Blue + $saturation:=100*($luminosity-$Green)/$luminosity + $hue:=240 : ($Blue>$Red) & ($Red>$Green) //241° to 299° - $Luminosity:=$Blue - $Saturation:=100*($Luminosity-$Green)/$Luminosity - $Hue:=240+(60*(($Red-$Green)/($Blue-$Green))) //plus le rouge croit, plus le HUE croit + $luminosity:=$Blue + $saturation:=100*($luminosity-$Green)/$luminosity + $hue:=240+(60*(($Red-$Green)/($Blue-$Green))) //plus le rouge croit, plus le HUE croit : ($Red=$Blue) & ($Blue>$Green) //300° - $Luminosity:=$Blue - $Saturation:=100*($Luminosity-$Green)/$Luminosity - $Hue:=300 + $luminosity:=$Blue + $saturation:=100*($luminosity-$Green)/$luminosity + $hue:=300 : ($Red>$Blue) & ($Blue>$Green) //301° to 359° - $Luminosity:=$Red - $Saturation:=100*($Luminosity-$Green)/$Luminosity - $Hue:=300+(60*(($Red-$Blue)/($Red-$Green))) //plus le Bleu décroit, plus le HUE croit + $luminosity:=$Red + $saturation:=100*($luminosity-$Green)/$luminosity + $hue:=300+(60*(($Red-$Blue)/($Red-$Green))) //plus le Bleu décroit, plus le HUE croit : ($Red=$Blue) & ($Blue=$Green) - $Luminosity:=$Blue //or red or green - $Saturation:=0 - $Hue:=0 + $luminosity:=$Blue //or red or green + $saturation:=0 + $hue:=0 End case -$2->:=$Hue -$3->:=$Luminosity -$4->:=$Saturation +$huePtr->:=$hue +$luminosityPtr->:=$luminosity +$saturationPtr->:=$saturation diff --git a/Project/Sources/Methods/TOOL_WPIAlignButtons.4dm b/Project/Sources/Methods/TOOL_WPIAlignButtons.4dm deleted file mode 100644 index 3bcab6a5..00000000 --- a/Project/Sources/Methods/TOOL_WPIAlignButtons.4dm +++ /dev/null @@ -1,407 +0,0 @@ -//%attributes = {"invisible":true} -//TOOL_AlignButtons (->$ArrayObjectNames;->$ArrayObjectLabels;"Left";"top";"Horizontal";"proportional";0;->$ArrayMargins;->$ArraySpaces;$ArrayHeight) - -// modifiée par RL le 10 mai 2011 ∆∆∆ -// sur WIN pour les JAPONAIS on AJOUTE 4 pixels SYSTEMATIQUEMENT -// finalement non… (mis en if(false)) - -If (False:C215) //EXEMPLE D'APPEL DE LA METHODE (Seul le premier parametre est obligatoire) - ARRAY TEXT:C222($_ObjectNames; 5) - ARRAY TEXT:C222($_ObjectLabels; 5) - ARRAY LONGINT:C221($_Margin; 2) - ARRAY LONGINT:C221($_Space; 2) - ARRAY LONGINT:C221($_Height; 2) - ARRAY LONGINT:C221($_MinWidth; 2) - - - $_ObjectNames{1}:="Bouton1" - $_ObjectNames{2}:="Bouton2" - $_ObjectNames{3}:="Bouton3" - $_ObjectNames{4}:="Bouton4" - $_ObjectNames{5}:="Bouton5" - - $_ObjectLabels{1}:="Alpha-Bravo" - $_ObjectLabels{2}:="Charlie-Delta" - $_ObjectLabels{3}:="Uniform" - $_ObjectLabels{4}:="Golf" - $_ObjectLabels{5}:="Zoulou-Tango" - - $_Height{1}:=20 //win - $_Height{2}:=23 //mac - - $_Margin{1}:=2 //win - $_Margin{2}:=2 //mac - - $_Space{1}:=10 //win - $_Space{2}:=10 //mac - - $_MinWidth{1}:=50 //win - $_MinWidth{2}:=0 - - TOOL_WPIAlignButtons(->$_ObjectNames; ->$_ObjectLabels; Horizontally centered:K39:1; At the top:K39:5; "Horizontal"; "Proportional"; 0; ->$_Height; ->$_Margin; ->$_Space; ->$_MinWidth) -End if - -//mandatory parameters -C_POINTER:C301($1) //pointer on array of object names -C_POINTER:C301($2) //pointer on array of object labels - -//optional parameters - -C_LONGINT:C283($3) //horizontal reference (left;center;right) `default : left (use 4D constants) -C_LONGINT:C283($4) //vertical reference (top;center;bottom) `default : top (use 4D constants) -C_TEXT:C284($5) //Alignement type ("horizontal" / "vertical") `default : horizontal -C_TEXT:C284($6) //mode ("fixed"/"proportional") `default : proportionnal -C_LONGINT:C283($7) // "fixed value" (for fixed mode) `if 0 and "fixed mode" : biggest Horizontal size needed, ignored if proportional -C_POINTER:C301($8) //pointer on array of button heights (2 items : Win/Mac, default 23/20) -C_POINTER:C301($9) //pointer on array of text margins (inside buttons) (2 items : Win/Mac, default 0/0) -C_POINTER:C301($10) //pointer on array of spaces (between buttons) (2 items : Win/Mac, default 10/10) - -C_POINTER:C301($11) //min witdh of buttons -C_POINTER:C301($12) //rounded to… (i.e; to get buttons of size multiple of 10) - -//variables de réafectation des parametres - -C_POINTER:C301($PtrArrayObjectNames) //pointer on array of object names -C_POINTER:C301($PtrArrayObjectLabels) //pointer on array of object labels -C_LONGINT:C283($HorizontalAlign) //horizontal reference ("Left";"Center";"Right") -C_LONGINT:C283($VerticalAlign) //vertical reference ("Top";"Center";"Bottom") -C_TEXT:C284($AlignementType) //Alignement type ("Horizontal" / "Vertical") -C_TEXT:C284($SizeMode) //mode ("fixed"/"proportionnal") -C_LONGINT:C283($RoundValue) //value for "round to" -C_LONGINT:C283($SizeValue) //Value for "fixed", value ignored for "proportional" - -C_POINTER:C301($PtrRefVariable) //pointer on test variable (needed only if "proportional") -C_LONGINT:C283($TextMargin) //pointer on array of text margins (inside buttons) (2 items : Win/Mac, usualy 5/5) -C_LONGINT:C283($ButtonSpace) //pointer on array of spaces (between buttons) (2 items : Win/Mac, usualy 10/10) -C_LONGINT:C283($ButtonHeight) //pointer on array of button heights (2 items : Win/Mac, usualy 23/20) -C_LONGINT:C283($ButtonMinWidth) -C_LONGINT:C283($GlobalWidth; $GlobalHeight) -C_LONGINT:C283($Offset_H; $Offset_V) - -//Variables locales -C_LONGINT:C283($Plateform) -C_LONGINT:C283($i; $n) -C_LONGINT:C283($x1; $x2; $y1; $y2) -C_LONGINT:C283($Left; $Top; $Right; $Bottom) - -_O_PLATFORM PROPERTIES:C365($Plateform) -$Plateform:=Choose:C955($Plateform=Windows:K25:3; 1; 2) - -// Gestion des paramètres - -$PtrArrayObjectNames:=$1 - -If (Count parameters:C259>=2) - $PtrArrayObjectLabels:=$2 -End if - -If (Count parameters:C259>=3) - $HorizontalAlign:=$3 -Else - $HorizontalAlign:=On the left:K39:2 -End if - -If (Count parameters:C259>=4) - $VerticalAlign:=$4 -Else - $VerticalAlign:=At the top:K39:5 -End if - -If (Count parameters:C259>=5) - $AlignementType:=$5 -Else - $AlignementType:="Horizontal" -End if - -If (Count parameters:C259>=6) - $SizeMode:=$6 -Else - $SizeMode:="Proportional" -End if - -If (Count parameters:C259>=7) - $SizeValue:=$7 -Else - $SizeValue:=0 -End if - -If (Count parameters:C259>=8) - $ButtonHeight:=$8->{$Plateform} -Else - $ButtonHeight:=Choose:C955($Plateform=1; 23; 20) -End if - -If (Count parameters:C259>=9) - $TextMargin:=$9->{$Plateform} -Else - $TextMargin:=0 -End if - -If (Count parameters:C259>=10) - $ButtonSpace:=$10->{$Plateform} -Else - $ButtonSpace:=10 -End if - -If (Count parameters:C259>=11) //largeur minimum d'un bouton - $ButtonMinWidth:=$11->{$Plateform} -Else - $ButtonMinWidth:=20 -End if - -If (Count parameters:C259>=12) //arrondi à une valeur donnée - $RoundValue:=$12->{$Plateform} -Else - $RoundValue:=0 -End if - -$n:=Size of array:C274($PtrArrayObjectNames->) - -$n:=Size of array:C274($PtrArrayObjectNames->) -ARRAY LONGINT:C221($_btnWidth; $n) - -//Cas le pire, il faut calculer la plus grande taille des boutons - -If ($SizeMode="Fixed") & ($SizeValue=0) - - For ($i; 1; $n; 1) - - If (Not:C34(Is nil pointer:C315($PtrArrayObjectLabels))) - - OBJECT SET TITLE:C194(*; $PtrArrayObjectNames->{$i}; $PtrArrayObjectLabels->{$i}) - - End if - - If (False:C215) - $PtrRefVariable->:=$PtrArrayObjectLabels->{$i} - OBJECT GET BEST SIZE:C717($PtrRefVariable->; $x1; $y1) // variable - - Else - - OBJECT GET BEST SIZE:C717(*; $PtrArrayObjectNames->{$i}; $x1; $y1) // nom d'objet - End if - - If ($x1>$SizeValue) - - $SizeValue:=$x1 - - End if - End for - - If ($RoundValue>1) - - $SizeValue:=$RoundValue*Int:C8(($SizeValue+1+$RoundValue)/$RoundValue) - - End if -End if - -//1ere "vraie" boucle pour calculer la taille définitive des boutons ET les moyennes - -$GlobalWidth:=0 -$GlobalHeight:=0 - -For ($i; 1; $n; 1) - - If ($SizeMode="Fixed") - - $_btnWidth{$i}:=$SizeValue+(2*$TextMargin) - - Else //"proportional" - - If (Not:C34(Is nil pointer:C315($PtrArrayObjectLabels))) - - OBJECT SET TITLE:C194(*; $PtrArrayObjectNames->{$i}; $PtrArrayObjectLabels->{$i}) - - End if - - If (False:C215) - $PtrRefVariable->:=$PtrArrayObjectLabels->{$i} - OBJECT GET BEST SIZE:C717($PtrRefVariable->; $x1; $y1) - - Else - - OBJECT GET BEST SIZE:C717(*; $PtrArrayObjectNames->{$i}; $x1; $y1) - End if - - $_btnWidth{$i}:=$x1+(2*$TextMargin) - - //Need to round to ? - If ($RoundValue>1) - - $_btnWidth{$i}:=$RoundValue*Int:C8(($_btnWidth{$i}+1+$RoundValue)/$RoundValue) - - End if - - //minimum value for width ? - If ($_btnWidth{$i}<$ButtonMinWidth) - - $_btnWidth{$i}:=$ButtonMinWidth - - End if - - //If (False) - // // sur WIN pour les JAPONAIS on AJOUTE 4 pixels SYSTEMATIQUEMENT ∆∆∆ - //If (Get database localization="ja") & (Folder separator#":") // / ou \ je sais jamais donc j'ai mis # ":" - //$_btnWidth{$i}:=$_btnWidth{$i}+4 - //End if - //End if - - End if - - $GlobalWidth:=$GlobalWidth+$_btnWidth{$i}+$ButtonSpace //sert en cas d'alignement horizontal - $GlobalHeight:=$GlobalHeight+$ButtonHeight+$ButtonSpace //sert en cas d'alignement vertical - -End for - -$GlobalWidth:=$GlobalWidth-$ButtonSpace //sert en cas d'alignement horizontal (on retire un espace ajouté en trop en fin de boucle) -$GlobalHeight:=$GlobalHeight-$ButtonSpace //sert en cas d'alignement vertical (on retire un espace ajouté en trop en fin de boucle) - -If ($AlignementType="Horizontal") - - Case of - - //________________________________________ - : ($HorizontalAlign=On the left:K39:2) - - //affecte la valeur $Left directement à partir de la GAUCHE du PREMIER objet - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $Left; $y1; $x2; $y2) - - //________________________________________ - : ($HorizontalAlign=Horizontally centered:K39:1) - - //on prend la gauche de l'objet 1 et la droite de l'objet n, on en fait la moyenne, puis on soustrait la demi-largeur globale - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $Left; $y1; $x2; $y2) - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $Right; $y2) - $Left:=Round:C94(($Left+$Right-$GlobalWidth)/2; 0) - - //________________________________________ - : ($HorizontalAlign=On the right:K39:3) - - //affecte la valeur $Left à partir de la DROITE du DERNIER objet moins la largeur globale - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $Right; $y2) - $Left:=$Right-$GlobalWidth //affecte la valeur $Left en fonction de la droite - largeur globale - - //________________________________________ - End case - - Case of - - //________________________________________ - : ($VerticalAlign=At the top:K39:5) - - //affecte la valeur $Top directement à partir de HAUT du PREMIER objet - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $x1; $Top; $x2; $y2) - - //________________________________________ - : ($VerticalAlign=Vertically centered:K39:4) - - //affecte la valeur $Top à partir de moyenne du HAUT du PREMIER et du BAS du DERNIER objet moins la demi-Hauteur GLOBALE - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $x1; $Top; $x2; $y2) - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $x2; $Bottom) - $Top:=Round:C94(($Top+$Bottom-$ButtonHeight)/2; 0) - - //________________________________________ - : ($VerticalAlign=At the bottom:K39:6) - - //affecte la valeur $Top à partir du BAS du DERNIER objet moins la Hauteur GLOBALE - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $x2; $Bottom) - $Top:=$Bottom-$ButtonHeight - - //________________________________________ - End case - -Else //alignement vertical des boutons - - Case of - - //________________________________________ - : ($HorizontalAlign=On the left:K39:2) - - //affecte la valeur $HorizontalRef directement à partir de la GAUCHE du PREMIER objet - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $HorizontalRef; $y1; $x2; $y2) - - //________________________________________ - : ($HorizontalAlign=Horizontally centered:K39:1) - - //affecte la valeur $HorizontalRef à partir de moyenne de la gauche de l'objet 1 et la droite du dernier objet - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $Left; $y1; $x2; $y2) - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $Right; $y2) - $HorizontalRef:=Round:C94(($Left+$Right)/2; 0) - - //________________________________________ - : ($HorizontalAlign=On the right:K39:3) - - //affecte la valeur $HorizontalRef directement à partir de la DROITE du DERNIER objet - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $HorizontalRef; $y2) - - //________________________________________ - End case - - Case of - - //________________________________________ - : ($VerticalAlign=At the top:K39:5) - - //affecte la valeur $Top directement à partir de HAUT du PREMIER objet - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $x1; $Top; $x2; $y2) - - //________________________________________ - : ($VerticalAlign=Vertically centered:K39:4) - - //affecte la valeur $Top à partir de moyenne du HAUT du PREMIER et du BAS du DERNIER objet moins la demi-Hauteur de bouton - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{1}; $x1; $Top; $x2; $y2) - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $x2; $Bottom) - $Top:=Round:C94(($Top+$Bottom-$GlobalHeight)/2; 0) - - //________________________________________ - : ($VerticalAlign=At the bottom:K39:6) - - //affecte la valeur $Top à partir du BAS du DERNIER objet moins la Hauteur de bouton - OBJECT GET COORDINATES:C663(*; $PtrArrayObjectNames->{$n}; $x1; $y1; $x2; $Bottom) - $Top:=$Bottom-$GlobalHeight - - //________________________________________ - End case -End if - -If ($AlignementType="Horizontal") - - $Offset_H:=$Left - - For ($i; 1; $n; 1) - - OBJECT MOVE:C664(*; $PtrArrayObjectNames->{$i}; $Offset_H; $Top; $Offset_H+$_btnWidth{$i}; $Top+$ButtonHeight; *) - $Offset_H:=$Offset_H+$_btnWidth{$i}+$ButtonSpace - - End for - -Else //alignement vertical des boutons - - $Offset_V:=$Top - - For ($i; 1; $n; 1) - - Case of - - //________________________________________ - : ($HorizontalAlign=On the left:K39:2) - - OBJECT MOVE:C664(*; $PtrArrayObjectNames->{$i}; $HorizontalRef; $Offset_V; $HorizontalRef+$_btnWidth{$i}; $Offset_V+$ButtonHeight; *) - - //________________________________________ - : ($HorizontalAlign=Horizontally centered:K39:1) - - OBJECT MOVE:C664(*; $PtrArrayObjectNames->{$i}; $HorizontalRef-($_btnWidth{$i}/2); $Offset_V; $HorizontalRef+($_btnWidth{$i}/2); $Offset_V+$ButtonHeight; *) - - //________________________________________ - : ($HorizontalAlign=On the right:K39:3) - - OBJECT MOVE:C664(*; $PtrArrayObjectNames->{$i}; $HorizontalRef-$_btnWidth{$i}; $Offset_V; $HorizontalRef; $Offset_V+$ButtonHeight; *) - - //________________________________________ - End case - - $Offset_V:=$Offset_V+$ButtonHeight+$ButtonSpace - - End for -End if \ No newline at end of file diff --git a/Project/Sources/Methods/UI_ApplySkin.4dm b/Project/Sources/Methods/UI_ApplySkin.4dm index 24ffa9b4..0a14d639 100644 --- a/Project/Sources/Methods/UI_ApplySkin.4dm +++ b/Project/Sources/Methods/UI_ApplySkin.4dm @@ -1,21 +1,10 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($0) - -C_BOOLEAN:C305($skinApplied) - -C_REAL:C285($H) -C_REAL:C285($S) -C_REAL:C285($L) - -C_LONGINT:C283($color; $fontColor; $separatorColor; $backgroundColor; $separatorFontColor; $iconBackground; $iconBorder) -C_LONGINT:C283($fontSize) - -C_TEXT:C284($font) -C_TEXT:C284($skinName) -C_TEXT:C284($name) - -C_OBJECT:C1216($skin) +#DECLARE()->$skinApplied : Boolean +var $color; $fontColor; $fontSize; $separatorColor; $backgroundColor; $separatorFontColor; $iconBackground; $iconBorder : Integer +var $H; $S; $L : Real +var $font; $skinName; $name : Text +var $skin : Object // Default values based on app // CF Toolbar constructor @@ -185,11 +174,8 @@ Else // side bar mode End if - - $skinApplied:=True:C214 -$0:=$skinApplied diff --git a/Project/Sources/Methods/UI_PaletteAlignments.4dm b/Project/Sources/Methods/UI_PaletteAlignments.4dm index f986e64b..5d0014b0 100644 --- a/Project/Sources/Methods/UI_PaletteAlignments.4dm +++ b/Project/Sources/Methods/UI_PaletteAlignments.4dm @@ -1,9 +1,9 @@ //%attributes = {"invisible":true} //ACI0098389 (new item added) -C_POINTER:C301($ptrTextLineHeightUnit) -C_TEXT:C284($format) -C_LONGINT:C283($typeSelection) +var $ptrTextLineHeightUnit : Pointer +var $format : Text +var $typeSelection : Integer If (UI_isProtected(False:C215)) // false means don't take focus into account diff --git a/Project/Sources/Methods/UI_PaletteBookMarks.4dm b/Project/Sources/Methods/UI_PaletteBookMarks.4dm index fae683da..5ece8268 100644 --- a/Project/Sources/Methods/UI_PaletteBookMarks.4dm +++ b/Project/Sources/Methods/UI_PaletteBookMarks.4dm @@ -1,8 +1,7 @@ //%attributes = {"invisible":true} -C_POINTER:C301($ptr) -C_LONGINT:C283($p) -C_TEXT:C284($tip) -C_LONGINT:C283($typeSelection) +var $ptr : Pointer +var $p; $typeSelection : Integer +var $tip : Text If (UI_isProtected(False:C215)) // false means don't take focus into account @@ -31,11 +30,11 @@ Else $ptr:=OBJECT Get pointer:C1124(Object named:K67:5; "lb_bookmarkNames") - $tip:=Get localized string:C991("tipDeleteBookmark") + $tip:=Localized string:C991("tipDeleteBookmark") $tip:=Replace string:C233($tip; "[1]"; $ptr->{$p}) // $bookmarkName might be "" OBJECT SET HELP TIP:C1181(*; "btnRemove"; $tip) - $tip:=Get localized string:C991("tipRedefineBookmark") + $tip:=Localized string:C991("tipRedefineBookmark") $tip:=Replace string:C233($tip; "[1]"; $ptr->{$p}) // $bookmarkName might be "" OBJECT SET HELP TIP:C1181(*; "btnReload"; $tip) diff --git a/Project/Sources/Methods/UI_PaletteFonts.4dm b/Project/Sources/Methods/UI_PaletteFonts.4dm index 719408e1..f5115ccb 100644 --- a/Project/Sources/Methods/UI_PaletteFonts.4dm +++ b/Project/Sources/Methods/UI_PaletteFonts.4dm @@ -1,5 +1,5 @@ //%attributes = {"invisible":true} -C_LONGINT:C283($typeSelection) +var $typeSelection : Integer If (UI_isProtected(False:C215)) // false means don't take focus into account diff --git a/Project/Sources/Methods/UI_PaletteImage.4dm b/Project/Sources/Methods/UI_PaletteImage.4dm index 040cc40f..f9a36a98 100644 --- a/Project/Sources/Methods/UI_PaletteImage.4dm +++ b/Project/Sources/Methods/UI_PaletteImage.4dm @@ -1,8 +1,9 @@ //%attributes = {"invisible":true} #DECLARE($focus : Boolean) // toolbar = true, sidebar = false -C_OBJECT:C1216($range) -C_COLLECTION:C1488($elements) +var $range; $form : Object +var $elements : Collection + If (UI_isProtected($focus)) // false means do NOT take focus into account @@ -14,7 +15,6 @@ Else OBJECT SET ENABLED:C1123(*; "@"; True:C214) // RL 08/11/2022 OBJECT SET ENTERABLE:C238(*; "@"; True:C214) // RL 08/11/2022 - C_OBJECT:C1216($form) $range:=Form:C1466.selection @@ -39,10 +39,8 @@ Else OBJECT SET ENABLED:C1123(*; "btn_PictInfo@"; False:C215) End if - TB_setAutomaticActions("PicturesAndTextboxes") - End if diff --git a/Project/Sources/Methods/UI_PaletteImportExport.4dm b/Project/Sources/Methods/UI_PaletteImportExport.4dm index 6bceb03c..7cc4225e 100644 --- a/Project/Sources/Methods/UI_PaletteImportExport.4dm +++ b/Project/Sources/Methods/UI_PaletteImportExport.4dm @@ -1,6 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($document) -C_BOOLEAN:C305($docProtected) +var $document : Object +var $docProtected : Boolean If (UI_isProtected(True:C214)) // // ACI0103075 //true means take focus into account @@ -17,7 +17,7 @@ Else $document:=Form:C1466.selection.owner - WP GET ATTRIBUTES:C1345($document; wk protection enabled:K81:307; $docProtected) + WP Get attributes:C1345($document; wk protection enabled:K81:307; $docProtected) If ($docProtected) diff --git a/Project/Sources/Methods/UI_PaletteSizes.4dm b/Project/Sources/Methods/UI_PaletteSizes.4dm index 24db04ed..705c7ebc 100644 --- a/Project/Sources/Methods/UI_PaletteSizes.4dm +++ b/Project/Sources/Methods/UI_PaletteSizes.4dm @@ -1,15 +1,11 @@ //%attributes = {"invisible":true} +var $numFormat; $unitName : Text +var $typeSelection : Integer -C_TEXT:C284($numFormat) //• -C_TEXT:C284($unitName) //• - - //UI_ApplySkin -C_LONGINT:C283($typeSelection) - -If (UI_isProtected (False:C215)) // false means don't take focus into account +If (UI_isProtected(False:C215)) // false means don't take focus into account - OBJECT SET ENABLED:C1123(*;"@";False:C215) - OBJECT SET ENTERABLE:C238(*;"@";False:C215) + OBJECT SET ENABLED:C1123(*; "@"; False:C215) + OBJECT SET ENTERABLE:C238(*; "@"; False:C215) Else @@ -18,23 +14,23 @@ Else Case of : ($typeSelection=2) // static picture - OBJECT SET ENABLED:C1123(*;"@";False:C215) - //OBJECT SET ENTERABLE(*;"@";False) + OBJECT SET ENABLED:C1123(*; "@"; False:C215) + //OBJECT SET ENTERABLE(*;"@";False) - OBJECT SET ENABLED:C1123(*;"UserUnitNames";True:C214) // only unit is available + OBJECT SET ENABLED:C1123(*; "UserUnitNames"; True:C214) // only unit is available : ($typeSelection=0) - OBJECT SET ENABLED:C1123(*;"@";True:C214) - //OBJECT SET ENTERABLE(*;"@";True) + OBJECT SET ENABLED:C1123(*; "@"; True:C214) + //OBJECT SET ENTERABLE(*;"@";True) $unitName:=unitName $numFormat:=numFormat $numFormat:=$numFormat+" "+$unitName+";-;auto" - OBJECT SET FORMAT:C236(*;"paragraph@";$numFormat) - OBJECT SET FORMAT:C236(*;"picture@";$numFormat) + OBJECT SET FORMAT:C236(*; "paragraph@"; $numFormat) + OBJECT SET FORMAT:C236(*; "picture@"; $numFormat) End case diff --git a/Project/Sources/Methods/UI_PaletteStylesheets.4dm b/Project/Sources/Methods/UI_PaletteStylesheets.4dm index 02a82c50..112edbd1 100644 --- a/Project/Sources/Methods/UI_PaletteStylesheets.4dm +++ b/Project/Sources/Methods/UI_PaletteStylesheets.4dm @@ -1,33 +1,33 @@ //%attributes = {"invisible":true} -C_POINTER:C301($ptrListbox;$ptrStylesheetNames) -C_LONGINT:C283($p) -C_TEXT:C284($name) +var $ptrListbox; $ptrStylesheetNames : Pointer +var $p : Integer +var $name : Text -ARRAY LONGINT:C221($_events;0) -APPEND TO ARRAY:C911($_events;On Clicked:K2:4) +ARRAY LONGINT:C221($_events; 0) +APPEND TO ARRAY:C911($_events; On Clicked:K2:4) -If (UI_isProtected (False:C215)) // false means don't take focus into account +If (UI_isProtected(False:C215)) // false means don't take focus into account - OBJECT SET ENABLED:C1123(*;"@";False:C215) - OBJECT SET ENTERABLE:C238(*;"@";False:C215) - LISTBOX SET PROPERTY:C1440(*;"LB_StyleSheets";lk selection mode:K53:35;lk none:K53:57) - LISTBOX SELECT ROW:C912(*;"LB_StyleSheets";0;lk remove from selection:K53:3) - OBJECT SET EVENTS:C1239(*;"LB_StyleSheets";$_events;Disable events others unchanged:K42:39) + OBJECT SET ENABLED:C1123(*; "@"; False:C215) + OBJECT SET ENTERABLE:C238(*; "@"; False:C215) + LISTBOX SET PROPERTY:C1440(*; "LB_StyleSheets"; lk selection mode:K53:35; lk none:K53:57) + LISTBOX SELECT ROW:C912(*; "LB_StyleSheets"; 0; lk remove from selection:K53:3) + OBJECT SET EVENTS:C1239(*; "LB_StyleSheets"; $_events; Disable events others unchanged:K42:39) Else - LISTBOX SET PROPERTY:C1440(*;"LB_StyleSheets";lk selection mode:K53:35;lk single:K53:58) - OBJECT SET EVENTS:C1239(*;"LB_StyleSheets";$_events;Enable events others unchanged:K42:38) + LISTBOX SET PROPERTY:C1440(*; "LB_StyleSheets"; lk selection mode:K53:35; lk single:K53:58) + OBJECT SET EVENTS:C1239(*; "LB_StyleSheets"; $_events; Enable events others unchanged:K42:38) If (Form:C1466.selection.type=2) - OBJECT SET ENABLED:C1123(*;"@";False:C215) + OBJECT SET ENABLED:C1123(*; "@"; False:C215) Else - OBJECT SET ENABLED:C1123(*;"@";True:C214) + OBJECT SET ENABLED:C1123(*; "@"; True:C214) - $ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5;"LB_StyleSheets") - $ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") + $ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_StyleSheets") + $ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") - $p:=Find in array:C230($ptrListbox->;True:C214) + $p:=Find in array:C230($ptrListbox->; True:C214) If ($p>0) $name:=$ptrStylesheetNames->{$p} @@ -36,16 +36,16 @@ Else End if If ($name="normal") | ($name="") - OBJECT SET ENABLED:C1123(*;"btnDelete";False:C215) + OBJECT SET ENABLED:C1123(*; "btnDelete"; False:C215) Else - OBJECT SET ENABLED:C1123(*;"btnDelete";True:C214) + OBJECT SET ENABLED:C1123(*; "btnDelete"; True:C214) End if If ($name="") - OBJECT SET ENABLED:C1123(*;"btnEdit";False:C215) + OBJECT SET ENABLED:C1123(*; "btnEdit"; False:C215) Else - OBJECT SET ENABLED:C1123(*;"btnEdit";True:C214) + OBJECT SET ENABLED:C1123(*; "btnEdit"; True:C214) End if End if diff --git a/Project/Sources/Methods/UI_PaletteTabulations.4dm b/Project/Sources/Methods/UI_PaletteTabulations.4dm index 4adbdae7..418db457 100644 --- a/Project/Sources/Methods/UI_PaletteTabulations.4dm +++ b/Project/Sources/Methods/UI_PaletteTabulations.4dm @@ -1,15 +1,11 @@ //%attributes = {"invisible":true} -C_TEXT:C284($numFormat) //• -C_TEXT:C284($unitName) //• +var $numFormat; $unitName : Text +var $offset; $typeSelection : Integer -C_LONGINT:C283($offset) -C_LONGINT:C283($typeSelection) - - -If (UI_isProtected (False:C215)) // false means don't take focus into account +If (UI_isProtected(False:C215)) // false means don't take focus into account - OBJECT SET ENABLED:C1123(*;"@";False:C215) - OBJECT SET ENTERABLE:C238(*;"@";False:C215) + OBJECT SET ENABLED:C1123(*; "@"; False:C215) + OBJECT SET ENTERABLE:C238(*; "@"; False:C215) Else @@ -18,52 +14,52 @@ Else Case of : ($typeSelection=2) // static picture - OBJECT SET ENABLED:C1123(*;"@";False:C215) - OBJECT SET ENTERABLE:C238(*;"@";False:C215) + OBJECT SET ENABLED:C1123(*; "@"; False:C215) + OBJECT SET ENTERABLE:C238(*; "@"; False:C215) : ($typeSelection=0) - OBJECT SET ENABLED:C1123(*;"@";True:C214) - OBJECT SET ENTERABLE:C238(*;"@";True:C214) + OBJECT SET ENABLED:C1123(*; "@"; True:C214) + OBJECT SET ENTERABLE:C238(*; "@"; True:C214) - $offset:=(OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))-> + $offset:=(OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentInput"))-> If ($offset<=0) - OBJECT SET ENTERABLE:C238(*;"tabIndentInput";False:C215) - OBJECT SET ENTERABLE:C238(*;"tabDefaultLeading";False:C215) - OBJECT SET ENABLED:C1123(*;"bTabType@";False:C215) - OBJECT SET ENABLED:C1123(*;"tabIndentRuler";False:C215) + OBJECT SET ENTERABLE:C238(*; "tabIndentInput"; False:C215) + OBJECT SET ENTERABLE:C238(*; "tabDefaultLeading"; False:C215) + OBJECT SET ENABLED:C1123(*; "bTabType@"; False:C215) + OBJECT SET ENABLED:C1123(*; "tabIndentRuler"; False:C215) End if $unitName:=unitName $numFormat:=numFormat - OBJECT SET FORMAT:C236(*;"tabIndentInput";$numFormat+" "+$unitName) - OBJECT SET FORMAT:C236(*;"lb_offsets";$numFormat+" "+$unitName) + OBJECT SET FORMAT:C236(*; "tabIndentInput"; $numFormat+" "+$unitName) + OBJECT SET FORMAT:C236(*; "lb_offsets"; $numFormat+" "+$unitName) - //$ptr:=OBJECT Get pointer(Object named;"LB_Tabs") - //$p:=Find in array($ptr->;True) + //$ptr:=OBJECT Get pointer(Object named;"LB_Tabs") + //$p:=Find in array($ptr->;True) - //If ($p>0) - //OBJECT SET ENABLED(*;"btnRemove";True) - //Else - //OBJECT SET ENABLED(*;"btnRemove";False) - //End if + //If ($p>0) + //OBJECT SET ENABLED(*;"btnRemove";True) + //Else + //OBJECT SET ENABLED(*;"btnRemove";False) + //End if If (tabsSelectedRow>0) - OBJECT SET ENABLED:C1123(*;"btnRemove";True:C214) + OBJECT SET ENABLED:C1123(*; "btnRemove"; True:C214) Else - OBJECT SET ENABLED:C1123(*;"btnRemove";False:C215) + OBJECT SET ENABLED:C1123(*; "btnRemove"; False:C215) End if If (Not:C34(Undefined:C82(oSettings1))) If (Not:C34(OB Is empty:C1297(oSettings1))) - OBJECT SET ENABLED:C1123(*;"btnPaste";True:C214) + OBJECT SET ENABLED:C1123(*; "btnPaste"; True:C214) Else - OBJECT SET ENABLED:C1123(*;"btnPaste";False:C215) + OBJECT SET ENABLED:C1123(*; "btnPaste"; False:C215) End if Else - OBJECT SET ENABLED:C1123(*;"btnPaste";False:C215) + OBJECT SET ENABLED:C1123(*; "btnPaste"; False:C215) End if End case diff --git a/Project/Sources/Methods/UI_PictureSettings.4dm b/Project/Sources/Methods/UI_PictureSettings.4dm index ff8e7c8a..d79fd4b2 100644 --- a/Project/Sources/Methods/UI_PictureSettings.4dm +++ b/Project/Sources/Methods/UI_PictureSettings.4dm @@ -1,13 +1,7 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($GotoPage2) - -C_LONGINT:C283($p) -C_LONGINT:C283($x1; $y1; $x2; $y2; $memoX; $memoY) -C_LONGINT:C283($width; $height) - -C_TEXT:C284($Unit; $format; $format1; $format2) -C_TEXT:C284($find; $replace) - +var $GotoPage2 : Boolean +var $p; $x1; $y1; $x2; $y2; $memoX; $memoY; $width; $height : Integer +var $Unit; $format; $format1; $format2; $find; $replace : Text If (Form event code:C388=On Load:K2:1) If (FORM Get color scheme:C1761="dark") @@ -28,7 +22,7 @@ If (Form event code:C388=On Load:K2:1) End if End if -WP GET ATTRIBUTES:C1345(Form:C1466.picture.owner; wk layout unit:K81:78; $Unit) +WP Get attributes:C1345(Form:C1466.picture.owner; wk layout unit:K81:78; $Unit) Case of : ($Unit="mm") diff --git a/Project/Sources/Methods/UI_Selector.4dm b/Project/Sources/Methods/UI_Selector.4dm index 0c065f0f..f90dd971 100644 --- a/Project/Sources/Methods/UI_Selector.4dm +++ b/Project/Sources/Methods/UI_Selector.4dm @@ -1,12 +1,10 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1; $btnName) -C_LONGINT:C283($id; $p) -C_TEXT:C284($subform) -C_TEXT:C284($btn) +#DECLARE($btnName : Text) -If (Count parameters:C259=1) - $btnName:=$1 -Else +var $id; $p : Integer +var $subform; $btn : Text + +If (Count parameters:C259<1) $btnName:=OBJECT Get name:C1087(Object current:K67:2) // physical button name ("btn_Home") End if @@ -15,9 +13,6 @@ If ($p>0) $btnName:=Substring:C12($btnName; $p+1) // logical button name ("Home") End if - - - $id:=oForm.SidebarTabs.allButtonNames.indexOf($btnName) //ACI0101694 If ($id>=0) diff --git a/Project/Sources/Methods/UI_Tables.4dm b/Project/Sources/Methods/UI_Tables.4dm index 8ecfd277..113c95ba 100644 --- a/Project/Sources/Methods/UI_Tables.4dm +++ b/Project/Sources/Methods/UI_Tables.4dm @@ -1,11 +1,10 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1; $widgetType) +#DECLARE($widgetType : Text) -C_OBJECT:C1216($rows; $columns) -C_BOOLEAN:C305($result) -C_TEXT:C284($title) +var $rows; $columns : Object +var $result : Boolean +var $title : Text -$widgetType:=$1 If (UI_isProtected) @@ -44,9 +43,9 @@ Else //wk first row + wk row count If ($rows[wk row count:K81:197]<=1) - $title:=Get localized string:C991("DeleteRow") + $title:=Localized string:C991("DeleteRow") Else - $title:=Get localized string:C991("DeleteRows") + $title:=Localized string:C991("DeleteRows") $title:=Replace string:C233($title; ""; String:C10($rows[wk row count:K81:197])) End if If ($widgetType="sidebar") @@ -57,9 +56,9 @@ Else Else If ($widgetType="sidebar") - OBJECT SET TITLE:C194(*; "btnDeleteRows"; Get localized string:C991("DeleteRow")) + OBJECT SET TITLE:C194(*; "btnDeleteRows"; Localized string:C991("DeleteRow")) Else - OBJECT SET HELP TIP:C1181(*; "btnDeleteRows"; Get localized string:C991("DeleteRow")) + OBJECT SET HELP TIP:C1181(*; "btnDeleteRows"; Localized string:C991("DeleteRow")) End if //OBJECT SET ENABLED(*;"btnDeleteRows";False) @@ -76,9 +75,9 @@ Else //wk first column + wk column count If ($columns[wk column count:K81:199]<=1) - $title:=Get localized string:C991("DeleteColumn") + $title:=Localized string:C991("DeleteColumn") Else - $title:=Get localized string:C991("DeleteColumns") + $title:=Localized string:C991("DeleteColumns") $title:=Replace string:C233($title; ""; String:C10($columns[wk column count:K81:199])) End if If ($widgetType="sidebar") @@ -89,9 +88,9 @@ Else Else If ($widgetType="sidebar") - OBJECT SET TITLE:C194(*; "btnDeleteColumns"; Get localized string:C991("DeleteColumn")) + OBJECT SET TITLE:C194(*; "btnDeleteColumns"; Localized string:C991("DeleteColumn")) Else - OBJECT SET HELP TIP:C1181(*; "btnDeleteColumns"; Get localized string:C991("DeleteColumn")) + OBJECT SET HELP TIP:C1181(*; "btnDeleteColumns"; Localized string:C991("DeleteColumn")) End if End if diff --git a/Project/Sources/Methods/UI_Toolbar.4dm b/Project/Sources/Methods/UI_Toolbar.4dm index f930b81b..0ffb5a39 100644 --- a/Project/Sources/Methods/UI_Toolbar.4dm +++ b/Project/Sources/Methods/UI_Toolbar.4dm @@ -1,7 +1,7 @@ //%attributes = {"invisible":true} -C_LONGINT:C283($page) -C_BOOLEAN:C305($protected) +var $page : Integer +var $protected : Boolean OBJECT SET ENABLED:C1123(*; "@"; False:C215) //ACI0100560 OBJECT SET ENTERABLE:C238(*; "@"; False:C215) //ACI0100560 diff --git a/Project/Sources/Methods/UI_ToolbarStylesheets.4dm b/Project/Sources/Methods/UI_ToolbarStylesheets.4dm index fb596dce..240ff868 100644 --- a/Project/Sources/Methods/UI_ToolbarStylesheets.4dm +++ b/Project/Sources/Methods/UI_ToolbarStylesheets.4dm @@ -1,19 +1,7 @@ //%attributes = {"invisible":true} -C_POINTER:C301($ptrStylesheetNames) -C_LONGINT:C283($p) -C_TEXT:C284($name) - - - -//If (UI_isProtected) - -//OBJECT SET ENABLED(*; "@"; False) -//OBJECT SET ENTERABLE(*; "@"; False) - -//Else - - -//OBJECT SET ENABLED(*; "decor@"; False) +var $ptrStylesheetNames : Pointer +var $p : Integer +var $name : Text If (Form:C1466.selection.type=wk type image:K81:192) @@ -39,12 +27,4 @@ Else OBJECT SET ENABLED:C1123(*; "Stylesheet_btnDelete"; True:C214) End if - //If ($name="") - //OBJECT SET ENABLED(*;"Stylesheet_btnEdit";False) - //Else - //OBJECT SET ENABLED(*;"Stylesheet_btnEdit";True) - //End if - End if - -//End if diff --git a/Project/Sources/Methods/UI_TranslateConstant.4dm b/Project/Sources/Methods/UI_TranslateConstant.4dm index a3dd039b..26bbdc4a 100644 --- a/Project/Sources/Methods/UI_TranslateConstant.4dm +++ b/Project/Sources/Methods/UI_TranslateConstant.4dm @@ -1,79 +1,74 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1;$attribute) -C_LONGINT:C283($2;$value) -C_TEXT:C284($0) - -$attribute:=$1 -$value:=$2 +#DECLARE($attribute : Text; $value : Integer)->$result : Text Case of : ($Attribute=wk text underline style:K81:73) | ($Attribute=wk text linethrough style:K81:75) Case of : ($value=wk none:K81:91) - $0:=Get localized string:C991("None") + $result:=Localized string:C991("None") : ($value=wk solid:K81:115) - $0:=Get localized string:C991("Solid") + $result:=Localized string:C991("Solid") : ($value=wk dotted:K81:116) - $0:=Get localized string:C991("Dotted") + $result:=Localized string:C991("Dotted") : ($value=wk dashed:K81:117) - $0:=Get localized string:C991("Dashed") + $result:=Localized string:C991("Dashed") : ($value=wk double:K81:118) - $0:=Get localized string:C991("Double") + $result:=Localized string:C991("Double") : ($value=wk semi transparent:K81:119) - $0:=Get localized string:C991("Semi") + $result:=Localized string:C991("Semi") : ($value=wk word:K81:120) - $0:=Get localized string:C991("Word") + $result:=Localized string:C991("Word") End case : ($attribute=wk text transform:K81:70) Case of : ($value=wk none:K81:91) - $0:=Get localized string:C991("TextTransformNone") + $result:=Localized string:C991("TextTransformNone") : ($value=wk capitalize:K81:163) - $0:=Get localized string:C991("Capitalize") + $result:=Localized string:C991("Capitalize") : ($value=wk lowercase:K81:121) - $0:=Get localized string:C991("Lowercase") + $result:=Localized string:C991("Lowercase") : ($value=wk uppercase:K81:122) - $0:=Get localized string:C991("Uppercase") + $result:=Localized string:C991("Uppercase") : ($value=wk small uppercase:K81:123) - $0:=Get localized string:C991("SmallUppercase") + $result:=Localized string:C991("SmallUppercase") End case : ($attribute=wk text align:K81:49) Case of : ($value=wk default:K81:160) - $0:=Get localized string:C991("ssAlignDefault") + $result:=Localized string:C991("ssAlignDefault") : ($value=wk left:K81:95) - $0:=Get localized string:C991("ssAlignLeft") + $result:=Localized string:C991("ssAlignLeft") : ($value=wk center:K81:99) - $0:=Get localized string:C991("ssAlignCenter") + $result:=Localized string:C991("ssAlignCenter") : ($value=wk right:K81:96) - $0:=Get localized string:C991("ssAlignRight") + $result:=Localized string:C991("ssAlignRight") : ($value=wk justify:K81:100) - $0:=Get localized string:C991("ssAlignJustified") + $result:=Localized string:C991("ssAlignJustified") End case : ($attribute=wk vertical align:K81:9) Case of : ($value=wk default:K81:160) - $0:=Get localized string:C991("ssAlignDefault") + $result:=Localized string:C991("ssAlignDefault") : ($value=wk baseline:K81:102) - $0:=Get localized string:C991("ssAlignBase") + $result:=Localized string:C991("ssAlignBase") : ($value=wk top:K81:97) - $0:=Get localized string:C991("ssAlignTop") + $result:=Localized string:C991("ssAlignTop") : ($value=wk middle:K81:101) - $0:=Get localized string:C991("ssAlignMiddle") + $result:=Localized string:C991("ssAlignMiddle") : ($value=wk bottom:K81:98) - $0:=Get localized string:C991("ssAlignBottom") + $result:=Localized string:C991("ssAlignBottom") : ($value=wk superscript:K81:103) - $0:=Get localized string:C991("ssAlignSuperscript") + $result:=Localized string:C991("ssAlignSuperscript") : ($value=wk subscript:K81:104) - $0:=Get localized string:C991("ssAlignSubscript") + $result:=Localized string:C991("ssAlignSubscript") Else - $0:="-" + $result:="-" End case @@ -81,63 +76,63 @@ Case of Case of : ($value=wk none:K81:91) - $0:=Get localized string:C991("None") + $result:=Localized string:C991("None") : ($value=wk hidden:K81:128) - $0:=Get localized string:C991("Hidden") + $result:=Localized string:C991("Hidden") : ($value=wk solid:K81:115) - $0:=Get localized string:C991("Solid") + $result:=Localized string:C991("Solid") : ($value=wk dotted:K81:116) - $0:=Get localized string:C991("Dotted") + $result:=Localized string:C991("Dotted") : ($value=wk dashed:K81:117) - $0:=Get localized string:C991("Dashed") + $result:=Localized string:C991("Dashed") : ($value=wk double:K81:118) - $0:=Get localized string:C991("Double") + $result:=Localized string:C991("Double") : ($value=wk groove:K81:129) - $0:=Get localized string:C991("Groove") + $result:=Localized string:C991("Groove") : ($value=wk ridge:K81:130) - $0:=Get localized string:C991("Ridge") + $result:=Localized string:C991("Ridge") : ($value=wk inset:K81:131) - $0:=Get localized string:C991("Inset") + $result:=Localized string:C991("Inset") : ($value=wk outset:K81:132) - $0:=Get localized string:C991("Outset") + $result:=Localized string:C991("Outset") Else - $0:="" + $result:="" End case : ($attribute=wk list style type:K81:55) Case of : ($value=wk none:K81:91) - $0:=Get localized string:C991("None") + $result:=Localized string:C991("None") : ($value=wk disc:K81:140) - $0:=Get localized string:C991("Disc") + $result:=Localized string:C991("Disc") : ($value=wk circle:K81:141) - $0:=Get localized string:C991("Circle") + $result:=Localized string:C991("Circle") : ($value=wk square:K81:142) - $0:=Get localized string:C991("Square") + $result:=Localized string:C991("Square") : ($value=wk hollow square:K81:155) - $0:=Get localized string:C991("HollowSquare") + $result:=Localized string:C991("HollowSquare") : ($value=wk diamond:K81:156) - $0:=Get localized string:C991("Diamond") + $result:=Localized string:C991("Diamond") : ($value=wk club:K81:157) - $0:=Get localized string:C991("Club") + $result:=Localized string:C991("Club") : ($value=wk decimal:K81:126) - $0:=Get localized string:C991("123") + $result:=Localized string:C991("123") : ($value=wk decimal leading zero:K81:143) - $0:=Get localized string:C991("010203") + $result:=Localized string:C991("010203") : ($value=wk lower latin:K81:144) - $0:=Get localized string:C991("abcLow") + $result:=Localized string:C991("abcLow") : ($value=wk upper latin:K81:146) - $0:=Get localized string:C991("abcCAP") + $result:=Localized string:C991("abcCAP") : ($value=wk upper roman:K81:147) - $0:=Get localized string:C991("Roman") + $result:=Localized string:C991("Roman") Else - $0:="" + $result:="" End case Else - $0:="" + $result:="" End case diff --git a/Project/Sources/Methods/UI_isProtected.4dm b/Project/Sources/Methods/UI_isProtected.4dm index dd2a8a76..ad677d7f 100644 --- a/Project/Sources/Methods/UI_isProtected.4dm +++ b/Project/Sources/Methods/UI_isProtected.4dm @@ -1,15 +1,13 @@ //%attributes = {"invisible":true} - // This method returns TRUE if the area is NOT enterable -C_BOOLEAN:C305($1;$manageFocus) -C_BOOLEAN:C305($0) -C_BOOLEAN:C305($protected) -C_LONGINT:C283($protectedDoc;$protectedSel) +// This method returns TRUE if the area is NOT enterable + +#DECLARE($manageFocus : Boolean)->$protected : Boolean + +var $protectedDoc; $protectedSel : Integer $protected:=False:C215 // NOT protected by default -If (Count parameters:C259>=1) - $manageFocus:=$1 -Else +If (Count parameters:C259<1) $manageFocus:=True:C214 // area MUST have to focus otherwise the widget is fully disabled End if @@ -25,27 +23,26 @@ If (Not:C34($protected)) // still not protected ? If (Not:C34($protected)) // still not protected ? - WP GET ATTRIBUTES:C1345(Form:C1466.selection.owner;wk protection enabled:K81:307;$protectedDoc) // 1 protection enabled, 0 protection disabled - WP GET ATTRIBUTES:C1345(Form:C1466.selection;wk protected:K81:306;$protectedSel) // 1 protected, 0 not protected, wk mixed= semi protected + WP Get attributes:C1345(Form:C1466.selection.owner; wk protection enabled:K81:307; $protectedDoc) // 1 protection enabled, 0 protection disabled + WP Get attributes:C1345(Form:C1466.selection; wk protected:K81:306; $protectedSel) // 1 protected, 0 not protected, wk mixed= semi protected $protected:=(($protectedDoc#0) & ($protectedSel#0)) - //If (Not($protected)) // still not protected ? + //If (Not($protected)) // still not protected ? - //$actionInfo:=Get action info(wk border style) // works for text as for pictures ! + //$actionInfo:=Get action info(wk border style) // works for text as for pictures ! - //If (OB Is defined($actionInfo;"enabled")) //action is defined in the process - //$protected:=Not($actionInfo.enabled) - //End if + //If (OB Is defined($actionInfo;"enabled")) //action is defined in the process + //$protected:=Not($actionInfo.enabled) + //End if - // //If (Not($protected)) // still not protected ? - // //If (Not($protected)) // still not protected ? - // //End if - // //End if + // //If (Not($protected)) // still not protected ? + // //If (Not($protected)) // still not protected ? + // //End if + // //End if - //End if + //End if End if End if -$0:=$protected diff --git a/Project/Sources/Methods/WP RemoveDocumentIndex.4dm b/Project/Sources/Methods/WP RemoveDocumentIndex.4dm index 77fb4dbc..948619a9 100644 --- a/Project/Sources/Methods/WP RemoveDocumentIndex.4dm +++ b/Project/Sources/Methods/WP RemoveDocumentIndex.4dm @@ -1,7 +1,6 @@ //%attributes = {"invisible":true} -var $1; $document : Object +#DECLARE($document : Object) -$document:=$1 If (Not:C34(Undefined:C82($document._keywords))) OB REMOVE:C1226($document; "_keywords") End if diff --git a/Project/Sources/Methods/WP SetDocumentIndex.4dm b/Project/Sources/Methods/WP SetDocumentIndex.4dm index 35f06b32..d5723575 100644 --- a/Project/Sources/Methods/WP SetDocumentIndex.4dm +++ b/Project/Sources/Methods/WP SetDocumentIndex.4dm @@ -1,12 +1,13 @@ //%attributes = {"invisible":true} -var $1; $document; $header; $footer : Object +#DECLARE($document : Object) + +var $header; $footer : Object var $text : Text var $i; $sections : Integer var $words : Collection ARRAY TEXT:C222($_words; 0) -$document:=$1 $text:=WP Get text:C1575(WP Get body:C1516($document); wk expressions as space:K81:257) $sections:=WP Get sections:C1580($document).length diff --git a/Project/Sources/Methods/WP ShowTabPages.4dm b/Project/Sources/Methods/WP ShowTabPages.4dm index adb59be5..a3253a2b 100644 --- a/Project/Sources/Methods/WP ShowTabPages.4dm +++ b/Project/Sources/Methods/WP ShowTabPages.4dm @@ -1,10 +1,6 @@ //%attributes = {"shared":true,"invisible":true} -C_TEXT:C284($1;$subformName) -C_COLLECTION:C1488($2;$tabs) - +#DECLARE($subformName : Text; $tabs : Collection) If (Count parameters:C259>=2) - $subformName:=$1 - $tabs:=$2 - EXECUTE METHOD IN SUBFORM:C1085($subformName;"WP_ShowTabPages";*;$tabs) + EXECUTE METHOD IN SUBFORM:C1085($subformName; "WP_ShowTabPages"; *; $tabs) End if diff --git a/Project/Sources/Methods/WP SwitchToolbar.4dm b/Project/Sources/Methods/WP SwitchToolbar.4dm index b750025d..b177850f 100644 --- a/Project/Sources/Methods/WP SwitchToolbar.4dm +++ b/Project/Sources/Methods/WP SwitchToolbar.4dm @@ -1,17 +1,7 @@ //%attributes = {"shared":true,"invisible":true} - //ACI0099141 fixed 29/01/2019 by RL (WP SwitchToolbar intead of WP SwichToolbar, without "t") - -C_TEXT:C284($1;$2) - -C_TEXT:C284($subformName) -C_TEXT:C284($newfolderName) +//ACI0099141 fixed 29/01/2019 by RL (WP SwitchToolbar intead of WP SwichToolbar, without "t") +#DECLARE($subformName : Text; $newfolderName : Text) If (Count parameters:C259>=2) - - $subformName:=$1 - $newfolderName:=$2 - - EXECUTE METHOD IN SUBFORM:C1085($subformName;"WP_SwitchToolbar";*;$newfolderName) // same here (ACI0099141) - + EXECUTE METHOD IN SUBFORM:C1085($subformName; "WP_SwitchToolbar"; *; $newfolderName) // same here (ACI0099141) End if - diff --git a/Project/Sources/Methods/WP UpdateWidget.4dm b/Project/Sources/Methods/WP UpdateWidget.4dm index e7f8db26..749e361a 100644 --- a/Project/Sources/Methods/WP UpdateWidget.4dm +++ b/Project/Sources/Methods/WP UpdateWidget.4dm @@ -7,16 +7,12 @@ var $oWidget; $oArea : Variant var $typeWidget; $typeArea : Integer var $oWidgetUpdate : Object -C_BOOLEAN:C305($send) -//C_OBJECT($oWidget) // variable used manage to the 4D WritePro Widget -C_POINTER:C301($areaPtr) // Pointers on the area and widget -C_POINTER:C301($p) -//C_TEXT($areaName; $widgetName) // "4DWritePro area" and "4DWritePro widget" object names +var $send : Boolean +var $areaPtr; $p : Pointer // Pointers on the area and widget Case of : (Count parameters:C259=1) - //$widgetName:=$1 $p:=OBJECT Get pointer:C1124(Object named:K67:5; $widgetName) If (Not:C34(Is nil pointer:C315($p))) $p->:=$p-> @@ -24,9 +20,6 @@ Case of : (Count parameters:C259>=2) - //$widgetName:=$1 - //$areaName:=$2 - $p:=OBJECT Get pointer:C1124(Object named:K67:5; $widgetName) $oWidget:=OBJECT Get value:C1743($widgetName) diff --git a/Project/Sources/Methods/WP_BorderMenu.4dm b/Project/Sources/Methods/WP_BorderMenu.4dm index 4e2f2f1d..b035315a 100644 --- a/Project/Sources/Methods/WP_BorderMenu.4dm +++ b/Project/Sources/Methods/WP_BorderMenu.4dm @@ -1,22 +1,12 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1) -C_BOOLEAN:C305($2) - +#DECLARE($where : Text; $withMenu : Boolean) //C_LONGINT($menu) -C_TEXT:C284($applyTo) -C_TEXT:C284($select) -C_TEXT:C284($where) -C_TEXT:C284($menuRef) -C_BOOLEAN:C305($withMenu) - -$where:=$1 -$withMenu:=$2 +var $applyTo; $select; $menuRef : Text // read the "applyTo" $applyTo:=UI_GetApplyTo - If ($withMenu) $menuRef:=Create menu:C408 @@ -25,15 +15,15 @@ If ($withMenu) ////APPEND MENU ITEM($menuRef; ak standard action title) //SET MENU ITEM PROPERTY($menuRef; -1; Associated standard action name; $applyTo+"/borderStyle"+$where+"?value=solid") - APPEND MENU ITEM:C411($menuRef; Get localized string:C991("bordersStyle")) + APPEND MENU ITEM:C411($menuRef; Localized string:C991("bordersStyle")) //APPEND MENU ITEM($menuRef; ak standard action title) SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; $applyTo+"/borderStyle"+$where) - APPEND MENU ITEM:C411($menuRef; Get localized string:C991("bordersColor")) + APPEND MENU ITEM:C411($menuRef; Localized string:C991("bordersColor")) //APPEND MENU ITEM($menuRef; ak standard action title) SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; $applyTo+"/borderColor"+$where) - APPEND MENU ITEM:C411($menuRef; Get localized string:C991("borderWidth")) + APPEND MENU ITEM:C411($menuRef; Localized string:C991("borderWidth")) //APPEND MENU ITEM($menuRef; ak standard action title) SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; $applyTo+"/borderWidth"+$where) diff --git a/Project/Sources/Methods/WP_Convert.4dm b/Project/Sources/Methods/WP_Convert.4dm index fcdb4ead..a0b5ba5e 100644 --- a/Project/Sources/Methods/WP_Convert.4dm +++ b/Project/Sources/Methods/WP_Convert.4dm @@ -1,28 +1,17 @@ //%attributes = {"invisible":true} -C_REAL:C285($1) // value -C_TEXT:C284($2) // from -C_TEXT:C284($3) // to +#DECLARE($value : Real; $fromUnit : Text; $toUnit : Text)->$result : Real -C_REAL:C285($0) - -C_REAL:C285($value) -C_TEXT:C284($fromUnit) -C_TEXT:C284($toUnit) - -$value:=$1 -$fromUnit:=$2 -$toUnit:=$3 - -If ($toUnit#$fromUnit) & ($value#0) - - WP SET ATTRIBUTES:C1342(oTempArea; wk layout unit:K81:78; $fromUnit) - WP SET ATTRIBUTES:C1342(oTempArea; wk background width:K81:27; $value) //wk line height // - - WP SET ATTRIBUTES:C1342(oTempArea; wk layout unit:K81:78; $toUnit) - WP GET ATTRIBUTES:C1345(oTempArea; wk background width:K81:27; $value) //wk margin left // - +If ($toUnit#$fromUnit) + If ($value#0) + + WP SET ATTRIBUTES:C1342(oTempArea; wk layout unit:K81:78; $fromUnit) + WP SET ATTRIBUTES:C1342(oTempArea; wk background width:K81:27; $result) //wk line height // + + WP SET ATTRIBUTES:C1342(oTempArea; wk layout unit:K81:78; $toUnit) + WP Get attributes:C1345(oTempArea; wk background width:K81:27; $result) //wk margin left // + Else + $result:=0 + End if +Else + $result:=$value End if - -$0:=$value - - diff --git a/Project/Sources/Methods/WP_CopyPasteMenu.4dm b/Project/Sources/Methods/WP_CopyPasteMenu.4dm index f14d69fc..82fa562d 100644 --- a/Project/Sources/Methods/WP_CopyPasteMenu.4dm +++ b/Project/Sources/Methods/WP_CopyPasteMenu.4dm @@ -1,29 +1,17 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1) +#DECLARE($context : Text) -C_BOOLEAN:C305($hasPasteMenu1) -C_BOOLEAN:C305($hasPasteMenu2) -C_LONGINT:C283($i; $n; $type) +var $hasPasteMenu1; $hasPasteMenu2 : Boolean -C_TEXT:C284($menu) -C_TEXT:C284($Parameter) -C_TEXT:C284($textValue) -C_TEXT:C284($context) -C_TEXT:C284($unit) -C_TEXT:C284($attribute) +var $i; $n; $type : Integer +var $menu; $Parameter; $textValue; $unit; $attribute : Text +var $numValue : Real +var $oSettings; $oCurrent : Object +var $ptrPreviewCopy : Pointer -C_REAL:C285($numValue) +var oSettings1; oSettings2 : Object -C_OBJECT:C1216($oSettings) -C_OBJECT:C1216($oCurrent) - -C_OBJECT:C1216(oSettings1) -C_OBJECT:C1216(oSettings2) - -C_POINTER:C301($ptrPreviewCopy) - -$context:=$1 If (Not:C34(Undefined:C82(oSettings1))) If (Not:C34(OB Is empty:C1297(oSettings1))) @@ -60,60 +48,60 @@ $menu:=Create menu:C408 Case of : ($context="fontFamilly") - APPEND MENU ITEM:C411($menu; Get localized string:C991("CopyStyle")) + APPEND MENU ITEM:C411($menu; Localized string:C991("CopyStyle")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Copy1") If ($hasPasteMenu1) APPEND MENU ITEM:C411($menu; "(-") - APPEND MENU ITEM:C411($menu; Get localized string:C991("PasteStyle")) + APPEND MENU ITEM:C411($menu; Localized string:C991("PasteStyle")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Paste1") End if : ($context="AlignmentsAndMargins") - APPEND MENU ITEM:C411($menu; Get localized string:C991("CopyTextSettings")) + APPEND MENU ITEM:C411($menu; Localized string:C991("CopyTextSettings")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Copy1") - APPEND MENU ITEM:C411($menu; Get localized string:C991("CopyMargins")) + APPEND MENU ITEM:C411($menu; Localized string:C991("CopyMargins")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Copy2") If (($hasPasteMenu1) | ($hasPasteMenu2)) APPEND MENU ITEM:C411($menu; "(-") End if If ($hasPasteMenu1) - APPEND MENU ITEM:C411($menu; Get localized string:C991("PasteTextSettings")) + APPEND MENU ITEM:C411($menu; Localized string:C991("PasteTextSettings")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Paste1") End if If ($hasPasteMenu2) - APPEND MENU ITEM:C411($menu; Get localized string:C991("PasteMargins")) + APPEND MENU ITEM:C411($menu; Localized string:C991("PasteMargins")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Paste2") End if : ($context="Tabulations") - APPEND MENU ITEM:C411($menu; Get localized string:C991("CopyTabulation")) + APPEND MENU ITEM:C411($menu; Localized string:C991("CopyTabulation")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Copy1") If ($hasPasteMenu1) APPEND MENU ITEM:C411($menu; "(-") - APPEND MENU ITEM:C411($menu; Get localized string:C991("PasteTabulation")) + APPEND MENU ITEM:C411($menu; Localized string:C991("PasteTabulation")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Paste1") End if : ($context="Frame") - APPEND MENU ITEM:C411($menu; Get localized string:C991("CopyFrame")) + APPEND MENU ITEM:C411($menu; Localized string:C991("CopyFrame")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Copy1") If (($hasPasteMenu1) | ($hasPasteMenu2)) APPEND MENU ITEM:C411($menu; "(-") End if If ($hasPasteMenu1) - APPEND MENU ITEM:C411($menu; Get localized string:C991("PasteFrame")) + APPEND MENU ITEM:C411($menu; Localized string:C991("PasteFrame")) SET MENU ITEM PARAMETER:C1004($menu; -1; "Paste1") End if : ($context="Background") - APPEND MENU ITEM:C411($menu; Get localized string:C991("CopyBackground")) + APPEND MENU ITEM:C411($menu; Localized string:C991("CopyBackground")) SET MENU ITEM PARAMETER:C1004($menu; -1; "CopyBackground") // If ($hasPasteMenu1) @@ -121,7 +109,7 @@ Case of End if If ($hasPasteMenu1) - APPEND MENU ITEM:C411($menu; Get localized string:C991("PasteBackground")) + APPEND MENU ITEM:C411($menu; Localized string:C991("PasteBackground")) SET MENU ITEM PARAMETER:C1004($menu; -1; "PasteBackground") // End if @@ -165,7 +153,7 @@ Case of APPEND TO ARRAY:C911($_attributes; wk text shadow offset:K81:72) CLEAR VARIABLE:C89(oSettings1) - C_OBJECT:C1216(oSettings1) + oSettings1:=New object:C1471 $n:=Size of array:C274($_attributes) For ($i; 1; $n) @@ -173,17 +161,17 @@ Case of Case of : ($_attributes{$i}=wk font family:K81:65) | ($_attributes{$i}=wk font:K81:69) //2020/06/02 ACI0100924 - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $textValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $textValue) OB SET:C1220(oSettings1; $_attributes{$i}; $textValue) : ($_attributes{$i}=wk text shadow offset:K81:72) - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $_numValues1) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $_numValues1) OB SET ARRAY:C1227(oSettings1; $_attributes{$i}; $_numValues1) Else - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $numValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $numValue) If ($numValue#wk mixed:K81:89) OB SET:C1220(oSettings1; $_attributes{$i}; $numValue) End if @@ -207,7 +195,7 @@ Case of //End if CLEAR VARIABLE:C89(oSettings1) - C_OBJECT:C1216(oSettings1) + oSettings1:=New object:C1471 $n:=Size of array:C274($_attributes) For ($i; 1; $n) @@ -216,9 +204,9 @@ Case of //If ((OBJECT Get pointer(Object named; "TargetSelector3"))->#1) - WP GET ATTRIBUTES:C1345($oCurrent; wk layout unit:K81:78; $unit) // memo current unit + WP Get attributes:C1345($oCurrent; wk layout unit:K81:78; $unit) // memo current unit WP SET ATTRIBUTES:C1342($oCurrent; wk layout unit:K81:78; wk unit percent:K81:139) // tempo set to % - WP GET ATTRIBUTES:C1345($oCurrent; wk line height:K81:51; $numValue) // set the line height (in %) + WP Get attributes:C1345($oCurrent; wk line height:K81:51; $numValue) // set the line height (in %) WP SET ATTRIBUTES:C1342($oCurrent; wk layout unit:K81:78; $unit) // back to current unit //Else @@ -226,7 +214,7 @@ Case of //End if Else - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $numValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $numValue) End case @@ -244,10 +232,10 @@ Case of APPEND TO ARRAY:C911($_attributes; wk margin bottom:K81:14) CLEAR VARIABLE:C89(oSettings2) - C_OBJECT:C1216(oSettings2) + oSettings2:=New object:C1471 $n:=Size of array:C274($_attributes) For ($i; 1; $n) - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $numValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $numValue) If ($numValue#wk mixed:K81:89) OB SET:C1220(oSettings2; $_attributes{$i}; $numValue) End if @@ -296,7 +284,7 @@ Case of CLEAR VARIABLE:C89(oSettings1) $n:=Size of array:C274($_attributes) For ($i; 1; $n) - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $numValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $numValue) If ($numValue#wk mixed:K81:89) OB SET:C1220(oSettings1; $_attributes{$i}; $numValue) End if @@ -323,7 +311,7 @@ Case of $n:=Size of array:C274($_attributes) For ($i; 1; $n) - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $numValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $numValue) If ($numValue#wk mixed:K81:89) OB SET:C1220(oSettings1; $_attributes{$i}; $numValue) End if @@ -337,7 +325,7 @@ Case of $n:=Size of array:C274($_attributes) For ($i; 1; $n) - WP GET ATTRIBUTES:C1345($oCurrent; $_attributes{$i}; $textValue) + WP Get attributes:C1345($oCurrent; $_attributes{$i}; $textValue) If ($textValue#"") OB SET:C1220(oSettings1; $_attributes{$i}; $textValue) End if @@ -409,7 +397,7 @@ Case of : ($attribute=wk line height:K81:51) - WP GET ATTRIBUTES:C1345($oCurrent; wk layout unit:K81:78; $unit) + WP Get attributes:C1345($oCurrent; wk layout unit:K81:78; $unit) WP SET ATTRIBUTES:C1342($oCurrent; wk layout unit:K81:78; wk unit percent:K81:139) WP SET ATTRIBUTES:C1342($oCurrent; wk line height:K81:51; $numValue) WP SET ATTRIBUTES:C1342($oCurrent; wk layout unit:K81:78; $unit) diff --git a/Project/Sources/Methods/WP_FR_InitOptions.4dm b/Project/Sources/Methods/WP_FR_InitOptions.4dm index 1d4d2df5..02b5e938 100644 --- a/Project/Sources/Methods/WP_FR_InitOptions.4dm +++ b/Project/Sources/Methods/WP_FR_InitOptions.4dm @@ -1,12 +1,12 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1) // "toolbar", "sidebar" or "dialog" -C_BOOLEAN:C305($check) -C_TEXT:C284($title) +#DECLARE($location : Text) +var $check : Boolean +var $title : Text // init default values -If ($1="sideBar") | ($1="toolbar") +If ($location="sideBar") | ($location="toolbar") If (Undefined:C82(oForm.FR.caseSensitive)) // not inited yet @@ -36,12 +36,12 @@ End if // Interface setting (display or not keyboard based option) -If ($1="sideBar") | ($1="dialog") +If ($location="sideBar") | ($location="dialog") OBJECT SET VISIBLE:C603(*; "cbKeyboardBased"; False:C215) If (Not:C34(Undefined:C82(oForm.FR.keyboard))) - $title:=Get localized string:C991("KeyboardBased") + $title:=Localized string:C991("KeyboardBased") $title:=Replace string:C233($title; "<1>"; oForm.FR.keyboard) OBJECT SET TITLE:C194(*; "cbKeyboardBased"; $title) OBJECT SET VISIBLE:C603(*; "cbKeyboardBased"; True:C214) diff --git a/Project/Sources/Methods/WP_GetBackgroundColor.4dm b/Project/Sources/Methods/WP_GetBackgroundColor.4dm index d3fd0a8d..235fb72f 100644 --- a/Project/Sources/Methods/WP_GetBackgroundColor.4dm +++ b/Project/Sources/Methods/WP_GetBackgroundColor.4dm @@ -1,31 +1,27 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($oCurrent) +#DECLARE($oCurrent : Object) -C_LONGINT:C283($color) -C_LONGINT:C283($frameColor) - -$oCurrent:=$1 +var $color; $frameColor : Integer $frameColor:=0x00404040 If (Not:C34(OB Is empty:C1297($oCurrent))) - OBJECT SET RGB COLORS:C628(*;"backgroundColor";$frameColor;0x00FFFFFF) - OBJECT SET VISIBLE:C603(*;"InvisibleBackground";False:C215) - OBJECT SET VISIBLE:C603(*;"MultiBackgroundColor";False:C215) + OBJECT SET RGB COLORS:C628(*; "backgroundColor"; $frameColor; 0x00FFFFFF) + OBJECT SET VISIBLE:C603(*; "InvisibleBackground"; False:C215) + OBJECT SET VISIBLE:C603(*; "MultiBackgroundColor"; False:C215) - WP GET ATTRIBUTES:C1345($oCurrent;wk background color:K81:20;$color) + WP Get attributes:C1345($oCurrent; wk background color:K81:20; $color) Case of : ($color=wk transparent:K81:134) - OBJECT SET VISIBLE:C603(*;"InvisibleBackground";True:C214) + OBJECT SET VISIBLE:C603(*; "InvisibleBackground"; True:C214) : ($color=wk mixed:K81:89) - OBJECT SET VISIBLE:C603(*;"MultiBackgroundColor";True:C214) + OBJECT SET VISIBLE:C603(*; "MultiBackgroundColor"; True:C214) Else - OBJECT SET RGB COLORS:C628(*;"backgroundColor";$frameColor;$color) + OBJECT SET RGB COLORS:C628(*; "backgroundColor"; $frameColor; $color) End case End if diff --git a/Project/Sources/Methods/WP_GetBackgroundURL.4dm b/Project/Sources/Methods/WP_GetBackgroundURL.4dm index 86150882..76b5f6b5 100644 --- a/Project/Sources/Methods/WP_GetBackgroundURL.4dm +++ b/Project/Sources/Methods/WP_GetBackgroundURL.4dm @@ -1,20 +1,16 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) -C_TEXT:C284($url) -C_TEXT:C284($codec) -C_POINTER:C301($ptr) -C_LONGINT:C283($p) +var $url; $codec : Text +var $ptr : Pointer +var $p : Integer -C_BLOB:C604($blob) -C_PICTURE:C286($picture) - -$range:=$1 +var $blob : Blob +var $picture : Picture 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/@") diff --git a/Project/Sources/Methods/WP_GetBookmarks.4dm b/Project/Sources/Methods/WP_GetBookmarks.4dm index 150a3c53..0c2266b0 100644 --- a/Project/Sources/Methods/WP_GetBookmarks.4dm +++ b/Project/Sources/Methods/WP_GetBookmarks.4dm @@ -1,9 +1,9 @@ //%attributes = {"invisible":true} -C_POINTER:C301($ptr) +var $ptr : Pointer -$ptr:=OBJECT Get pointer:C1124(Object named:K67:5;"lb_bookmarkNames") -ARRAY TEXT:C222($ptr->;0) -WP GET BOOKMARKS:C1417(Form:C1466.selection[wk owner:K81:168];$ptr->) +$ptr:=OBJECT Get pointer:C1124(Object named:K67:5; "lb_bookmarkNames") +ARRAY TEXT:C222($ptr->; 0) +WP GET BOOKMARKS:C1417(Form:C1466.selection[wk owner:K81:168]; $ptr->) diff --git a/Project/Sources/Methods/WP_GetDecoInfo.4dm b/Project/Sources/Methods/WP_GetDecoInfo.4dm index ce0b2a33..c14a6b46 100644 --- a/Project/Sources/Methods/WP_GetDecoInfo.4dm +++ b/Project/Sources/Methods/WP_GetDecoInfo.4dm @@ -1,23 +1,16 @@ //%attributes = {"invisible":true} //WP_GetDecoInfo -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) -C_POINTER:C301($ptr) -C_LONGINT:C283($color) -C_LONGINT:C283($frameColor) -C_LONGINT:C283($linethrough) -C_LONGINT:C283($underline) -C_LONGINT:C283($p) +var $ptr : Pointer +var $color; $frameColor; $linethrough; $underline; $p : Integer - -$range:=$1 $frameColor:=0x00404040 If (Not:C34(OB Is empty:C1297($range))) $ptr:=OBJECT Get pointer:C1124(Object named:K67:5; "cbLinethrough") - WP GET ATTRIBUTES:C1345($range; wk text linethrough style:K81:75; $linethrough) + WP Get attributes:C1345($range; wk text linethrough style:K81:75; $linethrough) Case of : ($linethrough=wk mixed:K81:89) $ptr->:=2 @@ -28,7 +21,7 @@ If (Not:C34(OB Is empty:C1297($range))) End case $ptr:=OBJECT Get pointer:C1124(Object named:K67:5; "cbUnderline") - WP GET ATTRIBUTES:C1345($range; wk text underline style:K81:73; $underline) + WP Get attributes:C1345($range; wk text underline style:K81:73; $underline) Case of : ($underline=wk mixed:K81:89) $ptr->:=2 @@ -48,7 +41,7 @@ If (Not:C34(OB Is empty:C1297($range))) End case - WP GET ATTRIBUTES:C1345($range; wk text underline color:K81:74; $color) + WP Get attributes:C1345($range; wk text underline color:K81:74; $color) If ($color=wk mixed:K81:89) OBJECT SET VISIBLE:C603(*; "MultiLineColor"; True:C214) OBJECT SET RGB COLORS:C628(*; "UnderlineColor"; $frameColor; 0) diff --git a/Project/Sources/Methods/WP_GetDocInfos.4dm b/Project/Sources/Methods/WP_GetDocInfos.4dm index 41e4efe5..ed6275b0 100644 --- a/Project/Sources/Methods/WP_GetDocInfos.4dm +++ b/Project/Sources/Methods/WP_GetDocInfos.4dm @@ -1,35 +1,32 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($o_Document) +#DECLARE($document : Object) -C_LONGINT:C283($i;$n) +var $i; $n : Integer -$o_Document:=$1 - -If (Not:C34(OB Is empty:C1297($o_Document))) +If (Not:C34(OB Is empty:C1297($document))) - ARRAY TEXT:C222($_Sources;0) - ARRAY POINTER:C280($_Targets;0) + ARRAY TEXT:C222($_Sources; 0) + ARRAY POINTER:C280($_Targets; 0) - APPEND TO ARRAY:C911($_Sources;wk title:K81:79) - APPEND TO ARRAY:C911($_Sources;wk subject:K81:80) - APPEND TO ARRAY:C911($_Sources;wk author:K81:81) - APPEND TO ARRAY:C911($_Sources;wk company:K81:82) - APPEND TO ARRAY:C911($_Sources;wk notes:K81:83) - APPEND TO ARRAY:C911($_Sources;wk date creation:K81:84) - APPEND TO ARRAY:C911($_Sources;wk date modified:K81:85) + APPEND TO ARRAY:C911($_Sources; wk title:K81:79) + APPEND TO ARRAY:C911($_Sources; wk subject:K81:80) + APPEND TO ARRAY:C911($_Sources; wk author:K81:81) + APPEND TO ARRAY:C911($_Sources; wk company:K81:82) + APPEND TO ARRAY:C911($_Sources; wk notes:K81:83) + APPEND TO ARRAY:C911($_Sources; wk date creation:K81:84) + APPEND TO ARRAY:C911($_Sources; wk date modified:K81:85) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Title")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Subject")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Author")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Company")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Notes")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Created")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Modified")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Title")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Subject")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Author")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Company")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Notes")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Created")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Modified")) $n:=Size of array:C274($_Sources) - For ($i;1;$n) - WP GET ATTRIBUTES:C1345($o_Document;$_Sources{$i};$_Targets{$i}->) + For ($i; 1; $n) + WP Get attributes:C1345($document; $_Sources{$i}; $_Targets{$i}->) End for End if diff --git a/Project/Sources/Methods/WP_GetExpressions_Unused.4dm b/Project/Sources/Methods/WP_GetExpressions_Unused.4dm deleted file mode 100644 index d98cbafe..00000000 --- a/Project/Sources/Methods/WP_GetExpressions_Unused.4dm +++ /dev/null @@ -1,110 +0,0 @@ -//%attributes = {"invisible":true} - -C_TEXT:C284($1) -C_LONGINT:C283($2; $3) - -C_POINTER:C301($4; $5; $6; $7) - -C_TEXT:C284($areaName) -C_LONGINT:C283($start; $end) -C_POINTER:C301($ptrLabel; $ptrURL; $ptrTrueExpression; $ptrVirtualExpression) - -C_LONGINT:C283($i; $n) -ARRAY TEXT:C222($_objects; 0) -ARRAY POINTER:C280($_variables; 0) - -C_TEXT:C284($memoExpression; $virtualExpression; $trueExpression) - -//$ptrLabel:=OBJECT Get pointer(Object named; "URLlabel") -//If (Not(Is nil pointer($ptrLabel))) -//$ptrLabel->:="" -//End if - -//$ptrURL:=OBJECT Get pointer(Object named; "URLurl") -//If (Not(Is nil pointer($ptrURL))) -//$ptrURL->:="" -//End if - -$ptrTrueExpression:=OBJECT Get pointer:C1124(Object named:K67:5; "TrueExpression") -If (Not:C34(Is nil pointer:C315($ptrTrueExpression))) - $ptrTrueExpression->:="" -End if - -$ptrVirtualExpression:=OBJECT Get pointer:C1124(Object named:K67:5; "VirtualExpression") -If (Not:C34(Is nil pointer:C315($ptrVirtualExpression))) - $ptrVirtualExpression->:="" -End if - - -If (areaName#"") - - If (Count parameters:C259=0) // component context) - - If (Not:C34((Is nil pointer:C315($ptrTrueExpression)) | (Is nil pointer:C315($ptrVirtualExpression)))) - - $start:=Form:C1466.selection[wk start:K81:87] - $end:=Form:C1466.selection[wk end:K81:88] - CALL FORM:C1391(Current form window:C827; Current method name:C684; areaName; $start; $end; $ptrLabel; $ptrURL; $ptrTrueExpression; $ptrVirtualExpression) - - End if - - Else // host database context - - $areaName:=$1 - $start:=$2 - $end:=$3 - - $ptrLabel:=$4 - $ptrURL:=$5 - $ptrTrueExpression:=$6 - $ptrVirtualExpression:=$7 - - - OBJECT GET COORDINATES:C663(*; $areaName; $x1; $y1; $y1; $y2) - If (($x1+$y1+$y1+$y2)#0) - - // form in current page - - //ST GET URL(*; $areaName; $label; $URL; $start; $end) - - //$ptrLabel->:=$label - //$ptrURL->:=$URL - - // when the cursor is just prior the expression, the expression should be "" // ACI0101873 - - - - $ptrTrueExpression->:="" - $ptrVirtualExpression->:="" - - If ($start#$end) - $memoExpression:=ST Get expression:C1287(*; $areaName; $start; $end) - $virtualExpression:=Parse formula:C1576($memoExpression; Formula out with virtual structure:K88:2) - $trueExpression:=Parse formula:C1576($virtualExpression; Formula in with virtual structure:K88:1) - - If ($memoExpression=$trueExpression) - $ptrTrueExpression->:=$trueExpression - $ptrVirtualExpression->:=$virtualExpression //display expression using virtual structure (RL palettes only) - End if - End if - - Else - - // try in subforms - - FORM GET OBJECTS:C898($_objects; $_variables; Form current page:K67:6) - $n:=Size of array:C274($_objects) - For ($i; 1; $n) - If (OBJECT Get type:C1300(*; $_objects{$i})=Object type subform:K79:40) - EXECUTE METHOD IN SUBFORM:C1085($_objects{$i}; Current method name:C684; *; $1; $2; $3; $4; $5; $6; $7) - End if - End for - - End if - - End if - -End if - - - diff --git a/Project/Sources/Methods/WP_GetFontInfo.4dm b/Project/Sources/Methods/WP_GetFontInfo.4dm index 7312667d..75fb7fca 100644 --- a/Project/Sources/Methods/WP_GetFontInfo.4dm +++ b/Project/Sources/Methods/WP_GetFontInfo.4dm @@ -1,31 +1,18 @@ //%attributes = {"invisible":true} - -//C_OBJECT($1) -//C_BOOLEAN($2) // check if not empty selection #DECLARE($range : Object; $check : Boolean) var $index : Integer - -C_BOOLEAN:C305($redraw) - -C_LONGINT:C283($p) -C_LONGINT:C283($frameColor) -C_LONGINT:C283($color) -C_LONGINT:C283($rangeStart; $rangeEnd) - -C_TEXT:C284($fontFamily) -C_TEXT:C284($font) - +var $redraw : Boolean +var $p; $frameColor; $color; $rangeStart; $rangeEnd : Integer +var $fontFamily; $font : Text var $fontSize : Real // ACI0104990 Pat Bensky - If (Count parameters:C259<2) $check:=False:C215 End if $frameColor:=0x00404040 - If (Not:C34(OB Is empty:C1297($range))) If ($check) @@ -38,17 +25,15 @@ If (Not:C34(OB Is empty:C1297($range))) $redraw:=True:C214 End if - If ($redraw) - WP GET ATTRIBUTES:C1345($range; wk font family:K81:65; $fontFamily) + WP Get attributes:C1345($range; wk font family:K81:65; $fontFamily) $p:=Find in array:C230(WP_fontFamilly; $fontFamily) If ($p<0) // second chance for japanese :-) $p:=Find in array:C230(WP_fontFamillyJapanese; $fontFamily) End if - If ($p>0) & ($p<=Size of array:C274(WP_fontFamilly)) // set the drop down to the right value @@ -59,7 +44,7 @@ If (Not:C34(OB Is empty:C1297($range))) WP_FillFontStyles($fontFamily) //ACI0104450 - WP GET ATTRIBUTES:C1345($range; wk font:K81:69; $font) + WP Get attributes:C1345($range; wk font:K81:69; $font) $p:=Find in array:C230(WP_fontLongName; $font) If ($p>0) & ($p<=Size of array:C274(WP_fontLongName)) WP_fontStyle:=$p @@ -72,7 +57,6 @@ If (Not:C34(OB Is empty:C1297($range))) //WP_fontFamilly:=0 End if - Else // font familly not found in array ! @@ -81,12 +65,10 @@ If (Not:C34(OB Is empty:C1297($range))) End if - - If (Not:C34(Undefined:C82(oForm.fonts))) //New font button - WP GET ATTRIBUTES:C1345($range; wk font:K81:69; $font; wk font family:K81:65; $fontFamily) + WP Get attributes:C1345($range; wk font:K81:69; $font; wk font family:K81:65; $fontFamily) $index:=oForm.fonts.names.indexOf($font) If ($index>0) OBJECT SET TITLE:C194(*; "btnFonts"; oForm.fonts.families[$index]+" "+oForm.fonts.styles[$index]) @@ -100,16 +82,12 @@ If (Not:C34(OB Is empty:C1297($range))) End if End if - - - // Get the size (always in pt) - WP GET ATTRIBUTES:C1345($range; wk font size:K81:66; $fontSize) + WP Get attributes:C1345($range; wk font size:K81:66; $fontSize) If ($fontSize#wk mixed:K81:89) oForm.fontSize:=$fontSize End if - // standard action since 2022 march 17th //WP GET ATTRIBUTES($range; wk font italic; $style) //0, 1 or wk mixed @@ -126,10 +104,7 @@ If (Not:C34(OB Is empty:C1297($range))) //oForm.cbBold:=2 //End if - - - - WP GET ATTRIBUTES:C1345($range; wk text color:K81:64; $color) + WP Get attributes:C1345($range; wk text color:K81:64; $color) If ($color=wk mixed:K81:89) OBJECT SET VISIBLE:C603(*; "MultiFontColor"; True:C214) OBJECT SET RGB COLORS:C628(*; "ColorSample"; $frameColor; 0x00FFFFFF) diff --git a/Project/Sources/Methods/WP_GetFontVertAlign.4dm b/Project/Sources/Methods/WP_GetFontVertAlign.4dm index 08ac0e32..814a4daf 100644 --- a/Project/Sources/Methods/WP_GetFontVertAlign.4dm +++ b/Project/Sources/Methods/WP_GetFontVertAlign.4dm @@ -1,22 +1,16 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) -C_LONGINT:C283($p) -C_LONGINT:C283($verticalAlign) -C_POINTER:C301($ptrVerticalAlignNames) -C_POINTER:C301($ptrVerticalAlignValues) - - -$range:=$1 +var $p; $verticalAlign : Integer +var $ptrVerticalAlignNames; $ptrVerticalAlignValues : Pointer If (Not:C34(OB Is empty:C1297($range))) - $ptrVerticalAlignNames:=OBJECT Get pointer:C1124(Object named:K67:5;"verticalAlignNames") - $ptrVerticalAlignValues:=OBJECT Get pointer:C1124(Object named:K67:5;"verticalAlignValues") + $ptrVerticalAlignNames:=OBJECT Get pointer:C1124(Object named:K67:5; "verticalAlignNames") + $ptrVerticalAlignValues:=OBJECT Get pointer:C1124(Object named:K67:5; "verticalAlignValues") - WP GET ATTRIBUTES:C1345($range;wk vertical align:K81:9;$verticalAlign) - $p:=Find in array:C230($ptrVerticalAlignValues->;$verticalAlign) + WP Get attributes:C1345($range; wk vertical align:K81:9; $verticalAlign) + $p:=Find in array:C230($ptrVerticalAlignValues->; $verticalAlign) If ($p>0) $ptrVerticalAlignNames->:=$p Else diff --git a/Project/Sources/Methods/WP_GetFormulas.4dm b/Project/Sources/Methods/WP_GetFormulas.4dm index 6f953f20..86514ee5 100644 --- a/Project/Sources/Methods/WP_GetFormulas.4dm +++ b/Project/Sources/Methods/WP_GetFormulas.4dm @@ -1,8 +1,7 @@ //%attributes = {"invisible":true} -C_POINTER:C301($ptrTrueExpression; $ptrVirtualExpression) -C_TEXT:C284($virtualExpression; $trueExpression) - +var $ptrTrueExpression; $ptrVirtualExpression : Pointer +var $virtualExpression; $trueExpression : Text var $_formulas : Collection $ptrTrueExpression:=OBJECT Get pointer:C1124(Object named:K67:5; "TrueExpression") @@ -15,7 +14,6 @@ If (Not:C34(Is nil pointer:C315($ptrVirtualExpression))) $ptrVirtualExpression->:="" End if - If (Not:C34((Is nil pointer:C315($ptrTrueExpression)) | (Is nil pointer:C315($ptrVirtualExpression)))) If (Form:C1466.selection.start#Form:C1466.selection.end) //ACI0104093 @@ -36,5 +34,4 @@ If (Not:C34((Is nil pointer:C315($ptrTrueExpression)) | (Is nil pointer:C315($pt End if End if - End if \ No newline at end of file diff --git a/Project/Sources/Methods/WP_GetProtections.4dm b/Project/Sources/Methods/WP_GetProtections.4dm index f80f8d0d..4dc0a662 100644 --- a/Project/Sources/Methods/WP_GetProtections.4dm +++ b/Project/Sources/Methods/WP_GetProtections.4dm @@ -1,25 +1,21 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1; $range) - -C_BOOLEAN:C305($docProtected) -C_LONGINT:C283($protection) -C_OBJECT:C1216($document) -C_OBJECT:C1216($tableRange) -C_OBJECT:C1216($rows; $cells) -$range:=$1 -$document:=$range.owner +#DECLARE($range : Object) +var $docProtected : Boolean +var $protection : Integer +var $document; $tableRange; $rows; $cells : Object +$document:=$range.owner //-------------------- document ---------------------- -WP GET ATTRIBUTES:C1345($document; wk protection enabled:K81:307; $docProtected) +WP Get attributes:C1345($document; wk protection enabled:K81:307; $docProtected) Form:C1466.protectionEnabled:=$docProtected //-------------------- paragraph ---------------------- -WP GET ATTRIBUTES:C1345($range; wk protected:K81:306; $protection) +WP Get attributes:C1345($range; wk protected:K81:306; $protection) If ($protection=wk mixed:K81:89) $protection:=2 // semi-checked on palettes, checked on toolbar End if @@ -33,7 +29,7 @@ If ($range.type#2) // anchored picture (check added 2021/01/13 by RL) If (WP Get elements:C1550($range; wk type table:K81:222).length>0) $tableRange:=WP Table range:C1553($range) - WP GET ATTRIBUTES:C1345($tableRange; wk protected:K81:306; $protection) + WP Get attributes:C1345($tableRange; wk protected:K81:306; $protection) If ($protection=wk mixed:K81:89) $protection:=2 // semi-checked on palettes, checked on toolbar @@ -49,7 +45,7 @@ If ($range.type#2) // anchored picture (check added 2021/01/13 by RL) $rows:=WP Table get rows:C1475($range) If (Not:C34($rows=Null:C1517)) - WP GET ATTRIBUTES:C1345($rows; wk protected:K81:306; $protection) + WP Get attributes:C1345($rows; wk protected:K81:306; $protection) If ($protection=wk mixed:K81:89) $protection:=2 // semi-checked on palettes, checked on toolbar @@ -66,7 +62,7 @@ If ($range.type#2) // anchored picture (check added 2021/01/13 by RL) $cells:=WP Table get cells:C1477($range) If (Not:C34($cells=Null:C1517)) - WP GET ATTRIBUTES:C1345($cells; wk protected:K81:306; $protection) + WP Get attributes:C1345($cells; wk protected:K81:306; $protection) If ($protection=wk mixed:K81:89) $protection:=2 // semi-checked on palettes, checked on toolbar @@ -78,11 +74,10 @@ If ($range.type#2) // anchored picture (check added 2021/01/13 by RL) Form:C1466.cellProtected:=$protection - //----------------- text box -------------------- If ($range#Null:C1517) && (OB Is defined:C1231($range; "container")) && ($range.container.type=300) // 300 == wk type text box - WP GET ATTRIBUTES:C1345($range.container; wk protected:K81:306; $protection) + WP Get attributes:C1345($range.container; wk protected:K81:306; $protection) Form:C1466.textboxProtected:=$protection End if diff --git a/Project/Sources/Methods/WP_GetSizes.4dm b/Project/Sources/Methods/WP_GetSizes.4dm index 2a04a561..2e2fd4e7 100644 --- a/Project/Sources/Methods/WP_GetSizes.4dm +++ b/Project/Sources/Methods/WP_GetSizes.4dm @@ -1,17 +1,9 @@ //%attributes = {"invisible":true} //WP_GetSizes -C_OBJECT:C1216($1) -//C_TEXT($2) +#DECLARE($range : Object) -C_OBJECT:C1216($range) - -C_LONGINT:C283($i; $n) - -$range:=$1 -//$context:=$2 - -C_REAL:C285($height; $minHeight) -C_REAL:C285($width; $minWidth) +var $i; $n : Integer +var $height; $minHeight; $width; $minWidth : Real ARRAY POINTER:C280($_ptr; 0) APPEND TO ARRAY:C911($_ptr; ->$height) // not used anymore @@ -33,9 +25,9 @@ If (Not:C34(OB Is empty:C1297($range))) //: ($context="paragraph") $_ptr{1}->:=0 - WP GET ATTRIBUTES:C1345($range; wk width:K81:45; $_ptr{2}->) - WP GET ATTRIBUTES:C1345($range; wk min height:K81:48; $_ptr{3}->) - WP GET ATTRIBUTES:C1345($range; wk min width:K81:47; $_ptr{4}->) + WP Get attributes:C1345($range; wk width:K81:45; $_ptr{2}->) + WP Get attributes:C1345($range; wk min height:K81:48; $_ptr{3}->) + WP Get attributes:C1345($range; wk min width:K81:47; $_ptr{4}->) //End case @@ -82,7 +74,6 @@ If (Not:C34(OB Is empty:C1297($range))) End case - //End case End if diff --git a/Project/Sources/Methods/WP_GetStyleAttributesByGroup.4dm b/Project/Sources/Methods/WP_GetStyleAttributesByGroup.4dm index 5f2f1416..f4fa4b3c 100644 --- a/Project/Sources/Methods/WP_GetStyleAttributesByGroup.4dm +++ b/Project/Sources/Methods/WP_GetStyleAttributesByGroup.4dm @@ -1,40 +1,34 @@ //%attributes = {"invisible":true} - -C_TEXT:C284($1;$group) -C_COLLECTION:C1488($0;$col) - - - -$group:=$1 +#DECLARE($group : Text)->$col : Collection $col:=New collection:C1472 If ($group="fonts") - //$col.push(New object("property";wk font family;"label";Get localized string("ssFontFamily");"visibleValue";True)) - $col.push(New object:C1471("property";wk font:K81:69;"label";Get localized string:C991("ssFont");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk font size:K81:66;"label";Get localized string:C991("ssFontSize");"visibleValue";True:C214;"valueType";Is text:K8:3)) - //$col.push(New object("property";wk font bold;"label";Get localized string("ssBold");"visibleValue";False)) - //$col.push(New object("property";wk font italic;"label";Get localized string("ssItalic");"visibleValue";False)) - $col.push(New object:C1471("property";wk text color:K81:64;"label";Get localized string:C991("ssTextColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) + //$col.push(New object("property";wk font family;"label";Get localized string("ssFontFamily");"visibleValue";True)) + $col.push(New object:C1471("property"; wk font:K81:69; "label"; Localized string:C991("ssFont"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk font size:K81:66; "label"; Localized string:C991("ssFontSize"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + //$col.push(New object("property";wk font bold;"label";Get localized string("ssBold");"visibleValue";False)) + //$col.push(New object("property";wk font italic;"label";Get localized string("ssItalic");"visibleValue";False)) + $col.push(New object:C1471("property"; wk text color:K81:64; "label"; Localized string:C991("ssTextColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) If (Form:C1466.stylesheet.type=wk type default:K81:190) // character style sheet only - $col.push(New object:C1471("property";wk background color:K81:20;"label";Get localized string:C991("ssBackgroundColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk background color:K81:20; "label"; Localized string:C991("ssBackgroundColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) End if $col.push(New object:C1471) - $col.push(New object:C1471("property";wk text underline style:K81:73;"label";Get localized string:C991("ssUnderlineStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk text underline color:K81:74;"label";Get localized string:C991("ssUnderlineColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk text underline style:K81:73; "label"; Localized string:C991("ssUnderlineStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk text underline color:K81:74; "label"; Localized string:C991("ssUnderlineColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk text linethrough style:K81:75;"label";Get localized string:C991("ssLinethroughStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk text linethrough color:K81:76;"label";Get localized string:C991("ssLinethroughColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk text linethrough style:K81:75; "label"; Localized string:C991("ssLinethroughStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk text linethrough color:K81:76; "label"; Localized string:C991("ssLinethroughColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk text shadow color:K81:71;"label";Get localized string:C991("ssShadowColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk text shadow offset:K81:72;"label";Get localized string:C991("ssShadowOffet");"visibleValue";True:C214;"valueType";Is text:K8:3)) + $col.push(New object:C1471("property"; wk text shadow color:K81:71; "label"; Localized string:C991("ssShadowColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk text shadow offset:K81:72; "label"; Localized string:C991("ssShadowOffet"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk text transform:K81:70;"label";Get localized string:C991("ssTransform");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk text transform:K81:70; "label"; Localized string:C991("ssTransform"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) If (Form:C1466.stylesheet.type=wk type default:K81:190) // character style sheet only $col.push(New object:C1471) - $col.push(New object:C1471("property";wk vertical align:K81:9;"label";Get localized string:C991("ssVerticalAlign");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk vertical align:K81:9; "label"; Localized string:C991("ssVerticalAlign"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) End if End if @@ -42,71 +36,69 @@ End if If ($group="paragraphs") // align, indent, tabs - $col.push(New object:C1471("property";wk text align:K81:49;"label";Get localized string:C991("ssHorizontalAlign");"visibleValue";True:C214;"valueType";Is real:K8:4)) // OK - $col.push(New object:C1471("property";wk line height:K81:51;"label";Get localized string:C991("ssLineHeight");"visibleValue";True:C214;"valueType";Is text:K8:3)) // OK - $col.push(New object:C1471("property";wk vertical align:K81:9;"label";Get localized string:C991("ssVerticalAlign");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk text align:K81:49; "label"; Localized string:C991("ssHorizontalAlign"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) // OK + $col.push(New object:C1471("property"; wk line height:K81:51; "label"; Localized string:C991("ssLineHeight"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) // OK + $col.push(New object:C1471("property"; wk vertical align:K81:9; "label"; Localized string:C991("ssVerticalAlign"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk text indent:K81:52;"label";Get localized string:C991("ssTextIndent");"visibleValue";True:C214;"valueType";Is text:K8:3)) // OK - $col.push(New object:C1471("property";wk tab default:K81:279;"label";Get localized string:C991("ssDefaultTab");"visibleValue";False:C215;"valueType";Is object:K8:27)) - $col.push(New object:C1471("property";wk tabs:K81:278;"label";Get localized string:C991("ssTabs");"visibleValue";False:C215;"valueType";Is collection:K8:32)) + $col.push(New object:C1471("property"; wk text indent:K81:52; "label"; Localized string:C991("ssTextIndent"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) // OK + $col.push(New object:C1471("property"; wk tab default:K81:279; "label"; Localized string:C991("ssDefaultTab"); "visibleValue"; False:C215; "valueType"; Is object:K8:27)) + $col.push(New object:C1471("property"; wk tabs:K81:278; "label"; Localized string:C991("ssTabs"); "visibleValue"; False:C215; "valueType"; Is collection:K8:32)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk background color:K81:20;"label";Get localized string:C991("ssBackgroundColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk list style type:K81:55;"label";Get localized string:C991("ssListStyleType");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk background color:K81:20; "label"; Localized string:C991("ssBackgroundColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk list style type:K81:55; "label"; Localized string:C991("ssListStyleType"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) - //Not in the interface - //$col.push(New object("property";wk list start number)) - //$col.push(New object("property";wk list string format LTR)) - //$col.push(New object("property";wk list string format RTL)) - //$col.push(New object("property";wk list style image)) - //$col.push(New object("property";wk list style image height)) - //$col.push(New object("property";wk list style image url)) + //Not in the interface + //$col.push(New object("property";wk list start number)) + //$col.push(New object("property";wk list string format LTR)) + //$col.push(New object("property";wk list string format RTL)) + //$col.push(New object("property";wk list style image)) + //$col.push(New object("property";wk list style image height)) + //$col.push(New object("property";wk list style image url)) End if - If ($group="margins") - $col.push(New object:C1471("property";wk margin left:K81:11;"label";Get localized string:C991("ssMarginLeft");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk margin right:K81:12;"label";Get localized string:C991("ssMarginTop");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk margin top:K81:13;"label";Get localized string:C991("ssMarginRight");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk margin bottom:K81:14;"label";Get localized string:C991("ssMarginBottom");"visibleValue";True:C214;"valueType";Is text:K8:3)) + $col.push(New object:C1471("property"; wk margin left:K81:11; "label"; Localized string:C991("ssMarginLeft"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk margin right:K81:12; "label"; Localized string:C991("ssMarginTop"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk margin top:K81:13; "label"; Localized string:C991("ssMarginRight"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk margin bottom:K81:14; "label"; Localized string:C991("ssMarginBottom"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk padding left:K81:16;"label";Get localized string:C991("ssPaddingLeft");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk padding right:K81:17;"label";Get localized string:C991("ssPaddingTop");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk padding top:K81:18;"label";Get localized string:C991("ssPaddingRight");"visibleValue";True:C214;"valueType";Is text:K8:3)) - $col.push(New object:C1471("property";wk padding bottom:K81:19;"label";Get localized string:C991("ssPaddingBottom");"visibleValue";True:C214;"valueType";Is text:K8:3)) + $col.push(New object:C1471("property"; wk padding left:K81:16; "label"; Localized string:C991("ssPaddingLeft"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk padding right:K81:17; "label"; Localized string:C991("ssPaddingTop"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk padding top:K81:18; "label"; Localized string:C991("ssPaddingRight"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) + $col.push(New object:C1471("property"; wk padding bottom:K81:19; "label"; Localized string:C991("ssPaddingBottom"); "visibleValue"; True:C214; "valueType"; Is text:K8:3)) $col.push(New object:C1471) - //End if + //End if - //If ($group="borders") // borders (style, width color, radius) + //If ($group="borders") // borders (style, width color, radius) If (True:C214) - $col.push(New object:C1471("property";wk border style right:K81:31;"label";Get localized string:C991("ssBorderStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border style left:K81:30;"label";Get localized string:C991("ssBorderStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border style top:K81:32;"label";Get localized string:C991("ssBorderStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border style bottom:K81:33;"label";Get localized string:C991("ssBorderStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk border style right:K81:31; "label"; Localized string:C991("ssBorderStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border style left:K81:30; "label"; Localized string:C991("ssBorderStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border style top:K81:32; "label"; Localized string:C991("ssBorderStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border style bottom:K81:33; "label"; Localized string:C991("ssBorderStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk border width right:K81:41;"label";Get localized string:C991("ssBorderWidth");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border width left:K81:40;"label";Get localized string:C991("ssBorderWidth");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border width top:K81:42;"label";Get localized string:C991("ssBorderWidth");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border width bottom:K81:43;"label";Get localized string:C991("ssBorderWidth");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk border width right:K81:41; "label"; Localized string:C991("ssBorderWidth"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border width left:K81:40; "label"; Localized string:C991("ssBorderWidth"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border width top:K81:42; "label"; Localized string:C991("ssBorderWidth"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border width bottom:K81:43; "label"; Localized string:C991("ssBorderWidth"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) $col.push(New object:C1471) - $col.push(New object:C1471("property";wk border color right:K81:36;"label";Get localized string:C991("ssBorderColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border color left:K81:35;"label";Get localized string:C991("ssBorderColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border color top:K81:37;"label";Get localized string:C991("ssBorderColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border color bottom:K81:38;"label";Get localized string:C991("ssBorderColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk border color right:K81:36; "label"; Localized string:C991("ssBorderColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border color left:K81:35; "label"; Localized string:C991("ssBorderColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border color top:K81:37; "label"; Localized string:C991("ssBorderColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border color bottom:K81:38; "label"; Localized string:C991("ssBorderColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) Else - $col.push(New object:C1471("property";wk border style:K81:29;"label";Get localized string:C991("ssBorderStyle");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border width:K81:39;"label";Get localized string:C991("ssBorderWidth");"visibleValue";True:C214;"valueType";Is real:K8:4)) - $col.push(New object:C1471("property";wk border color:K81:34;"label";Get localized string:C991("ssBorderColor");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk border style:K81:29; "label"; Localized string:C991("ssBorderStyle"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border width:K81:39; "label"; Localized string:C991("ssBorderWidth"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) + $col.push(New object:C1471("property"; wk border color:K81:34; "label"; Localized string:C991("ssBorderColor"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) End if $col.push(New object:C1471) - $col.push(New object:C1471("property";wk border radius:K81:44;"label";Get localized string:C991("ssBorderRadius");"visibleValue";True:C214;"valueType";Is real:K8:4)) + $col.push(New object:C1471("property"; wk border radius:K81:44; "label"; Localized string:C991("ssBorderRadius"); "visibleValue"; True:C214; "valueType"; Is real:K8:4)) End if -$0:=$col diff --git a/Project/Sources/Methods/WP_GetStyleAttributesByType.4dm b/Project/Sources/Methods/WP_GetStyleAttributesByType.4dm index 3e9de3b9..df750816 100644 --- a/Project/Sources/Methods/WP_GetStyleAttributesByType.4dm +++ b/Project/Sources/Methods/WP_GetStyleAttributesByType.4dm @@ -1,11 +1,7 @@ //%attributes = {"invisible":true} +#DECLARE($type : Integer)->$col : Collection -C_LONGINT:C283($1; $type) -C_COLLECTION:C1488($0; $col) - -C_BOOLEAN:C305($block1; $block2; $block3; $block4) - -$type:=$1 +var $block1; $block2; $block3; $block4 : Boolean Case of : ($type=wk type default:K81:190) // character @@ -115,5 +111,4 @@ If ($block4) // borders (style, width color, radius) End if -$0:=$col diff --git a/Project/Sources/Methods/WP_GetStyleSheet.4dm b/Project/Sources/Methods/WP_GetStyleSheet.4dm index 640ccebd..444d8372 100644 --- a/Project/Sources/Methods/WP_GetStyleSheet.4dm +++ b/Project/Sources/Methods/WP_GetStyleSheet.4dm @@ -1,14 +1,11 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($range) -C_OBJECT:C1216($styleSheet) -C_LONGINT:C283($typeStylesheet) -C_LONGINT:C283($p) -C_POINTER:C301($ptrStylesheetNames) -C_TEXT:C284($name) - -$typeStylesheet:=WP_GetStylesheetType +var $range; $styleSheet : Object +var $typeStylesheet; $p : Integer +var $ptrStylesheetNames : Pointer +var $name : Text +$typeStylesheet:=WP_GetStylesheetType Case of : ($typeStylesheet=wk type default:K81:190) @@ -19,23 +16,21 @@ Case of End case - If (Not:C34(OB Is empty:C1297($range))) - WP GET ATTRIBUTES:C1345($range;wk style sheet:K81:63;$styleSheet) // wk name + WP Get attributes:C1345($range; wk style sheet:K81:63; $styleSheet) // wk name If ($styleSheet#Null:C1517) $name:=$styleSheet.name - $ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") - - $p:=Find in array:C230($ptrStylesheetNames->;$name) + $ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") + $p:=Find in array:C230($ptrStylesheetNames->; $name) If ($p>0) $ptrStylesheetNames->:=$p // toolbar widget - LISTBOX SELECT ROW:C912(*;"LB_StyleSheets";$p;lk replace selection:K53:1) // palette widget + LISTBOX SELECT ROW:C912(*; "LB_StyleSheets"; $p; lk replace selection:K53:1) // palette widget Else $ptrStylesheetNames->:=0 // toolbar widget - LISTBOX SELECT ROW:C912(*;"LB_StyleSheets";0;lk remove from selection:K53:3) // palette widget + LISTBOX SELECT ROW:C912(*; "LB_StyleSheets"; 0; lk remove from selection:K53:3) // palette widget End if End if diff --git a/Project/Sources/Methods/WP_GetStyleSheets.4dm b/Project/Sources/Methods/WP_GetStyleSheets.4dm index 47a08485..e4db109f 100644 --- a/Project/Sources/Methods/WP_GetStyleSheets.4dm +++ b/Project/Sources/Methods/WP_GetStyleSheets.4dm @@ -1,19 +1,18 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($document) -C_COLLECTION:C1488($_stylesheets) +var $document : Object +var $_stylesheets : Collection -C_POINTER:C301($ptrStylesheetNames) -C_LONGINT:C283($stylesheetType) +var $ptrStylesheetNames : Pointer +var $stylesheetType : Integer - -$stylesheetType:=WP_GetStylesheetType -$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") +$stylesheetType:=WP_GetStylesheetType +$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") $document:=Form:C1466.selection[wk owner:K81:168] -$_stylesheets:=WP Get style sheets:C1655($document;$stylesheetType) - //$_stylesheets:=$_stylesheets.orderBy("name") +$_stylesheets:=WP Get style sheets:C1655($document; $stylesheetType) +//$_stylesheets:=$_stylesheets.orderBy("name") -COLLECTION TO ARRAY:C1562($_stylesheets;$ptrStylesheetNames->;"name") -SORT ARRAY:C229($ptrStylesheetNames->;>) +COLLECTION TO ARRAY:C1562($_stylesheets; $ptrStylesheetNames->; "name") +SORT ARRAY:C229($ptrStylesheetNames->; >) -WP_GetStyleSheet +WP_GetStyleSheet diff --git a/Project/Sources/Methods/WP_GetStylesheetType.4dm b/Project/Sources/Methods/WP_GetStylesheetType.4dm index 75369c81..1409f58c 100644 --- a/Project/Sources/Methods/WP_GetStylesheetType.4dm +++ b/Project/Sources/Methods/WP_GetStylesheetType.4dm @@ -1,4 +1,6 @@ //%attributes = {"invisible":true} -C_LONGINT:C283($index) +#DECLARE()->$value : Integer +var $index : Integer + $index:=oForm.styleSheet.btnType.indexOf(1) -$0:=oForm.styleSheet.btnValue[$index] +$value:=oForm.styleSheet.btnValue[$index] diff --git a/Project/Sources/Methods/WP_GetTabInfo.4dm b/Project/Sources/Methods/WP_GetTabInfo.4dm index 155aee5a..6ac32704 100644 --- a/Project/Sources/Methods/WP_GetTabInfo.4dm +++ b/Project/Sources/Methods/WP_GetTabInfo.4dm @@ -1,151 +1,64 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) -C_LONGINT:C283($tabType) -C_LONGINT:C283($n;$m) - -C_POINTER:C301($ptrOffsets;$ptrTypes) - -C_REAL:C285($tabValue) -C_TEXT:C284($unit) - -C_OBJECT:C1216($tab) - -$range:=$1 +var $tabType; $n; $m : Integer +var $ptrOffsets; $ptrTypes : Pointer +var $tabValue : Real +var $unit : Text +var $tab : Object If (Not:C34(OB Is empty:C1297($range))) - WP GET ATTRIBUTES:C1345($range;wk layout unit:K81:78;$unit) + WP Get attributes:C1345($range; wk layout unit:K81:78; $unit) + // NEW CODE, USED WITH COLLECTION - // NEW CODE, USED WITH COLLECTION - - WP GET ATTRIBUTES:C1345($range;wk tabs:K81:278;_tabs) - For each ($tab;_tabs) - $tab.offsetNum:=Num:C11($tab.offset;".") + WP Get attributes:C1345($range; wk tabs:K81:278; _tabs) + For each ($tab; _tabs) + $tab.offsetNum:=Num:C11($tab.offset; ".") End for each - // default values - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType0"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType1"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType2"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType3"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType4"))->:=0 + // default values + (OBJECT Get pointer:C1124(Object named:K67:5; "bTabType0"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "bTabType1"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "bTabType2"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "bTabType3"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "bTabType4"))->:=0 - WP GET ATTRIBUTES:C1345($range;wk tab default:K81:279;tabDefault) + WP Get attributes:C1345($range; wk tab default:K81:279; tabDefault) If (tabDefault#Null:C1517) - // offset - $tabValue:=Num:C11(tabDefault.offset;".") - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))->:=$tabValue - $tabValue:=WP_Convert ($tabValue;userUnit;wk unit pt:K81:136) - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentRuler"))->:=$tabValue + // offset + $tabValue:=Num:C11(tabDefault.offset; ".") + (OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentInput"))->:=$tabValue + $tabValue:=WP_Convert($tabValue; userUnit; wk unit pt:K81:136) + (OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentRuler"))->:=$tabValue - // type - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType"+String:C10(tabDefault.type)))->:=1 + // type + (OBJECT Get pointer:C1124(Object named:K67:5; "bTabType"+String:C10(tabDefault.type)))->:=1 - //Case of - //: (tabDefault.type=wk left) - //(OBJECT Get pointer(Object named;"bTabType0"))->:=1 - //: (tabDefault.type=wk right) - //(OBJECT Get pointer(Object named;"bTabType1"))->:=1 - //: (tabDefault.type=wk center) - //(OBJECT Get pointer(Object named;"bTabType2"))->:=1 - //: (tabDefault.type=wk decimal) - //(OBJECT Get pointer(Object named;"bTabType3"))->:=1 - //: (tabDefault.type=wk bar) - //(OBJECT Get pointer(Object named;"bTabType4"))->:=1 - //End case + //Case of + //: (tabDefault.type=wk left) + //(OBJECT Get pointer(Object named;"bTabType0"))->:=1 + //: (tabDefault.type=wk right) + //(OBJECT Get pointer(Object named;"bTabType1"))->:=1 + //: (tabDefault.type=wk center) + //(OBJECT Get pointer(Object named;"bTabType2"))->:=1 + //: (tabDefault.type=wk decimal) + //(OBJECT Get pointer(Object named;"bTabType3"))->:=1 + //: (tabDefault.type=wk bar) + //(OBJECT Get pointer(Object named;"bTabType4"))->:=1 + //End case - // leading char - (OBJECT Get pointer:C1124(Object named:K67:5;"tabDefaultLeading"))->:=tabDefault.leading + // leading char + (OBJECT Get pointer:C1124(Object named:K67:5; "tabDefaultLeading"))->:=tabDefault.leading Else - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentRuler"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"tabDefaultLeading"))->:="" + (OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentInput"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentRuler"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "tabDefaultLeading"))->:="" End if - - // OLD CODE, USED WITH ARRAYS - If (False:C215) - // arrays - $ptrOffsets:=OBJECT Get pointer:C1124(Object named:K67:5;"lb_offsets") - $ptrTypes:=OBJECT Get pointer:C1124(Object named:K67:5;"lb_types") - - ARRAY REAL:C219($ptrOffsets->;0) - WP GET ATTRIBUTES:C1345($range;wk tab stop offsets:K81:53;$ptrOffsets->) - - ARRAY LONGINT:C221($ptrTypes->;0) - WP GET ATTRIBUTES:C1345($range;wk tab stop types:K81:54;$ptrTypes->) - - // interface - - $n:=Size of array:C274($ptrOffsets->) - $m:=Size of array:C274($ptrTypes->) - - If ($n=0) | ($m=0) - - ARRAY REAL:C219($ptrOffsets->;0) - ARRAY LONGINT:C221($ptrTypes->;0) - - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentRuler"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))->:=0 - - Else - - // not the same size ? keep the smaller - Case of - : ($n>$m) - $n:=$m - ARRAY REAL:C219($ptrOffsets->;$n) // resize with smaller - ARRAY LONGINT:C221($ptrTypes->;$n) // resize with smaller - - : ($m>$n) - ARRAY REAL:C219($ptrOffsets->;$n) // resize with smaller - ARRAY LONGINT:C221($ptrTypes->;$n) // resize with smaller - End case - - $tabValue:=$ptrOffsets->{$n} - $tabType:=$ptrTypes->{$n} - - DELETE FROM ARRAY:C228($ptrOffsets->;$n;1) // remove the default value from the array - DELETE FROM ARRAY:C228($ptrTypes->;$n;1) // remove the default value from the array - - // set the default value in the upper part of the interface - - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))->:=$tabValue - $tabValue:=WP_Convert ($tabValue;userUnit;wk unit pt:K81:136) - (OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentRuler"))->:=$tabValue - - // set the default type in the upper part of the interface - - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType0"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType1"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType2"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType3"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType4"))->:=0 - Case of - : ($tabType=wk left:K81:95) - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType0"))->:=1 - : ($tabType=wk right:K81:96) - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType1"))->:=1 - : ($tabType=wk center:K81:99) - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType2"))->:=1 - : ($tabType=wk decimal:K81:126) - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType3"))->:=1 - : ($tabType=wk bar:K81:127) - (OBJECT Get pointer:C1124(Object named:K67:5;"bTabType4"))->:=1 - End case - - //End if - - End if - - End if - - End if \ No newline at end of file diff --git a/Project/Sources/Methods/WP_GetTextIndent.4dm b/Project/Sources/Methods/WP_GetTextIndent.4dm index cbfa9681..bb5bf0c9 100644 --- a/Project/Sources/Methods/WP_GetTextIndent.4dm +++ b/Project/Sources/Methods/WP_GetTextIndent.4dm @@ -1,26 +1,24 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) +#DECLARE($range : Object) -C_OBJECT:C1216($range) -C_REAL:C285($textIndentPt;$textIndentUnit) -C_TEXT:C284($textIndentUnit_t) +var $textIndentPt; $textIndentUnit : Real +var $textIndentUnit_t : Text -$range:=$1 If (Not:C34(OB Is empty:C1297($range))) - // get the indent in user units - WP GET ATTRIBUTES:C1345($range;wk text indent:K81:52;$textIndentUnit) // result in user unit - WP GET ATTRIBUTES:C1345($range;wk text indent:K81:52;$textIndentUnit_t) + // get the indent in user units + WP Get attributes:C1345($range; wk text indent:K81:52; $textIndentUnit) // result in user unit + WP Get attributes:C1345($range; wk text indent:K81:52; $textIndentUnit_t) If ($textIndentUnit#wk mixed:K81:89) - $textIndentPt:=WP_Convert ($textIndentUnit;userUnit;wk unit pt:K81:136) + $textIndentPt:=WP_Convert($textIndentUnit; userUnit; wk unit pt:K81:136) - (OBJECT Get pointer:C1124(Object named:K67:5;"textIndentRuler"))->:=$textIndentPt - (OBJECT Get pointer:C1124(Object named:K67:5;"textIndentInput"))->:=$textIndentUnit + (OBJECT Get pointer:C1124(Object named:K67:5; "textIndentRuler"))->:=$textIndentPt + (OBJECT Get pointer:C1124(Object named:K67:5; "textIndentInput"))->:=$textIndentUnit Else - (OBJECT Get pointer:C1124(Object named:K67:5;"textIndentRuler"))->:=0 - (OBJECT Get pointer:C1124(Object named:K67:5;"textIndentInput"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "textIndentRuler"))->:=0 + (OBJECT Get pointer:C1124(Object named:K67:5; "textIndentInput"))->:=0 End if End if diff --git a/Project/Sources/Methods/WP_GetTextLineHeight.4dm b/Project/Sources/Methods/WP_GetTextLineHeight.4dm index d759b302..6c74db77 100644 --- a/Project/Sources/Methods/WP_GetTextLineHeight.4dm +++ b/Project/Sources/Methods/WP_GetTextLineHeight.4dm @@ -1,68 +1,37 @@ //%attributes = {"invisible":true} //ACI0098389 2018/07/10 -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) -C_REAL:C285($textLineHeight) -C_TEXT:C284($textLineHeight_t) -C_POINTER:C301($ptrTextLineHeightUnit) -C_LONGINT:C283($p) +var $textLineHeight : Real +var $textLineHeight_t : Text +var $ptrTextLineHeightUnit : Pointer +var $p : Integer -$range:=$1 If (Not:C34(OB Is empty:C1297($range))) + //ACI0098389 2018/07/10 - If (True:C214) //ACI0098389 2018/07/10 - - $ptrTextLineHeightUnit:=OBJECT Get pointer:C1124(Object named:K67:5; "TextLineHeightUnit") - - WP GET ATTRIBUTES:C1345($range; wk line height:K81:51; $textLineHeight_t) // get the line height as TEXT - - $p:=Position:C15("pt"; $textLineHeight_t) // expressed in "pt" ? + $ptrTextLineHeightUnit:=OBJECT Get pointer:C1124(Object named:K67:5; "TextLineHeightUnit") + + WP Get attributes:C1345($range; wk line height:K81:51; $textLineHeight_t) // get the line height as TEXT + + $p:=Position:C15("pt"; $textLineHeight_t) // expressed in "pt" ? + If ($p>0) + $textLineHeight:=Num:C11(Substring:C12($textLineHeight_t; 1; $p-1)) + $ptrTextLineHeightUnit->:=2 + Else + $p:=Position:C15("%"; $textLineHeight_t) // expressed in "%" ? If ($p>0) $textLineHeight:=Num:C11(Substring:C12($textLineHeight_t; 1; $p-1)) - $ptrTextLineHeightUnit->:=2 + $ptrTextLineHeightUnit->:=1 Else - $p:=Position:C15("%"; $textLineHeight_t) // expressed in "%" ? - If ($p>0) - $textLineHeight:=Num:C11(Substring:C12($textLineHeight_t; 1; $p-1)) - $ptrTextLineHeightUnit->:=1 - Else - $ptrTextLineHeightUnit->:=1 - $textLineHeight:=100 - End if + $ptrTextLineHeightUnit->:=1 + $textLineHeight:=100 End if - - (OBJECT Get pointer:C1124(Object named:K67:5; "textLineHeightRuler"))->:=$textLineHeight - (OBJECT Get pointer:C1124(Object named:K67:5; "textLineHeightInput"))->:=$textLineHeight - - Else // previous way to calculate - - - // // read current unit - //WP GET ATTRIBUTES($range;wk layout unit;$unit) - - //If ($unit#wk unit percent) - // // changes unit temporarly to "percent" - //WP SET ATTRIBUTES($range;wk layout unit;wk unit percent) - // // get the indent in percent - //WP GET ATTRIBUTES($range;wk line height;$textLineHeight) // result in "%" - // // sets the unit back to current - //WP SET ATTRIBUTES($range;wk layout unit;$unit) - - //Else - //WP GET ATTRIBUTES($range;wk line height;$textLineHeight) // result in "%" - //End if - - //If ($textLineHeight#wk mixed) - //(OBJECT Get pointer(Object named;"textLineHeightRuler"))->:=$textLineHeight - //(OBJECT Get pointer(Object named;"textLineHeightInput"))->:=$textLineHeight - //Else - //(OBJECT Get pointer(Object named;"textLineHeightRuler"))->:=100 - //(OBJECT Get pointer(Object named;"textLineHeightInput"))->:=100 - //End if - End if + (OBJECT Get pointer:C1124(Object named:K67:5; "textLineHeightRuler"))->:=$textLineHeight + (OBJECT Get pointer:C1124(Object named:K67:5; "textLineHeightInput"))->:=$textLineHeight + End if diff --git a/Project/Sources/Methods/WP_GetTextShadow.4dm b/Project/Sources/Methods/WP_GetTextShadow.4dm index 2002dc18..c9a43589 100644 --- a/Project/Sources/Methods/WP_GetTextShadow.4dm +++ b/Project/Sources/Methods/WP_GetTextShadow.4dm @@ -1,43 +1,38 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) -C_LONGINT:C283($color) -C_LONGINT:C283($frameColor) -C_LONGINT:C283($offset) - -$range:=$1 +var $color; $frameColor; $offset : Integer $frameColor:=0x00404040 If (Not:C34(OB Is empty:C1297($range))) - WP GET ATTRIBUTES:C1345($range;wk text shadow color:K81:71;$color) + WP Get attributes:C1345($range; wk text shadow color:K81:71; $color) If ($color=wk mixed:K81:89) oForm.cbShadow:=2 - OBJECT SET VISIBLE:C603(*;"MultiShadowColor";True:C214) - OBJECT SET RGB COLORS:C628(*;"ColorShadow";$frameColor;0x00FFFFFF) + OBJECT SET VISIBLE:C603(*; "MultiShadowColor"; True:C214) + OBJECT SET RGB COLORS:C628(*; "ColorShadow"; $frameColor; 0x00FFFFFF) Else - OBJECT SET VISIBLE:C603(*;"MultiShadowColor";False:C215) + OBJECT SET VISIBLE:C603(*; "MultiShadowColor"; False:C215) If ($color=wk transparent:K81:134) oForm.cbShadow:=0 Else oForm.cbShadow:=1 - OBJECT SET RGB COLORS:C628(*;"ColorShadow";$frameColor;$color) + OBJECT SET RGB COLORS:C628(*; "ColorShadow"; $frameColor; $color) End if End if - // offset + // offset If ($color#wk transparent:K81:134) - WP GET ATTRIBUTES:C1345($range;wk text shadow offset:K81:72;$offset) + WP Get attributes:C1345($range; wk text shadow offset:K81:72; $offset) If ($offset=wk mixed:K81:89) oForm.cbShadow:=2 diff --git a/Project/Sources/Methods/WP_GetTextTransform.4dm b/Project/Sources/Methods/WP_GetTextTransform.4dm index 64a10f40..f842dcb0 100644 --- a/Project/Sources/Methods/WP_GetTextTransform.4dm +++ b/Project/Sources/Methods/WP_GetTextTransform.4dm @@ -1,21 +1,16 @@ //%attributes = {"invisible":true} +#DECLARE($range : Object) -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) - -C_POINTER:C301($ptrArrayNames;$ptrArrayValues) -C_LONGINT:C283($p) -C_LONGINT:C283($transform) - -$range:=$1 +var $ptrArrayNames; $ptrArrayValues : Pointer +var $p; $transform : Integer If (Not:C34(OB Is empty:C1297($range))) - $ptrArrayNames:=OBJECT Get pointer:C1124(Object named:K67:5;"textTransformNames") - $ptrArrayValues:=OBJECT Get pointer:C1124(Object named:K67:5;"textTransformValues") + $ptrArrayNames:=OBJECT Get pointer:C1124(Object named:K67:5; "textTransformNames") + $ptrArrayValues:=OBJECT Get pointer:C1124(Object named:K67:5; "textTransformValues") - WP GET ATTRIBUTES:C1345($range;wk text transform:K81:70;$transform) - $p:=Find in array:C230($ptrArrayValues->;$transform) + WP Get attributes:C1345($range; wk text transform:K81:70; $transform) + $p:=Find in array:C230($ptrArrayValues->; $transform) If ($p>0) $ptrArrayNames->:=$p End if diff --git a/Project/Sources/Methods/WP_GetTextUnderline.4dm b/Project/Sources/Methods/WP_GetTextUnderline.4dm index 360b7d6e..d4d0b704 100644 --- a/Project/Sources/Methods/WP_GetTextUnderline.4dm +++ b/Project/Sources/Methods/WP_GetTextUnderline.4dm @@ -1,17 +1,9 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) +#DECLARE($range : Object) +var $color; $frameColor; $i : Integer +var $colorAttribute; $widgetColor; $widgetMultiColor : Text -C_LONGINT:C283($color) -C_LONGINT:C283($frameColor) -C_LONGINT:C283($i) - -C_TEXT:C284($colorAttribute) -C_TEXT:C284($widgetColor) -C_TEXT:C284($widgetMultiColor) - -$range:=$1 $frameColor:=0x00404040 If (Not:C34(OB Is empty:C1297($range))) @@ -33,9 +25,9 @@ If (Not:C34(OB Is empty:C1297($range))) End if - WP GET ATTRIBUTES:C1345($range; $colorAttribute; $color) + WP Get attributes:C1345($range; $colorAttribute; $color) If ($color=-1) // automatic - WP GET ATTRIBUTES:C1345($range; wk text color:K81:64; $color) // lets display as text color (maybe mixed too…) + WP Get attributes:C1345($range; wk text color:K81:64; $color) // lets display as text color (maybe mixed too…) End if If ($color=wk mixed:K81:89) diff --git a/Project/Sources/Methods/WP_GetURL.4dm b/Project/Sources/Methods/WP_GetURL.4dm index b0eb239f..611827f3 100644 --- a/Project/Sources/Methods/WP_GetURL.4dm +++ b/Project/Sources/Methods/WP_GetURL.4dm @@ -1,8 +1,7 @@ //%attributes = {"invisible":true} -C_POINTER:C301($ptrLabel; $ptrURL) -C_TEXT:C284($label1; $label2) -C_COLLECTION:C1488($_URLs) - +var $ptrLabel; $ptrURL : Pointer +var $label1; $label2 : Text +var $_URLs : Collection $ptrLabel:=OBJECT Get pointer:C1124(Object named:K67:5; "URLlabel") If (Not:C34(Is nil pointer:C315($ptrLabel))) @@ -14,7 +13,6 @@ If (Not:C34(Is nil pointer:C315($ptrURL))) $ptrURL->:="" End if - If (Not:C34((Is nil pointer:C315($ptrLabel)) | (Is nil pointer:C315($ptrURL)))) $_URLs:=WP Get links:C1643(Form:C1466.selection) diff --git a/Project/Sources/Methods/WP_InsertSoftHyphen.4dm b/Project/Sources/Methods/WP_InsertSoftHyphen.4dm index 7ef445d1..bb36883d 100644 --- a/Project/Sources/Methods/WP_InsertSoftHyphen.4dm +++ b/Project/Sources/Methods/WP_InsertSoftHyphen.4dm @@ -1,7 +1,7 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($insert) -C_TEXT:C284($softHyphen; $previousChar; $nextChar) -C_OBJECT:C1216($document; $range; $paragraphRange) +var $insert : Boolean +var $softHyphen; $previousChar; $nextChar : Text +var $document; $range; $paragraphRange : Object $insert:=True:C214 // lets be OPTIMISTIC diff --git a/Project/Sources/Methods/WP_PictureSaveSettings.4dm b/Project/Sources/Methods/WP_PictureSaveSettings.4dm index 124eff30..7b1e50d2 100644 --- a/Project/Sources/Methods/WP_PictureSaveSettings.4dm +++ b/Project/Sources/Methods/WP_PictureSaveSettings.4dm @@ -1,6 +1,7 @@ //%attributes = {"invisible":true} +#DECLARE($action : Text) -If ($1="save") +If ($action="save") Form:C1466.backup:=OB Copy:C1225(Form:C1466.pictSettings) Else // rollback Form:C1466.pictSettings:=OB Copy:C1225(Form:C1466.backup) diff --git a/Project/Sources/Methods/WP_RemoveSoftHyphen.4dm b/Project/Sources/Methods/WP_RemoveSoftHyphen.4dm index a58a9348..554b3992 100644 --- a/Project/Sources/Methods/WP_RemoveSoftHyphen.4dm +++ b/Project/Sources/Methods/WP_RemoveSoftHyphen.4dm @@ -1,18 +1,8 @@ //%attributes = {"invisible":true} -C_TEXT:C284($text; $char) -C_OBJECT:C1216($range; $charRange; $document) -C_LONGINT:C283($start; $end) -C_LONGINT:C283($i; $n) - -//$objectName:=OBJECT Get name(Object with focus) -//$ptr:=OBJECT Get pointer(Object named;$objectName) -//If (Value type($ptr->)=Is object) - -//$memoErrorMethod:=Method called on error -//ON ERR CALL("WP_IgnoreError") -//$range:=WP Selection range(*;$objectName) // the object might NOT be a 4DWP document -//ON ERR CALL($memoErrorMethod) +var $text; $char : Text +var $range; $charRange; $document : Object +var $start; $end; $i; $n : Integer If (Form:C1466.selection#Null:C1517) @@ -28,7 +18,6 @@ If (Form:C1466.selection#Null:C1517) End if $end:=$range.end+1 - $range:=WP Text range:C1341($document; $start; $end) End if @@ -48,5 +37,5 @@ If (Form:C1466.selection#Null:C1517) End if End if -//End if + diff --git a/Project/Sources/Methods/WP_Request.4dm b/Project/Sources/Methods/WP_Request.4dm index 41648c14..f5b5db6d 100644 --- a/Project/Sources/Methods/WP_Request.4dm +++ b/Project/Sources/Methods/WP_Request.4dm @@ -1,17 +1,17 @@ //%attributes = {"invisible":true} //Method created 2020/06/03 to fix the ACI0100879 -var $1; $2; $3; $4; $5; $0 : Text +#DECLARE($title : Text; $value : Text; $labelOk : Text; $labelCancel : Text; $placeHolder : Text)->$answer : Text var $o : Object var $x1; $y1; $x2; $y2; $win : Integer $o:=New object:C1471 -$o.title:=$1 -$o.value:=$2 -$o.labelOk:=$3 -$o.labelCancel:=$4 -$o.placeHolder:=$5 +$o.title:=$title +$o.value:=$value +$o.labelOk:=$labelOk +$o.labelCancel:=$labelCancel +$o.placeHolder:=$placeHolder $o.windowTitle:="" GET WINDOW RECT:C443($x1; $y1; $x2; $y2) @@ -28,8 +28,8 @@ End if DIALOG:C40("D_Request"; $o) If (ok=1) - $0:=$o.value + $answer:=$o.value Else - $0:="" + $answer:="" End if diff --git a/Project/Sources/Methods/WP_Ruler.4dm b/Project/Sources/Methods/WP_Ruler.4dm index 48c6fc13..7f3daad2 100644 --- a/Project/Sources/Methods/WP_Ruler.4dm +++ b/Project/Sources/Methods/WP_Ruler.4dm @@ -1,19 +1,16 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1; $mode) - -C_COLLECTION:C1488($tabs) -C_REAL:C285($marginLeft; $marginRight; $textIndent) -C_LONGINT:C283($direction) - -$mode:=$1 // copy or paste +#DECLARE($mode : Text) +var $tabs : Collection +var $marginLeft; $marginRight; $textIndent : Real +var $direction : Integer Case of : ($mode="copy") oForm.ruler:=New object:C1471 - WP GET ATTRIBUTES:C1345(Form:C1466.selection; wk tabs:K81:278; $tabs; wk margin left:K81:11; $marginLeft; wk margin right:K81:12; $marginRight; wk text indent:K81:52; $textIndent; wk direction:K81:50; $direction) + WP Get attributes:C1345(Form:C1466.selection; wk tabs:K81:278; $tabs; wk margin left:K81:11; $marginLeft; wk margin right:K81:12; $marginRight; wk text indent:K81:52; $textIndent; wk direction:K81:50; $direction) oForm.ruler.tabs:=$tabs oForm.ruler.marginLeft:=$marginLeft diff --git a/Project/Sources/Methods/WP_SelectBookmark.4dm b/Project/Sources/Methods/WP_SelectBookmark.4dm index dad4c3fb..632b7c70 100644 --- a/Project/Sources/Methods/WP_SelectBookmark.4dm +++ b/Project/Sources/Methods/WP_SelectBookmark.4dm @@ -1,28 +1,19 @@ //%attributes = {"invisible":true} +#DECLARE($document : Object; $areaName : Text; $bookmarkName : Text; $selector : Integer) +//selector is used to know the context where the method is executed -C_OBJECT:C1216($1) // document -C_TEXT:C284($2; $3) // area Name, bookmark name +var $oRange : Object +var $i; $n : Integer -C_LONGINT:C283($4) //selector know the context where the method is executed - - -C_OBJECT:C1216($document) // document -C_TEXT:C284($areaName; $bookmarkName) // area Name, bookmark name -C_OBJECT:C1216($oRange) - -C_LONGINT:C283($i; $n) ARRAY TEXT:C222($_objects; 0) ARRAY POINTER:C280($_variables; 0) -$document:=$1 -$areaName:=$2 -$bookmarkName:=$3 -If (Count parameters:C259=3) +If (Count parameters:C259=3) // first call CALL FORM:C1391(Current form window:C827; Current method name:C684; $document; $areaName; $bookmarkName; 0) // 0 forces the "else" to be executed -Else +Else //second call : selector is now present (see the line above) $oRange:=WP Bookmark range:C1416($document; $bookmarkName) @@ -42,7 +33,7 @@ Else $n:=Size of array:C274($_objects) For ($i; 1; $n) If (OBJECT Get type:C1300(*; $_objects{$i})=Object type subform:K79:40) - EXECUTE METHOD IN SUBFORM:C1085($_objects{$i}; Current method name:C684; *; $1; $2; $3; 0) + EXECUTE METHOD IN SUBFORM:C1085($_objects{$i}; Current method name:C684; *; $document; $areaName; $bookmarkName; 0) End if End for diff --git a/Project/Sources/Methods/WP_Set4Ddate.4dm b/Project/Sources/Methods/WP_Set4Ddate.4dm deleted file mode 100644 index f8418aa7..00000000 --- a/Project/Sources/Methods/WP_Set4Ddate.4dm +++ /dev/null @@ -1,31 +0,0 @@ -//%attributes = {"invisible":true} -C_TEXT:C284($1) -C_LONGINT:C283($2;$3) - -C_TEXT:C284($areaName) - -C_LONGINT:C283($start;$end) -C_OBJECT:C1216($oCurrent) - -If (Count parameters:C259=0) // component context - - If (areaName#"") - - $oCurrent:=Form:C1466.selection - $start:=OB Get:C1224($oCurrent;wk start:K81:87) - $end:=OB Get:C1224($oCurrent;wk end:K81:88) - - CALL FORM:C1391(Current form window:C827;Current method name:C684;areaName;$start;$end) - - End if - -Else - - $areaName:=$1 - $start:=$2 - $end:=$3 - - ST INSERT EXPRESSION:C1281(*;$areaName;"Current date:C33";$start;$end) - WP SELECT:C1348(*;$areaName;$end+1;$end+1) - -End if \ No newline at end of file diff --git a/Project/Sources/Methods/WP_SetAlign.4dm b/Project/Sources/Methods/WP_SetAlign.4dm index a38a9c2f..93b304c6 100644 --- a/Project/Sources/Methods/WP_SetAlign.4dm +++ b/Project/Sources/Methods/WP_SetAlign.4dm @@ -1,15 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($align) - -$range:=$1 -$align:=$2 +#DECLARE($range : Object; $align : Integer) If (Not:C34(OB Is empty:C1297($range))) - - WP SET ATTRIBUTES:C1342($range;wk text align:K81:49;$align) - + WP SET ATTRIBUTES:C1342($range; wk text align:K81:49; $align) End if diff --git a/Project/Sources/Methods/WP_SetBackgroundColor.4dm b/Project/Sources/Methods/WP_SetBackgroundColor.4dm index 68e36c8f..486d5e9f 100644 --- a/Project/Sources/Methods/WP_SetBackgroundColor.4dm +++ b/Project/Sources/Methods/WP_SetBackgroundColor.4dm @@ -1,13 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($color) - -$range:=$1 -$color:=$2 +#DECLARE($range : Object; $color : Integer) If (Not:C34(OB Is empty:C1297($range))) - WP SET ATTRIBUTES:C1342($range;wk background color:K81:20;$color) + WP SET ATTRIBUTES:C1342($range; wk background color:K81:20; $color) End if diff --git a/Project/Sources/Methods/WP_SetCellProtection.4dm b/Project/Sources/Methods/WP_SetCellProtection.4dm index a719daf3..5c463af7 100644 --- a/Project/Sources/Methods/WP_SetCellProtection.4dm +++ b/Project/Sources/Methods/WP_SetCellProtection.4dm @@ -1,11 +1,7 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1; $textRange) -C_LONGINT:C283($2; $protection) +#DECLARE($textRange : Object; $protection : Integer) -C_OBJECT:C1216($cells) - -$textRange:=$1 -$protection:=$2 +var $cells : Object $cells:=WP Table get cells:C1477($textRange) If ($cells#Null:C1517) diff --git a/Project/Sources/Methods/WP_SetDocInfos.4dm b/Project/Sources/Methods/WP_SetDocInfos.4dm index e54ecec3..70f7eb3c 100644 --- a/Project/Sources/Methods/WP_SetDocInfos.4dm +++ b/Project/Sources/Methods/WP_SetDocInfos.4dm @@ -1,36 +1,34 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_OBJECT:C1216($range) -C_LONGINT:C283($i;$n) +#DECLARE($range : Object) -$range:=$1 +var $i; $n : Integer If (Not:C34(OB Is empty:C1297($range))) - ARRAY TEXT:C222($_Sources;0) - ARRAY POINTER:C280($_Targets;0) + ARRAY TEXT:C222($_Sources; 0) + ARRAY POINTER:C280($_Targets; 0) - APPEND TO ARRAY:C911($_Sources;wk title:K81:79) - APPEND TO ARRAY:C911($_Sources;wk subject:K81:80) - APPEND TO ARRAY:C911($_Sources;wk author:K81:81) - APPEND TO ARRAY:C911($_Sources;wk company:K81:82) - APPEND TO ARRAY:C911($_Sources;wk notes:K81:83) - //APPEND TO ARRAY($_Sources;wp date creation) - APPEND TO ARRAY:C911($_Sources;wk date modified:K81:85) + APPEND TO ARRAY:C911($_Sources; wk title:K81:79) + APPEND TO ARRAY:C911($_Sources; wk subject:K81:80) + APPEND TO ARRAY:C911($_Sources; wk author:K81:81) + APPEND TO ARRAY:C911($_Sources; wk company:K81:82) + APPEND TO ARRAY:C911($_Sources; wk notes:K81:83) + //APPEND TO ARRAY($_Sources;wp date creation) + APPEND TO ARRAY:C911($_Sources; wk date modified:K81:85) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Title")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Subject")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Author")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Company")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Notes")) - //APPEND TO ARRAY($_Targets;OBJECT Get pointer(Object named;"Created")) - APPEND TO ARRAY:C911($_Targets;OBJECT Get pointer:C1124(Object named:K67:5;"Modified")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Title")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Subject")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Author")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Company")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Notes")) + //APPEND TO ARRAY($_Targets;OBJECT Get pointer(Object named;"Created")) + APPEND TO ARRAY:C911($_Targets; OBJECT Get pointer:C1124(Object named:K67:5; "Modified")) $n:=Size of array:C274($_Sources) - For ($i;1;$n) - WP SET ATTRIBUTES:C1342($range;$_Sources{$i};$_Targets{$i}->) + For ($i; 1; $n) + WP SET ATTRIBUTES:C1342($range; $_Sources{$i}; $_Targets{$i}->) End for End if diff --git a/Project/Sources/Methods/WP_SetDocumentProtection.4dm b/Project/Sources/Methods/WP_SetDocumentProtection.4dm index 57b4b21f..c7aa2ee5 100644 --- a/Project/Sources/Methods/WP_SetDocumentProtection.4dm +++ b/Project/Sources/Methods/WP_SetDocumentProtection.4dm @@ -1,9 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1;$document) -C_BOOLEAN:C305($2;$protected) -$document:=$1 -$protected:=$2 +#DECLARE($document : Object; $protected : Boolean) -WP SET ATTRIBUTES:C1342($document;wk protection enabled:K81:307;$protected) +WP SET ATTRIBUTES:C1342($document; wk protection enabled:K81:307; $protected) diff --git a/Project/Sources/Methods/WP_SetFont.4dm b/Project/Sources/Methods/WP_SetFont.4dm index 4db35fc2..ef6bdd36 100644 --- a/Project/Sources/Methods/WP_SetFont.4dm +++ b/Project/Sources/Methods/WP_SetFont.4dm @@ -1,12 +1,5 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_TEXT:C284($2) - -C_OBJECT:C1216($range) -C_TEXT:C284($font) - -$range:=$1 -$font:=$2 +#DECLARE($range : Object; $font : Text) If (Not:C34(OB Is empty:C1297($range))) WP SET ATTRIBUTES:C1342($range; wk font:K81:69; $font) diff --git a/Project/Sources/Methods/WP_SetFontBold.4dm b/Project/Sources/Methods/WP_SetFontBold.4dm index 6e59877b..6dbd96ec 100644 --- a/Project/Sources/Methods/WP_SetFontBold.4dm +++ b/Project/Sources/Methods/WP_SetFontBold.4dm @@ -1,12 +1,5 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($weight) - -$range:=$1 -$weight:=$2 +#DECLARE($range : Object; $weight : Integer) If (Not:C34(OB Is empty:C1297($range))) WP SET ATTRIBUTES:C1342($range; wk font bold:K81:68; $weight) diff --git a/Project/Sources/Methods/WP_SetFontFamily.4dm b/Project/Sources/Methods/WP_SetFontFamily.4dm index f6556640..e9ec4da8 100644 --- a/Project/Sources/Methods/WP_SetFontFamily.4dm +++ b/Project/Sources/Methods/WP_SetFontFamily.4dm @@ -1,12 +1,5 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_TEXT:C284($2) - -C_OBJECT:C1216($range) -C_TEXT:C284($family) - -$range:=$1 -$family:=$2 +#DECLARE($range : Object; $family : Text) If (Not:C34(OB Is empty:C1297($range))) WP SET ATTRIBUTES:C1342($range; wk font family:K81:65; $family) diff --git a/Project/Sources/Methods/WP_SetFontItalic.4dm b/Project/Sources/Methods/WP_SetFontItalic.4dm index 2a16fa51..26135059 100644 --- a/Project/Sources/Methods/WP_SetFontItalic.4dm +++ b/Project/Sources/Methods/WP_SetFontItalic.4dm @@ -1,12 +1,5 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($style) - -$range:=$1 -$style:=$2 +#DECLARE($range : Object; $style : Integer) If (Not:C34(OB Is empty:C1297($range))) WP SET ATTRIBUTES:C1342($range; wk font italic:K81:67; $style) diff --git a/Project/Sources/Methods/WP_SetFontVertAlign.4dm b/Project/Sources/Methods/WP_SetFontVertAlign.4dm index 6ab4a048..b6bc27d9 100644 --- a/Project/Sources/Methods/WP_SetFontVertAlign.4dm +++ b/Project/Sources/Methods/WP_SetFontVertAlign.4dm @@ -1,13 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($verticalAlign) - -$range:=$1 -$verticalAlign:=$2 +#DECLARE($range : Object; $verticalAlign : Integer) If (Not:C34(OB Is empty:C1297($range))) - WP SET ATTRIBUTES:C1342($range;wk vertical align:K81:9;$verticalAlign) + WP SET ATTRIBUTES:C1342($range; wk vertical align:K81:9; $verticalAlign) End if diff --git a/Project/Sources/Methods/WP_SetFormula.4dm b/Project/Sources/Methods/WP_SetFormula.4dm index cb57d523..6f4484e8 100644 --- a/Project/Sources/Methods/WP_SetFormula.4dm +++ b/Project/Sources/Methods/WP_SetFormula.4dm @@ -1,8 +1,8 @@ //%attributes = {"invisible":true} -C_TEXT:C284($virtualExpression; $trueExpression) -C_LONGINT:C283($n) -C_POINTER:C301($ptr) +var $virtualExpression; $trueExpression : Text +var $n : Integer +var $ptr : Pointer ARRAY TEXT:C222($_titles; 0) ARRAY LONGINT:C221($_nums; 0) @@ -53,7 +53,7 @@ If (Not:C34(Is nil pointer:C315($ptr))) $formula:=Formula from string:C1601($trueExpression; 1) // 1 = sk execute in host database If (Form:C1466.selection.type#2) // not an anchored picture - WP INSERT FORMULA:C1703(Form:C1466.selection; $formula; wk replace:K81:177) + WP Insert formula:C1703(Form:C1466.selection; $formula; wk replace:K81:177) Else // si anchored picture, update the attribute Form:C1466.selection.imageFormula:=$formula End if @@ -63,7 +63,7 @@ If (Not:C34(Is nil pointer:C315($ptr))) End if Else - ALERT:C41(Get localized string:C991("NoTableAvailable")) + ALERT:C41(Localized string:C991("NoTableAvailable")) End if diff --git a/Project/Sources/Methods/WP_SetParagraphProtection.4dm b/Project/Sources/Methods/WP_SetParagraphProtection.4dm index 1cf938c9..30fa7ba6 100644 --- a/Project/Sources/Methods/WP_SetParagraphProtection.4dm +++ b/Project/Sources/Methods/WP_SetParagraphProtection.4dm @@ -1,8 +1,4 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1;$textRange) -C_LONGINT:C283($2;$protection) +#DECLARE($textRange : Object; $protection : Integer) -$textRange:=$1 -$protection:=$2 - -WP SET ATTRIBUTES:C1342($textRange;wk protected:K81:306;$protection) +WP SET ATTRIBUTES:C1342($textRange; wk protected:K81:306; $protection) diff --git a/Project/Sources/Methods/WP_SetRowProtection.4dm b/Project/Sources/Methods/WP_SetRowProtection.4dm index 96bf5b63..e26b87d3 100644 --- a/Project/Sources/Methods/WP_SetRowProtection.4dm +++ b/Project/Sources/Methods/WP_SetRowProtection.4dm @@ -1,11 +1,7 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1; $textRange) -C_LONGINT:C283($2; $protection) +#DECLARE($textRange : Object; $protection : Integer) -C_OBJECT:C1216($rows) - -$textRange:=$1 -$protection:=$2 +var $rows : Object $rows:=WP Table get rows:C1475($textRange) If ($rows#Null:C1517) diff --git a/Project/Sources/Methods/WP_SetSizes.4dm b/Project/Sources/Methods/WP_SetSizes.4dm index 1d1ef89d..63b36bc4 100644 --- a/Project/Sources/Methods/WP_SetSizes.4dm +++ b/Project/Sources/Methods/WP_SetSizes.4dm @@ -1,14 +1,7 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_TEXT:C284($2) +#DECLARE($range : Object; $type : Text) -C_OBJECT:C1216($range) -C_TEXT:C284($type) - -$range:=$1 -$type:=$2 - -ARRAY REAL:C219($_value;4) +ARRAY REAL:C219($_value; 4) If (Not:C34(OB Is empty:C1297($range))) @@ -16,44 +9,44 @@ If (Not:C34(OB Is empty:C1297($range))) : ($type="picture") - $_value{1}:=(OBJECT Get pointer:C1124(Object named:K67:5;"pictureHeight"))-> - $_value{2}:=(OBJECT Get pointer:C1124(Object named:K67:5;"pictureWidth"))-> - $_value{3}:=(OBJECT Get pointer:C1124(Object named:K67:5;"pictureMinHeight"))-> - $_value{4}:=(OBJECT Get pointer:C1124(Object named:K67:5;"pictureMinWidth"))-> + $_value{1}:=(OBJECT Get pointer:C1124(Object named:K67:5; "pictureHeight"))-> + $_value{2}:=(OBJECT Get pointer:C1124(Object named:K67:5; "pictureWidth"))-> + $_value{3}:=(OBJECT Get pointer:C1124(Object named:K67:5; "pictureMinHeight"))-> + $_value{4}:=(OBJECT Get pointer:C1124(Object named:K67:5; "pictureMinWidth"))-> : ($type="paragraph") - $_value{2}:=(OBJECT Get pointer:C1124(Object named:K67:5;"paragraphWidth"))-> - $_value{3}:=(OBJECT Get pointer:C1124(Object named:K67:5;"paragraphMinHeight"))-> - $_value{4}:=(OBJECT Get pointer:C1124(Object named:K67:5;"paragraphMinWidth"))-> + $_value{2}:=(OBJECT Get pointer:C1124(Object named:K67:5; "paragraphWidth"))-> + $_value{3}:=(OBJECT Get pointer:C1124(Object named:K67:5; "paragraphMinHeight"))-> + $_value{4}:=(OBJECT Get pointer:C1124(Object named:K67:5; "paragraphMinWidth"))-> End case Case of : ($type="picture") - WP SET ATTRIBUTES:C1342($range;wk height:K81:46;$_value{1}) - WP SET ATTRIBUTES:C1342($range;wk width:K81:45;$_value{2}) - WP SET ATTRIBUTES:C1342($range;wk min height:K81:48;$_value{3}) - WP SET ATTRIBUTES:C1342($range;wk min width:K81:47;$_value{4}) + WP SET ATTRIBUTES:C1342($range; wk height:K81:46; $_value{1}) + WP SET ATTRIBUTES:C1342($range; wk width:K81:45; $_value{2}) + WP SET ATTRIBUTES:C1342($range; wk min height:K81:48; $_value{3}) + WP SET ATTRIBUTES:C1342($range; wk min width:K81:47; $_value{4}) : ($type="paragraph") - If ((OBJECT Get pointer:C1124(Object named:K67:5;"rbWidthOption1"))->=1) //set width by default + If ((OBJECT Get pointer:C1124(Object named:K67:5; "rbWidthOption1"))->=1) //set width by default $_value{4}:=0 - WP SET ATTRIBUTES:C1342($range;wk width:K81:45;$_value{2}) - WP SET ATTRIBUTES:C1342($range;wk min height:K81:48;$_value{3}) - WP SET ATTRIBUTES:C1342($range;wk min width:K81:47;$_value{4}) + WP SET ATTRIBUTES:C1342($range; wk width:K81:45; $_value{2}) + WP SET ATTRIBUTES:C1342($range; wk min height:K81:48; $_value{3}) + WP SET ATTRIBUTES:C1342($range; wk min width:K81:47; $_value{4}) Else // min width has been set, so width MUST be set to 0 $_value{2}:=0 - WP SET ATTRIBUTES:C1342($range;wk width:K81:45;$_value{2}) - WP SET ATTRIBUTES:C1342($range;wk min height:K81:48;$_value{3}) - WP SET ATTRIBUTES:C1342($range;wk min width:K81:47;$_value{4}) + WP SET ATTRIBUTES:C1342($range; wk width:K81:45; $_value{2}) + WP SET ATTRIBUTES:C1342($range; wk min height:K81:48; $_value{3}) + WP SET ATTRIBUTES:C1342($range; wk min width:K81:47; $_value{4}) End if diff --git a/Project/Sources/Methods/WP_SetTabIndent.4dm b/Project/Sources/Methods/WP_SetTabIndent.4dm index 7fc3fc8a..b6f817fc 100644 --- a/Project/Sources/Methods/WP_SetTabIndent.4dm +++ b/Project/Sources/Methods/WP_SetTabIndent.4dm @@ -1,19 +1,15 @@ //%attributes = {"invisible":true} +#DECLARE($indent : Real) -C_REAL:C285($1) -C_REAL:C285($indent) +var $ptr : Pointer +var $n : Integer -C_POINTER:C301($ptr) -C_LONGINT:C283($n) - -$indent:=$1 - -$ptr:=OBJECT Get pointer:C1124(Object named:K67:5;"lb_offsets") +$ptr:=OBJECT Get pointer:C1124(Object named:K67:5; "lb_offsets") $n:=Size of array:C274($ptr->) If ($n=0) - APPEND TO ARRAY:C911($ptr->;$indent) + APPEND TO ARRAY:C911($ptr->; $indent) Else $ptr->{$n}:=$indent End if diff --git a/Project/Sources/Methods/WP_SetTabInfos.4dm b/Project/Sources/Methods/WP_SetTabInfos.4dm index a1e5464a..9f89adc5 100644 --- a/Project/Sources/Methods/WP_SetTabInfos.4dm +++ b/Project/Sources/Methods/WP_SetTabInfos.4dm @@ -1,85 +1,83 @@ //%attributes = {"invisible":true} -C_LONGINT:C283($offset) +var tabDefault : Object -C_OBJECT:C1216($oParagraphs) -C_OBJECT:C1216(tabDefault) -C_OBJECT:C1216($tab) - -C_TEXT:C284($unit) +var $offset : Integer +var $oParagraphs; $tab : Object +var $unit : Text $oParagraphs:=Form:C1466.paragraphRange If (Not:C34(OB Is empty:C1297($oParagraphs))) - // NEW CODE WITH COLLECTION - WP GET ATTRIBUTES:C1345($oParagraphs;wk layout unit:K81:78;$unit) - For each ($tab;_tabs) - $tab.offset:=String:C10($tab.offsetNum;"&xml")+$unit // + // NEW CODE WITH COLLECTION + WP Get attributes:C1345($oParagraphs; wk layout unit:K81:78; $unit) + For each ($tab; _tabs) + $tab.offset:=String:C10($tab.offsetNum; "&xml")+$unit // End for each - WP SET ATTRIBUTES:C1342($oParagraphs;wk tabs:K81:278;_tabs) + WP SET ATTRIBUTES:C1342($oParagraphs; wk tabs:K81:278; _tabs) - // default values + // default values tabDefault:=New object:C1471 - $offset:=(OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))-> + $offset:=(OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentInput"))-> If ($offset>0) - tabDefault.offset:=(OBJECT Get pointer:C1124(Object named:K67:5;"tabIndentInput"))-> + tabDefault.offset:=(OBJECT Get pointer:C1124(Object named:K67:5; "tabIndentInput"))-> End if Case of - : ((OBJECT Get pointer:C1124(Object named:K67:5;"bTabType0"))->=1) + : ((OBJECT Get pointer:C1124(Object named:K67:5; "bTabType0"))->=1) tabDefault.type:=wk left:K81:95 - : ((OBJECT Get pointer:C1124(Object named:K67:5;"bTabType1"))->=1) + : ((OBJECT Get pointer:C1124(Object named:K67:5; "bTabType1"))->=1) tabDefault.type:=wk right:K81:96 - : ((OBJECT Get pointer:C1124(Object named:K67:5;"bTabType2"))->=1) + : ((OBJECT Get pointer:C1124(Object named:K67:5; "bTabType2"))->=1) tabDefault.type:=wk center:K81:99 - : ((OBJECT Get pointer:C1124(Object named:K67:5;"bTabType3"))->=1) + : ((OBJECT Get pointer:C1124(Object named:K67:5; "bTabType3"))->=1) tabDefault.type:=wk decimal:K81:126 - : ((OBJECT Get pointer:C1124(Object named:K67:5;"bTabType4"))->=1) + : ((OBJECT Get pointer:C1124(Object named:K67:5; "bTabType4"))->=1) tabDefault.type:=wk bar:K81:127 End case - tabDefault.leading:=(OBJECT Get pointer:C1124(Object named:K67:5;"tabDefaultLeading"))-> + tabDefault.leading:=(OBJECT Get pointer:C1124(Object named:K67:5; "tabDefaultLeading"))-> - WP SET ATTRIBUTES:C1342($oParagraphs;wk tab default:K81:279;tabDefault) + WP SET ATTRIBUTES:C1342($oParagraphs; wk tab default:K81:279; tabDefault) - //If (False) // OLD CODE WITH ARRAYS - //$ptrOffsets:=OBJECT Get pointer(Object named;"lb_offsets") - //$ptrTypes:=OBJECT Get pointer(Object named;"lb_types") + //If (False) // OLD CODE WITH ARRAYS + //$ptrOffsets:=OBJECT Get pointer(Object named;"lb_offsets") + //$ptrTypes:=OBJECT Get pointer(Object named;"lb_types") - //$tabValue:=(OBJECT Get pointer(Object named;"tabIndentInput"))-> + //$tabValue:=(OBJECT Get pointer(Object named;"tabIndentInput"))-> - //Case of - //: ((OBJECT Get pointer(Object named;"bTabType0"))->=1) - //$tabType:=wk left - //: ((OBJECT Get pointer(Object named;"bTabType1"))->=1) - //$tabType:=wk right - //: ((OBJECT Get pointer(Object named;"bTabType2"))->=1) - //$tabType:=wk center - //: ((OBJECT Get pointer(Object named;"bTabType3"))->=1) - //$tabType:=wk decimal - //: ((OBJECT Get pointer(Object named;"bTabType4"))->=1) - //$tabType:=wk bar - //End case + //Case of + //: ((OBJECT Get pointer(Object named;"bTabType0"))->=1) + //$tabType:=wk left + //: ((OBJECT Get pointer(Object named;"bTabType1"))->=1) + //$tabType:=wk right + //: ((OBJECT Get pointer(Object named;"bTabType2"))->=1) + //$tabType:=wk center + //: ((OBJECT Get pointer(Object named;"bTabType3"))->=1) + //$tabType:=wk decimal + //: ((OBJECT Get pointer(Object named;"bTabType4"))->=1) + //$tabType:=wk bar + //End case - // // temporary add default values at the top of the array - //APPEND TO ARRAY($ptrOffsets->;$tabValue) - //APPEND TO ARRAY($ptrTypes->;$tabType) + // // temporary add default values at the top of the array + //APPEND TO ARRAY($ptrOffsets->;$tabValue) + //APPEND TO ARRAY($ptrTypes->;$tabType) - //WP SET ATTRIBUTES($oParagraphs;wk tab stop offsets;$ptrOffsets->) - //WP SET ATTRIBUTES($oParagraphs;wk tab stop types;$ptrTypes->) + //WP SET ATTRIBUTES($oParagraphs;wk tab stop offsets;$ptrOffsets->) + //WP SET ATTRIBUTES($oParagraphs;wk tab stop types;$ptrTypes->) - // // remove default values - //$n:=Size of array($ptrOffsets->) - //DELETE FROM ARRAY($ptrOffsets->;$n;1) // remove the default value from the array - //DELETE FROM ARRAY($ptrTypes->;$n;1) // remove the default value from the array + // // remove default values + //$n:=Size of array($ptrOffsets->) + //DELETE FROM ARRAY($ptrOffsets->;$n;1) // remove the default value from the array + //DELETE FROM ARRAY($ptrTypes->;$n;1) // remove the default value from the array - //End if + //End if End if diff --git a/Project/Sources/Methods/WP_SetTabType.4dm b/Project/Sources/Methods/WP_SetTabType.4dm index 808c5a8e..3fb8356a 100644 --- a/Project/Sources/Methods/WP_SetTabType.4dm +++ b/Project/Sources/Methods/WP_SetTabType.4dm @@ -1,8 +1,4 @@ //%attributes = {"invisible":true} +#DECLARE($type : Integer) -C_LONGINT:C283($1) -C_LONGINT:C283($type) - -$type:=$1 - -WP_SetTabInfos \ No newline at end of file +WP_SetTabInfos \ No newline at end of file diff --git a/Project/Sources/Methods/WP_SetTableProtection.4dm b/Project/Sources/Methods/WP_SetTableProtection.4dm index 4b91780a..84fb2c52 100644 --- a/Project/Sources/Methods/WP_SetTableProtection.4dm +++ b/Project/Sources/Methods/WP_SetTableProtection.4dm @@ -1,11 +1,7 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1;$textRange) -C_LONGINT:C283($2;$protection) +#DECLARE($textRange : Object; $protection : Integer) -C_OBJECT:C1216($tableRange) - -$textRange:=$1 -$protection:=$2 +var $tableRange : Object $tableRange:=WP Table range:C1553($textRange) -WP SET ATTRIBUTES:C1342($tableRange;wk protected:K81:306;$protection) +WP SET ATTRIBUTES:C1342($tableRange; wk protected:K81:306; $protection) diff --git a/Project/Sources/Methods/WP_SetTextColor.4dm b/Project/Sources/Methods/WP_SetTextColor.4dm index 739e4dd0..1cbc2c32 100644 --- a/Project/Sources/Methods/WP_SetTextColor.4dm +++ b/Project/Sources/Methods/WP_SetTextColor.4dm @@ -1,13 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($color) - -$range:=$1 -$color:=$2 +#DECLARE($range : Object; $color : Integer) If (Not:C34(OB Is empty:C1297($range))) - WP SET ATTRIBUTES:C1342($range;wk text color:K81:64;$color) + WP SET ATTRIBUTES:C1342($range; wk text color:K81:64; $color) End if diff --git a/Project/Sources/Methods/WP_SetTextIndent.4dm b/Project/Sources/Methods/WP_SetTextIndent.4dm index febf57f9..1b446a2e 100644 --- a/Project/Sources/Methods/WP_SetTextIndent.4dm +++ b/Project/Sources/Methods/WP_SetTextIndent.4dm @@ -1,27 +1,15 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_REAL:C285($2) -C_TEXT:C284($3) - -C_OBJECT:C1216($range) -C_REAL:C285($indent) -C_TEXT:C284($tempUnit) - - -$range:=$1 -$indent:=$2 +#DECLARE($range : Object; $indent : Real; $tempUnit : Text) If (Not:C34(OB Is empty:C1297($range))) If (Count parameters:C259=3) - $tempUnit:=$3 - - $indent:=WP_Convert ($indent;$tempUnit;userUnit) - WP SET ATTRIBUTES:C1342($range;wk text indent:K81:52;$indent) + $indent:=WP_Convert($indent; $tempUnit; userUnit) + WP SET ATTRIBUTES:C1342($range; wk text indent:K81:52; $indent) Else - WP SET ATTRIBUTES:C1342($range;wk text indent:K81:52;$indent) + WP SET ATTRIBUTES:C1342($range; wk text indent:K81:52; $indent) End if End if diff --git a/Project/Sources/Methods/WP_SetTextLineHeight.4dm b/Project/Sources/Methods/WP_SetTextLineHeight.4dm index c1e2cfc6..ebe05269 100644 --- a/Project/Sources/Methods/WP_SetTextLineHeight.4dm +++ b/Project/Sources/Methods/WP_SetTextLineHeight.4dm @@ -1,18 +1,10 @@ //%attributes = {"invisible":true} -//ACI0098389 (new item added) - -C_OBJECT:C1216($1) -C_REAL:C285($2) -C_TEXT:C284($3) +#DECLARE($range : Object; $heightValue : Real) -C_OBJECT:C1216($range) -C_REAL:C285($heightValue) -C_TEXT:C284($heightValue_t) -C_POINTER:C301($ptrTextLineHeightUnit) - -$range:=$1 -$heightValue:=$2 +//ACI0098389 (new item added) +var $heightValue_t : Text +var $ptrTextLineHeightUnit : Pointer If (Not:C34(OB Is empty:C1297($range))) diff --git a/Project/Sources/Methods/WP_SetTextLinetrough.4dm b/Project/Sources/Methods/WP_SetTextLinetrough.4dm index 85f2d875..c2b375d4 100644 --- a/Project/Sources/Methods/WP_SetTextLinetrough.4dm +++ b/Project/Sources/Methods/WP_SetTextLinetrough.4dm @@ -1,13 +1,5 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - - -C_OBJECT:C1216($range) -C_LONGINT:C283($color) - -$range:=$1 -$color:=$2 +#DECLARE($range : Object; $color : Integer) If (Not:C34(OB Is empty:C1297($range))) diff --git a/Project/Sources/Methods/WP_SetTextShadow.4dm b/Project/Sources/Methods/WP_SetTextShadow.4dm index df7d2f85..3d74c555 100644 --- a/Project/Sources/Methods/WP_SetTextShadow.4dm +++ b/Project/Sources/Methods/WP_SetTextShadow.4dm @@ -1,26 +1,17 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) -C_LONGINT:C283($3) +#DECLARE($range : Object; $offset : Integer; $color : Integer) -C_OBJECT:C1216($range) -C_LONGINT:C283($offset) -C_LONGINT:C283($color) -$range:=$1 -$offset:=$2 -If (Count parameters:C259>=3) - $color:=$3 -Else +If (Count parameters:C259<3) $color:=-1 End if If (Not:C34(OB Is empty:C1297($range))) - // set the shadow offset in pt - WP SET ATTRIBUTES:C1342($range;wk text shadow offset:K81:72;$offset) + // set the shadow offset in pt + WP SET ATTRIBUTES:C1342($range; wk text shadow offset:K81:72; $offset) If ($color>=0) | ($color=wk transparent:K81:134) - WP SET ATTRIBUTES:C1342($range;wk text shadow color:K81:71;$color) + WP SET ATTRIBUTES:C1342($range; wk text shadow color:K81:71; $color) End if End if \ No newline at end of file diff --git a/Project/Sources/Methods/WP_SetTextTransform.4dm b/Project/Sources/Methods/WP_SetTextTransform.4dm index fb64c303..10a83df8 100644 --- a/Project/Sources/Methods/WP_SetTextTransform.4dm +++ b/Project/Sources/Methods/WP_SetTextTransform.4dm @@ -1,13 +1,6 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($transform) - -$range:=$1 -$transform:=$2 +#DECLARE($range : Object; $transform : Integer) If (Not:C34(OB Is empty:C1297($range))) - WP SET ATTRIBUTES:C1342($range;wk text transform:K81:70;$transform) + WP SET ATTRIBUTES:C1342($range; wk text transform:K81:70; $transform) End if diff --git a/Project/Sources/Methods/WP_SetTextUnderline.4dm b/Project/Sources/Methods/WP_SetTextUnderline.4dm index 9e23f9ea..fb1e3833 100644 --- a/Project/Sources/Methods/WP_SetTextUnderline.4dm +++ b/Project/Sources/Methods/WP_SetTextUnderline.4dm @@ -1,14 +1,5 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1) -C_LONGINT:C283($2) -//C_LONGINT($2) - -C_OBJECT:C1216($range) -C_LONGINT:C283($color) -//C_LONGINT($style) - -$range:=$1 -$color:=$2 +#DECLARE($range : Object; $color : Integer) If (Not:C34(OB Is empty:C1297($range))) diff --git a/Project/Sources/Methods/WP_ShiftIndent.4dm b/Project/Sources/Methods/WP_ShiftIndent.4dm index 6b8e411c..07624247 100644 --- a/Project/Sources/Methods/WP_ShiftIndent.4dm +++ b/Project/Sources/Methods/WP_ShiftIndent.4dm @@ -1,17 +1,15 @@ //%attributes = {"invisible":true} -C_TEXT:C284($1; $shiftMode) +#DECLARE($shiftMode : Text) // shift right -C_REAL:C285($leftMargin; $rightMargin; $pageWidth; $pageHeight; $pageLeftMargin; $pageRightMargin; $shift) -C_LONGINT:C283($orientation; $direction) -C_TEXT:C284($unit) -C_OBJECT:C1216($paragraph; $section) -C_COLLECTION:C1488($_paragraphs) +var $leftMargin; $rightMargin; $pageWidth; $pageHeight; $pageLeftMargin; $pageRightMargin; $shift : Real +var $orientation; $direction : Integer +var $unit : Text +var $paragraph; $section : Object +var $_paragraphs : Collection -$shiftMode:=$1 - -WP GET ATTRIBUTES:C1345(Form:C1466.selection; wk layout unit:K81:78; $unit) +WP Get attributes:C1345(Form:C1466.selection; wk layout unit:K81:78; $unit) Case of : ($unit="cm") $shift:=1 @@ -24,7 +22,7 @@ Case of End case $paragraph:=WP Paragraph range:C1346(Form:C1466.selection) -WP GET ATTRIBUTES:C1345($paragraph; wk margin left:K81:11; $leftMargin; wk margin right:K81:12; $rightMargin) +WP Get attributes:C1345($paragraph; wk margin left:K81:11; $leftMargin; wk margin right:K81:12; $rightMargin) If ($leftMargin=wk mixed:K81:89) | ($rightMargin=wk mixed:K81:89) $_paragraphs:=WP Get elements:C1550(Form:C1466.selection; wk type paragraph:K81:191) // collection of paragraph elements @@ -34,10 +32,10 @@ End if For each ($paragraph; $_paragraphs) - WP GET ATTRIBUTES:C1345($paragraph; wk margin left:K81:11; $leftMargin; wk margin right:K81:12; $rightMargin; wk direction:K81:50; $direction) + WP Get attributes:C1345($paragraph; wk margin left:K81:11; $leftMargin; wk margin right:K81:12; $rightMargin; wk direction:K81:50; $direction) $section:=WP Get section:C1581($paragraph) - WP GET ATTRIBUTES:C1345($section; \ + WP Get attributes:C1345($section; \ wk page width:K81:262; $pageWidth; \ wk page height:K81:263; $pageHeight; \ wk page orientation:K81:264; $orientation; \ @@ -82,7 +80,4 @@ For each ($paragraph; $_paragraphs) End case - - - End for each diff --git a/Project/Sources/Methods/WP_ShowTabPages.4dm b/Project/Sources/Methods/WP_ShowTabPages.4dm index c985e666..51514a48 100644 --- a/Project/Sources/Methods/WP_ShowTabPages.4dm +++ b/Project/Sources/Methods/WP_ShowTabPages.4dm @@ -33,15 +33,12 @@ Possible values inside collection for toolbar */ -C_COLLECTION:C1488($1; $_tabs) +#DECLARE($_tabs : Collection) -C_LONGINT:C283($width; $height; $nbPages) +var $width; $height; $nbPages : Integer +var $typeForm; $buttonName; $className : Text -C_TEXT:C284($typeForm) -C_TEXT:C284($buttonName) -C_TEXT:C284($className) -$_tabs:=$1 distinctKeepOrder($_tabs) //.distinct() FORM GET PROPERTIES:C674(Current form name:C1298; $width; $height; $nbPages) diff --git a/Project/Sources/Methods/WP_StyleFillEditLB.4dm b/Project/Sources/Methods/WP_StyleFillEditLB.4dm index 2d899b5e..c92b5eae 100644 --- a/Project/Sources/Methods/WP_StyleFillEditLB.4dm +++ b/Project/Sources/Methods/WP_StyleFillEditLB.4dm @@ -1,38 +1,17 @@ //%attributes = {"invisible":true} -//WP_StyleFillEditLB +#DECLARE($page : Integer) -C_LONGINT:C283($1) - -C_BOOLEAN:C305($translate) -C_BOOLEAN:C305($forceCheck) - -//C_TEXT($1;$category) - -C_OBJECT:C1216($styleSheet) -C_OBJECT:C1216($tempTarget) -C_OBJECT:C1216($item) -C_OBJECT:C1216($temp) -C_OBJECT:C1216($target) -C_OBJECT:C1216($normalStyleSheet) -C_OBJECT:C1216($val_o) -C_COLLECTION:C1488($col) -C_COLLECTION:C1488($val_c) - -C_LONGINT:C283($i) - -C_REAL:C285($val_r) - -C_TEXT:C284($displayStylesheetValue) -C_TEXT:C284($displayNormalValue) -C_TEXT:C284($category) -C_TEXT:C284($val_t) +var $translate; $forceCheck : Boolean +var $styleSheet; $tempTarget; $item; $temp; $target; $normalStyleSheet; $val_o : Object +var $col; $val_c : Collection +var $i : Integer +var $val_r : Real +var $displayStylesheetValue; $displayNormalValue; $category; $val_t : Text //------------------------------------------------------------------------------------------ If (Count parameters:C259=0) GET LIST ITEM:C378(_StylesheetTabs; *; $page; $text) //| *;itemRef;itemText{;sublist;expanded}) -Else - $page:=$1 End if $category:=Choose:C955($page; "bug"; "fonts"; "paragraphs"; "margins") @@ -100,16 +79,16 @@ For each ($item; $col) Case of : ($item.valueType=Is text:K8:3) - WP GET ATTRIBUTES:C1345($tempTarget; $item.property; $val_t) // read the value in the style sheet + WP Get attributes:C1345($tempTarget; $item.property; $val_t) // read the value in the style sheet $temp.value:=$val_t : ($item.valueType=Is real:K8:4) - WP GET ATTRIBUTES:C1345($tempTarget; $item.property; $val_r) // read the value in the style sheet + WP Get attributes:C1345($tempTarget; $item.property; $val_r) // read the value in the style sheet $temp.value:=$val_r : ($item.valueType=Is object:K8:27) - WP GET ATTRIBUTES:C1345($tempTarget; $item.property; $val_o) // read the value in the style sheet + WP Get attributes:C1345($tempTarget; $item.property; $val_o) // read the value in the style sheet $temp.value:=$val_o : ($item.valueType=Is collection:K8:32) - WP GET ATTRIBUTES:C1345($tempTarget; $item.property; $val_c) // read the value in the style sheet + WP Get attributes:C1345($tempTarget; $item.property; $val_c) // read the value in the style sheet $temp.value:=$val_c End case diff --git a/Project/Sources/Methods/WP_StylesheetAdd.4dm b/Project/Sources/Methods/WP_StylesheetAdd.4dm index 5fb2b1c2..9f3c6f65 100644 --- a/Project/Sources/Methods/WP_StylesheetAdd.4dm +++ b/Project/Sources/Methods/WP_StylesheetAdd.4dm @@ -1,38 +1,30 @@ //%attributes = {"invisible":true} -C_COLLECTION:C1488($col) +var $col : Collection +var $typeStylesheet; $i; $n; $p : Integer +var $newStylesheet; $source; $o : Object +var $ptrStylesheetNames : Pointer +var $menu; $submenu; $choice; $rqCancel; $rqOK; $rqPlaceHolder; $rqTitle; $placeHolder; $newName; $sourceName : Text -C_LONGINT:C283($typeStylesheet) -C_LONGINT:C283($i;$n;$p) +$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") +$typeStylesheet:=WP_GetStylesheetType -C_OBJECT:C1216($newStylesheet) -C_OBJECT:C1216($source;$o) - -C_POINTER:C301($ptrStylesheetNames) - -C_TEXT:C284($menu;$submenu;$choice) -C_TEXT:C284($rqCancel;$rqOK;$rqPlaceHolder;$rqTitle;$placeHolder) -C_TEXT:C284($newName;$sourceName) - -$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") -$typeStylesheet:=WP_GetStylesheetType - - // create menu ***************** +// create menu ***************** $menu:=Create menu:C408 - //APPEND MENU ITEM($menu;Get localized string("menuNewEmpty")) - //SET MENU ITEM PARAMETER($menu;-1;"new") -APPEND MENU ITEM:C411($menu;Get localized string:C991("menuNewFromSelection")) -SET MENU ITEM PARAMETER:C1004($menu;-1;"newFromSelection") +//APPEND MENU ITEM($menu;Get localized string("menuNewEmpty")) +//SET MENU ITEM PARAMETER($menu;-1;"new") +APPEND MENU ITEM:C411($menu; Localized string:C991("menuNewFromSelection")) +SET MENU ITEM PARAMETER:C1004($menu; -1; "newFromSelection") $n:=Size of array:C274($ptrStylesheetNames->) If ($n>0) // no "duplicate" if no items ! $submenu:=Create menu:C408 - For ($i;1;$n) - APPEND MENU ITEM:C411($submenu;$ptrStylesheetNames->{$i}) - SET MENU ITEM PARAMETER:C1004($submenu;-1;"duplicate_"+String:C10($i)) + For ($i; 1; $n) + APPEND MENU ITEM:C411($submenu; $ptrStylesheetNames->{$i}) + SET MENU ITEM PARAMETER:C1004($submenu; -1; "duplicate_"+String:C10($i)) End for - APPEND MENU ITEM:C411($menu;Get localized string:C991("menuDuplicate");$submenu) + APPEND MENU ITEM:C411($menu; Localized string:C991("menuDuplicate"); $submenu) RELEASE MENU:C978($submenu) // will be cleared later thanks to refcounting End if @@ -42,60 +34,60 @@ RELEASE MENU:C978($menu) If ($choice#"") - // Action ***************** + // Action ***************** - ARRAY TEXT:C222($allstylesheet_Names;0) - COLLECTION TO ARRAY:C1562(WP Get style sheets:C1655(Form:C1466.document;wk type character:K81:296).extract("name").concat(WP Get style sheets:C1655(Form:C1466.document;wk type paragraph:K81:191).extract("name"));$allstylesheet_Names) + ARRAY TEXT:C222($allstylesheet_Names; 0) + COLLECTION TO ARRAY:C1562(WP Get style sheets:C1655(Form:C1466.document; wk type character:K81:296).extract("name").concat(WP Get style sheets:C1655(Form:C1466.document; wk type paragraph:K81:191).extract("name")); $allstylesheet_Names) - $rqTitle:=Get localized string:C991("requestTitle") - $rqPlaceHolder:=Get localized string:C991("requestPlaceHolder") - $rqOK:=Get localized string:C991("requestCreateLabel") - $rqCancel:=Get localized string:C991("requestCancelLabel") - $placeHolder:=Get localized string:C991("StyleSheetPlaceHolder") + $rqTitle:=Localized string:C991("requestTitle") + $rqPlaceHolder:=Localized string:C991("requestPlaceHolder") + $rqOK:=Localized string:C991("requestCreateLabel") + $rqCancel:=Localized string:C991("requestCancelLabel") + $placeHolder:=Localized string:C991("StyleSheetPlaceHolder") Case of : ($choice="new") | ($choice="newFromSelection") Repeat - //$newName:=Request($rqTitle;$rqPlaceHolder;$rqOK;$rqCancel) - //Method WP_Request created 2020/06/03 to fix the ACI0100879 - $newName:=WP_Request ($rqTitle;$rqPlaceHolder;$rqOK;$rqCancel;$placeHolder) + //$newName:=Request($rqTitle;$rqPlaceHolder;$rqOK;$rqCancel) + //Method WP_Request created 2020/06/03 to fix the ACI0100879 + $newName:=WP_Request($rqTitle; $rqPlaceHolder; $rqOK; $rqCancel; $placeHolder) If ($newName="section@") - ALERT:C41(Get localized string:C991("nameError")) + ALERT:C41(Localized string:C991("nameError")) End if Until (($newName#"section@") & ($newName#"")) | (ok=0) : ($choice="duplicate_@") - $i:=Num:C11(Substring:C12($choice;11)) // 11 = after the "_" in "duplicate_XXX" + $i:=Num:C11(Substring:C12($choice; 11)) // 11 = after the "_" in "duplicate_XXX" $sourceName:=$ptrStylesheetNames->{$i} $newName:=$sourceName Repeat - $newName:=TOOL_IncrementString ($newName) - $p:=Find in array:C230($allstylesheet_Names;$newName) + $newName:=TOOL_IncrementString($newName) + $p:=Find in array:C230($allstylesheet_Names; $newName) Until ($p<0) - //$newName:=Request($rqTitle;$newName;$rqOK;$rqCancel) - //Method WP_Request created 2020/06/03 to fix the ACI0100879 - $newName:=WP_Request ($rqTitle;$rqPlaceHolder;$rqOK;$rqCancel;$placeHolder) + //$newName:=Request($rqTitle;$newName;$rqOK;$rqCancel) + //Method WP_Request created 2020/06/03 to fix the ACI0100879 + $newName:=WP_Request($rqTitle; $rqPlaceHolder; $rqOK; $rqCancel; $placeHolder) End case If (ok=1) // resuls of Request - // just in case the user refuses the "x" added at the end… - $p:=Find in array:C230($allstylesheet_Names;$newName) + // just in case the user refuses the "x" added at the end… + $p:=Find in array:C230($allstylesheet_Names; $newName) While ($p>0) - $newName:=TOOL_IncrementString ($newName) - $p:=Find in array:C230($allstylesheet_Names;$newName) + $newName:=TOOL_IncrementString($newName) + $p:=Find in array:C230($allstylesheet_Names; $newName) End while - $newStylesheet:=WP New style sheet:C1650(Form:C1466.document;$typeStylesheet;$newName) - $col:=WP_GetStyleAttributesByType ($typeStylesheet) // collection of attributes according to stylesheet TYPE + $newStylesheet:=WP New style sheet:C1650(Form:C1466.document; $typeStylesheet; $newName) + $col:=WP_GetStyleAttributesByType($typeStylesheet) // collection of attributes according to stylesheet TYPE Case of - //: ($choice="new") - // // already done + //: ($choice="new") + // // already done : ($choice="newFromSelection") @@ -113,23 +105,23 @@ If ($choice#"") $o.to:=$newStylesheet $o.remove:=True:C214 - WP_StylesheetSetAttributes ($o) //$col;$source;$newStylesheet;True) - WP SET ATTRIBUTES:C1342(Form:C1466.selection;wk style sheet:K81:63;$newStylesheet) // as an object + WP_StylesheetSetAttributes($o) //$col;$source;$newStylesheet;True) + WP SET ATTRIBUTES:C1342(Form:C1466.selection; wk style sheet:K81:63; $newStylesheet) // as an object : ($choice="duplicate_@") $o:=New object:C1471 - //$o.list:=$col - $o.from:=WP Get style sheet:C1656(Form:C1466.document;$sourceName) + //$o.list:=$col + $o.from:=WP Get style sheet:C1656(Form:C1466.document; $sourceName) $o.to:=$newStylesheet - WP_StylesheetCopyAttributes ($o) //$col;$sourceStylesheet;$newStylesheet) + WP_StylesheetCopyAttributes($o) //$col;$sourceStylesheet;$newStylesheet) End case - WP_GetStyleSheets // update the list + WP_GetStyleSheets // update the list End if End if diff --git a/Project/Sources/Methods/WP_StylesheetCopyAttributes.4dm b/Project/Sources/Methods/WP_StylesheetCopyAttributes.4dm index 38d96578..0d715207 100644 --- a/Project/Sources/Methods/WP_StylesheetCopyAttributes.4dm +++ b/Project/Sources/Methods/WP_StylesheetCopyAttributes.4dm @@ -1,16 +1,9 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1;$o) +#DECLARE($o : Object) - -C_COLLECTION:C1488($_attributes) - -C_OBJECT:C1216($source) -C_OBJECT:C1216($target) - -C_TEXT:C284($name) - - -$o:=$1 +var $_attributes : Collection +var $source; $target : Object +var $name : Text $source:=$o.from $target:=$o.to @@ -18,14 +11,14 @@ $target:=$o.to If ($o.list#Null:C1517) $_attributes:=$o.list Else - ARRAY TEXT:C222($_attributeNames;0) + ARRAY TEXT:C222($_attributeNames; 0) $_attributes:=New collection:C1472 - OB GET PROPERTY NAMES:C1232($source;$_attributeNames) - ARRAY TO COLLECTION:C1563($_attributes;$_attributeNames) + OB GET PROPERTY NAMES:C1232($source; $_attributeNames) + ARRAY TO COLLECTION:C1563($_attributes; $_attributeNames) End if - //$object:=New object -For each ($name;$_attributes) // only contains attribute NAMES, VALUES will be added (or not) +//$object:=New object +For each ($name; $_attributes) // only contains attribute NAMES, VALUES will be added (or not) Case of : ($name="name") diff --git a/Project/Sources/Methods/WP_StylesheetEdit.4dm b/Project/Sources/Methods/WP_StylesheetEdit.4dm index b2265fe5..dee78a92 100644 --- a/Project/Sources/Methods/WP_StylesheetEdit.4dm +++ b/Project/Sources/Methods/WP_StylesheetEdit.4dm @@ -1,20 +1,14 @@ //%attributes = {"invisible":true} +var $n; $p; $win : Integer +var $document; $styleSheet; $form : Object +var $ptrStylesheetNames; $ptrListbox : Pointer +var $stylesheetName; $newName : Text -C_LONGINT:C283($n;$p;$win) - -C_OBJECT:C1216($document) -C_OBJECT:C1216($styleSheet) -C_OBJECT:C1216($form) - -C_POINTER:C301($ptrStylesheetNames;$ptrListbox) - -C_TEXT:C284($stylesheetName;$newName) - -$ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5;"LB_StyleSheets") -$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") +$ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_StyleSheets") +$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") If (Not:C34(Is nil pointer:C315($ptrListbox))) // from palette - $n:=Find in array:C230($ptrListbox->;True:C214) // index + $n:=Find in array:C230($ptrListbox->; True:C214) // index Else // from toolbar $n:=$ptrStylesheetNames-> End if @@ -22,11 +16,11 @@ If ($n>0) $stylesheetName:=$ptrStylesheetNames->{$n} End if - //$stylesheetType:=WP_GetStylesheetType // wk type default or wk type paragraph +//$stylesheetType:=WP_GetStylesheetType // wk type default or wk type paragraph If ($stylesheetName#"") $document:=Form:C1466.selection[wk owner:K81:168] - $styleSheet:=WP Get style sheet:C1656($document;$stylesheetName) + $styleSheet:=WP Get style sheet:C1656($document; $stylesheetName) End if @@ -36,33 +30,33 @@ If ($styleSheet#Null:C1517) $form.selection:=Form:C1466.selection $form.name:=$form.stylesheet.name // if stylesheet.name = "normal" the dialog will disable almost everything - $win:=Open form window:C675("WP_StyleSheetEdit";Plain form window:K39:10;Horizontally centered:K39:1;Vertically centered:K39:4) - DIALOG:C40("WP_StyleSheetEdit";$form) + $win:=Open form window:C675("WP_StyleSheetEdit"; Plain form window:K39:10; Horizontally centered:K39:1; Vertically centered:K39:4) + DIALOG:C40("WP_StyleSheetEdit"; $form) If ($form.name#$form.stylesheet.name) - // changed named, must be checked - ARRAY TEXT:C222($allstylesheet_Names;0) + // changed named, must be checked + ARRAY TEXT:C222($allstylesheet_Names; 0) - COLLECTION TO ARRAY:C1562(WP Get style sheets:C1655(Form:C1466.document;wk type paragraph:K81:191).concat(WP Get style sheets:C1655(Form:C1466.document;wk type character:K81:296));$allstylesheet_Names;"name") + COLLECTION TO ARRAY:C1562(WP Get style sheets:C1655(Form:C1466.document; wk type paragraph:K81:191).concat(WP Get style sheets:C1655(Form:C1466.document; wk type character:K81:296)); $allstylesheet_Names; "name") $newName:=$form.name - $p:=Find in array:C230($allstylesheet_Names;$newName) + $p:=Find in array:C230($allstylesheet_Names; $newName) While ($p>0) - $newName:=TOOL_IncrementString ($newName) - $p:=Find in array:C230($allstylesheet_Names;$newName) + $newName:=TOOL_IncrementString($newName) + $p:=Find in array:C230($allstylesheet_Names; $newName) End while $form.stylesheet.name:=$form.name End if - // force stype sheet apply (test) - //WP SET ATTRIBUTES(Form.selection;wk style sheet;$form.stylesheet) + // force stype sheet apply (test) + //WP SET ATTRIBUTES(Form.selection;wk style sheet;$form.stylesheet) - WP_GetStyleSheets // reload list + WP_GetStyleSheets // reload list End if SET TIMER:C645(-1) - //End case +//End case diff --git a/Project/Sources/Methods/WP_StylesheetRemove.4dm b/Project/Sources/Methods/WP_StylesheetRemove.4dm index 7904512a..72bc118b 100644 --- a/Project/Sources/Methods/WP_StylesheetRemove.4dm +++ b/Project/Sources/Methods/WP_StylesheetRemove.4dm @@ -1,15 +1,14 @@ //%attributes = {"invisible":true} -C_BOOLEAN:C305($delete) -C_LONGINT:C283($stylesheetType) -C_POINTER:C301($ptrListbox;$ptrStylesheetNames) -C_TEXT:C284($menu;$menuLabel;$choice) -C_LONGINT:C283($p) -C_TEXT:C284($stylesheetName) +var $delete : Boolean +var $stylesheetType : Integer +var $ptrListbox; $ptrStylesheetNames : Pointer +var $menu; $menuLabel; $choice; $stylesheetName : Text +var $p : Integer -$ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5;"LB_StyleSheets") -$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5;"stylesheet_Names") +$ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_StyleSheets") +$ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") If (Not:C34(Is nil pointer:C315($ptrListbox))) // executed from palette - $p:=Find in array:C230($ptrListbox->;True:C214) + $p:=Find in array:C230($ptrListbox->; True:C214) Else // executed from toolbar $p:=$ptrStylesheetNames-> End if @@ -22,41 +21,41 @@ End if If ($stylesheetName="normal") | ($stylesheetName="") - //$delete:=False - // should NEVER happend, the button should be disabled + //$delete:=False + // should NEVER happend, the button should be disabled Else - $stylesheetType:=WP_GetStylesheetType // wk type default or wk type paragraph + $stylesheetType:=WP_GetStylesheetType // wk type default or wk type paragraph - //CONFIRM(".Delete style sheet \""+$stylesheetName+"\"?";".delete";".cancel") - //If (ok=1) // cancel = 1, delete = 0 - // //ALERT(".Style sheet can't be delete yet…") - //WP DELETE STYLE SHEET(Form.document;$stylesheetName) - //WP_GetStyleSheets // refresh - //End if - //SET TIMER(-1) + //CONFIRM(".Delete style sheet \""+$stylesheetName+"\"?";".delete";".cancel") + //If (ok=1) // cancel = 1, delete = 0 + // //ALERT(".Style sheet can't be delete yet…") + //WP DELETE STYLE SHEET(Form.document;$stylesheetName) + //WP_GetStyleSheets // refresh + //End if + //SET TIMER(-1) $menu:=Create menu:C408 $delete:=True:C214 If ($delete) - $menuLabel:=Get localized string:C991("menuDeleteStylesheet") - $menuLabel:=Replace string:C233($menuLabel;"<1>";$stylesheetName) - APPEND MENU ITEM:C411($menu;$menuLabel) - SET MENU ITEM PARAMETER:C1004($menu;-1;"Delete") + $menuLabel:=Localized string:C991("menuDeleteStylesheet") + $menuLabel:=Replace string:C233($menuLabel; "<1>"; $stylesheetName) + APPEND MENU ITEM:C411($menu; $menuLabel) + SET MENU ITEM PARAMETER:C1004($menu; -1; "Delete") End if If ($stylesheetType=wk type default:K81:190) - APPEND MENU ITEM:C411($menu;Get localized string:C991("menuRemoveCharacterStyleshet")) - SET MENU ITEM PARAMETER:C1004($menu;-1;"RemoveCharacterSS") + APPEND MENU ITEM:C411($menu; Localized string:C991("menuRemoveCharacterStyleshet")) + SET MENU ITEM PARAMETER:C1004($menu; -1; "RemoveCharacterSS") End if If ($stylesheetType=wk type paragraph:K81:191) - APPEND MENU ITEM:C411($menu;Get localized string:C991("menuRemoveParagraphStylesheet")) - SET MENU ITEM PARAMETER:C1004($menu;-1;"RemoveParagraphSS") + APPEND MENU ITEM:C411($menu; Localized string:C991("menuRemoveParagraphStylesheet")) + SET MENU ITEM PARAMETER:C1004($menu; -1; "RemoveParagraphSS") End if @@ -65,17 +64,17 @@ Else Case of : ($choice="Delete") - CONFIRM:C162(Replace string:C233(Get localized string:C991("confirmDeleteStylesheet");"<1>";$stylesheetName);Get localized string:C991("delete");Get localized string:C991("cancel")) + CONFIRM:C162(Replace string:C233(Localized string:C991("confirmDeleteStylesheet"); "<1>"; $stylesheetName); Localized string:C991("delete"); Localized string:C991("cancel")) If (ok=1) - WP DELETE STYLE SHEET:C1652(Form:C1466.document;$stylesheetName) + WP DELETE STYLE SHEET:C1652(Form:C1466.document; $stylesheetName) End if - WP_GetStyleSheets + WP_GetStyleSheets : ($choice="RemoveCharacterSS") - WP RESET ATTRIBUTES:C1344(Form:C1466.selection;wk style sheet:K81:63) + WP RESET ATTRIBUTES:C1344(Form:C1466.selection; wk style sheet:K81:63) : ($choice="RemoveParagraphSS") - WP RESET ATTRIBUTES:C1344(WP Paragraph range:C1346(Form:C1466.selection);wk style sheet:K81:63) + WP RESET ATTRIBUTES:C1344(WP Paragraph range:C1346(Form:C1466.selection); wk style sheet:K81:63) End case diff --git a/Project/Sources/Methods/WP_StylesheetSetAttributes.4dm b/Project/Sources/Methods/WP_StylesheetSetAttributes.4dm index c7da21c1..ba3a87c1 100644 --- a/Project/Sources/Methods/WP_StylesheetSetAttributes.4dm +++ b/Project/Sources/Methods/WP_StylesheetSetAttributes.4dm @@ -1,36 +1,16 @@ //%attributes = {"invisible":true} -C_OBJECT:C1216($1; $o) +#DECLARE($o : Object) -C_BOOLEAN:C305($removeFromSource) -C_BOOLEAN:C305($checkNormal; $checkValue) -C_BOOLEAN:C305($exit) -C_BOOLEAN:C305($sameAsNormal) - -C_COLLECTION:C1488($_attributes) -C_COLLECTION:C1488($updateList) -C_COLLECTION:C1488($stackList) - -C_LONGINT:C283($type) - -C_OBJECT:C1216($item) -C_OBJECT:C1216($source) -C_OBJECT:C1216($paragraph) -C_OBJECT:C1216($target) -C_OBJECT:C1216($document) -C_OBJECT:C1216($normal) -C_OBJECT:C1216($stackItem) - -C_TEXT:C284($action) -C_TEXT:C284($property) -C_TEXT:C284($jsonSource; $jsonNormal) - -$o:=$1 +var $removeFromSource; $checkNormal; $checkValue; $exit; $sameAsNormal : Boolean +var $_attributes; $updateList; $stackList : Collection +var $type : Integer +var $item; $source; $paragraph; $target; $document; $normal; $stackItem : Object +var $action; $property; $jsonSource; $jsonNormal : Text $_attributes:=$o.list $source:=$o.from $target:=$o.to - If ($o.remove#Null:C1517) $removeFromSource:=$o.remove Else diff --git a/Project/Sources/Methods/WP_StylesheetUpdate.4dm b/Project/Sources/Methods/WP_StylesheetUpdate.4dm index 6d018014..fa86669a 100644 --- a/Project/Sources/Methods/WP_StylesheetUpdate.4dm +++ b/Project/Sources/Methods/WP_StylesheetUpdate.4dm @@ -1,24 +1,15 @@ //%attributes = {"invisible":true} -C_COLLECTION:C1488($_attributes) - -C_LONGINT:C283($stylesheetType) -C_LONGINT:C283($n) - -C_OBJECT:C1216($source; $o) -C_OBJECT:C1216($stylesheet) -C_OBJECT:C1216($document) -C_OBJECT:C1216($styleSheet) - -C_POINTER:C301($ptrListbox; $ptrStylesheetNames) - -C_TEXT:C284($stylesheetName) +var $_attributes : Collection +var $stylesheetType; $n : Integer +var $source; $o; $stylesheet; $document; $styleSheet : Object +var $ptrListbox; $ptrStylesheetNames : Pointer +var $stylesheetName : Text $stylesheetType:=WP_GetStylesheetType // paragraph, char, picture, table, row or cell $ptrListbox:=OBJECT Get pointer:C1124(Object named:K67:5; "LB_StyleSheets") $ptrStylesheetNames:=OBJECT Get pointer:C1124(Object named:K67:5; "stylesheet_Names") - Case of : (Form event code:C388=On Clicked:K2:4) diff --git a/Project/Sources/Methods/WP_SwitchToolbar.4dm b/Project/Sources/Methods/WP_SwitchToolbar.4dm index 16e3f20e..4b592436 100644 --- a/Project/Sources/Methods/WP_SwitchToolbar.4dm +++ b/Project/Sources/Methods/WP_SwitchToolbar.4dm @@ -1,15 +1,11 @@ //%attributes = {"invisible":true} //ACI0099141 fixed 29/01/2019 by RL (WP SwitchToolbar intead of WP SwichToolbar, without "t") -C_TEXT:C284($1) -C_TEXT:C284($NewfolderName) +#DECLARE($NewFolderName : Text) -C_LONGINT:C283($i; $n; $p; $length) -C_TEXT:C284($start) +var $i; $n; $p; $length : Integer +var $start; $format; $folderName : Text -C_TEXT:C284($format; $folderName; $NewFolderName) - -$NewFolderName:=$1 ARRAY TEXT:C222($_formObjects; 0) FORM GET OBJECTS:C898($_formObjects) diff --git a/Project/Sources/Methods/WP_xxx_Set4Dexpression.4dm b/Project/Sources/Methods/WP_xxx_Set4Dexpression.4dm deleted file mode 100644 index 2e25eccd..00000000 --- a/Project/Sources/Methods/WP_xxx_Set4Dexpression.4dm +++ /dev/null @@ -1,74 +0,0 @@ -//%attributes = {"invisible":true} -C_TEXT:C284($1) -C_TEXT:C284($2) -C_LONGINT:C283($3; $4) - -C_TEXT:C284($areaName) -C_TEXT:C284($trueExpression; $virtualExpression) -C_LONGINT:C283($start; $end) -C_LONGINT:C283($n) -C_POINTER:C301($ptr) -ARRAY TEXT:C222($_titles; 0) -ARRAY LONGINT:C221($_nums; 0) - -If (Count parameters:C259=0) // component context - - $trueExpression:=(OBJECT Get pointer:C1124(Object named:K67:5; "TrueExpression"))-> - // the formula is displayed with virtual structure - // parse to real structure before edit - $virtualExpression:=Parse formula:C1576($trueExpression; Formula in with virtual structure:K88:1) - - - If (Not:C34(Is nil pointer:C315(masterTable))) // 27 sept 2018 (was not used before!) - $ptr:=masterTable - Else - $ptr:=Current form table:C627 - If (Is nil pointer:C315($ptr)) - // RL 2019/12/02 : check for available table in database - GET TABLE TITLES:C803($_titles; $_nums) - $n:=Size of array:C274($_nums) - If ($n>0) - $ptr:=Table:C252($_nums{1}) - End if - End if - End if - - - If (Not:C34(Is nil pointer:C315($ptr))) - - If (Form:C1466.selection.start=Form:C1466.selection.end) //ACI0101873 (check again) - $trueExpression:="" - $virtualExpression:="" - End if - EDIT FORMULA:C806($ptr->; $trueExpression) - - If (ok=1) - - (OBJECT Get pointer:C1124(Object named:K67:5; "TrueExpression"))->:=$trueExpression - - If (areaName#"") - - $start:=OB Get:C1224(Form:C1466.selection; wk start:K81:87) - $end:=OB Get:C1224(Form:C1466.selection; wk end:K81:88) - - CALL FORM:C1391(Current form window:C827; Current method name:C684; areaName; $trueExpression; $start; $end) // this must be executed in the host form - - End if - End if - Else - ALERT:C41(Get localized string:C991("NoTableAvailable")) - End if - -Else // host database WINDOW (generated by CALL FORM above) // THE CONTEXT IS STILL THE CONTEXT OF THE COMPONENT but FORM OBJECTS ARE REACHABLE - - $areaName:=$1 - $trueExpression:=$2 - $start:=$3 - $end:=$4 - - ST INSERT EXPRESSION:C1281(*; $areaName; $trueExpression; $start; $end) - //WP SELECT(*; $areaName; $end; $end) - -End if - -//ST INSERT EXPRESSION($ptr->;$expression) \ No newline at end of file diff --git a/Project/Sources/Methods/_and.4dm b/Project/Sources/Methods/_and.4dm deleted file mode 100644 index 24c07e87..00000000 --- a/Project/Sources/Methods/_and.4dm +++ /dev/null @@ -1,13 +0,0 @@ -//%attributes = {"invisible":true} -C_OBJECT:C1216(${1}) -C_LONGINT:C283($i) -C_BOOLEAN:C305($0;$result) - -$result:=True:C214 -$i:=1 -Repeat - $result:=$result & (${$i}.call()) - $i:=$i+1 -Until ($i>Count parameters:C259) | ($result=False:C215) - -$0:=$result diff --git a/Project/Sources/Methods/_bool.4dm b/Project/Sources/Methods/_bool.4dm deleted file mode 100644 index 5e4ba77c..00000000 --- a/Project/Sources/Methods/_bool.4dm +++ /dev/null @@ -1,55 +0,0 @@ -//%attributes = {"invisible":true} - //%attributes = {"invisible":true} - // ---------------------------------------------------- - // Project method : _bool - // Database: 4D Mobile App - // ID[06511DE8ED904E3495500804FA271F14] - // Created 16-4-2019 by Vincent de Lachaux - // ---------------------------------------------------- - // Description: - // - // ---------------------------------------------------- - // Declarations -C_BOOLEAN:C305($0) -C_TEXT:C284($1) - -C_OBJECT:C1216($o) - -If (False:C215) - C_BOOLEAN:C305(_bool ;$0) - C_TEXT:C284(_bool ;$1) -End if - -$o:=New object:C1471 - -Case of - - //______________________________________________________ - : ($1="false") - - $o.value:=False:C215 - - //______________________________________________________ - : ($1="true") - - $o.value:=True:C214 - - //______________________________________________________ - : (Match regex:C1019("(?m-si)^\\d+$";$1;1;*)) - - $o.value:=Bool:C1537(Num:C11($1)) - - //______________________________________________________ - Else - - $o.value:=($1#"") - - //______________________________________________________ -End case - - // ---------------------------------------------------- - // Return -$0:=OB Get:C1224($o;"value";Is boolean:K8:9) - - // ---------------------------------------------------- - // End \ No newline at end of file diff --git a/Project/Sources/Methods/_or.4dm b/Project/Sources/Methods/_or.4dm deleted file mode 100644 index 8a7d5a23..00000000 --- a/Project/Sources/Methods/_or.4dm +++ /dev/null @@ -1,16 +0,0 @@ -//%attributes = {"invisible":true} -C_OBJECT:C1216(${1}) -C_LONGINT:C283($i) -C_BOOLEAN:C305($0;$result) - -$result:=False:C215 -$i:=1 -Repeat - $result:=$result | (${$i}.call()) - $i:=$i+1 -Until ($i>Count parameters:C259) | ($result=True:C214) - -$0:=$result - - - diff --git a/Project/Sources/Methods/distinctKeepOrder.4dm b/Project/Sources/Methods/distinctKeepOrder.4dm index eaaa8f84..a662a4b3 100644 --- a/Project/Sources/Methods/distinctKeepOrder.4dm +++ b/Project/Sources/Methods/distinctKeepOrder.4dm @@ -1,6 +1,6 @@ //%attributes = {"invisible":true} -var $1 : Collection -var $col : Collection +#DECLARE($col : Collection) + var $i; $p : Integer If (Count parameters:C259=0) @@ -15,11 +15,6 @@ If (Count parameters:C259=0) Else - $col:=$1 - - //$col2:=$col1.distinct() - //If ($col1.length#$col2.length) // there are some doubles - $i:=0 While ($i<($col.length-1)) $p:=$col.indexOf($col[$i]; $i+1) @@ -32,7 +27,5 @@ Else End while - //End if - End if diff --git a/Project/Sources/Methods/getIcon.4dm b/Project/Sources/Methods/getIcon.4dm index 25b6b67d..c3884bbf 100644 --- a/Project/Sources/Methods/getIcon.4dm +++ b/Project/Sources/Methods/getIcon.4dm @@ -1,7 +1,4 @@ //%attributes = {"invisible":true} -var $1; $type : Text -var $0 : Picture +#DECLARE($type : Text)->$picture : Picture -$type:=$1 - -$0:=Form:C1466.icons[$type] // ex : .error .warning +$picture:=Form:C1466.icons[$type] // ex : .error .warning diff --git a/Project/Sources/Methods/zGetSamplePict.4dm b/Project/Sources/Methods/zGetSamplePict.4dm index 91dfe6c9..5cf88317 100644 --- a/Project/Sources/Methods/zGetSamplePict.4dm +++ b/Project/Sources/Methods/zGetSamplePict.4dm @@ -1,7 +1,4 @@ //%attributes = {"invisible":true} -var $0 : Picture -var $pict : Picture -READ PICTURE FILE:C678(Get 4D folder:C485(Current resources folder:K5:16)+"Images"+Folder separator:K24:12+"sampleColor.png"; $pict) - +#DECLARE()->$pict : Picture -$0:=$pict +READ PICTURE FILE:C678(Get 4D folder:C485(Current resources folder:K5:16)+"Images"+Folder separator:K24:12+"sampleColor.png"; $pict) diff --git a/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/Button22.4dm b/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/Button22.4dm index 0645ef52..98dafc5a 100644 --- a/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/Button22.4dm +++ b/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/Button22.4dm @@ -1,3 +1,4 @@ -svgPict:=WP CreatePreview([SAMPLE:1]WP:2) + +svgPict:=WP CreatePreview([Sample:1]wp:2) diff --git a/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/WParea.4dm b/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/WParea.4dm index 5f0d1ca0..310c3b1b 100644 --- a/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/WParea.4dm +++ b/Project/Sources/TableForms/1/InputToolBar/ObjectMethods/WParea.4dm @@ -1,19 +1,10 @@ -var $menu; $result : Text - WP UpdateWidget("WPtoolbar"; "WParea") -//WP ContextualMenu(New collection("pictureSettings"; "formulaSettings"; "tableSettings")) + +ContextMemnu_Display("WParea"; ["paragraph"; "table"; "spell"]) + -If (Form event code:C388=On Clicked:K2:4) && (Contextual click:C713) - $menu:=Create menu:C408 - APPEND MENU ITEM:C411($menu; ak standard action title:K76:83) - SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "spell") - - $result:=Dynamic pop up menu:C1006($menu) - RELEASE MENU:C978($menu) - -End if //If (Form event code=On Double Clicked) | (Shift down) // shift down to allow anchored picture selection (test) diff --git a/Project/Sources/TableForms/1/InputToolBar/form.4DForm b/Project/Sources/TableForms/1/InputToolBar/form.4DForm index fcf053f1..393117a7 100644 --- a/Project/Sources/TableForms/1/InputToolBar/form.4DForm +++ b/Project/Sources/TableForms/1/InputToolBar/form.4DForm @@ -725,6 +725,14 @@ "method": "ObjectMethods/Button32.4dm", "sizingX": "fixed", "sizingY": "move" + }, + "Text": { + "type": "text", + "text": "$hue", + "top": -9, + "left": 51, + "width": 31, + "height": 17 } }, "entryOrder": [ @@ -783,7 +791,7 @@ "kind": "form" }, "method": "method.4dm", - "geometryStamp": 424, + "geometryStamp": 425, "editor": { "activeView": "View 1", "defaultView": "View 1", diff --git a/Project/Sources/TableForms/1/InputToolBar/method.4dm b/Project/Sources/TableForms/1/InputToolBar/method.4dm index b97f706c..f510f0e9 100644 --- a/Project/Sources/TableForms/1/InputToolBar/method.4dm +++ b/Project/Sources/TableForms/1/InputToolBar/method.4dm @@ -1,3 +1,4 @@ + Case of : (Form event code:C388=On Load:K2:1) @@ -20,7 +21,7 @@ Case of SET ALLOWED METHODS:C805($_AllowedMethods) - C_OBJECT:C1216($WP_skin) + _O_C_OBJECT:C1216($WP_skin) $WP_skin:=New object:C1471 If (FORM Get color scheme:C1761="light") diff --git a/Project/Sources/catalog.4DCatalog b/Project/Sources/catalog.4DCatalog index d9eb0b99..9757449c 100644 --- a/Project/Sources/catalog.4DCatalog +++ b/Project/Sources/catalog.4DCatalog @@ -1,6 +1,6 @@ - + diff --git a/Project/Sources/folders.json b/Project/Sources/folders.json index b9db5b45..bffccff6 100644 --- a/Project/Sources/folders.json +++ b/Project/Sources/folders.json @@ -37,7 +37,6 @@ "WP_GetTextLineHeight", "WP_GetTextTransform", "WP_GetTextUnderline", - "WP_Set4Ddate", "WP_SetAlign", "WP_SetBackgroundColor", "WP_SetBackgroundPicture", @@ -89,7 +88,6 @@ "RndRGB", "TOOL_ColorRgbLongToColorRgbText", "TOOL_ColorRgbTextToColorRgbLong", - "TOOL_WPIAlignButtons", "TrapError", "UI_PaletteBackgrounds", "UI_PaletteBookMarks", @@ -117,9 +115,6 @@ }, "WP_Private": { "methods": [ - "_and", - "_bool", - "_or", "MENU_Display", "MENU_Execute", "UI_isProtected",