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

Commit a14ff97

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop' of https://github.com/runrev/livecode into feature-browser_widget_callbacks
2 parents 064cf4d + 655994a commit a14ff97

File tree

188 files changed

+1752
-1649
lines changed

Some content is hidden

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

188 files changed

+1752
-1649
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ xcuserdata/
9696
make-*_*/
9797
vsprojects/
9898
xcprojects/
99+
GPATH
100+
GRTAGS
101+
GTAGS
99102

100103
# Build folders #
101104
#################

‎builder/docs_builder.livecodescript‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,6 +1970,9 @@ private function builderGetDocsAPIData pExtensions
19701970
local tLcdoc
19711971
put revDocsGenerateDocsFileFromModularFile(tFolder & slash & tSource) into tLcdoc
19721972

1973+
# Output the lcdoc file
1974+
put textEncode(tLcdoc, "utf-8") into url ("binfile:" & tFolder & slash & "api.lcdoc")
1975+
19731976
# Convert to JSON
19741977
put revDocsFormatDocTextAsJSON(tLcdoc,"", "LiveCode") into tExtensionAPI
19751978

@@ -2011,11 +2014,6 @@ end builderGetDocsGuideData
20112014

20122015
on docsBuilderGenerateBuiltGuide pExtensions
20132016
local tData
2014-
2015-
# Get the location of the distributed guide
2016-
local tGuidePath
2017-
put revIDESpecialFolderPath("guide") into tGuidePath
2018-
20192017
put "var tUserGuideData =" & CR & "{" & CR & tab & quote & "guides" & quote & ":[" into tData
20202018

20212019
# Add the guide data from each of the packaged extensions
@@ -2028,11 +2026,6 @@ end docsBuilderGenerateBuiltGuide
20282026

20292027
on docsBuilderGenerateBuiltAPI pExtensions
20302028
local tData
2031-
2032-
# Get the location of the distributed API
2033-
local tAPIPath
2034-
put revIDESpecialFolderPath("API") into tAPIPath
2035-
20362029
put "var dictionary_data =" & CR & "{" & CR & tab & quote & "docs" & quote & ":[" after tData
20372030

20382031
# Add the api data from each of the packaged extensions

‎builder/server_builder.livecodescript‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ command serverBuilderRun pPlatform, pEdition
103103
end if
104104
end repeat
105105

106-
repeat for each word tDriver in "dbsqlite dbmysql dbpostgresql dbodbc dboracle"
106+
// SN-2015-06-25: [[ ServerBuilder ]] DBoracle has never been in the Server zip.
107+
// Removed to suppress the builder warning
108+
repeat for each word tDriver in "dbsqlite dbmysql dbpostgresql dbodbc"
107109
get tEngineFolder & slash & "server-" & tDriver & tLibExtension
108110
if there is a file it then
109111
builderLog "message", "Adding driver '" & tDriver & "'"

