From 64b676c6c97babda086f96d6bfb92bfc57beec5d Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 5 Jun 2016 16:18:24 +0300 Subject: [PATCH] cyka --- Applications.txt | 13 +++++++++---- Applications/AppMarket/AppMarket.lua | 26 +++++++++----------------- Applications/convertImage.lua | 27 +++++++++++++++++++++++++++ MineOS/Wallpapers/Govnokod.pic | Bin 0 -> 15571 bytes 4 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 Applications/convertImage.lua create mode 100644 MineOS/Wallpapers/Govnokod.pic diff --git a/Applications.txt b/Applications.txt index 861baa86..f05b93e2 100644 --- a/Applications.txt +++ b/Applications.txt @@ -29,8 +29,8 @@ ["version"]=1.0, }, { - ["name"]="MineOS/Pictures/Afterlife.pic", - ["url"]="IgorTimofeev/OpenComputers/master/MineOS/Wallpapers/Afterlife.pic", + ["name"]="MineOS/Pictures/Govnokod.pic", + ["url"]="IgorTimofeev/OpenComputers/master/MineOS/Wallpapers/Govnokod.pic", ["type"]="Wallpaper", ["version"]=1.0, }, @@ -410,7 +410,12 @@ ["name"]="bin/get.lua", ["url"]="IgorTimofeev/OpenComputers/master/Applications/get.lua", ["type"]="Script", - ["forceDownload"]=true, + ["version"]=1.0, + }, + { + ["name"]="bin/convertImage.lua", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/convertImage.lua", + ["type"]="Script", ["version"]=1.0, }, { @@ -585,7 +590,7 @@ ["icon"]="IgorTimofeev/OpenComputers/master/Applications/AppMarket/Icon.pic", ["createShortcut"]="dock", ["forceDownload"]=true, - ["version"]=1.33, + ["version"]=1.34, }, { ["name"]="MineOS/Applications/Snake", diff --git a/Applications/AppMarket/AppMarket.lua b/Applications/AppMarket/AppMarket.lua index 735da984..5293a883 100644 --- a/Applications/AppMarket/AppMarket.lua +++ b/Applications/AppMarket/AppMarket.lua @@ -202,9 +202,6 @@ local function drawMain(refreshData) getApplication(i) end x, y = drawApplication(x, y, i) - -- else - -- ecs.error(matchCount, from, from + limit - 1) - -- break end matchCount = matchCount + 1 end @@ -379,11 +376,13 @@ while true do obj.nextPageButton:press() fromY = sizes.yMain + 1 from = from + limit + currentApps = {} drawAll(true, false) elseif obj.prevPageButton:isClicked(e[3], e[4]) then if from > limit then fromY = sizes.yMain + 1 from = from - limit + currentApps = {} drawAll(true, false) end end @@ -403,22 +402,15 @@ while true do end end elseif e[1] == "scroll" then - -- if currentTopBarElement < 5 then - if e[5] == 1 then - if (fromY < sizes.yMain) then - fromY = fromY + 2 - drawAll(false, false) - end - else - fromY = fromY - 2 + if e[5] == 1 then + if (fromY < sizes.yMain) then + fromY = fromY + 2 drawAll(false, false) end - -- else - -- if e[5] == 1 then - - -- else - -- end - -- end + else + fromY = fromY - 2 + drawAll(false, false) + end end end diff --git a/Applications/convertImage.lua b/Applications/convertImage.lua new file mode 100644 index 00000000..82daa69b --- /dev/null +++ b/Applications/convertImage.lua @@ -0,0 +1,27 @@ +local args = {...} + +local libraries = { + buffer = "doubleBuffering", + image = "image", + fs = "filesystem", + GUI = "GUI", +} + +for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil + +------------------------------------------------------------------------------------------------------------------ +buffer.start() + +if fs.exists(args[1]) then + local cyka = image.load(args[1]) + buffer.clear(0x000000) + buffer.image(1, 1, cyka) + buffer.draw() + + if args[2] then + fs.makeDirectory(fs.path(args[2]) or "") + image.save(args[2], cyka, 4) + end +else + GUI.error("Файл \"" .. args[1] .. "\" не существует") +end diff --git a/MineOS/Wallpapers/Govnokod.pic b/MineOS/Wallpapers/Govnokod.pic new file mode 100644 index 0000000000000000000000000000000000000000..55df96033781ac9e497a5c8163839ad16e372458 GIT binary patch literal 15571 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 G>HiDLrDHw- literal 0 HcmV?d00001