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

Commit 7e31631

Browse files
author
Monte Goulding
authored
Merge pull request #1822 from bwmilby/bwm-bugfix-13825
[[Bug 13825/18097]] Profile Manager/Geometry Manager on Mobile
2 parents 07f32c9 + cf8c72b commit 7e31631

2 files changed

Lines changed: 56 additions & 86 deletions

File tree

Toolset/libraries/revcommonlibrary.livecodescript

Lines changed: 55 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ end revGoPDF
5454
# TH-2008-06-27 :: Bug 6521/6432, have seperated revMail into two alternative handlers. revMailUnicode
5555
# should be ussed by people sending unicode characters, the original revMail can be used otherwise
5656
command revMail pTo, pCC, pSubject, pBody
57+
if the environment is "mobile" then
58+
pass revMail
59+
end if
5760
revMailUnicode pTo, pCC, uniEncode(pSubject), uniEncode(pBody)
5861
end revMail
5962

@@ -137,32 +140,21 @@ on revSetWindowsShellCommand
137140
end revSetWindowsShellCommand
138141

139142

140-
getProp cREVGeneral[pWhichProp] pWhichProfile
141-
lock messages
142-
local tRevUniqueID
143-
put the cREVGeneral["revUniqueID"] of the target into tRevUniqueID
144-
unlock messages
145-
146-
# OK-2008-04-14 : The long id will return an invalid reference when in edit group mode,
147-
# instead the "rugged id" should be used.
148-
--put the long id of the target into tTarget
149-
150-
# OK-2008-06-02 : Because this script is used in standalones, using revRuggedId will break this
151-
# because its located in revBackscript (which is not included in standalones). As we don't require a
152-
# rugged id in standalones anyway, just revert to the old behavior in standalone environment.
153-
local tTarget
154-
if the environment is "development" then
155-
put revRuggedId(the long id of the target) into tTarget
156-
else
157-
put the long id of the target into tTarget
158-
end if
159-
160-
local tMilliseconds
161-
if pWhichProp is "revUniqueID" and tRevUniqueID is empty then
162-
put the milliseconds into tMilliSeconds
163-
set the cREVGeneral["revUniqueID"] of tTarget to tMilliSeconds
164-
return tMilliSeconds
165-
else if pWhichProp is "revUniqueID" then
143+
getProp revProfile
144+
return the cREVGeneral["profile"] of the target
145+
end revProfile
146+
147+
getProp cREVGeneral[pWhichProp]
148+
if pWhichProp is "revUniqueID" then
149+
lock messages
150+
local tRevUniqueID
151+
put the cREVGeneral["revUniqueID"] of the target into tRevUniqueID
152+
unlock messages
153+
154+
if tRevUniqueID is empty then
155+
put the milliseconds into tRevUniqueID
156+
set the cREVGeneral["revUniqueID"] of the target to tRevUniqueID
157+
end if
166158
return tRevUniqueID
167159
end if
168160

@@ -172,30 +164,25 @@ getProp cREVGeneral[pWhichProp] pWhichProfile
172164
lock messages
173165

174166
local tProfile
175-
put the cREVGeneral["profile"] of tTarget into tProfile
176-
if tProfile is empty or tProfile is the cREVGeneral["masterName"] of tTarget then put "Master" into tProfile
167+
put the cREVGeneral["profile"] of the target into tProfile
168+
if tProfile is empty or tProfile is the cREVGeneral["masterName"] of the target then put "Master" into tProfile
177169
unlock messages
178170
return tProfile
179171
end cREVGeneral
180-
172+
181173

182174
setProp revProfile pWhich
183175
set the cREVGeneral["profile"] of the target to pWhich
184176
end revProfile
185177

186-
getProp revProfile
187-
return the cREVGeneral["profile"] of the target
188-
end revProfile
189-
190-
191-
192178
setProp cREVGeneral[pWhichProp] pWhichProfile
193179
local tTarget
194180
put the long id of the target into tTarget
195181

