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

Commit 8094151

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.2' into merge-develop-8.2_30.08.17
2 parents cd3d945 + 230e44d commit 8094151

File tree

99 files changed

+667
-275
lines changed

Some content is hidden

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

99 files changed

+667
-275
lines changed

‎builder/builder_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

33
constant kMergExtVersion = "2017-4-6"
4-
constant kTSNetVersion = "1.2.10"
4+
constant kTSNetVersion = "1.3.0"
55

66
local sEngineDir
77
local sWorkDir

‎docs/dictionary/command/answer-file.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ file dialog box.
4848
windowTitle:
4949
If specified, appears in the title bar of the dialog box.
5050
If no <windowTitle> is given, the title bar is blank. This parameter
51-
has no effect on Mac OS systems, because Mac OS file dialog boxes don't
52-
have a title bar.
51+
has no effect on macOS 10.11 (El Capitan) and above, so make sure that any important information is placed in the <prompt> parameter.
5352

5453
It:
5554
The <answer file> command places the absolute file path(s) of the

‎docs/dictionary/command/answer-folder.lcdoc‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: answer directory
44

55
Type: command
66

7-
Syntax: answer folder <prompt> [with <defaultPath>] [as sheet]
7+
Syntax: answer folder <prompt> [with <defaultPath>] [titled <windowTitle>] [as sheet]
88

99
Summary:
1010
Displays a <file dialog box|standard file dialog> for the user to choose
@@ -36,6 +36,11 @@ The name and location of the folder whose contents are listed when the
3636
<dialog box> appears. If no defaultPath is specified, the <dialog box> lists
3737
the contents of the last <folder> you used with a <file dialog box>.
3838

39+
windowTitle:
40+
If specified, appears in the title bar of the dialog box.
41+
If no <windowTitle> is given, the title bar is blank. This parameter
42+
has no effect on macOS 10.11 (El Capitan) and above, so make sure that any important information is placed in the <prompt> parameter.
43+
3944
It:
4045
The absolute file path of the <folder> the user selects is placed in the
4146
<it> <variable>.

‎docs/dictionary/command/do.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ A LiveCode statement, a container with one or more statements, or a
2929
string that evaluates to a statement.
3030

3131
The result:
32-
The <result> is
33-
affected by the LiveCode commands and functions in the script in the normal way.
32+
The <result> is affected by the LiveCode commands and functions in the
33+
script in the normal way.
3434

3535
Description:
3636
Use the <do> command to execute statements in a container, or to execute

