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

Commit 07f32c9

Browse files
Merge pull request #1854 from livecode/merge-develop-8.1-13.12.2017
Merge develop 8.1 13.12.2017
2 parents 44c6ecd + 229b937 commit 07f32c9

5 files changed

Lines changed: 23 additions & 2 deletions

File tree

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9168,6 +9168,15 @@ on revIDEActionPasteTextIntoField pField
91689168
unlock screen
91699169
end revIDEActionPasteTextIntoField
91709170

9171+
on revIDEToggleLockTextOfField pField
9172+
# Make sure we have an field
9173+
if word 1 of pField is not "field" then
9174+
exit revIDEToggleLockTextOfField
9175+
end if
9176+
9177+
set the lockText of pField to not (the lockText of pField)
9178+
end revIDEToggleLockTextOfField
9179+
91719180
on revIDEToggleTraversalOnOfField pField
91729181
# Make sure we have an field
91739182
if word 1 of pField is not "field" then

Toolset/palettes/menubar/revmenubar.livecodescript

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2594,6 +2594,9 @@ on revMenubarContextMenuPickTarget pWhich, pTarget
25942594
case "Paste Text"
25952595
revIDEActionPasteTextIntoField pTarget
25962596
break
2597+
case "Lock Text"
2598+
revIDEToggleLockTextOfField pTarget
2599+
break
25972600
case "Can Receive Keyboard Focus"
25982601
revIDEToggleTraversalOnOfField pTarget
25992602
break
4.17 KB
Binary file not shown.

Toolset/palettes/standalone settings/revstandalonesettingsiosbehavior.livecodescript

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ on updateSettings
144144
put computeDefault(tSettings["ios,retina icon"], empty) into field "Retina Icon"
145145
put computeDefault(tSettings["ios,iOS 7 retina icon"], empty) into field "iOS 7 Retina Icon"
146146
put computeDefault(tSettings["ios,iPhone 6 Plus icon"], empty) into field "iPhone 6 Plus Icon"
147+
put computeDefault(tSettings["ios,iPhone X icon"], empty) into field "iPhone X Icon"
147148
put computeDefault(tSettings["ios,ipad icon"], empty) into field "iPad Icon"
148149
put computeDefault(tSettings["ios,ipad retina icon"], empty) into field "iPad Retina Icon"
149150
put computeDefault(tSettings["ios,iOS 7 ipad icon"], empty) into field "iOS 7 iPad Icon"
@@ -155,6 +156,8 @@ on updateSettings
155156
put computeDefault(tSettings["ios,iPhone 6 splash"], empty) into field "iPhone 6 Splash"
156157
put computeDefault(tSettings["ios,iPhone 6 Plus Portrait splash"], empty) into field "iPhone 6 Plus Portrait Splash"
157158
put computeDefault(tSettings["ios,iPhone 6 Plus Landscape splash"], empty) into field "iPhone 6 Plus Landscape Splash"
159+
put computeDefault(tSettings["ios,iPhone X Portrait splash"], empty) into field "iPhone X Portrait Splash"
160+
put computeDefault(tSettings["ios,iPhone X Landscape splash"], empty) into field "iPhone X Landscape Splash"
158161
put computeDefault(tSettings["ios,ipad portrait splash"], empty) into field "iPad Portrait Splash"
159162
put computeDefault(tSettings["ios,ipad landscape splash"], empty) into field "iPad Landscape Splash"
160163
put computeDefault(tSettings["ios,ipad retina portrait splash"], empty) into field "iPad Retina Portrait Splash"
@@ -322,6 +325,8 @@ command updateOrientationSettings
322325
if the enabled of button "iPhone Intial Orientation" then
323326
set the enabled of group "iPhone 6 Plus Portrait Splash" to tInitialOrientation contains "portrait"
324327
set the enabled of group "iPhone 6 Plus Landscape Splash" to tInitialOrientation contains "landscape"
328+
set the enabled of group "iPhone X Portrait Splash" to tInitialOrientation contains "portrait"
329+
set the enabled of group "iPhone X Landscape Splash" to tInitialOrientation contains "landscape"
325330
end if
326331
end updateOrientationSettings
327332

@@ -335,6 +340,7 @@ command enableDeviceSpecificSettings pDevices
335340
set the enabled of group "Retina Icon" to (1 is among the items of pDevices)
336341
set the enabled of group "iOS 7 Retina Icon" to (1 is among the items of pDevices)
337342
set the enabled of group "iPhone 6 Plus Icon" to (1 is among the items of pDevices)
343+
set the enabled of group "iPhone X Icon" to (1 is among the items of pDevices)
338344
set the enabled of group "iPad Icon" to (2 is among the items of pDevices)
339345
set the enabled of group "iPad Retina Icon" to (2 is among the items of pDevices)
340346
set the enabled of group "iOS 7 iPad Icon" to (2 is among the items of pDevices)
@@ -346,6 +352,8 @@ command enableDeviceSpecificSettings pDevices
346352
set the enabled of group "iPhone 6 Splash" to (1 is among the items of pDevices)
347353
set the enabled of group "iPhone 6 Plus Portrait Splash" to (1 is among the items of pDevices)
348354
set the enabled of group "iPhone 6 Plus Landscape Splash" to (1 is among the items of pDevices)
355+
set the enabled of group "iPhone X Portrait Splash" to (1 is among the items of pDevices)
356+
set the enabled of group "iPhone X Landscape Splash" to (1 is among the items of pDevices)
349357
set the enabled of group "iPad Portrait Splash" to (2 is among the items of pDevices)
350358
set the enabled of group "iPad Landscape Splash" to (2 is among the items of pDevices)
351359
set the enabled of group "iPad Retina Portrait Splash" to (2 is among the items of pDevices)
@@ -434,11 +442,11 @@ on tipDisplayUpdate
434442
if the visible of group "iOSCommercialTip" then
435443
set the topLeft of group "iosBuild" to 12,136
436444
set the topLeft of group "iOS Settings" to -1,136
437-
set the cSize of this card to 1024,726
445+
set the cSize of this card to 1024,796
438446
else
439447
set the topLeft of group "iOS Settings" to -1,67
440448
set the topLeft of group "iosBuild" to 12,68
441-
set the cSize of this card to 1024,676
449+
set the cSize of this card to 1024,746
442450
end if
443451
updateCardSize
444452
end tipDisplayUpdate

notes/bugfix-20713.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Enable lock/unlock text from popUp for fields

0 commit comments

Comments
 (0)