More wget fixes, and make nbox2018 slightly easier to use

This commit is contained in:
20kdc 2018-04-25 20:47:18 +01:00
parent 5ddfb128cd
commit beb76fcf6f
2 changed files with 7 additions and 7 deletions

View File

@ -12,20 +12,20 @@ local sRunning = true
-- useful to perform a system update -- useful to perform a system update
local url = "http://20kdc.duckdns.org/neo/inst.lua" local url = "http://20kdc.duckdns.org/neo/inst.lua"
local function doWorking() local function doWorking()
return 25, 1, nil, neoux.tcwindow(25, 1, { return 50, 1, nil, neoux.tcwindow(50, 1, {
neoux.tcrawview(1, 1, {"Downloading now..."}), neoux.tcrawview(1, 1, {"Downloading now..."}),
}, function (w) }, function (w)
sRunning = false sRunning = false
end, 0xFFFFFF, 0) end, 0xFFFFFF, 0)
end end
local function doMainWin() local function doMainWin()
return 25, 3, nil, neoux.tcwindow(25, 3, { return 50, 3, nil, neoux.tcwindow(50, 3, {
neoux.tcrawview(1, 1, {"URL to download?"}), neoux.tcrawview(1, 1, {"URL to download?"}),
neoux.tcfield(1, 2, 25, function (t) neoux.tcfield(1, 2, 50, function (t)
url = t or url url = t or url
return url return url
end), end),
neoux.tcbutton(16, 3, "Confirm", function (w) neoux.tcbutton(41, 3, "Download", function (w)
sRunning = true sRunning = true
w.reset(doWorking()) w.reset(doWorking())
local nurl = url local nurl = url

View File

@ -123,7 +123,7 @@ local programStates = {
minX = cx, minX = cx,
minY = cy, minY = cy,
minZ = cz, minZ = cz,
tex = "", tex = "stone",
rgb = 0xFFFFFF rgb = 0xFFFFFF
} }
programState = "point2" programState = "point2"
@ -197,9 +197,9 @@ local programStates = {
local targetBox = boxes[state][selectedBox] local targetBox = boxes[state][selectedBox]
return { return {
"Texturing Box:" .. miText .. "/" .. mxText, "Texturing Box:" .. miText .. "/" .. mxText,
"Type texture ID or use clipboard", "Type texture ID, or use clipboard.",
runField(targetBox.tex, "[", "]"), runField(targetBox.tex, "[", "]"),
"Enter to confirm." "Enter confirms. \"\" is invisible."
} }
end, end,
function (ka, kc) function (ka, kc)