Cleaning and improvements

Clean up unused or obsolete macros & a new special paste with a class
vdelachaux · Sep 6, 2021 · 8b0c0d4 · 8b0c0d4
1 parent 1b0e8fd
commit 8b0c0d4
Show file tree

Hide file tree

Showing 44 changed files with 1,041 additions and 4,217 deletions.
diff --git a/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ b/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ
diff --git a/Build/Components/4DPop Macros.4dbase/Info.plist b/Build/Components/4DPop Macros.4dbase/Info.plist
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">  <dict>    <key>CFBundleName</key>    <string>4DPop Macros</string>    <key>CFBundleVersion</key>    <string>196</string>    <key>NSHumanReadableCopyright</key>    <string>©4D SAS 2009-2021</string>    <key>CFBundleGetInfoString</key>    <string>4DPop Macros</string>    <key>CFBundleLongVersionString</key>    <string>19</string>    <key>CFBundleShortVersionString</key>    <string>19</string>    <key>CFBundleDisplayName</key>    <string>4DPop Macros</string>  </dict></plist>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">  <dict>    <key>CFBundleName</key>    <string>4DPop Macros</string>    <key>CFBundleVersion</key>    <string>199</string>    <key>NSHumanReadableCopyright</key>    <string>©4D SAS 2009-2021</string>    <key>CFBundleGetInfoString</key>    <string>4DPop Macros</string>    <key>CFBundleLongVersionString</key>    <string>19</string>    <key>CFBundleShortVersionString</key>    <string>19</string>    <key>CFBundleDisplayName</key>    <string>4DPop Macros</string>  </dict></plist>

diff --git a/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Macros.4dbase/Macros v2/4DPop_Macros.xml b/Build/Components/4DPop Macros.4dbase/Macros v2/4DPop_Macros.xml
@@ -57,13 +57,15 @@
         <text><method>4DPop_MACROS("method-new")</method></text>        
     </macro>
 
+<!-- 
     <macro name="Export method…" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_method" 
         version="2">        
         <text><method>4DPop_MACROS("method-export";"<method_path/>")</method></text>        
     </macro>
+ -->
 
     <macro name="Beautifier/§" 
         in_menu="true" 
@@ -79,14 +81,17 @@
         <text><method>4DPop_MACROS("removeBlankLines")</method></text>        
     </macro>
 
+<!-- 
     <macro name="Set method attribute…" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_method" 
         version="2">        
         <text><method>4DPop_MACROS("method-attributes";"<method_path/>")</method></text>        
     </macro>
+ -->
 
+<!-- 
     <macro name="Edit the method's comment…" 
         in_menu="true" 
         type_ahead="true" 
@@ -95,47 +100,58 @@
         <text><method>4DPop_MACROS("method-comments";"<method_path/>")</method></text>        
     </macro>
     
+ -->
+<!-- 
     <macro name="Save method/ß" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("backup_method";"<method_name/>")</method></text>
     </macro>
+ -->
 
     <!-- ******************************* LISTS ******************************* -->
-    <macro name="-" in_menu="true" type_ahead="false"><text/></macro>
+<!--     <macro name="-" in_menu="true" type_ahead="false"><text/></macro> -->
 
+<!-- 
     <macro name="Local var list" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="$" 
         version="2">
         <text><method>4DPop_MACROS("locals_list")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Groups list" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_g" 
         version="2">
         <text><method>4DPop_MACROS("groups_list")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Users list" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_u" 
         version="2">
         <text><method>4DPop_MACROS("users_list")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Methods list/£" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_method" 
         version="2">        
         <text><method>4DPop_MACROS("method-list")</method></text>        
     </macro>
+ -->
 
     <!-- ******************************* COPY PASTE ******************************* -->
     <macro name="-" in_menu="true" type_ahead="true" type_ahead_text="Scomber scombrus : lol">
@@ -165,12 +181,14 @@
         <text><method>4DPop_MACROS("insert_color")</method></text>
     </macro>
 
+<!-- 
     <macro name="Copy with indentation" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("copyWithIndentation")</method></text>
     </macro>
+ -->
 
     <!-- ******************************* COMMENTS ******************************* -->
     <macro name="-" in_menu="true" type_ahead="true" type_ahead_text="4d macro">
@@ -191,21 +209,25 @@
         <text><method>4DPop_MACROS("commentBlock")</method></text>
     </macro>
 
+<!-- 
     <macro name="Edit comments..." 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="Comments"
         version="2">
         <text><method>4DPop_MACROS("edit_comment")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Comment current level" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="Comments"
         version="2">
         <text><method>4DPop_MACROS("comment_current_level")</method></text>
     </macro>
+ -->
 
     <!-- ******************************* REFACTORING ******************************* -->
     <macro name="-" type_ahead="false"><text/></macro>
@@ -231,12 +253,14 @@
         <text><method>4DPop_MACROS("Choose")</method></text>        
     </macro>
 
