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

Commit 28aeee6

Browse files
peter-bpeter-b
authored
Merge pull request livecode#1280 from livecode/develop-8.0
Merge develop-8.0 into develop
2 parents a74c72f + 79ffbfb commit 28aeee6

20 files changed

+1831
-1396
lines changed

‎Toolset/home.livecodescript‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,71 +1387,73 @@ command revInternal__InitialiseDefaults
13871387
end revInternal__InitialiseDefaults
13881388

13891389
command revInternal__InitialiseOptions
1390-
revInternal__Log "Enter", "Options Initialisation"
1391-
1392-
set the selectGroupedControls to the cSelectGrouped of stack "revPreferences"
1393-
set the tooltipDelay to the cREVToolTipDelay of stack "revPreferences"
1394-
set the grid to the cGrid of stack "revPreferences"
1395-
set the scriptTextFont to the cREVScriptFont of stack "revPreferences"
1396-
set the scriptTextSize to the cREVScriptSize of stack "revPreferences"
1397-
1398-
if the cHttpProxy of stack "revPreferences" is not empty then
1399-
set the httpProxy to the cHttpProxy of stack "revPreferences"
1400-
end if
1401-
1402-
set the gridSize to the cGridSize of stack "revPreferences"
1403-
1404-
if the cSelectionHandleColor of stack "revPreferences" is empty then
1405-
set the selectionHandleColor to "Gray50"
1406-
else
1407-
set the selectionHandleColor to the cSelectionHandleColor of stack "revPreferences"
1408-
end if
1409-
1410-
set the navigationArrows to the cNavigationArrows of stack "revPreferences"
1411-
1412-
global gREVShowStacks
1413-
if the cShowRevolutionStacks of stack "revPreferences" is empty then
1414-
put false into gREVShowStacks
1415-
else
1416-
put the cShowRevolutionStacks of stack "revPreferences" into gREVShowStacks
1417-
end if
1418-
1419-
global gREVLanguageNames
1420-
put the cLanguageNames of card 1 of stack "revPreferences" into gREVLanguageNames
1421-
1422-
revInternal__Log "Message", "Obtained preference languageNames = " & gREVLanguageNames
1423-
1424-
global gREVPopups
1425-
put the cRevPopups of stack "revPreferences" into gREVPopups
1426-
1427-
global gREVAutoFormat
1428-
put the cAutoFormat of stack "revPreferences" into gREVAutoFormat
1429-
1430-
global gREVUIScriptShortcut
1431-
put the cREVUIScriptShortcut of stack "revPreferences" into gREVUIScriptShortcut
1432-
1433-
global gREVScriptShortcut
1434-
put the cREVScriptShortcut of stack "revPreferences" into gREVScriptShortcut
1390+
revInternal__Log "Enter", "Options Initialisation"
14351391

1436-
global gREVCommentCharacter
1437-
if the cCommentCharacter of stack "revPreferences" is not empty then
1438-
put the cCommentCharacter of stack "revPreferences" into gREVCommentCharacter
1439-
else
1440-
put "--" into gREVCommentCharacter
1441-
end if
1392+
set the selectGroupedControls to the cSelectGrouped of stack "revPreferences"
1393+
set the tooltipDelay to the cREVToolTipDelay of stack "revPreferences"
1394+
set the grid to the cGrid of stack "revPreferences"
1395+
set the scriptTextFont to the cREVScriptFont of stack "revPreferences"
1396+
set the scriptTextSize to the cREVScriptSize of stack "revPreferences"
14421397

1443-
global gREVTemplateMasterName
1444-
put the cREVTemplateMasterName of stack "revPreferences" into gREVTemplateMasterName
1445-
1446-
global gREVAutoCreateProfiles
1447-
put the cREVAutoCreateProfiles of stack "revPreferences" into gREVAutoCreateProfiles
1448-
1449-
global gREVProfileReadOnly
1450-
put the cREVProfileReadOnly of stack "revPreferences" into gREVProfileReadOnly
1398+
if the cHttpProxy of stack "revPreferences" is not empty then
1399+
set the httpProxy to the cHttpProxy of stack "revPreferences"
1400+
end if
14511401

1452-
revInternal__Log "Leave", "Options Initialisation"
1453-
1454-
return true
1402+
set the gridSize to the cGridSize of stack "revPreferences"
1403+
1404+
if the cSelectionHandleColor of stack "revPreferences" is empty then
1405+
set the selectionHandleColor to "Gray50"
1406+
else
1407+
set the selectionHandleColor to the cSelectionHandleColor of stack "revPreferences"
1408+
end if
1409+
1410+
set the navigationArrows to the cNavigationArrows of stack "revPreferences"
1411+
1412+
global gREVShowStacks, gREVDevelopment
1413+
if gREVDevelopment then
1414+
put true into gREVShowStacks
1415+
else if the cShowRevolutionStacks of stack "revPreferences" is empty then
1416+
put false into gREVShowStacks
1417+
else
1418+
put the cShowRevolutionStacks of stack "revPreferences" into gREVShowStacks
1419+
end if
1420+
1421+
global gREVLanguageNames
1422+
put the cLanguageNames of card 1 of stack "revPreferences" into gREVLanguageNames
1423+
1424+
revInternal__Log "Message", "Obtained preference languageNames = " & gREVLanguageNames
1425+
1426+
global gREVPopups
1427+
put the cRevPopups of stack "revPreferences" into gREVPopups
1428+
1429+
global gREVAutoFormat
1430+
put the cAutoFormat of stack "revPreferences" into gREVAutoFormat
1431+
1432+
global gREVUIScriptShortcut
1433+
put the cREVUIScriptShortcut of stack "revPreferences" into gREVUIScriptShortcut
1434+
1435+
global gREVScriptShortcut
1436+
put the cREVScriptShortcut of stack "revPreferences" into gREVScriptShortcut
1437+
1438+
global gREVCommentCharacter
1439+
if the cCommentCharacter of stack "revPreferences" is not empty then
1440+
put the cCommentCharacter of stack "revPreferences" into gREVCommentCharacter
1441+
else
1442+
put "--" into gREVCommentCharacter
1443+
end if
1444+
1445+
global gREVTemplateMasterName
1446+
put the cREVTemplateMasterName of stack "revPreferences" into gREVTemplateMasterName
1447+
1448+
global gREVAutoCreateProfiles
1449+
put the cREVAutoCreateProfiles of stack "revPreferences" into gREVAutoCreateProfiles
1450+
1451+
global gREVProfileReadOnly
1452+
put the cREVProfileReadOnly of stack "revPreferences" into gREVProfileReadOnly
1453+
1454+
revInternal__Log "Leave", "Options Initialisation"
1455+
1456+
return true
14551457
end revInternal__InitialiseOptions
14561458

14571459
command revInternal__InitialiseUserLibraries

0 commit comments

Comments
 (0)