Merge pull request #2037 from livecode/merge-develop-9.0_21.02.2019

livecodepanos · web-flow · commit c2cf1c2dd6d7 · 2019-02-21T11:56:01.000+02:00
Merge develop 9.0 21.02.2019
diff --git a/Plugins/livecodeTestInterface.livecode b/Plugins/livecodeTestInterface.livecode
diff --git a/Toolset/libraries/revidelibrary.8.livecodescript b/Toolset/libraries/revidelibrary.8.livecodescript
@@ -8095,21 +8095,26 @@ on revIDECut
    end if
    
    lock screen
-   lock messages
+   
    if the selectedImage is not empty then
       # If the there is a selection in an image using the image selection tool
       # Then make sure no text is selected before doing the cut
-      if the selectedText is not empty then select empty
+      if the selectedText is not empty then 
+         lock messages
+         select empty
+         unlock messages
+      end if
       set the defaultStack to revTargetStack(the long id of the selectedImage)
       cut
+      unlock screen
       exit revIDECut
    end if
    
    # Ensure the user is aware of the consequences of the cut wrt groups
    if revCheckGroupDelete() then
       cut
    end if
-   unlock messages
+   
    unlock screen
    
    ideMessageSend "ideSelectedObjectChanged"
diff --git a/Toolset/palettes/inspector/editors/com.livecode.pi.editorlist.behavior.livecodescript b/Toolset/palettes/inspector/editors/com.livecode.pi.editorlist.behavior.livecodescript
@@ -1,4 +1,4 @@
-﻿script "com.livecode.pi.editorList.behavior"
+﻿script "com.livecode.pi.editorList.behavior" with behavior "revInspectorEditorBehavior"
 local sNumChildren
 
 constant kComponentSpacing = 6
@@ -117,7 +117,15 @@ on editorValueChanged
    repeat with x =1 to sNumChildren
       put the editorValue of group ("editor" & x) of me into tValueArray[x]
    end repeat
-   combine tValueArray with tDelimiter
-   set the editorValue of me to tValueArray
+   
+   // TODO: Use 'combine tValueArray with tDelimiter' once we add sorting option to combine
+   // See bug 9344
+   local tList
+   repeat for each element tElement in tValueArray
+      put tElement & tDelimiter after tList
+   end repeat
+   delete char -1 of tList
+   set the editorValue of me to tList
+   
    dispatch "updateProperty"
 end editorValueChanged
diff --git a/Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript b/Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript
@@ -324,8 +324,8 @@ private command _CreateMobileScroller
          (_ControlType() is "table" and \
          the dgProps["show hscrollbar"] of me is not false) then
       if sScrollerId is empty or sScrollerId is not among the lines of mobileControls() then
-         mobileControlCreate "scroller"
-         put the result into sScrollerId
+         put the long id of me into sScrollerId
+         mobileControlCreate "scroller", sScrollerId
       end if
       mobileControlSet sScrollerId, "canBounce", "true"
       mobileControlSet sScrollerId, "pagingEnabled", "false"
@@ -3233,6 +3233,10 @@ private command _list.DrawCachedControlList pForceRefresh, pCallback, pCallbackC
    local theSequence
    local theTopLeft
    -----
+
+   # If controls haven't been cached yet then exit
+   if sControlOfIndexA is not an array then return empty
+
    put false into noRedrawNeeded
    put empty into theFirstControlHeight
    
@@ -5431,7 +5435,7 @@ end uProps
 getprop uProps[pProp]
     if the target is not me then pass uProps
     return the dgProps[pProp] of me
-end uProps[pProp]
+end uProps
 ## end temporary aliases
 
 
@@ -5755,7 +5759,7 @@ setprop dgProps [pProp] pValue
             show group "dgHorizontalComponents" of me
             _table.RegenerateColumns
             -- set the uEffectiveColumnWidths of group "dgHeader" of group "dgHeaderMask" of group "dgHeaderComponents" of me \
-                  -- to _table.GetEffectiveColumnWidths()
+            -- to _table.GetEffectiveColumnWidths()
             
             ## Set any props that have special settings for table.
             lock messages
