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

Commit 6316583

Browse files
livecodesebastienlivecodesebastien
committed
Merge branch 'develop-7.0' into develop
Conflicts: engine/src/capsule.h engine/src/deploy.cpp engine/src/deploy.h engine/src/externalv0.cpp engine/src/util.cpp engine/src/util.h ide ide-support/revsblibrary.livecodescript libexternal/src/external.c revbrowser/src/cefbrowser_w32.cpp rules/Global Mobile.xcconfig thirdparty tools/build-ios.osx version
2 parents 08425ff + 8443943 commit 6316583

File tree

123 files changed

+6064
-1050
lines changed

Some content is hidden

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

123 files changed

+6064
-1050
lines changed

‎docs/dictionary/command/iphoneSetStatusBarStyle.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<doc> <legacy_id></legacy_id> <name>iphoneSetStatusBarStyle</name> <type>command</type> <syntax> <example>iphoneSetStatusBarStyle <i>style</i></example> </syntax> <synonyms> </synonyms> <summary>Controls the style of the iOS status bar.</summary> <examples><example>iphoneSetStatusBarStyle tStyle</example><example>iphoneSetStatusBarStyle &quot;translucent&quot;</example> </examples> <history> <introduced version="4.5.2">Added</introduced> <deprecated version=""></deprecated> <removed version=""></removed> </history> <objects> </objects> <platforms> <ios/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <command tag="mobileHideStatusBar">mobileHideStatusBar Command</command> <command tag="mobileShowStatusBar">mobileShowStatusBar Command</command> </references> <description> <overview>Use <b>iphoneSetStatusBarStyle</b> to change the style of the iOS status bar.</overview> <parameters> <parameter> <name>style</name> <description>The style of the iOS status bar.</description> <options title=""> <option> <item>default</item> <description>The default mode for the device.</description> </option> <option> <item>translucent</item> <description>Semi-transparent status bar (in this case the stack appears underneath it).</description> </option> <option> <item>opaque</item> <description>A black status bar (in this case the stack appears below it).</description> </option> </options> </parameter> </parameters> <value></value> <comments></comments> </description></doc>
1+
<doc> <legacy_id></legacy_id> <name>iphoneSetStatusBarStyle</name> <type>command</type> <syntax> <example>iphoneSetStatusBarStyle <i>style</i></example> </syntax> <synonyms> </synonyms> <summary>Controls the style of the iOS status bar.</summary> <examples><example>iphoneSetStatusBarStyle tStyle</example><example>iphoneSetStatusBarStyle "translucent"</example> </examples> <history> <introduced version="4.5.2">Added</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <ios/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <command tag="mobileHideStatusBar">mobileHideStatusBar Command</command> <command tag="mobileShowStatusBar">mobileShowStatusBar Command</command> </references> <description> <overview>Use <b>iphoneSetStatusBarStyle</b> to change the style of the iOS status bar.</overview> <parameters> <parameter> <name>style</name> <description>The style of the iOS status bar.</description> <options title=""> <option> <item>default</item> <description>The default mode for the device.</description> </option> <option> <item>translucent</item> <description>Semi-transparent status bar (in this case the stack appears underneath it).</description> </option> <option> <item>opaque</item> <description>A black status bar (in this case the stack appears below it in pre-iOS 7, and underneath it in iOS 7+).</description> </option> <option> <item>solid</item> <description>A black status bar (in this case the stack appears below it).</description> </option> </options> </parameter> </parameters> <value></value> <comments></comments> </description></doc>

‎docs/dictionary/function/textEncode.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</option>
8282
<option>
8383
<item>Native</item>
84-
<description>ISO-8859-1 on Minux, MacRoman on OS X, CP1252 on Windows</description>
84+
<description>ISO-8859-1 on Linux, MacRoman on OS X, CP1252 on Windows</description>
8585
</option>
8686
<option>
8787
<item>UTF-16</item>

