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

Commit c023969

Browse files
committed
Merge remote-tracking branch 'origin/develop-8.2' into merge-develop-8.2-27.11.2017
2 parents 81a8afb + 6e9fef0 commit c023969

51 files changed

Lines changed: 616 additions & 585 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/guides/The LiveCode IDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ Figure 12 – Find and Replace
883883
| Format handler or move to next placeholder | Tab | Tab |
884884
| Next tab in Editor | Control-tab | Control-tab |
885885
| Previous tab in Editor | Control-shift-tab | Control-shift-tab |
886-
| Show completions palette | Control-shift-right | Command-shift-right |
886+
| Show completions palette | F1 | F1 |
887887

888888
| **The Message Box** | **Windows / Linux** | **Mac OS X**|
889889
|------|--------|-------|

Toolset/libraries/revgeometrylibrary.livecodescript

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,7 @@ on revCalculateGeometryDistances pWhichNumber
825825
if lOrigWidth is empty then put the width of this stack into lOrigWidth
826826
if lOrigHeight is empty then put the height of this stack into lOrigHeight
827827
repeat for each item tEdge in "left,right,top,bottom"
828+
if revGetGeometry("scale" & tEdge) is not true then next repeat
828829
if revGetGeometry("scale" & tEdge & "Absolute") is false then
829830
--we need to calculate the distance as it stands as a percentage of card width or height
830831
get revCalculateScaleDistance(tEdge)
@@ -844,6 +845,7 @@ on revCalculateGeometryDistances pWhichNumber
844845
end if
845846
end repeat
846847
repeat for each item tDimension in "h,v"
848+
if revGetGeometry("move" & tDimension) is not true then next repeat
847849
if revGetGeometry("move" & tDimension & "Absolute") is false then
848850
--we need to calculate the distance as it stands as a percentage of card width or height
849851
get revCalculateMoveDistance(tDimension)
@@ -1101,3 +1103,40 @@ function revUniqueIDToName pWhich
11011103
end if
11021104
end repeat
11031105
end revUniqueIDToName
1106+
1107+
# Clears any extra keys from the current profile's geometry settings. If no settings
1108+
# are found, removes the key for the profile.
1109+
command revClearExtraGeometrySettings
1110+
local tProfileName
1111+
put the cREVGeneral["profile"] of lGeometryObject into tProfileName
1112+
if tProfileName is empty or tProfileName is the cREVGeneral["masterName"] of lGeometryObject \
1113+
then put "Master" into tProfileName
1114+
1115+
local tGeometry, tKeys, tSettingsUsed
1116+
put the customProperties["cRevGeometry"] of lGeometryObject into tGeometry
1117+
put the keys of tGeometry into tKeys
1118+
put 0 into tSettingsUsed
1119+
1120+
local tExtraKeys
1121+
repeat for each item tSetting in "moveH,moveV,scaleLeft,scaleRight,scaleTop,scaleBottom"
1122+
--check to see if each geometry setting is used
1123+
if tGeometry[tProfileName & "," & tSetting] then
1124+
add 1 to tSettingsUsed
1125+
next repeat
1126+
end if
1127+
--since the setting is not used, clear associated keys
1128+
filter tKeys with (tProfileName & "," & tSetting & "*") into tExtraKeys
1129+
repeat for each line tKey in tExtraKeys
1130+
delete variable tGeometry[tKey]
1131+
end repeat
1132+
end repeat
1133+
if tSettingsUsed is 0 then
1134+
--no geometry settings are used, clear everything else
1135+
delete variable tGeometry[tProfileName]
1136+
filter tKeys with (tProfileName & ",*") into tExtraKeys
1137+
repeat for each line tKey in tExtraKeys
1138+
delete variable tGeometry[tKey]
1139+
end repeat
1140+
end if
1141+
set the customProperties["cRevGeometry"] of lGeometryObject to tGeometry
1142+
end revClearExtraGeometrySettings

Toolset/libraries/revidedocumentationlibrary.livecodescript

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -360,19 +360,27 @@ function ideDocsFetchLibraryNames
360360
repeat while tMoreRecords
361361
add 1 to tCount
362362
get revDatabaseColumnNamed(tRecordSet, "library_name", "tData")
363-
put tData into tDataSet[tCount]
363+
put true into tDataSet[tData]
364364
revMoveToNextRecord tRecordSet
365365
put the result into tMoreRecords
366366
end repeat
367-
367+
368368
# Close the record set
369369
revCloseCursor tRecordSet
370-
371-
combine tDataSet with return
370+
371+
combine tDataSet with return as set
372+
sort tDataSet
372373
return tDataSet
373374
end ideDocsFetchLibraryNames
374375