@@ -5776,6 +5780,7 @@ setprop dgProps [pProp] pValue
          unlock messages      
          
          ResizeToFit
+         ResetList
          unlock screen
          break
          
@@ -5796,7 +5801,7 @@ setprop dgProps [pProp] pValue
             unlock messages
             put empty into sFormattedHeight
             put empty into sControlHeights
-
+            
             DG2_EnsureRowChainedBehavior
          end if
          break
@@ -5837,7 +5842,7 @@ setprop dgProps [pProp] pValue
       case "scroll when vscrollbar is hidden"
       case "scroll when hscrollbar is hidden"
       case "scroll selections into view"
-
+         
       case "animate actions"
       case "enable swipe"
          lock messages
@@ -5859,13 +5864,13 @@ setprop dgProps [pProp] pValue
             lock messages
             set the dgProps[pProp] of me to pValue
             unlock messages
-
+            
             -- We're setting new template controls. Redraw the list to take these new controls into account.
             DG2_CustomisableControlsClearByName pProp
             RefreshList
          end if
          break
-
+         
       case "alternate row colors"
          lock messages
          set the dgProps[pProp] of me to pValue is true
@@ -6013,7 +6018,7 @@ setprop dgProps [pProp] pValue
             -- Update any customisable controls to take into account the row resize.
             DG2_CustomisableControlsResizeDefaults
             DG2_CustomisableControlsClear
-
+            
             ResetList 
             unlock screen
          end if
@@ -6927,7 +6932,7 @@ getprop dgDataControlOfIndex [pIndex]
         end if
     end if
     return empty
-end dgDataControlOfIndex[pIndex]
+end dgDataControlOfIndex
 
 
 function ColumnControlOfIndex pColumn, pIndex
diff --git a/Toolset/palettes/revpreferencesgui.rev b/Toolset/palettes/revpreferencesgui.rev
diff --git a/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript
@@ -3084,7 +3084,7 @@ command scriptFormat pScope, pDontGroup
       if tStart > tEnd then
          put tOldFirstIndent into tOldLastIndent
       else
-         put textFormatGetLineIndent(line (tLine + tSelectionLineCount) of tScript) into tOldLastIndent
+         put textFormatGetLineIndent(line (tLine + tSelectionLineCount - 1) of tScript) into tOldLastIndent
       end if
       
       local tCode
@@ -3111,17 +3111,27 @@ command scriptFormat pScope, pDontGroup
       # The selection offsets are composed of two parts, the difference in the indent of the line that the selection started / ended on
       # and the difference in the number of chars before that line.
       local tFirstSelectionOffset
-      put (the number of chars of tNewFirstIndent - the number of chars of tOldFirstIndent) + (the number of chars of line 1 to (tLine - 1) of tNewScript - the number of chars of line 1 to (tLine - 1) of tScript) into tFirstSelectionOffset
+      put (the number of chars of line 1 to tLine of tNewScript - the number of chars of line 1 to tLine of tScript) into tFirstSelectionOffset      
+      
+      put (the number of chars of line 1 to tLine - 1 of tNewScript) + 2 into tFirstLineChar
+      if tLine is 1 then subtract 1 from tFirstLineChar
       
       local tLastSelectionOffset
       if tStart > tEnd then
          put tFirstSelectionOffset into tLastSelectionOffset
       else
-         put (the number of chars of tNewLastIndent - the number of chars of tOldLastIndent) + (the number of chars of line 1 to (tLine + tSelectionLineCount) of tNewScript - the number of chars of line 1 to (tLine + tSelectionLineCount) of tScript) into tLastSelectionOffset
-      end if
+         put(the number of chars of line 1 to (tLine + (tSelectionLineCount - 1)) of tNewScript - the number of chars of line 1 to (tLine + (tSelectionLineCount - 1)) of tScript) into tLastSelectionOffset      end if
       
       if tStart is not empty then