196-
local tTargetLongID
197-
put tTarget into tTargetLongID
198-
if pWhichProp is not "profile" and pWhichProp is not "inLineImages" and pWhichProp is not "virtualWidth" and pWhichProp is not "virtualHeight" and pWhichProp is not "breakPoints" then pass cREVGeneral
182+
if pWhichProp is not "profile" and pWhichProp is not "inLineImages" and \
183+
pWhichProp is not "virtualWidth" and pWhichProp is not "virtualHeight" \
184+
then pass cREVGeneral
185+
199186
if pWhichProp is "virtualWidth" then
200187
lock messages
201188
local tOriginalWidth
@@ -212,6 +199,7 @@ setProp cREVGeneral[pWhichProp] pWhichProfile
212199
unlock messages
213200
exit cREVGeneral
214201
end if
202+
215203
if pWhichProp is "virtualHeight" then
216204
lock messages
217205
local tOriginalHeight
@@ -224,52 +212,7 @@ setProp cREVGeneral[pWhichProp] pWhichProfile
224212
unlock messages
225213
exit cREVGeneral
226214
end if
227-
if pWhichProp is "breakPoints" then
228-
229-
pass cREVGeneral
230-
231-
local tBreakPointsList
232-
put the breakPoints into tBreakPointsList
233-
234-
local tMainStack
235-
put the mainStack of stack revTargetStack(tTarget) into tMainStack
236-
237-
local tObjects
238-
put the cREVGeneral["debugObjects"] of stack tMainStack into tObjects
239-
240-
local tStack
241-
put word -2 to -1 of tTarget into tStack
242-
put the name of tStack into word -2 to -1 of tTarget
243-
if pWhichProfile is not empty then
244-
if tTarget is not among the lines of tObjects then
245-
--add breakpoint object
246-
put tTarget into line (the number of lines in tObjects)+1 of tObjects
247-
end if
248-
else
249-
if tTarget is among the lines of tOBjects then
250-
--remove breakpoint object
251-
delete line lineOffset(tTarget,tObjects) of tOBjects
252-
end if
253-
end if
254-
set the cREVGeneral["debugObjects"] of stack tMainStack to tObjects
255-
256-
local tOldPoints
257-
repeat for each line l in tBreakPointsList
258-
if tTargetLongID is not in l then put l & cr after tOldPoints
259-
end repeat
260-
delete last char of tOldPoints
261-
put tOldPoints into tBreakPointsList
262-
263-
local tAddPoints
264-
repeat for each line l in pWhichProfile
265-
put tTarget,l & cr after tAddPoints
266-
end repeat
267-
delete last char of tAddPoints
268-
put tAddPoints into line (the number of lines in tBreakPointsList+1) of tBreakPointsList
269-
set the breakPoints to tBreakPointsList
270-
pass cREVGeneral
271-
end if
272-
--inline images next
215+
273216
if pWhichProp is "inLineImages" then
274217
if pWhichProfile is true then
275218
lock messages
@@ -390,7 +333,9 @@ setProp cREVGeneral[pWhichProp] pWhichProfile
390333
end if
391334
set the cREVGEneral["inLineImages"&the number of this cd] of tTarget to pWhichProfile
392335
exit cREVGeneral
393-
end if
336+
end if --inLineImages
337+
338+
-- pWhichProp is "profile"
394339
global gREVProfileReadOnly, gREVAutoCreateProfiles
395340
lock screen
396341
lock messages
@@ -1352,6 +1297,14 @@ function revFontGetSystemFont
13521297
return "Helvetica"
13531298
break
13541299

1300+
case "iphone"
1301+
return "San Francisco"
1302+
break
1303+
1304+
case "android"
1305+
return "Roboto"
1306+
break
1307+
13551308
end switch
13561309
end revFontGetSystemFont
13571310

@@ -1375,6 +1328,14 @@ function revFontGetSystemFontSize
13751328
return 12
13761329
break
13771330

1331+
case "iphone"
1332+
return 17
1333+
break
1334+
1335+
case "android"
1336+
return 14
1337+
break
1338+
13781339
end switch
13791340
end revFontGetSystemFontSize
13801341

@@ -1418,6 +1379,15 @@ private function _revEnvironmentPlatform
14181379
case "Win32"
14191380
put "Windows" into tPlatform
14201381
break
1382+
case "iphone"
1383+
put "iphone" into tPlatform
1384+
break
1385+
case "android"
1386+
put "android" into tPlatform
1387+
break
1388+
case "HTML5"
1389+
put "html5" into tPlatform
1390+
break
14211391
default
14221392
put "Unsupported" into tPlatform
14231393
break

Toolset/palettes/standalone settings/revstandalonesettingsgeneralbehavior.livecodescript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on preOpenCard
4444
set the text of field "Default Build Folder" of me to tStandaloneSettingsA["defaultBuildFolder"]
4545
set the hilite of button "Automatically Build here" of me to (tStandaloneSettingsA["automaticallyBuildInDefaultFolder"] is true)
4646

47-
set the enabled of group "profiles" to not tStandaloneSettingsA["ios"]
47+
enable group "profiles"
4848

4949
local tTipLastShown, tShowTip
5050

0 commit comments

Comments
 (0)