375-
private function ideDocsFetchLibraryEntries pLibraryName
376+
/*
377+
Fetch the data for all entries in a given library
378+
379+
Returns:
380+
A numerically keyed array, each element of which is the array
381+
of data pertaining to an entry in the given library API.
382+
*/
383+
function ideDocsFetchLibraryEntries pLibraryName
376384
return __ideDocsFetchData("", pLibraryName, "")
377385
end ideDocsFetchLibraryEntries
378386

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,11 +569,11 @@ private on __setPropertyDataOfObjectFromFile pObjectType, pFile, pPropInfoA
569569
end __setPropertyDataOfObjectFromFile
570570

571571
private function __propertyInfoFilename
572-
return "propertyInfo.txt"
572+
return "propertyInfo.tsv"
573573
end __propertyInfoFilename
574574

575575
private function __classicToolsOrderFilename
576-
return "classicToolsOrder.txt"
576+
return "classicToolsOrder.tsv"
577577
end __classicToolsOrderFilename
578578

579579
private on __orderClassicTools
@@ -611,7 +611,7 @@ private on __objectPropertiesRead
611611
put tFile into tObjectType
612612
# Get the name of the object
613613
set the itemdel to "."
614-
if the last item of tObjectType is "txt" then delete the last item of tObjectType
614+
if the last item of tObjectType is "tsv" then delete the last item of tObjectType
615615
if tObjectType is empty then next repeat
616616

617617
__setPropertyDataOfObjectFromFile tObjectType, tObjectDefinitionsPath & slash & tFile, tPropertiesInfo
@@ -6463,7 +6463,7 @@ on revIDEStandaloneSettingsForStack pStackID
64636463
end revIDEStandaloneSettingsForStack
64646464

64656465
private function __standaloneSettingsInfoFilename
6466-
return "standaloneSettings.txt"
6466+
return "standaloneSettings.tsv"
64676467
end __standaloneSettingsInfoFilename
64686468

64696469
function revIDEStandaloneSettings pStack, pSection
@@ -10904,6 +10904,10 @@ private function revIDEGetDocsGuideData
1090410904
put revEnvironmentUserDocsPath() & slash & \
1090510905
the last item of tFolder into tCachedDataFolder
1090610906
put tFolder & slash & "guide.md" into tGuideFile
10907+
if there is not a file tGuideFile then
10908+
-- User widgets have the guide.md in docs/guide/
10909+
put tFolder & slash & "docs/guide/guide.md" into tGuideFile
10910+
end if
1090710911
if there is not a file tGuideFile then next repeat
1090810912
revIDEEnsurePath tCachedDataFolder
1090910913

@@ -11342,6 +11346,7 @@ on revIDESetGeometry pObject, pProperty, pGeometryArray
1134211346
repeat for each key tKey in pGeometryArray["geometry"]
1134311347
revSetGeometry tKey, pGeometryArray["geometry"][tKey]
1134411348
end repeat
11349+
revClearExtraGeometrySettings
1134511350
end revIDESetGeometry
1134611351

1134711352
function revIDEGetGeometry pObject, pProperty

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ on mouseUp pButton
220220
answer warning "Really remove all Geometry from the selected object?" with "No" or "Yes"
221221
if it is "Yes" then
222222
put empty into tValue
223-
setValue tValue
223+
setValue tValue, "all"
224224
end if
225225
break
226226
default
@@ -459,6 +459,9 @@ on setValue pValue, pKey
459459
case "moveV"
460460
put "scaleTop,scaleBottom" into tTurnOffGeometries
461461
break
462+
case "all"
463+
put "moveH,moveV,scaleLeft,scaleRight,scaleTop,scaleBottom" into tTurnOffGeometries
464+
break
462465
end switch
463466
repeat for each item tItem in tTurnOffGeometries
464467
put false into pValue[tItem]

Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,17 @@ on escapeKey
14111411
pass escapeKey
14121412
end escapeKey
14131413

