Skip to content

Commit

Permalink
bf & CR
Browse files Browse the repository at this point in the history
  • Loading branch information
vdelachaux committed May 31, 2024
1 parent 29b9a23 commit faf9bff
Show file tree
Hide file tree
Showing 19 changed files with 184 additions and 355 deletions.
Binary file modified Build/4DPop-Macros.dmg
Binary file not shown.
Binary file modified Build/4DPop-Macros.zip
Binary file not shown.
Binary file modified Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ
Binary file not shown.
4 changes: 2 additions & 2 deletions Build/Components/4DPop Macros.4dbase/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<key>CFBundleName</key>
<string>4DPop Macros</string>
<key>CFBundleVersion</key>
<string>284</string>
<string>285</string>
<key>NSHumanReadableCopyright</key>
<string>©vdl 2009-2024</string>
<key>CFBundleGetInfoString</key>
<string>20R6</string>
<key>CFBundleLongVersionString</key>
<string>20R6 (283)</string>
<string>20R6 (284)</string>
<key>CFBundleShortVersionString</key>
<string>20R6</string>
<key>CFBundleDisplayName</key>
Expand Down
Binary file not shown.
48 changes: 24 additions & 24 deletions Build/Components/4DPop Macros.4dbase/Macros v2/4DPop_Macros.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,35 @@
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS</method></text>
<text><method>_4DPop_MACROS</method></text>
</macro>

<macro name="Declarations.../$"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("Declarations";"<method_path/>")</method></text>
<text><method>_4DPop_MACROS("Declarations";"<method_path/>")</method></text>
</macro>

<macro name="Compiler directive… /¢"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("compiler_directive")</method></text>
<text><method>_4DPop_MACROS("compiler_directive")</method></text>
</macro>

<macro name="Find with Google"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("googleSearch")</method></text>
<text><method>_4DPop_MACROS("googleSearch")</method></text>
</macro>

<macro name="Make an archive"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("zipForShare")</method></text>
<text><method>_4DPop_MACROS("zipForShare")</method></text>
</macro>

<!-- ******************************* METHODS ******************************* -->
Expand All @@ -61,56 +61,56 @@
type_ahead="true"
type_ahead_text="_method"
version="2">
<text><method>4DPop_MACROS("method-new")</method></text>
<text><method>_4DPop_MACROS("method-new")</method></text>
</macro>

<macro name="Beautifier/§"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("Beautifier")</method></text>
<text><method>_4DPop_MACROS("Beautifier")</method></text>
</macro>

<macro name="Remove blank lines/*"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("RemoveBlankLines")</method></text>
<text><method>_4DPop_MACROS("RemoveBlankLines")</method></text>
</macro>

<!-- ******************************* COPY PASTE ******************************* -->
<macro name="-" in_menu="true" type_ahead="true" type_ahead_text="Scomber scombrus : lol">
<text><method>4DPop_MACROS("about")</method></text>
<text><method>_4DPop_MACROS("about")</method></text>
</macro>

<macro name="Copy with tokens"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("CopyWithTokens")</method></text>
<text><method>_4DPop_MACROS("CopyWithTokens")</method></text>
</macro>

<macro name="Copy and replace/©"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("PasteAndKeepTarget")</method></text>
<text><method>_4DPop_MACROS("PasteAndKeepTarget")</method></text>
</macro>

<macro name="Special paste.../◊"
in_menu="true"
type_ahead="true"
type_ahead_text="_p"
version="2">
<text><method>4DPop_MACROS("SpecialPaste")</method></text>
<text><method>_4DPop_MACROS("SpecialPaste")</method></text>
</macro>

<macro name="Past a color expression"
in_menu="true"
type_ahead="true"
type_ahead_text="_c"
version="2">
<text><method>4DPop_MACROS("PasteColor")</method></text>
<text><method>_4DPop_MACROS("PasteColor")</method></text>
</macro>

<!-- ******************************* COMMENTS ******************************* -->
Expand All @@ -122,14 +122,14 @@
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("comment")</method></text>
<text><method>_4DPop_MACROS("comment")</method></text>
</macro>

<macro name="Duplicate and comment/∂"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("duplicateAndComment")</method></text>
<text><method>_4DPop_MACROS("duplicateAndComment")</method></text>
</macro>

<!-- ******************************* REFACTORING ******************************* -->
Expand All @@ -139,42 +139,42 @@
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("Asserted")</method></text>
<text><method>_4DPop_MACROS("Asserted")</method></text>
</macro>

<macro name="Convert to call with token"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("ConvertToCallWithToken")</method></text>
<text><method>_4DPop_MACROS("ConvertToCallWithToken")</method></text>
</macro>

<macro name="Dot notation"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("dot_notation")</method></text>
<text><method>_4DPop_MACROS("dot_notation")</method></text>
</macro>

<macro name="Choose"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("Choose")</method></text>
<text><method>_4DPop_MACROS("Choose")</method></text>
</macro>

<macro name="EXECUTE METHOD"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("convert_to_execute")</method></text>
<text><method>_4DPop_MACROS("convert_to_execute")</method></text>
</macro>

<macro name="EXECUTE FORMULA"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("convert_to_formula")</method></text>
<text><method>_4DPop_MACROS("convert_to_formula")</method></text>
</macro>

<!-- ******************************* CONVERSIONS ******************************* -->
Expand All @@ -186,14 +186,14 @@
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("convert_hexa")</method></text>
<text><method>_4DPop_MACROS("convert_hexa")</method></text>
</macro>

<macro name="Convert to decimal"
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("convert_decimal")</method></text>
<text><method>_4DPop_MACROS("convert_decimal")</method></text>
</macro>

<macro name="-" type_ahead="false"><text/></macro>
Expand All @@ -202,7 +202,7 @@
in_menu="true"
type_ahead="false"
version="2">
<text><method>4DPop_MACROS("invert_expression")</method></text>
<text><method>_4DPop_MACROS("invert_expression")</method></text>
</macro>

<macro name="-" in_menu="true" type_ahead="false"><text/></macro>
Expand Down
Loading

0 comments on commit faf9bff

Please sign in to comment.