-         select char (tStart + tFirstSelectionOffset) to (tEnd + tLastSelectionOffset) of field "Script" of me
+         if tStart > tEnd then
+            select char (tStart + tFirstSelectionOffset ) to (tEnd + tFirstSelectionOffset ) of field "Script" of me
+         else
+            put tStart + tFirstSelectionOffset into tStart
+            if tStart < tFirstLineChar + (the number of chars of tNewFirstIndent) then 
+               put tFirstLineChar + (the number of chars of tNewFirstIndent) into tStart
+            end if
+            select char (tStart) to (tEnd + tLastSelectionOffset) of field "Script" of me
+         end if
       end if
    end if
    
diff --git a/Toolset/palettes/script editor/behaviors/revseeditorbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revseeditorbehavior.livecodescript
@@ -1951,14 +1951,14 @@ command showNextFindResult pQuery, pIsRegExp, pUseWildCards, pWholeMatch, pIgnor
          revSESetCurrentObject tObject, empty, true
          put 1 into tStart
       else
-         if tStart is empty then
+         if sLastFindLocation is empty then
             # Must be the first iteration
             put tSearch["start"] into tStart
          else
             # Calculate a new search start
             if sLastFindObject is not empty and seGetRuggedId(sLastFindObject) is seGetRuggedId(getObjectID()) and sLastFindLocation is not empty then
                if pInteractive then
-                  put item 1 of sLastFindLocation into tStart
+                  put item 2 of sLastFindLocation into tStart
                else
                   put item 1 of sLastFindLocation + 1 into tStart
                end if
diff --git a/Toolset/palettes/standalone settings/revstandalonesettings.8.rev b/Toolset/palettes/standalone settings/revstandalonesettings.8.rev
diff --git a/Toolset/palettes/standalone settings/revstandalonesettingsandroidbehavior.livecodescript b/Toolset/palettes/standalone settings/revstandalonesettingsandroidbehavior.livecodescript
@@ -127,6 +127,12 @@ on updateAndroidSettingState
    set the enabled of group "Android Settings" of me to tEnabled
    set the visible of button "Androidchecked" to tEnabled
    set the opaque of button "Androidchecked" to false
+   
+   -- splash screen is not supported in Indy and Business editions
+   if revLicenseType() is "commercial" \
+         or revLicenseType() is "professional" then
+      set the enabled of button "Splash Chooser" of group "Android Settings" of me to false
+   end if
 end updateAndroidSettingState
 
 on updateAndroidArch pArch, pBuild
diff --git a/Toolset/palettes/standalone settings/revstandalonesettingsiosbehavior.livecodescript b/Toolset/palettes/standalone settings/revstandalonesettingsiosbehavior.livecodescript
@@ -181,6 +181,10 @@ on updateSettings
    put computeDefault(tSettings["ios,iPhone 6 Plus Landscape splash"], empty) into field "iPhone 6 Plus Landscape Splash"
    put computeDefault(tSettings["ios,iPhone X Portrait splash"], empty) into field "iPhone X Portrait Splash"   
    put computeDefault(tSettings["ios,iPhone X Landscape splash"], empty) into field "iPhone X Landscape Splash"
+   put computeDefault(tSettings["ios,iPhone XR Portrait splash"], empty) into field "iPhone XR Portrait Splash" 
+   put computeDefault(tSettings["ios,iPhone XR Landscape splash"], empty) into field "iPhone XR Landscape Splash"
+   put computeDefault(tSettings["ios,iPhone XSMAX Portrait splash"], empty) into field "iPhone XSMAX Portrait Splash" 
+   put computeDefault(tSettings["ios,iPhone XSMAX Landscape splash"], empty) into field "iPhone XSMAX Landscape Splash" 
    put computeDefault(tSettings["ios,ipad portrait splash"], empty) into field "iPad Portrait Splash"
    put computeDefault(tSettings["ios,ipad landscape splash"], empty) into field "iPad Landscape Splash"
    put computeDefault(tSettings["ios,ipad retina portrait splash"], empty) into field "iPad Retina Portrait Splash"
@@ -361,6 +365,10 @@ command updateOrientationSettings
       set the enabled of group "iPhone 6 Plus Landscape Splash" to tInitialOrientation contains "landscape"
       set the enabled of group "iPhone X Portrait Splash" to tInitialOrientation contains "portrait"
       set the enabled of group "iPhone X Landscape Splash" to tInitialOrientation contains "landscape"
