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

Commit c6d1fc6

Browse files
livecodepanoslivecodepanos
authored
Merge pull request #2106 from livecode/merge-develop-9.5-25.11.2019
Merge develop 9.5 25.11.2019
2 parents 5f18849 + 5782258 commit c6d1fc6

14 files changed

+158
-40
lines changed

‎Documentation/dictionary/datagrid.lcdoc‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1908,8 +1908,6 @@ the data will be added to the end of the existing data.
19081908

19091909
Name: DeleteIndex
19101910

1911-
Synonyms: DeleteIndexes
1912-
19131911
Type: command
19141912

19151913
Associations: datagrid, datagrid commands
@@ -1920,13 +1918,27 @@ Summary: Deletes the specified indexes from the data grid.
19201918

19211919
Description:
19221920

1921+
Deletes the specified indexes from the data grid. pIndex is an
1922+
integer.
1923+
1924+
1925+
Name: DeleteIndexes
1926+
1927+
Type: command
1928+
1929+
Associations: datagrid, datagrid commands
1930+
1931+
Syntax: dispatch "DeleteIndexes" to group "DataGrid" with pIndexes
1932+
1933+
Summary: Deletes the specified indexes from the data grid.
1934+
1935+
Description:
1936+
19231937
Deletes the specified indexes from the data grid. pIndexes is a comma
19241938
delimited list of integers.
19251939

19261940

1927-
Name: DeleteLine
1928-
1929-
Synonyms: DeleteLines
1941+
Name: DeleteLine
19301942

19311943
Type: command
19321944

@@ -1936,6 +1948,21 @@ Syntax: dispatch "DeleteLine" to group "DataGrid" with pLine
19361948

19371949
Summary: Deletes the specified lines from the data grid.
19381950

1951+
Description:
1952+
Deletes the specified line from the data grid. pLine is an
1953+
integer.
1954+
1955+
1956+
Name: DeleteLines
1957+
1958+
Type: command
1959+
1960+
Associations: datagrid, datagrid commands
1961+
1962+
Syntax: dispatch "DeleteLine" to group "DataGrid" with pLines
1963+
1964+
Summary: Deletes the specified lines from the data grid.
1965+
19391966
Description:
19401967
Deletes the specified lines from the data grid. pLines is a comma
19411968
delimited list of integers.

‎Documentation/guides/Deploying Your Application.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Deploying an app to standalone is straightforward:
5151

5252
Your application will be packaged up and placed in the selected output folder.
5353

54-
### Standalone Applications Settings
54+
## Standalone Applications Settings
5555

5656
The Standalone Applications Setting dialog allows you to create settings for your
5757
standalone application. This dialog can be found in the File menu. The settings you enter
@@ -63,7 +63,7 @@ Related lessons:
6363