‎configure.bat‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,15 @@ IF EXIST "%programfiles(x86)%\Microsoft Speech SDK\*" (
7171
REM Pause so any warnings can be seen
7272
IF %warnings% NEQ 0 PAUSE
7373

74+
REM Community or commercial?
75+
IF /I %BUILD_EDITION% == commercial (
76+
SET gypfile="../livecode-commercial.gyp"
77+
)
78+
7479
REM Run the configure step
75-
%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options%
80+
%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options% %gypfile%
81+
PAUSE
7682

7783
REM Pause if there was an error so that the user gets a chance to see it
7884
IF %ERRORLEVEL% NEQ 0 PAUSE
7985
EXIT %ERRORLEVEL%
80-

‎docs/dictionary/command/create-widget.lcdoc‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Name: create widget
2+
3+
Type: command
4+
5+
Associations: widget
6+
7+
Syntax: create [invisible] widget [<controlName>] as <widgetKind> [in <group>]
8+
9+
Summary: Create a <widget> control of the specified <kind>.
10+
11+
Introduced: 8.0
12+
13+
OS: mac,windows,linux,ios,android
14+
15+
Platforms: desktop,server,web,mobile
16+
17+
Example:
18+
create widget "My Navbar" as "com.livecode.widget.navbar"
19+
20+
Example:
21+
create group "Swatches"
22+
repeat with x = 1 to 20
23+
create invisible widget ("Color Swatch" && x) as "com.livecode.widget.colorswatch" in group "Swatches"
24+
end repeat
25+
26+
Parameters:
27+
controlName: The name to call the newly created <widget>. If you don't specify a name, the <widget> is created with a default name.
28+
widgetKind: The name of the module that defines the widget to be created.
29+
group: A reference or an expression that evaluates to a reference to a group on the current card. If you specify a group, the new <widget> is a member of the <group>, and exists on each <card> that has the <group>. If you don't specify a <group>, the <widget> is created on the current <card> and appears only on that <card>.
30+
31+
It: The <create widget> command places the ID property of the newly created <widget> in the <it> variable.
32+
33+
Description:
34+
Use the <create widget> command to make a new <widget> control or grouped <widget> control of <kind> <widgetKind>.
35+
36+
If you use the invisible form, the <widget> is created with its <visible> property set to false, so it cannot be seen. Use this form to create a hidden <widget>, change its appearance or position, then make it visible.
37+
38+
When the new <widget> is created, the pointer tool is automatically chosen.
39+
40+
>*Note:* The <LCB extension|extension> of the specified <kind> must have been loaded using the <load extension> command. To see a list of the currently loaded <LiveCode Builder extension|extensions>, use the <loadedExtensions> <function>.
41+
42+
References: kind (property), load extension (command), loadedExtensions (function), widget (object), card (object), group (object), visible (property), LiveCode Builder extension (glossary), it (keyword)
43+
44+
Tags: objects, extensions

‎docs/dictionary/command/load-extension.lcdoc‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
Name: load extension
2+
3+
Type: command
4+
5+
Syntax: load extension {from file <filePath> | from data <moduleData>} [ with resource path <resourcePath> ]
6+
7+
Summary: Load a LiveCode Builder extension.
8+
9+
Introduced: 8.0
10+
11+
OS: mac,windows,linux,ios,android
12+
13+
Platforms: desktop,server,web,mobile
14+
15+
Example:
16+
load extension from file (revIDESpecialFolderPath("extensions") & slash & "com.livecode.extensions.livecode.navbar" & slash & "module.lcm")
17+
if the result is empty then
18+
create widget "My Navbar" as "com.livecode.widget.navbar"
19+
end if
20+
21+
Example:
22+
local tExtensionData
23+
put url ("binfile:" & tMyExtensionFolder & slash & "module.lcm") into tExtensionData
24+
load extension from data tExtensionData with resource path (tMyExtensionFolder & slash & "resources")
25+
26+
Parameters:
27+
filePath: The path to a compiled <LiveCode Builder extension> file.
28+
moduleData: Binary data that constitutes a valid compiled <LiveCode Builder extension>.
29+
resourcePath: The path to use for any operations in the <LiveCode Builder extension|extensions> that use resource files (eg 'image from resource file').
30+
31+
The result:
32+
If the <load extension> <command> succeeds, the <result> is empty. Otherwise the <result> contains an error message describing why the extension could not be loaded.
33+
34+
Description:
35+
Use the <load extension> <command> to load a <LiveCode Builder extension>.
36+
If the extension is a library, its public handlers will be added to the bottom of the message path.
37+
If it is a widget, it will be available as a control in the tools palette to drag out, or to create with the <create widget> <command>.
38+
39+
References: unload extension (command), loadedExtensions (function), create widget (command), LiveCode Builder extension (glossary), result (function)
40+
41+
Tags: extensions

‎docs/dictionary/command/open-socket.lcdoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ The most common CAs such as verisign can be found in the file root.pem. If a ve
7171

7272
For technical information about the numbers used to designate standard ports, see the list of port numbers at &lt;http://www.iana.org/assignments/port-numbers&gt;, in particular the section titled "Well Known Port Numbers".
7373

74-
>*Important:* The open secure socket command is part of the SSL & Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. In the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL & Encryption" is selected in the list of script libraries.
74+
>*Important:* The open secure socket command is part of the SSL & Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. For desktop standalones, in the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL & Encryption" is selected in the list of script libraries. For iOS standalones, in the "Basic Application Settings" section on the iOS screen of the Standalone Application Settings window, make sure "Encryption" is checked. For Android standalones, in the "Basic Application Settings" section on the Android screen of the Standalone Application Settings window, make sure "SSL & Encryption" is checked.
75+
>*Important:*
76+
On Android, when using remote sockets, internet permissions must be enabled. Do this by selecting the "Internet" checkbox of the "Application Permissions" section of the Android screen.
7577

7678
(4.5) The open socket command no longer blocks on DNS resolution. Instead, if resolution is required the command will return immediately and the DNS lookup will happen in the background. If resolution fails, then a socketError message is sent in the same was as if connection fails.
7779

‎docs/dictionary/command/secure-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Summary: Secures an open socket.
1010

1111
Introduced: 6.6
1212

13-
OS: mac,windows,linux
13+
OS: mac,windows,linux,ios,android
1414

15-
Platforms: desktop
15+
Platforms: desktop,mobile
1616

1717
Security: network
1818

‎docs/dictionary/command/unload-extension.lcdoc‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Name: unload extension
2+
3+
Type: command
4+
5+
Syntax: unload extension <extensionIdentifier>
6+
7+
Summary: Unload a <LiveCode Builder extension>.
8+
9+
Introduced: 8.0
10+
11+
OS: mac,windows,linux,ios,android
12+
13+
Platforms: desktop,server,web,mobile
14+
15+
Example:
16+
unload extension com.livecode.widget.navbar
17+
18+
Example:
19+
-- Unload all extensions
20+
repeat for each line tExtension in the loadedExtensions
21+
unload extension tExtension
22+
end repeat
23+
24+
Parameters:
25+
extensionIdentifier: The identifier of the extension to unload.
26+
27+
Description:
28+
Use the <unload extension> <command> to unload a <LiveCode Builder extension>. The extension is removed from memory.
29+
If the extension is a library, its public handlers will no longer be in the message path.
30+
If it is a widget, it will no longer be available as a control to add to a stack.
31+
32+
>*Note:* If there is an instance of a widget still present on a stack in memory, the <unload extension> <command> will fail.
33+
34+
References: load extension (command), loadedExtensions (function), LiveCode Builder extension (glossary)
35+
36+
Tags: extensions

‎docs/dictionary/command/write-to-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Summary: Sends data to a <socket>.
88

99
Introduced: 1.0
1010

11-
OS: mac,windows,linux
11+
OS: mac,windows,linux,ios,android
1212

13-
Platforms: desktop,server,web
13+
Platforms: desktop,server,web,mobile
1414

1515
Security: network
1616

0 commit comments

Comments
 (0)