+      set the enabled of group "iPhone XR Portrait Splash" to tInitialOrientation contains "portrait"
+      set the enabled of group "iPhone XR Landscape Splash" to tInitialOrientation contains "landscape"
+      set the enabled of group "iPhone XSMAX Portrait Splash" to tInitialOrientation contains "portrait"
+      set the enabled of group "iPhone XSMAX Landscape Splash" to tInitialOrientation contains "landscape"
    end if
 end updateOrientationSettings
 
@@ -388,6 +396,10 @@ command enableDeviceSpecificSettings pDevices
    set the enabled of group "iPhone 6 Plus Landscape Splash" to (1 is among the items of pDevices)
    set the enabled of group "iPhone X Portrait Splash" to (1 is among the items of pDevices)
    set the enabled of group "iPhone X Landscape Splash" to (1 is among the items of pDevices)
+   set the enabled of group "iPhone XR Portrait Splash" to (1 is among the items of pDevices)
+   set the enabled of group "iPhone XR Landscape Splash" to (1 is among the items of pDevices)
+   set the enabled of group "iPhone XSMAX Portrait Splash" to (1 is among the items of pDevices)
+   set the enabled of group "iPhone XSMAX Landscape Splash" to (1 is among the items of pDevices)
    set the enabled of group "iPad Portrait Splash" to (2 is among the items of pDevices)
    set the enabled of group "iPad Landscape Splash" to (2 is among the items of pDevices)
    set the enabled of group "iPad Retina Portrait Splash" to (2 is among the items of pDevices)
diff --git a/Toolset/palettes/start center/revStartCenterBehavior.livecodescript b/Toolset/palettes/start center/revStartCenterBehavior.livecodescript
@@ -99,8 +99,19 @@ on ideOpenStack pTarget
    local tPlugins
    put revIDEGetAllPlugins() into tPlugins
    
-   if tTargetStack is not the short name of me and \
-         the filename of stack tTargetStack is not among the lines of tPlugins then
+   repeat for each line tLine in tPlugins
+      local tSubstacks
+      if tLine ends with ".livecode" or tLine ends with ".livecodescript" or \
+            tLine ends with ".rev" then 
+         put the substacks of stack tLine into tSubstacks
+      end if
+      if tLine is the filename of stack tTargetStack OR \
+            tSubstacks contains tTargetStack then
+         exit ideOpenStack
+      end if
+   end repeat
+   
+   if tTargetStack is not the short name of me then
       startCenterClose
    end if
 end ideOpenStack
diff --git a/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.DataGridForm.tsv b/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.DataGridForm.tsv
@@ -13,7 +13,7 @@ cache controls:revIDEGetDataGridProperty:revIDESetDataGridProperty	Cache control
 persistent data:revIDEGetDataGridProperty:revIDESetDataGridProperty	Persistent data	Data Grid	com.livecode.pi.boolean	true	false		no_default					
 animate actions:revIDEGetDataGridProperty:revIDESetDataGridProperty	Animate actions	Data Grid	com.livecode.pi.boolean	true	false		true					
 enable swipe:revIDEGetDataGridProperty:revIDESetDataGridProperty	Enable swipes	Data Grid	com.livecode.pi.boolean	true	false		false					
-fixed control height:revIDEGetDataGridProperty:revIDESetDataGridProperty	Empty row height	Data Grid	com.livecode.pi.boolean	true	false		no_default					
+fixed control height:revIDEGetDataGridProperty:revIDESetDataGridProperty	Fixed row height	Data Grid	com.livecode.pi.boolean	true	false		no_default					
 row height:revIDEGetDataGridProperty:revIDESetDataGridProperty	Row height	Data Grid	com.livecode.pi.number	true	false		21					1
 row behavior:revIDEGetDataGridProperty:revIDESetDataGridProperty	Row behavior	Data Grid	com.livecode.pi.script	true	true		no_default					1
 												
diff --git a/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.DefaultButton.tsv b/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.DefaultButton.tsv
@@ -29,6 +29,7 @@ disabledIcon							0
 visitedIcon							0					
 armedIcon							0					
 hoverIcon							0					