6464
* [The Standalone Application Settings](http://lessons.livecode.com/m/4603/l/685074-the-standalone-application-settings)
6565

66-
#### General Settings
66+
## General Settings
6767

6868
![](images/standalone-settings-general.png)
6969

@@ -196,7 +196,7 @@ The following database drivers are available by default:
196196
- SQLite
197197
- PostgreSQL
198198

199-
#### Mac Deployment
199+
## Mac Deployment Settings
200200

201201
![](images/standalone-settings-mac.png)
202202

@@ -220,7 +220,7 @@ Related lessons:
220220

221221
* [Signing and Uploading apps to the Mac App Store](http://lessons.livecode.com/m/4071/l/876834-signing-and-uploading-apps-to-the-mac-app-store)
222222

223-
#### Windows Deployment
223+
## Windows Deployment Settings
224224

225225
![](images/standalone-settings-windows.png)
226226

@@ -235,7 +235,7 @@ Figure 6 – Standalone Settings – Windows
235235
| **Version information** | The version information to be stored as part of your application and displayed in the Windows property inspector and dialogs. |
236236
| **UAC Execution Level** | Select the user account control level that applies to your application. For more information, consult [MSDN](https://msdn.microsoft.com/en-us/library/bb384608.aspx) |
237237

238-
#### Linux Deployment
238+
## Linux Deployment Settings
239239

240240
![](images/standalone-settings-linux.png)
241241

@@ -247,7 +247,7 @@ Figure 7 – Standalone Settings – Linux
247247
| **Build for Linux x64** | Build a standalone for 64-bit Linux |
248248
| **Include** | Select built-in LiveCode dialogs to include. These dialogs are useful if your application may be run on a system that does not include these dialogs as part of the OS. You do not need to include these dialogs if you are running a recent version of GTK. |
249249

250-
#### iOS Deployment
250+
## iOS Deployment Settings
251251

252252
![](images/standalone-settings-ios-basic.png)
253253

@@ -363,7 +363,7 @@ Related lessons:
363363
* [How do I Become an iOS Developer?](http://lessons.livecode.com/m/4069/l/565715-how-do-i-become-an-ios-developer)
364364
* [How do I build an iOS application?](http://lessons.livecode.com/m/4069/l/565713-how-do-i-build-an-ios-application)
365365

366-
#### Android Deployment
366+
## Android Deployment Settings
367367

368368
![](images/standalone-settings-android.png)
369369

@@ -422,7 +422,7 @@ Related lessons:
422422
* [LiveCode and Android Studio](http://lessons.livecode.com/m/4069/l/985962-livecode-and-android-studio)
423423
* [The Basics: How do I Create Hello World on Android?](http://lessons.livecode.com/m/4069/l/27733-the-basics-how-do-i-create-hello-world-on-android)
424424

425-
#### HTML5 Deployment
425+
## HTML5 Deployment Settings
426426

427427
![](images/standalone-settings-html5.png)
428428

@@ -666,7 +666,7 @@ LiveCode Business Edition the remote debugger will detect any execution errors
666666
and present them.
667667

668668
> **Note:** iOS devices connected via USB are detected as test targets in
669-
LiveCode Business Edition and apps will be installed on them, however, the will
669+
LiveCode Business Edition and apps will be installed on them, however, they will
670670
not be automatically launched.
671671

672672

‎Toolset/libraries/revbackscriptlibrary.livecodescript‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2481,26 +2481,17 @@ function revDBDriverPath pDriver, pPlatform, pArchitecture
24812481
-- returns path to database driver from runtime or user runtime folder
24822482
-- will be a folder on Mac OS X, a list of files on Windows
24832483

2484-
local tEnvironmentFolder, tUserFolder
2485-
switch pPlatform
2486-
case "MacOSX"
2487-
if pArchitecture is empty then
2488-
put "Universal" into pArchitecture
2489-
end if
2490-
put revEnvironmentRuntimePath() & "/Mac OS X/" & pArchitecture & "/Externals" into tEnvironmentFolder
2491-
put revEnvironmentUserRuntimePath() & "/Mac OS X/" & pArchitecture & "/Externals" into tUserFolder
2492-
break
2493-
2494-
case "Windows"
2495-
put revEnvironmentRuntimePath() & "/Windows/x86-32/Externals" into tEnvironmentFolder
2496-
put revEnvironmentUserRuntimePath() & "/Windows/x86-32/Externals" into tUserFolder
2497-
break
2498-
2499-
case "Linux"
2500-
put revEnvironmentRuntimePath() & "/Linux/" & pArchitecture & "/Externals" into tEnvironmentFolder
2501-
put revEnvironmentUserRuntimePath() & "/Linux/" & pArchitecture & "/Externals" into tUserFolder
2502-
break
2503-
end switch
2484+
local tPlatform, tEnvironmentFolder, tUserFolder
2485+
put pPlatform into tPlatform
2486+
if tPlatform is "MacOSX" then
2487+
put "Mac OS X" into tPlatform
2488+
if pArchitecture is empty then
2489+
put "Universal" into pArchitecture
2490+
end if
2491+
end if
2492+
2493+
put revEnvironmentRuntimePath() & "/" & tPlatform & "/" & pArchitecture & "/Externals" into tEnvironmentFolder
2494+
put revEnvironmentUserRuntimePath() & "/" & tPlatform & "/" & pArchitecture & "/Externals" into tUserFolder
25042495

25052496
local tEnvironmentFile, tUserFile, tLegacyFile
25062497
put tEnvironmentFolder & slash & kDriverIndexSubFolder & slash & kDriverIndexName into tEnvironmentFile

‎Toolset/palettes/project browser/behaviors/revideprojectbrowsercontainerrowbehavior.livecodescript‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,26 @@ command connectorResize pControl
485485
set the width of group pControl of me to 20
486486
set the top of group pControl of me to the top of me
487487

488-
set the width of widget "icon" of group pControl of me to 12
488+
local tTextSize, tWidgetSize
489+
put the effective textsize of me into tTextSize
490+
switch
491+
case tTextSize >= 8 and tTextSize < 12
492+
put 11 into tWidgetSize
493+
break
494+
case tTextSize >= 12 and tTextSize < 14
495+
put 13 into tWidgetSize
496+
break
497+
case tTextSize >= 14 and tTextSize < 18
498+
put 15 into tWidgetSize
499+
break
500+
case tTextSize >= 18
501+
put 17 into tWidgetSize
502+
break
503+
default
504+
put 13 into tWidgetSize
505+
end switch
506+
507+
set the width of widget "icon" of group pControl of me to tWidgetSize
489508
set the height of widget "icon" of group pControl of me to the width of widget "icon" of group pControl of me
490509
set the loc of widget "icon" of group pControl of me to the loc of group pControl of me
491510
end connectorResize

‎Toolset/palettes/project browser/behaviors/revideprojectbrowsercontrolrowbehavior.livecodescript‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,26 @@ command connectorResize pControl
435435
set the width of group pControl of me to 20
436436
set the top of group pControl of me to the top of me
437437

438-
set the width of widget "icon" of group pControl of me to 12
438+
local tTextSize, tWidgetSize
439+
put the effective textsize of me into tTextSize
440+
switch
441+
case tTextSize >= 8 and tTextSize < 12
442+
put 11 into tWidgetSize
443+
break
444+
case tTextSize >= 12 and tTextSize < 14
445+
put 13 into tWidgetSize
446+
break
447+
case tTextSize >= 14 and tTextSize < 18
448+
put 15 into tWidgetSize
449+
break
450+
case tTextSize >= 18
451+
put 17 into tWidgetSize
452+
break
453+
default
454+
put 13 into tWidgetSize
455+
end switch
456+
457+
set the width of widget "icon" of group pControl of me to tWidgetSize
439458
set the height of widget "icon" of group pControl of me to the width of widget "icon" of group pControl of me
440459
set the loc of widget "icon" of group pControl of me to the loc of group pControl of me
441460
end connectorResize

‎Toolset/palettes/project browser/behaviors/revideprojectbrowsergrouprowbehavior.livecodescript‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,26 @@ command connectorResize pControl
464464
set the width of group pControl of me to 20
465465
set the top of group pControl of me to the top of me
466466

467-
set the width of widget "icon" of group pControl of me to 12
467+
local tTextSize, tWidgetSize
468+
put the effective textsize of me into tTextSize
469+
switch
470+
case tTextSize >= 8 and tTextSize < 12
471+
put 11 into tWidgetSize
472+
break
473+
case tTextSize >= 12 and tTextSize < 14
474+
put 13 into tWidgetSize
475+
break
476+
case tTextSize >= 14 and tTextSize < 18
477+
put 15 into tWidgetSize
478+
break
479+
case tTextSize >= 18
480+
put 17 into tWidgetSize
481+
break
482+
default
483+
put 13 into tWidgetSize
484+
end switch
485+
486+
set the width of widget "icon" of group pControl of me to tWidgetSize
468487
set the height of widget "icon" of group pControl of me to the width of widget "icon" of group pControl of me
469488
set the loc of widget "icon" of group pControl of me to the loc of group pControl of me
470489
end connectorResize

‎Toolset/palettes/project browser/behaviors/revideprojectbrowserlibraryrowbehavior.livecodescript‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,26 @@ command connectorResize pControl
151151
set the width of group pControl of me to 20
152152
set the top of group pControl of me to the top of me
153153

154-
set the width of widget "icon" of group pControl of me to 12
154+
local tTextSize, tWidgetSize
155+
put the effective textsize of me into tTextSize
156+
switch
157+
case tTextSize >= 8 and tTextSize < 12
158+
put 11 into tWidgetSize
159+
break
160+
case tTextSize >= 12 and tTextSize < 14
161+
put 13 into tWidgetSize
162+
break
163+
case tTextSize >= 14 and tTextSize < 18
164+
put 15 into tWidgetSize
165+
break
166+
case tTextSize >= 18
167+
put 17 into tWidgetSize
168+
break
169+
default
170+
put 13 into tWidgetSize
171+
end switch
172+
173+
set the width of widget "icon" of group pControl of me to tWidgetSize
155174
set the height of widget "icon" of group pControl of me to the width of widget "icon" of group pControl of me
156175
set the loc of widget "icon" of group pControl of me to the loc of group pControl of me
157176
end connectorResize

‎Toolset/palettes/project browser/behaviors/revideprojectbrowsersectionrowbehavior.livecodescript‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,26 @@ command connectorResize pControl
117117
set the width of group pControl of me to 20
118118
set the top of group pControl of me to the top of me
119119

120-
set the width of widget "icon" of group pControl of me to 12
120+
local tTextSize, tWidgetSize
121+
put the effective textsize of me into tTextSize
122+
switch
123+
case tTextSize >= 8 and tTextSize < 12
124+
put 11 into tWidgetSize
125+
break
126+
case tTextSize >= 12 and tTextSize < 14
127+
put 13 into tWidgetSize
128+
break
129+
case tTextSize >= 14 and tTextSize < 18
130+
put 15 into tWidgetSize
131+
break
132+
case tTextSize >= 18
133+
put 17 into tWidgetSize
134+
break
135+
default
136+
put 13 into tWidgetSize
137+
end switch
138+
139+
set the width of widget "icon" of group pControl of me to tWidgetSize
121140
set the height of widget "icon" of group pControl of me to the width of widget "icon" of group pControl of me
122141
set the loc of widget "icon" of group pControl of me to the loc of group pControl of me
123142
end connectorResize

‎Toolset/palettes/project browser/revprojectbrowserbehavior.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ function levelConnectors pObjectArray, pParentRow, pPosition
14761476
put "branch" into tLevelConnectors[1]
14771477
end if
14781478
else if pObjectArray["type"] is "card" then
1479-
if word 1 of pObjectArray["owner"] is "stack" AND pObjectArray["owner"] contains "of" then
1479+
if word 1 of pObjectArray["owner"] is "stack" AND the owner of pObjectArray["owner"] is not empty then
14801480
put sDisplayArray["objects"][pParentRow]["levels"] into tParentLevelConnectors
14811481
if pPosition is "only" then
14821482
if tParentLevelConnectors[1] is "branch" then put "vertical" into tLevelConnectors[1]

‎notes/bugfix-16933.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Adapt icon size to text size in Project Browser

0 commit comments

Comments
 (0)