‎docs/dictionary/command/import-snapshot.lcdoc‎

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Syntax: import snapshot [from rect[angle] <rectDescription>] [of {<objectRef> |
77
Syntax: import snapshot from {<objectRef> [{with | without} effects] | <stackRef>} [at size <sizeDescription>]
88

99
Summary:
10-
Creates an <image> of a portion of the screen, portion of a stack or a
11-
specific object and sets <it> to the long id of the created <image>.
10+
Creates an <image> of a portion of the screen, a portion of a stack
11+
window, or a specific object and sets <it> to the long id of the
12+
created <image>.
1213

1314
Introduced: 1.0
1415

@@ -62,7 +63,6 @@ Any valid card or control <object reference>.
6263
sizeDescription:
6364
The width and height of the snapshot in pixels, in the form *height,width*.
6465

65-
6666
Description:
6767
Use the <import snapshot> <command> to place a screenshot in the
6868
<current stack>.
@@ -110,6 +110,65 @@ as the Tools palette).
110110
The format of the resulting <image> depends on the current setting of the
111111
<paintCompression> <property>.
112112

113+
<<<<<<< HEAD
114+
To import a snapshot for a portion of a stack you use the form:
115+
116+
import snapshot from rect[angle] rectDescription of stack winID
117+
118+
Where *winID* is the <windowID> property of the given stack.
119+
120+
To import a snapshot of a specific (non-stack) object, use the form:
121+
122+
import snapshot from objectRef
123+
124+
Where <objectRef> is any control or card <object reference>, or any
125+
<expression> evaluating to a control or card <object reference>.
126+
127+
To import a snapshot of an object, including its <blendLevel>, <ink>, or
128+
graphic effects, use the `with effects` form:
129+
130+
import snapshot from objectRef with effects
131+
132+
=======
133+
iOS supports both the object and screen snapshot variants of the
134+
<import snapshot> command. In the screen snapshot case, coordinates
135+
are given relative to the top-left of the screen, including the
136+
area where status bar is, but not including the status bar itself.
137+
138+
If you do not specify the rect[angle] <token> or an <objectRef>, LiveCode
139+
displays a crosshairs <cursor>. Click at one corner of the rectangular
140+
area to be imported and drag to the opposite corner to <select> the area.
141+
142+
If taking a snapshot using the rect[angle] <token> and <rectangle(property)>
143+
of an object, the coordinates in the <rectDescription> are absolute (screen)
144+
coordinates. The portions of all windows and other objects on the screen
145+
that intersect the <rectDescription> will be included in the snapshot.
146+
147+
If taking a snapshot using the rectangle <token>, <rectDescription>, and
148+
a <stackRef>, the coordinates in <rectDescription> are relative to the
149+
top left corner of the stack you specify. The portions of all
150+
objects that intersect the <rectDescription> will be included in the
151+
snapshot. In addition, if the window is partly overlapped by another
152+
window, whatever is visible on the screen within that <rectDescription>
153+
is placed in the snapshot. In other words, you cannot take a snapshot
154+
of a part of a window that is hidden by another overlapping window.
155+
156+
If taking a snapshot using an <objectRef>, the object is rendered into
157+
an <image> as if no other objects existed around it. The snapshot is taken
158+
without applying the object's <blendlevel>, <ink>, or graphic effects.
159+
You can take a snapshot of an object regardless of its visibility or open
160+
status--in particular, snapshots can be taken of objects that are not on
161+
the current card or in stacks that are not open.
162+
163+
Use the `at size sizeDescription` extension if you wish the engine
164+
to resize the snapshot taken to the dimensions specified.
165+
166+
While you take the snapshot, LiveCode hides its own IDE windows (such
167+
as the Tools palette).
168+
169+
The format of the resulting <image> depends on the current setting of the
170+
<paintCompression> <property>.
171+
113172
To import a snapshot for a portion of a stack you use the form:
114173

115174
import snapshot from rect[angle] rectDescription of stack winID
@@ -128,6 +187,7 @@ graphic effects, use the `with effects` form:
128187

129188
import snapshot from objectRef with effects
130189

190+
>>>>>>> upstream/develop-8.2
131191
Where <objectRef> is any control <object reference>, or any
132192
<expression> evaluating to a control <object reference>.
133193

@@ -152,7 +212,7 @@ import (command), current stack (glossary), current card (glossary),
152212
command (glossary), object reference (glossary), property (glossary),
153213
image (glossary), cursor (property), blendlevel (property), ink (property),
154214
paintCompression (property), rectangle (property), select (glossary),
155-
token (glossary), windowID (property), it (property)
215+
token (glossary), windowID (property), it (keyword)
156216

157217
Tags: multimedia
158218

‎docs/dictionary/command/put-unicode.lcdoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Type: command
44

55
Syntax: put unicode <value> {before | into | after} <fieldChunk>
66

7+
Deprecated: 7.0
8+
79
Summary:
810
Inserts a unicode string into a field where specified.
911

‎docs/dictionary/command/send-to-program.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: send to program
22

33
Type: command
44

5-
Syntax: send <message> to {program | application} <programAddress> \ [with <classID>] [{with | without} reply]
5+
Syntax: send <message> to {program | application} <programAddress> [with <classID>] [{with | without} reply]
66

77
Summary:
88
Sends an <Apple event> to a program.

‎docs/dictionary/command/start-using-font.lcdoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ application.
4747
References: stop using font (command), function (glossary),
4848
result (function), fontNames (function),
4949
property (glossary), fontFilesInUse (property)
50+

‎docs/dictionary/command/stop-using-font.lcdoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ The <fontFile> is the path of the font file to unload
3535
> newly unloaded font, compare the value of the <fontNames> before and
3636
> after unloading the font.
3737

38-
>*Warning:* Ensure fonts are not in use before unloading them to avoid
39-
> unexpected behaviour.
38+
References: start using font (command), function (glossary),
39+
fontNames (function), property (glossary),
40+
fontFilesInUse (property)
4041

4142
References: start using font (command), function (glossary),
4243
fontNames (function), property (glossary),

‎docs/dictionary/control_st/try.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ single line, followed by a list of LiveCode <statement|statements>.
4646

4747
The catch section begins with the <catch> <keyword>, followed by a
4848
<parameter> name. If any <error|errors> occur during <execute|execution>
49-
of the <statementList>, the <error> <message> is placed in the
49+
of the <statementList>, the <error message> is placed in the
5050
<errorVariable> <parameter>, and the <errorStatementsList> is
5151
<execute|executed>. <statement|statements> in the <errorStatementsList>
5252
can refer to the <value> of the errorReport.

0 commit comments

Comments
 (0)