+iconGravity
 threeD							true					
 showBorder							true					
 hiliteBorder							true					
diff --git a/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.Image.tsv b/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.Image.tsv
@@ -6,6 +6,7 @@ title	Image
 name												
 filename::revIDESetImageFilename												
 id												
+size
 tooltip												
 visible							true					
 dontDither							false					
diff --git a/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.RectangleButton.tsv b/Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.RectangleButton.tsv
@@ -28,6 +28,7 @@ disabledIcon
 visitedIcon												
 armedIcon												
 hoverIcon												
+iconGravity
 threeD							true					
 showBorder							true					
 hiliteBorder							true					
diff --git a/Toolset/resources/supporting_files/property_definitions/propertyInfo.tsv b/Toolset/resources/supporting_files/property_definitions/propertyInfo.tsv
@@ -165,6 +165,7 @@ showLines	Text baselines	Table	com.livecode.pi.boolean	true	false
 showName	Show name	Basic	com.livecode.pi.boolean	true	false			
 showSelection	Hilite selection	Basic	com.livecode.pi.boolean	true	false			
 showValue	Show value	Basic	com.livecode.pi.boolean	true	false		false			
+size	Size in bytes	Basic	com.livecode.pi.integer	true	true
 stackFiles::revIDESetStackFilesProperty	Stack files	Stack Files	com.livecode.pi.stackfiles	true	false			
 startAngle	Start	Basic	com.livecode.pi.number	true	false		0			0	360	1
 startArrow	Start arrow	Basic	com.livecode.pi.boolean	true	false			
diff --git a/notes/bugfix-11295.md b/notes/bugfix-11295.md
@@ -0,0 +1 @@
+# Fix error in DataGrid when form controls are cached, fixed line height is true, and showing the vertical scrollbar is set to auto.
diff --git a/notes/bugfix-12400.md b/notes/bugfix-12400.md
@@ -0,0 +1 @@
+# Ensure Datagrid refreshes when switching its style from table to form and back to table
diff --git a/notes/bugfix-17823.md b/notes/bugfix-17823.md
@@ -0,0 +1 @@
+# Updated DG property label from "Empty row height" to "Fixed row height" in the Property Inspector
diff --git a/notes/bugfix-18636.md b/notes/bugfix-18636.md
@@ -0,0 +1 @@
+# [SE Interactive search] Ensure pressing the return key cycles through all instances of the string to be found
diff --git a/notes/bugfix-18654.md b/notes/bugfix-18654.md
@@ -0,0 +1 @@
+# Added "Size" field to the Property Inspector of the image object
diff --git a/notes/bugfix-21247.md b/notes/bugfix-21247.md
@@ -0,0 +1 @@
+# Fix setting Project Browser Prefs from the LC Prefs pane
diff --git a/notes/bugfix-21379.md b/notes/bugfix-21379.md
@@ -0,0 +1 @@
+# [NavBar PI] Fix setting an itemName when navbar has more than 9 items
diff --git a/notes/bugfix-21555.md b/notes/bugfix-21555.md
@@ -0,0 +1 @@
+# Ensure mobileControlTarget() returns the long id of the target, if the target is a DataGrid
diff --git a/notes/bugfix-21721.md b/notes/bugfix-21721.md
@@ -0,0 +1 @@
+# Keep selection when formatting handler
diff --git a/notes/bugfix-21746.md b/notes/bugfix-21746.md
@@ -0,0 +1 @@
+Android Standalone Settings: disable Splash option on Indy and Business editions
diff --git a/notes/bugfix-21767.md b/notes/bugfix-21767.md
@@ -0,0 +1 @@
+# Added support for splash screens for iPhone XR and XSMAX
diff --git a/notes/bugfix-21798.md b/notes/bugfix-21798.md
@@ -0,0 +1 @@
+# Ensure the button's iconGravity can be set from the Property Inspector
diff --git a/notes/bugfix-21802.md b/notes/bugfix-21802.md
@@ -0,0 +1 @@
+# Ensure textChanged msg is sent when we cut text of a field
