diff --git a/Zframework/file.lua b/Zframework/file.lua index 103c0c94..1f3b4b67 100644 --- a/Zframework/file.lua +++ b/Zframework/file.lua @@ -21,7 +21,7 @@ function FILE.load(name) return s end end - MES.new(name.." "..text.loadError) + MES.new('error',name.." "..text.loadError) end end function FILE.save(data,name,mode) @@ -30,13 +30,13 @@ function FILE.save(data,name,mode) if mode:find'l'then data=TABLE.dump(data) if not data then - MES.new(name.." "..text.saveError.."dump error") + MES.new('error',name.." "..text.saveError.."dump error") return end else data=JSON.encode(data) if not data then - MES.new(name.." "..text.saveError.."json error") + MES.new('error',name.." "..text.saveError.."json error") return end end @@ -50,11 +50,11 @@ function FILE.save(data,name,mode) F:flush()F:close() if success then if not mode:find'q'then - MES.new(text.saveDone) + MES.new('check',text.saveDone) end else - MES.new(text.saveError..(mes or"unknown error")) - MES.new(debug.traceback()) + MES.new('error',text.saveError..(mes or"unknown error")) + MES.new(false,debug.traceback()) end end function FILE.clear(path) diff --git a/Zframework/init.lua b/Zframework/init.lua index c44d9de4..14df63c4 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -208,7 +208,7 @@ local function noDevkeyPressed(key) if key=="f1"then PROFILE.switch() elseif key=="f2"then - MES.new(("System:%s[%s]\nluaVer:%s\njitVer:%s\njitVerNum:%s"):format(SYSTEM,jit.arch,_VERSION,jit.version,jit.version_num)) + MES.new('info',("System:%s[%s]\nluaVer:%s\njitVer:%s\njitVerNum:%s"):format(SYSTEM,jit.arch,_VERSION,jit.version,jit.version_num)) elseif key=="f3"then for _=1,8 do local P=PLY_ALIVE[rnd(#PLY_ALIVE)] @@ -226,15 +226,15 @@ local function noDevkeyPressed(key) elseif key=="f7"and love._openConsole then love._openConsole() elseif key=="f8"then - devMode=nil MES.new("DEBUG OFF",.2) + devMode=nil MES.new('info',"DEBUG OFF",.2) elseif key=="f9"then - devMode=1 MES.new("DEBUG 1") + devMode=1 MES.new('info',"DEBUG 1") elseif key=="f10"then - devMode=2 MES.new("DEBUG 2") + devMode=2 MES.new('info',"DEBUG 2") elseif key=="f11"then - devMode=3 MES.new("DEBUG 3") + devMode=3 MES.new('info',"DEBUG 3") elseif key=="f12"then - devMode=4 MES.new("DEBUG 4") + devMode=4 MES.new('info',"DEBUG 4") elseif devMode==2 then local W=WIDGET.sel if W then @@ -263,7 +263,7 @@ function love.keypressed(key) return elseif key=="f8"then devMode=1 - MES.new("DEBUG ON",.2) + MES.new('info',"DEBUG ON",.2) elseif key=="f11"then if kb.isDown("lctrl","rctrl")then _G["\100\114\97\119\70\87\77"]=NULL @@ -294,13 +294,13 @@ end function love.joystickadded(JS) ins(joysticks,JS) - MES.new("Joystick added") + MES.new('info',"Joystick added") end function love.joystickremoved(JS) local i=TABLE.find(joysticks,JS) if i then rem(joysticks,i) - MES.new("Joystick removed") + MES.new('info',"Joystick removed") end end local keyMirror={ @@ -359,7 +359,7 @@ function love.lowmemory() if TIME()-lastGCtime>6.26 then collectgarbage() lastGCtime=TIME() - MES.new("[auto GC] low MEM 设备内存过低") + MES.new('check',"[auto GC] low MEM 设备内存过低") end end function love.resize(w,h) diff --git a/Zframework/json.lua b/Zframework/json.lua index 7124c72d..bfa85f15 100644 --- a/Zframework/json.lua +++ b/Zframework/json.lua @@ -119,7 +119,7 @@ function json.encode(val) if a then return b elseif MES.new then - MES.new(text.jsonError..": "..(b or"uknErr")) + MES.new('error',text.jsonError..": "..(b or"uknErr")) end end @@ -349,7 +349,7 @@ function json.decode(str) if a then return b elseif MES.new then - MES.new(text.jsonError..": "..(b or"uknErr")) + MES.new('error',text.jsonError..": "..(b or"uknErr")) end end return json \ No newline at end of file diff --git a/Zframework/loadLib.lua b/Zframework/loadLib.lua index d56dd3ad..5c0da647 100644 --- a/Zframework/loadLib.lua +++ b/Zframework/loadLib.lua @@ -17,16 +17,16 @@ return function(name,libName) if success then libFunc,mes2=package.loadlib(SAVEDIR.."/lib/"..libName.Android,libName.libFunc) if libFunc then - MES.new(name.." lib loaded") + MES.new('check',name.." lib loaded") break else MES.new('error',"Cannot load "..name..": "..mes2) end else - MES.new(("Write %s-%s to saving failed: %s"):format(name,platform[i],mes2)) + MES.new('error',("Write %s-%s to saving failed: %s"):format(name,platform[i],mes2)) end else - MES.new(("Read %s-%s to saving failed: %s"):format(name,platform[i],mes1)) + MES.new('error',("Read %s-%s to saving failed: %s"):format(name,platform[i],mes1)) end end if not libFunc then diff --git a/Zframework/message.lua b/Zframework/message.lua index 5c89bf57..9ae101a7 100644 --- a/Zframework/message.lua +++ b/Zframework/message.lua @@ -6,6 +6,23 @@ local ins,rem=table.insert,table.remove local mesList={} local mesIcon={ + check=DOGC{40,40, + {'setLW',10}, + {'setCL',0,0,0}, + {'line',4,19,15,30,36,9}, + {'setLW',6}, + {'setCL',.7,1,.6}, + {'line',5,20,15,30,35,10}, + }, + info=DOGC{40,40, + {'setCL',.2,.25,.85}, + {'fCirc',20,20,15}, + {'setCL',1,1,1}, + {'setLW',2}, + {'dCirc',20,20,15}, + {'fRect',18,11,4,4}, + {'fRect',18,17,4,12}, + }, warn=DOGC{40,40, {'setCL',.95,.83,.4}, {'fPoly',20.5,1,0,38,40,38}, @@ -23,25 +40,20 @@ local mesIcon={ {'setCL',0,0,0}, {'dCirc',20,20,19}, {'setLW',6}, - {'line',20-9.8,20-9.8,20+9.8,20+9.8}, - {'line',20-9.8,20+9.8,20+9.8,20-9.8}, + {'line',10.2,10.2,29.8,29.8}, + {'line',10.2,29.8,29.8,10.2}, {'setLW',4}, {'setCL',1,1,1}, - {'line',20-9,20-9,20+9,20+9}, - {'line',20-9,20+9,20+9,20-9}, + {'line',11,11,29,29}, + {'line',11,29,29,11}, }, } local MES={} -function MES.new(...) - local icon,str,time=... - if type(icon)=='string'and mesIcon[icon]then - icon=mesIcon[icon] - elseif type(icon)~='userdata'then - icon,str,time=false,icon,str - else - end +function MES.new(icon,str,time) + -- icon=mesIcon.info + if type(icon)=='string'then icon=mesIcon[icon]end local t=gc.newText(getFont(30),str) local w=math.max(t:getWidth()+(icon and 45 or 5),200) local L={w+20,48, diff --git a/Zframework/profile.lua b/Zframework/profile.lua index 11837f67..8b5dcd3d 100644 --- a/Zframework/profile.lua +++ b/Zframework/profile.lua @@ -141,10 +141,10 @@ function profile.switch() profile.stop() love.system.setClipboardText(PROFILE.report()) PROFILE.reset() - MES.new("profile report copied!") + MES.new('check',"profile report copied!") else PROFILE.start() - MES.new("profile start!") + MES.new('check',"profile start!") end switch=not switch end diff --git a/Zframework/theme.lua b/Zframework/theme.lua index 5cdcc750..3a51683a 100644 --- a/Zframework/theme.lua +++ b/Zframework/theme.lua @@ -52,18 +52,14 @@ function THEME.set(theme) elseif theme=='xmas'then BG.setDefault('snow') BGM.setDefault('xmas') - MES.new("==============") - MES.new("Merry Christmas!") - MES.new("==============") + MES.new('info',"==Merry Christmas==") elseif theme=='birth'then BG.setDefault('firework') BGM.setDefault('magicblock') elseif theme=='sprfes'then BG.setDefault('firework') BGM.setDefault("spring festival") - MES.new(" ★☆☆★") - MES.new("新年快乐!") - MES.new(" ★☆☆★") + MES.new('info',"★☆新年快乐☆★") elseif theme=='zday1'then BG.setDefault('lanterns') BGM.setDefault("empty") diff --git a/Zframework/websocket.lua b/Zframework/websocket.lua index aa1f0864..ee8cb76a 100644 --- a/Zframework/websocket.lua +++ b/Zframework/websocket.lua @@ -349,7 +349,7 @@ function WS.update(dt) ws.pongTimer=1 else ws.status='dead' - MES.new(text.wsFailed..": "..(mes=="timeout"and text.netTimeout or mes)) + MES.new('warn',text.wsFailed..": "..(mes=="timeout"and text.netTimeout or mes)) end end elseif ws.status=='running'then diff --git a/parts/data.lua b/parts/data.lua index 00cb3454..a6d602d6 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -352,7 +352,7 @@ do--function DATA.saveRecording() --Filtering modes that cannot be saved for _,v in next,noRecList do if GAME.curModeName:find(v)then - MES.new('warn',"Cannot save recording of this mode now!") + MES.new('error',"Cannot save recording of this mode now!") return end end diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 1252dd30..f161450d 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -127,7 +127,7 @@ function freshDate(mode) STAT.date=date STAT.todayTime=0 if not mode:find'q'then - MES.new(text.newDay) + MES.new('info',text.newDay) end return true end @@ -141,10 +141,10 @@ function legalGameTime()--Check if today's playtime is legal if STAT.todayTime<14400 then return true elseif STAT.todayTime<21600 then - MES.new(text.playedLong) + MES.new('warn',text.playedLong) return true else - MES.new(text.playedTooMuch) + MES.new('error',text.playedTooMuch) return false end end diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua index 2c98cc21..48ee5ecf 100644 --- a/parts/modes/blind_wtf.lua +++ b/parts/modes/blind_wtf.lua @@ -16,7 +16,7 @@ return{ load=function() PLY.newPlayer(1) if SETTING.sfx_spawn==0 then - MES.new(text.switchSpawnSFX) + MES.new('warn',text.switchSpawnSFX) end end, mesDisp=function(P) diff --git a/parts/net.lua b/parts/net.lua index 67f6a6fc..2941067c 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -97,9 +97,9 @@ end local function _closeMessage(message) local mes=JSON.decode(message:sub(3)) if mes then - MES.new(("%s [%s] %s"):format(text.wsClose,mes.type or"unknown type",mes.reason or"")) + MES.new('info',("%s [%s] %s"):format(text.wsClose,mes.type or"unknown type",mes.reason or"")) else - MES.new(text.wsClose) + MES.new('info',text.wsClose) end end @@ -249,13 +249,13 @@ function NET.uploadSave() {section=6,data=STRING.packTable(FILE.load('conf/vkSave1'))}, {section=7,data=STRING.packTable(FILE.load('conf/vkSave2'))}, }..'}}') - MES.new("Uploading") + MES.new('info',"Uploading") end end function NET.downloadSave() if NET.lock('downloadSave',10)then WS.send('user','{"action":3,"data":{"sections":[1,2,3,4,5,6,7]}}') - MES.new("Downloading") + MES.new('info',"Downloading") end end function NET.loadSavedData(sections) @@ -295,7 +295,7 @@ function NET.loadSavedData(sections) FILE.save(NET.cloudData.vkSave1,'conf/vkSave1','q') FILE.save(NET.cloudData.vkSave2,'conf/vkSave2','q') else - MES.new(text.versionNotMatch,1) + MES.new('error',text.versionNotMatch,1) end end @@ -414,22 +414,22 @@ function NET.updateWS_app() end end if VERSION.code [message]"} + end + end, + description="Show a message", + details={ + "Show a message on the up-left corner", + "", + "Usage: mes [message]", + }, } commands.warn={ code=function(str)MES.new('warn',str,6)end, diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index d40c882c..02aa2f0e 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -51,13 +51,13 @@ function scene.keyDown(key) if key=="return"or key=="return2"then if CUSTOMENV.opponent~="X"then if CUSTOMENV.opponent:sub(1,2)=='CC'and CUSTOMENV.sequence=="fixed"then - MES.new(text.ai_fixed) + MES.new('error',text.ai_fixed) return elseif #BAG>0 then - MES.new(text.ai_prebag) + MES.new('error',text.ai_prebag) return elseif #MISSION>0 then - MES.new(text.ai_mission) + MES.new('error',text.ai_mission) return end end @@ -95,7 +95,7 @@ function scene.keyDown(key) str=str.."!" if #MISSION>0 then str=str..DATA.copyMission()end sys.setClipboardText(str.."!"..DATA.copyBoards().."!") - MES.new(text.exportSuccess) + MES.new('check',text.exportSuccess) elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() local args=STRING.split(str:sub((str:find(":")or 0)+1),"!") @@ -111,9 +111,9 @@ function scene.keyDown(key) if args[i]:find("%S")and not DATA.pasteBoard(args[i],i-3)and i<#args then goto THROW_fail end end freshMiniFieldVisible() - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) do return end - ::THROW_fail::MES.new(text.dataCorrupted) + ::THROW_fail::MES.new('error',text.dataCorrupted) elseif key=="escape"then FILE.save(CUSTOMENV,'conf/customEnv','q') SCN.back() diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 1cb8ac92..66b86df1 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -216,20 +216,20 @@ function scene.keyDown(key) SFX.play('fall',.8) elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then sys.setClipboardText("Techmino Field:"..DATA.copyBoard(page)) - MES.new(text.exportSuccess) + MES.new('check',text.exportSuccess) elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() local p=str:find(":")--ptr* if p then if not str:sub(1,p-1):find("Field")then - MES.new(text.pasteWrongPlace) + MES.new('error',text.pasteWrongPlace) end str=str:sub(p+1) end if DATA.pasteBoard(str,page)then - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end elseif key=="pageup"then page=max(page-1,1) diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 3cf1e80c..3a0b08b6 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -3,7 +3,6 @@ local kb=love.keyboard local int,sin=math.floor,math.sin local ins,rem=table.insert,table.remove -local sub=string.sub local scene={} @@ -71,22 +70,22 @@ function scene.keyDown(key) elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then if #MISSION>0 then sys.setClipboardText("Techmino Target:"..DATA.copyMission()) - MES.new(text.exportSuccess) + MES.new('check',text.exportSuccess) end elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() local p=str:find(":")--ptr* if p then if not str:sub(1,p-1):find("Target")then - MES.new(text.pasteWrongPlace) + MES.new('error',text.pasteWrongPlace) end str=str:sub(p+1) end if DATA.pasteMission(str)then - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) cur=#MISSION else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end elseif key=="escape"then SCN.back() diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 82456f7e..9debeb52 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -85,22 +85,22 @@ function scene.keyDown(key) elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then if #BAG>0 then sys.setClipboardText("Techmino SEQ:"..DATA.copySequence()) - MES.new(text.exportSuccess) + MES.new('check',text.exportSuccess) end elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() local p=str:find(":")--ptr* if p then if not str:sub(1,p-1):find("SEQ")then - MES.new(text.pasteWrongPlace) + MES.new('error',text.pasteWrongPlace) end str=str:sub(p+1) end if DATA.pasteSequence(str)then - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) cur=#BAG else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end elseif key=="escape"then SCN.back() diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index 5e0b38b2..1ae7bd3d 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -6,9 +6,9 @@ local savePW=false local function login() local email,password=emailBox:getText(),passwordBox:getText() if not STRING.simpEmailCheck(email)then - MES.new(text.wrongEmail)return + MES.new('error',text.wrongEmail)return elseif #password==0 then - MES.new(text.noPassword)return + MES.new('error',text.noPassword)return end NET.wsconn_user_pswd(email,password) if savePW then diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index eb75b6df..326d152d 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -67,7 +67,7 @@ function scene.keyDown(key) NET.tryLogin(false) else NET.wsconn_app() - MES.new(text.wsConnecting) + MES.new('info',text.wsConnecting) SFX.play('connect') end end diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index b1b62fec..3fe2f6b2 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -35,7 +35,7 @@ local function _quit() NET.signal_quit() else lastBackTime=TIME() - MES.new(text.sureQuit) + MES.new('info',text.sureQuit) end end local function _switchChat() diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index 78b0e171..31147565 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -32,7 +32,7 @@ scene.widgetList={ SCN.back() end else - MES.new(text.sureQuit) + MES.new('info',text.sureQuit) lastLogoutTime=TIME() end end}, diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 0c890f29..d541e5d7 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -85,7 +85,7 @@ scene.widgetList={ ROOMENV.capacity=i WIDGET.active.capacity.color=COLOR.lY else - MES.new('warn',"没有权限 Permission Denied") + MES.new('error',"没有权限 Permission Denied") WIDGET.active.capacity.color=COLOR.R end end}, diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index b5ec0ce8..b7da7c61 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -61,8 +61,8 @@ function scene.keyDown(k) elseif k=="return"then if NET.getlock('fetchRoom')or not NET.roomList[selected]then return end local R=NET.roomList[selected] - if R.roomInfo.version~=VERSION.short then MES.new('warn',"Version doesn't match")return end - if R.private then MES.new('warn',"Can't enter private room now")return end + if R.roomInfo.version~=VERSION.short then MES.new('error',"Version doesn't match")return end + if R.private then MES.new('error',"Can't enter private room now")return end NET.enterRoom(R)--,password end end diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua index 6b5aa727..1509b08f 100644 --- a/parts/scenes/register.lua +++ b/parts/scenes/register.lua @@ -6,13 +6,13 @@ local function register() local password= WIDGET.active.password:getText() local password2=WIDGET.active.password2:getText() if #username==0 then - MES.new(text.noUsername)return + MES.new('error',text.noUsername)return elseif not STRING.simpEmailCheck(email)then - MES.new(text.wrongEmail)return + MES.new('error',text.wrongEmail)return elseif #password==0 or #password2==0 then - MES.new(text.noPassword)return + MES.new('error',text.noPassword)return elseif password~=password2 then - MES.new(text.diffPassword)return + MES.new('error',text.diffPassword)return end NET.register(username,email,password) end diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 9c191fd5..031f0673 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -2,7 +2,7 @@ local scene={} local function dumpCB(T) love.system.setClipboardText(STRING.packText(TABLE.dump(T))) - MES.new(text.exportSuccess) + MES.new('check',text.exportSuccess) end local function parseCB() local _ @@ -10,7 +10,7 @@ local function parseCB() --Decode s=STRING.unpackText(s) - if not s then MES.new(text.dataCorrupted)return end + if not s then MES.new('error',text.dataCorrupted)return end s=loadstring(s) if s then @@ -32,9 +32,9 @@ scene.widgetList={ if D then TABLE.update(D,RANKS) FILE.save(RANKS,'conf/unlock') - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end end}, WIDGET.newButton{name="data", x=490,y=390,w=280,h=100,color='lR', @@ -43,9 +43,9 @@ scene.widgetList={ if D and D.version==STAT.version then TABLE.update(D,STAT) FILE.save(STAT,'conf/data') - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end end}, WIDGET.newButton{name="setting", x=790,y=390,w=280,h=100,color='lR', @@ -54,9 +54,9 @@ scene.widgetList={ if D then TABLE.update(D,SETTING) FILE.save(SETTING,'conf/settings') - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end end}, WIDGET.newButton{name="vk", x=1090,y=390,w=280,h=100,color='lR', @@ -65,9 +65,9 @@ scene.widgetList={ if D then TABLE.update(D,VK_org) FILE.save(VK_org,'conf/virtualkey') - MES.new(text.importSuccess) + MES.new('check',text.importSuccess) else - MES.new(text.dataCorrupted) + MES.new('error',text.dataCorrupted) end end}, diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 880cb4b2..c124af80 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -16,7 +16,7 @@ local function load1() if D then TABLE.update(D,VK_org) else - MES.new(text.noFile) + MES.new('error',text.noFile) end end local function save2() @@ -27,7 +27,7 @@ local function load2() if D then TABLE.update(D,VK_org) else - MES.new(text.noFile) + MES.new('error',text.noFile) end end @@ -188,7 +188,7 @@ scene.widgetList={ B.x,B.y,B.r=T[2],T[3],T[4] end end - MES.new(("==[ %d ]=="):format(defaultSetSelect)) + MES.new('check',("==[ %d ]=="):format(defaultSetSelect)) defaultSetSelect=defaultSetSelect%5+1 selected=false end}, diff --git a/parts/scenes/test.lua b/parts/scenes/test.lua index 2872f4a5..623fd35f 100644 --- a/parts/scenes/test.lua +++ b/parts/scenes/test.lua @@ -35,7 +35,7 @@ function scene.keyDown(key) if backCounter==0 then SCN.back() else - MES.new(backCounter) + MES.new('info',backCounter) end end end