milo better user experience

This commit is contained in:
kepler155c
2018-11-12 20:22:14 -05:00
parent 52ea4e039c
commit 1eaaca2cc3
17 changed files with 204 additions and 82 deletions

View File

@@ -30,7 +30,11 @@ local activityWizardPage = UI.Window {
function activityWizardPage:isValidType(node)
local m = device[node.name]
return m and m.type == 'monitor' and { name = 'Activity Monitor', value = 'activity' }
return m and m.type == 'monitor' and {
name = 'Activity Monitor',
value = 'activity',
help = 'Display storage activity'
}
end
function activityWizardPage:isValidFor(node)

View File

@@ -27,7 +27,11 @@ local brewingStandView = UI.Window {
function brewingStandView:isValidType(node)
local m = device[node.name]
return m and m.type == 'minecraft:brewing_stand'and { name = 'Brewing Stand', value = 'brewingStand' }
return m and m.type == 'minecraft:brewing_stand'and {
name = 'Brewing Stand',
value = 'brewingStand',
help = 'Auto-learning brewing stand',
}
end
function brewingStandView:isValidFor(node)

View File

@@ -15,6 +15,9 @@ local exportView = UI.Window {
},
sortColumn = 'slot',
help = 'Edit this entry',
accelerators = {
delete = 'remove_entry',
},
},
text = UI.Text {
x = 2, y = -2,
@@ -38,7 +41,11 @@ local exportView = UI.Window {
function exportView:isValidType(node)
local m = device[node.name]
return m and m.pullItems and { name = 'Generic Inventory', value = 'machine' }
return m and m.pullItems and {
name = 'Generic Inventory',
value = 'machine',
help = 'Chest, furnace... (has an inventory)'
}
end
function exportView:isValidFor(node)

View File

@@ -15,6 +15,9 @@ local importView = UI.Window {
},
sortColumn = 'slot',
help = 'Edit this entry',
accelerators = {
delete = 'remove_entry',
},
},
text = UI.Text {
x = 2, y = -2,
@@ -38,7 +41,11 @@ local importView = UI.Window {
function importView:isValidType(node)
local m = device[node.name]
return m and m.pullItems and { name = 'Generic Inventory', value = 'machine' }
return m and m.pullItems and {
name = 'Generic Inventory',
value = 'machine',
help = 'Chest, furnace... (has an inventory)',
}
end
function importView:isValidFor(node)

View File

@@ -23,7 +23,11 @@ local inputChestWizardPage = UI.Window {
function inputChestWizardPage:isValidType(node)
local m = device[node.name]
return m and m.pullItems and { name = 'Input Chest', value = 'input' }
return m and m.pullItems and {
name = 'Input Chest',
value = 'input',
help = 'Sends all items to storage',
}
end
function inputChestWizardPage:isValidFor(node)

View File

@@ -29,7 +29,11 @@ local jobsWizardPage = UI.Window {
function jobsWizardPage:isValidType(node)
local m = device[node.name]
return m and m.type == 'monitor' and { name = 'Crafting Monitor', value = 'jobs' }
return m and m.type == 'monitor' and {
name = 'Crafting Monitor',
value = 'jobs',
help = 'Display crafting progress / jobs'
}
end
function jobsWizardPage:isValidFor(node)

View File

@@ -36,8 +36,8 @@ local listingPage = UI.Page {
--{ text = 'Forget', event = 'forget' },
{ text = 'Craft', event = 'craft' },
{ text = 'Edit', event = 'details' },
{ text = 'Network', event = 'network' },
{ text = 'Refresh', event = 'refresh', x = -9 },
{ text = 'Refresh', event = 'refresh', x = -12 },
{ text = '\206', event = 'network', x = -3 },
},
},
grid = UI.Grid {
@@ -59,7 +59,7 @@ local listingPage = UI.Page {
backgroundColor = colors.cyan,
backgroundFocusColor = colors.cyan,
accelerators = {
[ 'enter' ] = 'craft',
[ 'enter' ] = 'eject',
},
},
storageStatus = UI.Text {
@@ -198,10 +198,12 @@ function listingPage:eventHandler(event)
elseif event.type == 'craft' then
local item = self.grid:getSelected()
if Craft.findRecipe(item) or true then -- or item.is_craftable then
UI:setPage('craft', self.grid:getSelected())
else
self.notification:error('No recipe defined')
if item then
if Craft.findRecipe(item) then -- or item.is_craftable then
UI:setPage('craft', self.grid:getSelected())
else
self.notification:error('No recipe defined')
end
end
elseif event.type == 'text_change' and event.element == self.statusBar.filter then

View File

@@ -35,7 +35,11 @@ function wizardPage:isValidType(node)
return m and
m.type == 'manipulator' and
m.getEnder and
{ name = 'Manipulator', value = 'manipulator' }
{
name = 'Manipulator',
value = 'manipulator',
help = 'Manipulator w/bound introspection mod'
}
end
function wizardPage:isValidFor(node)

View File

@@ -12,7 +12,7 @@ local function filter(a)
end
function PotionImportTask:cycle(context)
for bs in context.storage:filterActive('machine', filter) do
for bs in context.storage:filterActive('brewingStand', filter) do
if bs.adapter.getBrewTime() == 0 then
local list = bs.adapter.list()

View File

@@ -26,6 +26,7 @@ local storageView = UI.Window {
x = 16, ex = -2, y = 3,
value = '',
},
--[[
[4] = UI.Checkbox {
formLabel = 'Void', formKey = 'voidExcess',
help = 'Void excess if locked - TODO',
@@ -36,6 +37,7 @@ local storageView = UI.Window {
help = 'TODO',
pruneEmpty = true,
},
]]--
},
}
@@ -50,7 +52,11 @@ end
function storageView:isValidType(node)
local m = device[node.name]
return m and m.pullItems and { name = 'Storage', value = 'storage' }
return m and m.pullItems and {
name = 'Storage',
value = 'storage',
help = 'Use for item storage',
}
end
function storageView:isValidFor(node)

View File

@@ -25,7 +25,11 @@ local trashcanWizardPage = UI.Window {
function trashcanWizardPage:isValidType(node)
local m = device[node.name]
return m and m.pullItems and { name = 'Trashcan', value = 'trashcan' }
return m and m.pullItems and {
name = 'Trashcan',
value = 'trashcan',
help = 'An inventory to send unwanted items',
}
end
function trashcanWizardPage:isValidFor(node)