Revert "fix ACI0105555 R9 in toolbar"

This reverts commit 9fbec29.

Author: pfhuillet

Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_colorShowDialog2.4dm

@@ -1,33 +1,33 @@
-var $menuRef; $choice : Text
+C_TEXT:C284($menuRef; $choice)
 $menuRef:=Create menu:C408
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("subscript"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("subscript"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "fontSubscript")
 SET MENU ITEM ICON:C984($menuRef; -1; "Path:/RESOURCES/Images/MenuIcons/Subscript_24_1.png")
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("superscript"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("superscript"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "fontSuperscript")
 SET MENU ITEM ICON:C984($menuRef; -1; "Path:/RESOURCES/Images/MenuIcons/Superscript_24_1.png")
 
 APPEND MENU ITEM:C411($menuRef; "-")
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("Uppercase"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("Uppercase"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=uppercase")
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("Lowercase"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("Lowercase"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=lowercase")
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("Capitalize"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("Capitalize"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=capitalize")
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("SmallUppercase"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("SmallUppercase"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=small-uppercase")
 
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("TextTransformNone"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("TextTransformNone"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textTransform?value=none")
 
 APPEND MENU ITEM:C411($menuRef; "-")
-APPEND MENU ITEM:C411($menuRef; Localized string:C991("FontsElipsis"))
+APPEND MENU ITEM:C411($menuRef; Get localized string:C991("FontsElipsis"))
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "font/showDialog")
 
 APPEND MENU ITEM:C411($menuRef; "-")
@@ -53,19 +53,12 @@ SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8;
 APPEND MENU ITEM:C411($menuRef; ak standard action title:K76:83)
 SET MENU ITEM PROPERTY:C973($menuRef; -1; Associated standard action name:K28:8; "textShadowOffset")
 
-If (Form:C1466.selection#Null:C1517)
-	APPEND MENU ITEM:C411($menuRef; "-")
-	APPEND MENU ITEM:C411($menuRef; Localized string:C991("TransparentBackground"))
-	SET MENU ITEM PARAMETER:C1004($menuRef; -1; "TransparentBackground")
-End if 
 
 $choice:=Dynamic pop up menu:C1006($menuRef)
 
 RELEASE MENU:C978($menuRef)
 
-If ($choice="TransparentBackground")
-	WP_SetBackgroundColor(Form:C1466.selection; wk transparent:K81:134)
-End if 
+
 
 
 //APPEND TO ARRAY($ptrArrayNames->; Get localized string("TextTransformNone"))

Project/Sources/Forms/WP_Toolbar/form.4DForm

@@ -3760,6 +3760,25 @@
 					],
 					"method": "ObjectMethods/btnCellSettings.4dm",
 					"tooltip": ":xliff:Properties"
+				},
+				"btnCellUnmerge1": {
+					"type": "button",
+					"top": 35,
+					"left": 820,
+					"width": 40,
+					"height": 40,
+					"action": "cell/split",
+					"class": "Palette",
+					"focusable": false,
+					"icon": "Images/TableBorders_33.png",
+					"iconFrames": 4,
+					"textPlacement": "right",
+					"style": "custom",
+					"popupPlacement": "none",
+					"events": [
+						"onClick"
+					],
+					"tooltip": ":xliff:unmergeCells"
 				}
 			}
 		},
@@ -4543,5 +4562,5 @@
 			}
 		}
 	},
-	"geometryStamp": 7598
+	"geometryStamp": 7596
 }

Resources/en.lproj/WPC.xlf

@@ -830,10 +830,6 @@ This file is distributed under the same license as the product package.-->
           <source>Small uppercase</source>
           <target>Small uppercase</target>
         </trans-unit>
-        <trans-unit id="5" resname="TransparentBackground">
-          <source>Transparent background</source>
-          <target>Transparent background</target>
-        </trans-unit>
       </group>
       <group resname="PaletteStylesheets">
         <trans-unit id="169" resname="characterStylesheets">

Resources/fr.lproj/WPC.xlf

@@ -830,10 +830,6 @@ This file is distributed under the same license as the product package.-->
           <source>Small uppercase</source>
           <target>Petites majuscules</target>
         </trans-unit>
-        <trans-unit id="5" resname="TransparentBackground">
-          <source>Transparent background</source>
-          <target>Fond transparent</target>
-        </trans-unit>
       </group>
       <group resname="PaletteStylesheets">
         <trans-unit id="169" resname="characterStylesheets">