1414+
on help
1415+
if revEnvironmentEditionProperty("autocomplete") then
1416+
ideAutocompleteHandleHelp the long id of me, sObjectId
1417+
if the result then
1418+
pass help
1419+
end if
1420+
else
1421+
pass help
1422+
end if
1423+
end help
1424+
14141425
-- This calculates the position of the caret based on pPosition where the caret is (hypothetically).
14151426
private function caretPositionRight pLineStartChar, pProposedPosition, pLine
14161427
local tFirstPosition
@@ -2381,7 +2392,7 @@ on rawKeyDown pKey
23812392
end if
23822393
else
23832394
# For Mac: Ctrl-Left / Cmd-Left / Ctrl-A (Mac)
2384-
if (pKey is kKeyUpArrow and \
2395+
if (pKey is kKeyLeftArrow and \
23852396
(the eventCommandKey is down or \
23862397
the eventControlKey is down) and \
23872398
the eventShiftKey is up and \

Toolset/resources/supporting_files/property_definitions/classicToolsOrder.txt renamed to Toolset/resources/supporting_files/property_definitions/classicToolsOrder.tsv

File renamed without changes.

Toolset/resources/supporting_files/property_definitions/com.livecode.interface.Control.txt renamed to Toolset/resources/supporting_files/property_definitions/com.livecode.interface.Control.tsv

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
type control
2-
title Control Properties
3-
41
Property : optional getter : optional setter Label Section Editor User Visible Read Only Group Default Options Subsection min max step
5-
----------------------------------------------------------------------------------------------------
6-
geometry:revIDEGetGeometry:revIDESetGeometry Geometry Geometry Manager com.livecode.pi.geometry true false
2+
type control
3+
title Control Properties
4+
5+
----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
6+
geometry:revIDEGetGeometry:revIDESetGeometry Geometry Geometry Manager com.livecode.pi.geometry true false
77
location
8-
resize:revIDEGetRectProperty:revIDESetRectProperty Resize when setting rect property Position com.livecode.pi.boolean true false
8+
resize:revIDEGetRectProperty:revIDESetRectProperty Resize when setting rect property Position com.livecode.pi.boolean true false
99
left
1010
top
1111
right
1212
bottom
1313
layer
14-
number
14+
number

Toolset/resources/supporting_files/property_definitions/com.livecode.interface.MultipleObjects.txt renamed to Toolset/resources/supporting_files/property_definitions/com.livecode.interface.MultipleObjects.tsv

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
type multiple
2-
title Multiple Objects
3-
41
Property : optional getter : optional setter Label Section Editor User Visible Read Only Group Default Options Subsection min max step
5-
----------------------------------------------------------------------------------------------------
6-
equalize::revIDEAlignControlsFromPI Equalize Align Controls com.livecode.pi.equalize true false
7-
align::revIDEAlignControlsFromPI Align Align Controls com.livecode.pi.align true false Align
8-
alignCenter::revIDEAlignControlsFromPI Align center Align Controls com.livecode.pi.aligncenter true false Align
9-
distribute::revIDEAlignControlsFromPI Distribute Align Controls com.livecode.pi.distribute true false
10-
nudge::revIDEAlignControlsFromPI Nudge Align Controls com.livecode.pi.nudge true false
11-
relayer::revIDEAlignControlsFromPI Relayer Align Controls com.livecode.pi.relayer true false
2+
type multiple
3+
title Multiple Objects
4+
5+
----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
6+
equalize::revIDEAlignControlsFromPI Equalize Align Controls com.livecode.pi.equalize true false
7+
align::revIDEAlignControlsFromPI Align Align Controls com.livecode.pi.align true false Align
8+
alignCenter::revIDEAlignControlsFromPI Align center Align Controls com.livecode.pi.aligncenter true false Align
9+
distribute::revIDEAlignControlsFromPI Distribute Align Controls com.livecode.pi.distribute true false
10+
nudge::revIDEAlignControlsFromPI Nudge Align Controls com.livecode.pi.nudge true false
11+
relayer::revIDEAlignControlsFromPI Relayer Align Controls com.livecode.pi.relayer true false

Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.Button.txt renamed to Toolset/resources/supporting_files/property_definitions/com.livecode.interface.classic.Button.tsv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
type button
2-
title Standard Button
3-
41
Property : optional getter : optional setter Label Section Editor User Visible Read Only Group Default Options Subsection min max step
5-
----------------------------------------------------------------------------------------------------
2+
type button
3+
title Standard Button
4+
5+
----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
66
name Button
77
label
88
tooltip

0 commit comments

Comments
 (0)