Legacy-CC/sPhone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added new theme options

Browse source
This commit is contained in:
Ale32bit 2016-11-05 23:03:58 +01:00 committed by GitHub
parent 8719726c8b
commit 34ff6605aa
1 changed files with 43 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/sPhone.lua
View file

@ -26,6 +26,12 @@ local function kernel()
["window.side"] = colors.blue, ["window.side"] = colors.blue,
["window.button"] = colors.lightBlue, ["window.button"] = colors.lightBlue,
["window.text"] = colors.white, ["window.text"] = colors.white,
["lock.background"] = colors.white,
["lock.text"] = colors.black,
["lock.inputBackground"] = colors.white,
["lock.inputText"] = colors.black,
["lock.inputSide"] = colors.lightBlue,
["lock.error"] = colors.red,
} }
sPhone.defaultTheme = sPhone.theme sPhone.defaultTheme = sPhone.theme
@ -147,15 +153,21 @@ local function kernel()
local fileTheme = "/.sPhone/config/theme" local fileTheme = "/.sPhone/config/theme"
if fs.exists(fileTheme) then if fs.exists(fileTheme) then
sPhone.theme["header"] = config.read(fileTheme, "header") sPhone.theme["header"] = (config.read(fileTheme, "header") or sPhone.theme["header"])
sPhone.theme["headerText"] = config.read(fileTheme, "headerText") sPhone.theme["headerText"] = (config.read(fileTheme, "headerText") or sPhone.theme["headerText"])
sPhone.theme["text"] = config.read(fileTheme, "text") sPhone.theme["text"] = (config.read(fileTheme, "text") or sPhone.theme["text"])
sPhone.theme["background"] = config.read(fileTheme, "background") sPhone.theme["background"] = (config.read(fileTheme, "background") or sPhone.theme["background"])
sPhone.theme["backgroundColor"] = config.read(fileTheme, "backgroundColor") sPhone.theme["backgroundColor"] = (config.read(fileTheme, "backgroundColor") or sPhone.theme["backgroundColor"])
sPhone.theme["window.background"] = config.read(fileTheme, "window.background") sPhone.theme["window.background"] = (config.read(fileTheme, "window.background") or sPhone.theme["window.background"])
sPhone.theme["window.side"] = config.read(fileTheme, "window.side") sPhone.theme["window.side"] = (config.read(fileTheme, "window.side") or sPhone.theme["window.side"])
sPhone.theme["window.button"] = config.read(fileTheme, "window.button") sPhone.theme["window.button"] = (config.read(fileTheme, "window.button") or sPhone.theme["window.button"])
sPhone.theme["window.text"] = config.read(fileTheme, "window.text") sPhone.theme["window.text"] = (config.read(fileTheme, "window.text") or sPhone.theme["window.text"])
sPhone.theme["lock.background"] = (config.read(fileTheme, "lock.background") or sPhone.theme["lock.background"])
sPhone.theme["lock.text"] = (config.read(fileTheme, "lock.text") or sPhone.theme["lock.text"])
sPhone.theme["lock.inputBackground"] = (config.read(fileTheme, "lock.inputBackground") or sPhone.theme["lock.inputBackground"])
sPhone.theme["lock.inputText"] = (config.read(fileTheme, "lock.inputText") or sPhone.theme["lock.inputText"])
sPhone.theme["lock.inputSide"] = (config.read(fileTheme, "lock.inputSide") or sPhone.theme["lock.inputSide"])
sPhone.theme["lock.error"] = (config.read(fileTheme, "lock.error") or sPhone.theme["lock.error"])
else else
for k, v in pairs(sPhone.theme) do for k, v in pairs(sPhone.theme) do
config.write(fileTheme, k, v) config.write(fileTheme, k, v)
@ -873,25 +885,25 @@ end
sPhone.locked = true sPhone.locked = true
if config.read("/.sPhone/config/sPhone","password") then if config.read("/.sPhone/config/sPhone","password") then
while true do while true do
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
term.clear() term.clear()
term.setCursorPos(1,1) term.setCursorPos(1,1)
sPhone.header(sPhone.user) sPhone.header(sPhone.user)
paintutils.drawBox(7,9,20,11,sPhone.theme["window.background"]) paintutils.drawBox(7,9,20,11,sPhone.theme["lock.inputSide"])
if sPhone.wrongPassword then if sPhone.wrongPassword then
term.setTextColor(colors.red) term.setTextColor(sPhone.theme["lock.error"])
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
visum.align("center"," Wrong Password",false,13) visum.align("center"," Wrong Password",false,13)
end end
term.setTextColor(sPhone.theme["text"]) term.setTextColor(sPhone.theme["lock.text"])
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
visum.align("center"," Insert Password",false,7) visum.align("center"," Insert Password",false,7)
local loginTerm = window.create(term.native(), 8,10,12,1, true) local loginTerm = window.create(term.native(), 8,10,12,1, true)
term.redirect(loginTerm) term.redirect(loginTerm)
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.inputBackground"])
term.clear() term.clear()
term.setCursorPos(1,1) term.setCursorPos(1,1)
term.setTextColor(sPhone.theme["text"]) term.setTextColor(sPhone.theme["lock.inputText"])
local passwordLogin = read("*") local passwordLogin = read("*")
term.redirect(sPhone.mainTerm) term.redirect(sPhone.mainTerm)
local fpw = config.read("/.sPhone/config/sPhone","password") local fpw = config.read("/.sPhone/config/sPhone","password")
@ -910,40 +922,41 @@ end
local rServer local rServer
sPhone.firstBoot = true sPhone.firstBoot = true
while true do while true do
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
term.clear() term.clear()
term.setCursorPos(1,1) term.setCursorPos(1,1)
sPhone.header("Setup") sPhone.header("Setup")
paintutils.drawBox(7,9,20,11,sPhone.theme["window.background"]) paintutils.drawBox(7,9,20,11,sPhone.theme["lock.inputSide"])
if sPhone.wrongPassword then if sPhone.wrongPassword then
term.setTextColor(colors.red) term.setTextColor(sPhone.theme["lock.error"])
term.setBackgroundColor(sPhone.theme["lock.background"])
visum.align("center"," Wrong Password",false,13) visum.align("center"," Wrong Password",false,13)
end end
term.setTextColor(sPhone.theme["text"]) term.setTextColor(sPhone.theme["lock.text"])
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
visum.align("center"," Insert Password",false,7) visum.align("center"," Insert Password",false,7)
local loginTerm = window.create(term.native(), 8,10,12,1, true) local loginTerm = window.create(term.native(), 8,10,12,1, true)
term.redirect(loginTerm) term.redirect(loginTerm)
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.inputBackground"])
term.clear() term.clear()
term.setCursorPos(1,1) term.setCursorPos(1,1)
term.setTextColor(sPhone.theme["text"]) term.setTextColor(sPhone.theme["lock.inputText"])
local password1 = read("*") local password1 = read("*")
term.redirect(sPhone.mainTerm) term.redirect(sPhone.mainTerm)
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
term.clear() term.clear()
term.setCursorPos(1,1) term.setCursorPos(1,1)
sPhone.header("Setup") sPhone.header("Setup")
paintutils.drawBox(7,9,20,11,sPhone.theme["window.background"]) paintutils.drawBox(7,9,20,11,sPhone.theme["lock.inputSide"])
term.setTextColor(sPhone.theme["text"]) term.setTextColor(sPhone.theme["lock.text"])
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.background"])
visum.align("center"," Repeat",false,7) visum.align("center"," Repeat",false,7)
local loginTerm = window.create(term.native(), 8,10,12,1, true) local loginTerm = window.create(term.native(), 8,10,12,1, true)
term.redirect(loginTerm) term.redirect(loginTerm)
term.setBackgroundColor(sPhone.theme["backgroundColor"]) term.setBackgroundColor(sPhone.theme["lock.inputBackground"])
term.clear() term.clear()
term.setCursorPos(1,1) term.setCursorPos(1,1)
term.setTextColor(sPhone.theme["text"]) term.setTextColor(sPhone.theme["lock.inputText"])
local password2 = read("*") local password2 = read("*")
term.redirect(sPhone.mainTerm) term.redirect(sPhone.mainTerm)
if password1 == password2 then if password1 == password2 then