Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 1ee8b5a

Browse files
committed
Merge remote-tracking branch 'origin/develop-9.6' into merge-develop-9.6-08.06.2021
2 parents 9caf1bc + fc7e955 commit 1ee8b5a

12 files changed

+35
-3
lines changed

Documentation/dictionary/datagrid.lcdoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,6 +1787,21 @@ Description:
17871787
Returns the index associated with the given line.
17881788

17891789

1790+
Name: dgLineOfIndex
1791+
1792+
Type: property
1793+
1794+
Associations: datagrid
1795+
1796+
Syntax: put the dgLineOfIndex[pIndex] of group "DataGrid"
1797+
1798+
Summary: Returns the line associated with the given index.
1799+
1800+
1801+
Description:
1802+
1803+
Returns the line associated with the given index.
1804+
17901805

17911806
Name: dgVScroll
17921807

Toolset/palettes/extension builder/revextensionbuilderbehavior.livecodescript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,11 @@ private on displayExtensionData pData
354354
end if
355355

356356
# Userguide
357-
if pData["user_guide"] is not empty then put "Yes" into field "message_guide" of me
357+
if pData["guide_file"] is not empty then put "Yes" into field "message_guide" of me
358358
else put "No user guide found" into field "message_guide" of me
359359

360360
# Default script
361-
if pData["defaultscript"] is not empty then put pData["defaultscript"] into field "defaultscript" of me
361+
if pData["defaultscript_file"] is not empty then put pData["defaultscript_file"] into field "defaultscript" of me
362362
else put "No default script found" into field "defaultscript" of me
363363

364364
# Clear the console

Toolset/palettes/inspector/editors/com.livecode.pi.svgiconfilter.behavior.livecodescript

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ on preOpenStack
33
set the text of field "FilterText" to "Search"
44
set the filterString of widget "iconList" of me to empty
55
set the showSelectedElement of widget "iconList" of me to false
6-
set the iconSize of widget "iconList" of me to 45
6+
set the iconSize of widget "iconList" of me to 55
7+
set the showNames of widget "iconList" of me to true
78
set the selectedIcon of widget "iconList" of me to the dialogData
89

910
set the behavior of me to the long id of stack "com.livecode.pi.svgiconfilter.behavior"

Toolset/palettes/project browser/revprojectbrowserbehavior.livecodescript

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,7 @@ end getAbsoluteRow
10651065
function getVisibleRow pLongID
10661066
local tRow
10671067
put getRow(pLongID) into tRow
1068+
set the wholeMatches to true
10681069
return itemOffset(tRow, sDisplayArray["visible object keys"])
10691070
end getVisibleRow
10701071

1.79 KB
Binary file not shown.

Toolset/palettes/standalone settings/revstandalonesettingsandroidbehavior.livecodescript

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ on updateSettings
9393
put computeDefault(tSettings["android,nfc"], false) into tNFC
9494
set the hilited of button "NFC Tag Reading" to tNFC
9595

96+
local tAllowHttpConnections
97+
put computeDefault(tSettings["android,allow http"], false) into tAllowHttpConnections
98+
set the hilited of button "Allow Http Connections" to tAllowHttpConnections
99+
96100
repeat with i = 1 to the number of groups of group "device capabilities"
97101
get tSettings["android,device capabilities"][the short name of group i of group "Device Capabilities"]
98102
if it is "true" then

Toolset/palettes/standalone settings/revstandalonesettingsiosbehavior.livecodescript

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ on updateSettings
157157
put computeDefault(tSettings["ios,launch-image-dark-2x"], empty) into field "launch-image-dark-2x"
158158
put computeDefault(tSettings["ios,launch-image-dark-3x"], empty) into field "launch-image-dark-3x"
159159

160+
local tAppTrackingTransparency
161+
put computeDefault(tSettings["ios,AppTrackingTransparency"], false) into tAppTrackingTransparency
162+
set the hilite of button "App Tracking Transparency Check" to tAppTrackingTransparency
163+
put computeDefault(tSettings["ios,AppTrackingTransparencyMessage"], empty) into field "App Tracking Transparency Message"
164+
set the enabled of field "App Tracking Transparency Message" to tAppTrackingTransparency
165+
160166
set the opaque of graphic "launch-backcolor" to tSettings["ios,launch-backcolor"] is not empty
161167
set the hilite of button "Use system background color" to tSettings["ios,launch-backcolor"] is empty
162168
set the backColor of graphic "launch-backcolor" to tSettings["ios,launch-backcolor"]

notes/bugfix-22300.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure right-clicking on the Project Browser object list selects the correct row

notes/bugfix-22400.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Added support for unblocking http requests on Android browser

notes/bugfix-23202.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Added missing property dgLineOfIndex to documentation.

0 commit comments

Comments
 (0)