Ui enhancements 2.0 (#29)
* canvas overhaul * editor 2.0 * more tweaks * more editor work * completions + refactor * cleanup + editor additions * cleanup + undo overhaul * editor recent/peripherals/redo + cleanup * editor path issues * cleanup * changes for deprecated ui methods - recolor milo - make turtle scripts run again - mob rancher improvements * can now use named colors
This commit was merged in pull request #29.
This commit is contained in:
@@ -49,7 +49,7 @@ local function buildLockScreen()
|
||||
#self.pass.value > 0 and
|
||||
Security.verifyPassword(SHA.compute(self.pass.value)) then
|
||||
|
||||
UI:exitPullEvents() -- valid
|
||||
UI:quit() -- valid
|
||||
else
|
||||
self.notification:error('Invalid password', math.max(counter, 2))
|
||||
self:sync()
|
||||
@@ -66,7 +66,7 @@ local function buildLockScreen()
|
||||
Event.onTerminate(function() return false end)
|
||||
|
||||
UI:setPage(page)
|
||||
UI:pullEvents()
|
||||
UI:start()
|
||||
|
||||
-- restart lock timer
|
||||
timer = os.startTimer(config.timeout)
|
||||
|
||||
@@ -9,20 +9,23 @@ local config = Config.load('secure', {
|
||||
local tab = UI.Tab {
|
||||
tabTitle = 'Secure',
|
||||
description = 'Secure options',
|
||||
[1] = UI.Window {
|
||||
x = 2, y = 2, ex = -2, ey = 5,
|
||||
},
|
||||
label1 = UI.Text {
|
||||
x = 2, y = 3,
|
||||
x = 3, y = 3,
|
||||
value = 'Screen Locking',
|
||||
},
|
||||
checkbox = UI.Checkbox {
|
||||
x = 20, y = 3,
|
||||
x = 21, y = 3,
|
||||
value = config.enabled
|
||||
},
|
||||
label2 = UI.Text {
|
||||
x = 2, y = 4,
|
||||
x = 3, y = 4,
|
||||
value = 'Lock timeout',
|
||||
},
|
||||
timeout = UI.TextEntry {
|
||||
x = 20, y = 4, width = 6,
|
||||
x = 21, y = 4, width = 6,
|
||||
limit = 4,
|
||||
transform = 'number',
|
||||
value = config.timeout,
|
||||
@@ -31,8 +34,8 @@ local tab = UI.Tab {
|
||||
},
|
||||
},
|
||||
button = UI.Button {
|
||||
x = 20, y = 6,
|
||||
text = 'Update',
|
||||
x = -8, ex = -2, y = -2,
|
||||
text = 'Apply',
|
||||
event = 'update',
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user