‎docs/dictionary/message/browserDocumentFailed.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<doc>
2+
<legacy_id></legacy_id>
3+
<name>browserDocumentFailed</name>
4+
<type>message</type>
5+
<syntax>
6+
<example>browserDocumentFailed <i>instanceId, url, errorMessage</i></example>
7+
</syntax>
8+
<library>Browser Library</library>
9+
<objects>
10+
<card/>
11+
</objects>
12+
<synonyms>
13+
</synonyms>
14+
<classification>
15+
</classification>
16+
<references>
17+
<message tag="browserDownloadRequest">browserDownloadRequest Message</message>
18+
<function tag="revBrowserOpenCef">revBrowserOpenCef Function</function>
19+
</references>
20+
<history>
21+
<introduced version="6.7.3">Added.</introduced>
22+
</history>
23+
<platforms>
24+
<mac/>
25+
<windows/>
26+
</platforms>
27+
<classes>
28+
<desktop/>
29+
</classes>
30+
<security>
31+
<network/>
32+
</security>
33+
<summary>Sent when a browser object has encountered an error when loading a url</summary>
34+
<examples>
35+
<example>on browserDocumentFailed pInstanceId, pUrl, pErrorMessage</p><p> answer "Failed to load URL" && quote & pUrl & quote & return & "Error message: " && pErrorMessage</p><p>end browserDocumentFailed</example>
36+
</examples>
37+
<description>
38+
<p>The <b>browserDocumentFailed</b> message is sent to the current card of a stack containing a browser object when the browser object has encountered an error while loading a url and all its dependent resources.</p><p/><p>If the target is the main frame of the browser (e.g. the html page with the "FRAMESET" declaration), then the <b>browserDocumentFailed</b> message is sent. Otherwise the <message tag="browserDocumentFailedFrame">browserDocumentFailedFrame message</message> is sent instead.</p><p/><p><b>Parameters:</b></p><p>The <i>url</i> is the url that has failed to load</p><p>The <i>instanceId</i> is the integer identifer of the browser object</p><p>The <i>errorMessage</i> is a message explaining why the url failed to load</p><p/><p><b>Note:</b> For general information on using the browser library, see the notes in the <function tag="revBrowserOpen">revBrowserOpen function</function> reference.</p>
39+
</description>
40+
</doc>

‎docs/dictionary/message/browserDocumentFailedFrame.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<doc>
2+
<legacy_id></legacy_id>
3+
<name>browserDocumentFailedFrame</name>
4+
<type>message</type>
5+
<syntax>
6+
<example>browserDocumentFailedFrame <i>instanceId, url, errorMessage</i></example>
7+
</syntax>
8+
<library>Browser Library</library>
9+
<objects>
10+
<card/>
11+
</objects>
12+
<synonyms>
13+
</synonyms>
14+
<classification>
15+
</classification>
16+
<references>
17+
<message tag="browserDownloadRequest">browserDownloadRequest Message</message>
18+
<function tag="revBrowserOpenCef">revBrowserOpenCef Function</function>
19+
</references>
20+
<history>
21+
<introduced version="6.7.3">Added.</introduced>
22+
</history>
23+
<platforms>
24+
<mac/>
25+
<windows/>
26+
</platforms>
27+
<classes>
28+
<desktop/>
29+
</classes>
30+
<security>
31+
<network/>
32+
</security>
33+
<summary>Sent when a browser object has encountered an error when loading a url in a frame</summary>
34+
<examples>
35+
<example>on browserDocumentFailedFrame pInstanceId, pUrl, pErrorMessage</p><p> answer "Failed to load frame URL" && quote & pUrl & quote & return & "Error message: " && pErrorMessage</p><p>end browserDocumentFailedFrame</example>
36+
</examples>
37+
<description>
38+
<p>The <b>browserDocumentFailedFrame</b> message is sent to the current card of a stack containing a browser object when the browser object has encountered an error while loading a url and all its dependent resources in a frame.</p><p/><p>If the target is the main frame of the browser then the <message tag="browserDocumentFailed">browserDocumentFailed message</message> message is sent instead.</p><p/><p><b>Parameters:</b></p><p>The <i>url</i> is the url that has failed to load in a frame</p><p>The <i>instanceId</i> is the integer identifer of the browser object</p><p>The <i>errorMessage</i> is a message explaining why the url failed to load in the frame</p><p/><p><b>Note:</b> For general information on using the browser library, see the notes in the <function tag="revBrowserOpen">revBrowserOpen function</function> reference.</p>
39+
</description>
40+
</doc>

