mirrors/opus
1
0
Fork 0
mirror of https://github.com/kepler155c/opus synced 2024-12-28 01:20:27 +00:00
Code Issues Releases Wiki Activity

overview cleanup + chooser better events

Browse Source
This commit is contained in:
kepler155c@gmail.com 2018-11-12 20:21:35 -05:00
parent f9359cf77f
commit 62ac7a52ec
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/apis/ui.lua
View File

@ -3001,22 +3001,26 @@ function UI.Chooser:eventHandler(event)
if event.type == 'key' then if event.type == 'key' then
if event.key == 'right' or event.key == 'space' then if event.key == 'right' or event.key == 'space' then
local _,k = Util.find(self.choices, 'value', self.value) local _,k = Util.find(self.choices, 'value', self.value)
local choice
if k and k < #self.choices then if k and k < #self.choices then
self.value = self.choices[k+1].value choice = self.choices[k+1]
else else
self.value = self.choices[1].value choice = self.choices[1]
end end
self:emit({ type = 'choice_change', value = self.value }) self.value = choice.value
self:emit({ type = 'choice_change', value = self.value, element = self, choice = choice })
self:draw() self:draw()
return true return true
elseif event.key == 'left' then elseif event.key == 'left' then
local _,k = Util.find(self.choices, 'value', self.value) local _,k = Util.find(self.choices, 'value', self.value)
local choice
if k and k > 1 then if k and k > 1 then
self.value = self.choices[k-1].value choice = self.choices[k-1]
else else
self.value = self.choices[#self.choices].value choice = self.choices[#self.choices]
end end
self:emit({ type = 'choice_change', value = self.value }) self.value = choice.value
self:emit({ type = 'choice_change', value = self.value, element = self, choice = choice })
self:draw() self:draw()
return true return true
end end

17
sys/apps/Overview.lua
View File

@ -37,12 +37,12 @@ local extSupport = Util.getVersion() >= 1.76
local function loadApplications() local function loadApplications()
local requirements = { local requirements = {
turtle = function() return turtle end, turtle = not not turtle,
advancedTurtle = function() return turtle and term.isColor() end, advancedTurtle = turtle and term.isColor(),
advanced = function() return term.isColor() end, advanced = term.isColor(),
pocket = function() return pocket end, pocket = not not pocket,
advancedPocket = function() return pocket and term.isColor() end, advancedPocket = pocket and term.isColor(),
advancedComputer = function() return not turtle and not pocket and term.isColor() end, advancedComputer = not turtle and not pocket and term.isColor(),
} }
applications = Util.readTable('sys/etc/app.db') applications = Util.readTable('sys/etc/app.db')
@ -76,10 +76,7 @@ local function loadApplications()
end end
if a.requires then if a.requires then
local fn = requirements[a.requires] return requirements[a.requires]
if fn and not fn() then
return false
end
end end
return true -- Util.startsWith(a.run, 'http') or shell.resolveProgram(a.run) return true -- Util.startsWith(a.run, 'http') or shell.resolveProgram(a.run)