diff --git a/Applications.cfg b/Applications.cfg index 48d727fd..585d2cf4 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -204,7 +204,7 @@ path="/lib/MineOSCore.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua", type="Library", - version=1.66, + version=1.67, }, { path="/lib/advancedLua.lua", @@ -264,7 +264,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/GUI.lua", type="Library", preloadFile=true, - version=1.55, + version=1.56, }, { path="/lib/rayEngine.lua", @@ -449,7 +449,7 @@ icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic", createShortcut="dock", forceDownload=true, - version=1.72, + version=1.73, resources={ { path="/Localization/Russian.lang", @@ -507,7 +507,7 @@ type="Application", icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic", createShortcut="desktop", - version=1.13, + version=1.14, resources={ { path="/Cloudy.pic", @@ -693,7 +693,7 @@ type="Application", icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/PrintImage/Icon.pic", createShortcut="desktop", - version=1.10, + version=1.11, }, { path="/MineOS/Applications/Palette", @@ -709,7 +709,7 @@ type="Application", icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Stargate/Icon.pic", createShortcut="desktop", - version=1.06, + version=1.07, resources={ { path="/Ch1.pic", @@ -833,7 +833,7 @@ type="Application", icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/HoloClock/Icon.pic", createShortcut="desktop", - version=1.03, + version=1.04, }, -- { -- path="/MineOS/Applications/Finder", diff --git a/Applications/HoloClock/HoloClock.lua b/Applications/HoloClock/HoloClock.lua index 25ded337..f3fc6437 100755 --- a/Applications/HoloClock/HoloClock.lua +++ b/Applications/HoloClock/HoloClock.lua @@ -11,7 +11,7 @@ local GUI = require("GUI") -------------------------------------------------------------------------------------------- if not component.isAvailable("hologram") then - GUI.error("This program needs a Tier 2 holo-projector!", {title = {color = 0xFFDB40, text = "HoloClock"}}) + GUI.error("This program needs a Tier 2 holo-projector to work") return end diff --git a/Applications/MineCodeIDE/MineCodeIDE.lua b/Applications/MineCodeIDE/MineCodeIDE.lua index 741414f1..6411e239 100755 --- a/Applications/MineCodeIDE/MineCodeIDE.lua +++ b/Applications/MineCodeIDE/MineCodeIDE.lua @@ -768,7 +768,7 @@ local function downloadFileFromWeb() newFile() mainContainer.codeView.lines, mainContainer.codeView.maximumLineLength = splitStringIntoLines(result) else - GUI.error(reason, {title = {color = 0xFFDB40, text = "Failed to connect to URL"}}) + GUI.error("Failed to connect to URL: " .. tostring(reason)) end hideSettingsContainer() end @@ -1248,7 +1248,7 @@ local function find() return end else - GUI.error("Wrong searching regex", {title = {color = 0xFFDB40, text = "Warning"}}) + GUI.error("Wrong searching regex") end end diff --git a/Applications/PrintImage/PrintImage.lua b/Applications/PrintImage/PrintImage.lua index 32ad92d7..8f8b1b33 100755 --- a/Applications/PrintImage/PrintImage.lua +++ b/Applications/PrintImage/PrintImage.lua @@ -13,7 +13,7 @@ local GUI = require("GUI") ----------------------------------------- cyka ----------------------------------------- -if not component.isAvailable("printer3d") then GUI.error("This program requires at least one 3D-printer", {title = {color = 0xFFDB40, text = "Error"}}); return end +if not component.isAvailable("printer3d") then GUI.error("This program requires at least one 3D-printer"); return end local args, options = require("shell").parse(...) local startImagePath = args[1] == "open" and args[2] or "/MineOS/System/OS/Icons/Steve.pic" local configPath = "/MineOS/System/PrintImage/Config.cfg" @@ -203,10 +203,10 @@ local function createWindow() getStatus() return true else - GUI.error("File \"" .. text .. "\" is not in .pic format", {title = {color = 0xFFDB40, text = "Error while loading image"}}) + GUI.error("File \"" .. text .. "\" is not in .pic format") end else - GUI.error("File \"" .. text .. "\" doesn't exists", {title = {color = 0xFFDB40, text = "Error while loading image"}}) + GUI.error("File \"" .. text .. "\" doesn't exists") end end diff --git a/Applications/Stargate/Stargate.lua b/Applications/Stargate/Stargate.lua index 0943f2c7..6ecf39ca 100755 --- a/Applications/Stargate/Stargate.lua +++ b/Applications/Stargate/Stargate.lua @@ -7,7 +7,7 @@ local component = require("component") local unicode = require("unicode") local MineOSCore = require("MineOSCore") if not component.isAvailable("stargate") then - GUI.error("This program requires stargate from mod \"SGCraft\"", {title = {color = 0xFF8888, text = "Ошибка"}}) + GUI.error("This program requires stargate from mod \"SGCraft\"") return end local stargate = component.stargate @@ -295,10 +295,11 @@ mainContainer.eventHandler = function(mainContainer, object, eventData) buffer.draw() end elseif eventData[1] == "sgMessageReceived" then - GUI.error(tostring(eventData[3]), {title = {color = 0xBBBBBB, text = "Incoming message"}, backgroundColor = 0x262626}) + GUI.error(eventData[3]) end end +GUI.error() loadContacts() updateContacts() update() diff --git a/Applications/Weather/Weather.lua b/Applications/Weather/Weather.lua index cd9a2954..a977b506 100755 --- a/Applications/Weather/Weather.lua +++ b/Applications/Weather/Weather.lua @@ -248,7 +248,7 @@ local function tryToGetAndDrawWeather() --Сейвим погодку saveWeatherData() else - GUI.error(jsonWeatherResponse, {title = {color = 0xFF8888, text = "Ошибка"}}) + GUI.error(jsonWeatherResponse) end end diff --git a/lib/GUI.lua b/lib/GUI.lua index a1b35f3d..275269d0 100755 --- a/lib/GUI.lua +++ b/lib/GUI.lua @@ -889,6 +889,7 @@ function GUI.error(...) args[i] = tostring(args[i]) end end + if #args == 0 then args[1] = "nil" end local sign = image.fromString([[06030000FF 0000FF 00F7FF▟00F7FF▙0000FF 0000FF 0000FF 00F7FF▟F7FF00 F7FF00 00F7FF▙0000FF 00F7FF▟F7FF00CF7FF00yF7FF00kF7FF00a00F7FF▙]]) local offset = 2 diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua index fd4b9fe2..b04061c4 100755 --- a/lib/MineOSCore.lua +++ b/lib/MineOSCore.lua @@ -599,7 +599,7 @@ function MineOSCore.safeLaunch(path, ...) finalSuccess, finalPath, finalLine, finalTraceback = false, path, tonumber(match) or 1, loadReason end else - GUI.error("Failed to safely launch file that doesn't exists: \"" .. path .. "\"", {title = {color = 0xFFDB40, text = "Warning"}}) + GUI.error("Failed to safely launch file that doesn't exists: \"" .. path .. "\"") end component.screen.setPrecise(false)