‎docs/dictionary/property/printMargins.xml‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1 @@
1-
<doc>
2-
<legacy_id>2421</legacy_id>
3-
<name>printMargins</name>
4-
<type>property</type>
5-
<syntax>
6-
<example>set the printMargins to <i>left</i>,<i>top</i>,<i>right</i>,<i>bottom</i></example>
7-
</syntax>
8-
<library></library>
9-
<objects>
10-
<global/>
11-
</objects>
12-
<synonyms>
13-
</synonyms>
14-
<classification>
15-
<category>Printing</category>
16-
</classification>
17-
<references>
18-
<command tag="answer printer">answer printer Command</command>
19-
<command tag="answer page setup">answer page setup Command</command>
20-
<property tag="printCardBorders">printCardBorders Property</property>
21-
<property tag="printRowsFirst">printRowsFirst Property</property>
22-
<property tag="printGutters">printGutters Property</property>
23-
</references>
24-
<history>
25-
<introduced version="1.0">Added.</introduced>
26-
</history>
27-
<platforms>
28-
<mac/>
29-
<windows/>
30-
<linux/>
31-
<ios/>
32-
</platforms>
33-
<classes>
34-
<desktop/>
35-
<server/>
36-
<web/>
37-
<mobile/>
38-
</classes>
39-
<security>
40-
<printing/>
41-
</security>
42-
<summary>Specifies the width of the page margins when printing <glossary tag="card">cards</glossary>.</summary>
43-
<examples>
44-
<example>set the printMargins to 72,144,72,144 </example>
45-
</examples>
46-
<description>
47-
<p>Use the <b>printMargins</b> <glossary tag="property">property</glossary> to control how much blank space is left at each edge of the page when printing.</p><p/><p><b>Value:</b></p><p>The <b>printMargins</b> consists of four <href tag="../glossary/nondashnegative.xml">non-negative</href> <glossary tag="integer">integers</glossary>, separated by commas.</p><p/><p>By default, the <b>printMargins</b> is set to 72,72,72,72 (a one-inch margin on each side).</p><p/><p><b>Comments:</b></p><p>The <i>left</i> is the width in <property tag="points">points</property> of blank space between the left edge of the page and the leftmost edge of the printed <glossary tag="card">cards</glossary>. (There are 72 <property tag="points">points</property> to an inch.)</p><p/><p>The <i>top</i> is the height in <property tag="points">points</property> of blank space between the top edge of the page and the topmost edge of the printed <glossary tag="card">cards</glossary>.</p><p/><p>The <i>right</i> is the width in <property tag="points">points</property> of blank space between the right edge of the page and the rightmost edge of the printed <glossary tag="card">cards</glossary>.</p><p/><p>The <i>bottom</i> is the height in <property tag="points">points</property> of blank space between the bottom edge of the page and the bottommost edge of the printed <glossary tag="card">cards</glossary>.</p>
48-
</description>
49-
</doc>
1+
<doc> <legacy_id>2421</legacy_id> <name>printMargins</name> <type>property</type> <syntax> <example>set the printMargins to <i>left</i>,<i>top</i>,<i>right</i>,<i>bottom</i></example> </syntax> <synonyms> </synonyms> <summary>Specifies the width of the page margins when printing <glossary tag="card">cards</glossary>.</summary> <examples><example>set the printMargins to 72,144,72,144 </example> </examples> <history> <introduced version="1.0">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> <global/> </objects> <platforms> <mac/> <windows/> <linux/> <ios/> </platforms> <classes> <desktop/> <server/> <web/> <mobile/> </classes> <security> <printing/> </security> <classification> <category>Printing</category> </classification> <references> <command tag="answer printer">answer printer Command</command> <command tag="answer page setup">answer page setup Command</command> <property tag="printCardBorders">printCardBorders Property</property> <property tag="printRowsFirst">printRowsFirst Property</property> <property tag="printGutters">printGutters Property</property> </references> <description>Use the <b>printMargins</b> <glossary tag="property">property</glossary> to control how much blank space is left at each edge of the page when printing.<p></p><p><b>Value:</b></p><p>The <b>printMargins</b> consists of four non-negative <glossary tag="integer">integers</glossary>, separated by commas.</p><p></p><p>By default, the <b>printMargins</b> is set to 72,72,72,72 (a one-inch margin on each side).</p><p></p><p><b>Comments:</b></p><p>The <i>left</i> is the width in <property tag="points">points</property> of blank space between the left edge of the page and the leftmost edge of the printed <glossary tag="card">cards</glossary>. (There are 72 <property tag="points">points</property> to an inch.)</p><p></p><p>The <i>top</i> is the height in <property tag="points">points</property> of blank space between the top edge of the page and the topmost edge of the printed <glossary tag="card">cards</glossary>.</p><p></p><p>The <i>right</i> is the width in <property tag="points">points</property> of blank space between the right edge of the page and the rightmost edge of the printed <glossary tag="card">cards</glossary>.</p><p></p><p>The <i>bottom</i> is the height in <property tag="points">points</property> of blank space between the bottom edge of the page and the bottommost edge of the printed <glossary tag="card">cards</glossary>.</p><p></p><p>Set this property before calling the "open printing" or "open printing to pdf" command, to apply the new value to the current print run.</p></description></doc>

‎docs/notes/bugfix-11544.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# iOS 7 Status Bar Hidden, not hidden when use iPhonePickPhoto

‎docs/notes/bugfix-14011.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Printing is inconsistent

‎docs/notes/bugfix-14057.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# internal API error (2) when using external

‎docs/notes/bugfix-14140.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Location of modal stacks incorrect on OSX

‎docs/notes/bugfix-14383.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Android standalones can not open a new file for update on the device

0 commit comments

Comments
 (0)