+<!-- 
     <macro name="C_ALPHA -> C_TEXT" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("AlphaToTextDeclaration")</method></text>
     </macro>
+ -->
 
     <macro name="EXECUTE METHOD" 
         in_menu="true" 
@@ -257,26 +281,32 @@
         <text>Scomber scombrus : <caret/></text>
     </macro>
 
+<!-- 
     <macro name="Text to html" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("convert_to_html")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Text to UTF-8" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("convert_to_utf8")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="UTF-8 to Text" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("convert_from_utf8")</method></text>
     </macro>
+ -->
 
     <macro name="Convert to Hexa" 
         in_menu="true" 

diff --git a/Build/Components/4DPop Macros.4dbase/Resources/4DPop_Macros.xml b/Build/Components/4DPop Macros.4dbase/Resources/4DPop_Macros.xml
@@ -57,13 +57,15 @@
         <text><method>4DPop_MACROS("method-new")</method></text>        
     </macro>
 
+<!-- 
     <macro name="Export method…" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_method" 
         version="2">        
         <text><method>4DPop_MACROS("method-export";"<method_path/>")</method></text>        
     </macro>
+ -->
 
     <macro name="Beautifier/§" 
         in_menu="true" 
@@ -79,14 +81,17 @@
         <text><method>4DPop_MACROS("removeBlankLines")</method></text>        
     </macro>
 
+<!-- 
     <macro name="Set method attribute…" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_method" 
         version="2">        
         <text><method>4DPop_MACROS("method-attributes";"<method_path/>")</method></text>        
     </macro>
+ -->
 
+<!-- 
     <macro name="Edit the method's comment…" 
         in_menu="true" 
         type_ahead="true" 
@@ -95,47 +100,58 @@
         <text><method>4DPop_MACROS("method-comments";"<method_path/>")</method></text>        
     </macro>
     
+ -->
+<!-- 
     <macro name="Save method/ß" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("backup_method";"<method_name/>")</method></text>
     </macro>
+ -->
 
     <!-- ******************************* LISTS ******************************* -->
-    <macro name="-" in_menu="true" type_ahead="false"><text/></macro>
+<!--     <macro name="-" in_menu="true" type_ahead="false"><text/></macro> -->
 
+<!-- 
     <macro name="Local var list" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="$" 
         version="2">
         <text><method>4DPop_MACROS("locals_list")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Groups list" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_g" 
         version="2">
         <text><method>4DPop_MACROS("groups_list")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Users list" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_u" 
         version="2">
         <text><method>4DPop_MACROS("users_list")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Methods list/£" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="_method" 
         version="2">        
         <text><method>4DPop_MACROS("method-list")</method></text>        
     </macro>
+ -->
 
     <!-- ******************************* COPY PASTE ******************************* -->
     <macro name="-" in_menu="true" type_ahead="true" type_ahead_text="Scomber scombrus : lol">
@@ -165,12 +181,14 @@
         <text><method>4DPop_MACROS("insert_color")</method></text>
     </macro>
 
+<!-- 
     <macro name="Copy with indentation" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("copyWithIndentation")</method></text>
     </macro>
+ -->
 
     <!-- ******************************* COMMENTS ******************************* -->
     <macro name="-" in_menu="true" type_ahead="true" type_ahead_text="4d macro">
@@ -191,21 +209,25 @@
         <text><method>4DPop_MACROS("commentBlock")</method></text>
     </macro>
 
+<!-- 
     <macro name="Edit comments..." 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="Comments"
         version="2">
         <text><method>4DPop_MACROS("edit_comment")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Comment current level" 
         in_menu="true" 
         type_ahead="true" 
         type_ahead_text="Comments"
         version="2">
         <text><method>4DPop_MACROS("comment_current_level")</method></text>
     </macro>
+ -->
 
     <!-- ******************************* REFACTORING ******************************* -->
     <macro name="-" type_ahead="false"><text/></macro>
@@ -231,12 +253,14 @@
         <text><method>4DPop_MACROS("Choose")</method></text>        
     </macro>
 
+<!-- 
     <macro name="C_ALPHA -> C_TEXT" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("AlphaToTextDeclaration")</method></text>
     </macro>
+ -->
 
     <macro name="EXECUTE METHOD" 
         in_menu="true" 
@@ -257,26 +281,32 @@
         <text>Scomber scombrus : <caret/></text>
     </macro>
 
+<!-- 
     <macro name="Text to html" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("convert_to_html")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="Text to UTF-8" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("convert_to_utf8")</method></text>
     </macro>
+ -->
 
+<!-- 
     <macro name="UTF-8 to Text" 
         in_menu="true" 
         type_ahead="false" 
         version="2">
         <text><method>4DPop_MACROS("convert_from_utf8")</method></text>
     </macro>
+ -->
 
     <macro name="Convert to Hexa" 
         in_menu="true" 

diff --git a/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings