From 15a1fdd0d2e61e62c6180ddb286d217af285c042 Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 20 Mar 2016 02:40:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=BE=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5:=20=D0=9F?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.txt | 8 ++++++++ Applications/Palette/Icon.pic | Bin 0 -> 262 bytes Applications/Palette/Palette.lua | 1 + Applications/Viewer/Viewer.lua | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Applications/Palette/Icon.pic create mode 100644 Applications/Palette/Palette.lua diff --git a/Applications.txt b/Applications.txt index 67768c18..59337879 100644 --- a/Applications.txt +++ b/Applications.txt @@ -399,6 +399,14 @@ ["version"]=1.0, }, ----------------------------------------------------- Приложения без ресурсов -------------------------------------------------------------------------- + { + ["name"]="MineOS/Applications/Palette", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Palette/Palette.lua", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Palette/Icon.pic", + ["createShortcut"] = "desktop", + ["version"]=1.0, + }, { ["name"]="MineOS/Applications/Radio", ["url"]="IgorTimofeev/OpenComputers/master/Applications/Radio/Radio.lua", diff --git a/Applications/Palette/Icon.pic b/Applications/Palette/Icon.pic new file mode 100644 index 0000000000000000000000000000000000000000..d3f56430f2f6bb3509af746d610744388acd9d0e GIT binary patch literal 262 zcmYMvF%H5o3A091qK$5(Ic=>0TMUhBz#COawvy>5{VVcN_Q1<9_)Ed9*CP literal 0 HcmV?d00001 diff --git a/Applications/Palette/Palette.lua b/Applications/Palette/Palette.lua new file mode 100644 index 00000000..b5a5dc1e --- /dev/null +++ b/Applications/Palette/Palette.lua @@ -0,0 +1 @@ +require("palette").draw("auto", "auto", 0x6600FF) \ No newline at end of file diff --git a/Applications/Viewer/Viewer.lua b/Applications/Viewer/Viewer.lua index 1c1b22a0..80269c3b 100644 --- a/Applications/Viewer/Viewer.lua +++ b/Applications/Viewer/Viewer.lua @@ -78,7 +78,7 @@ end local function drawGUI() if showGUI then --Верхний бар - buffer.square(1, 1, buffer.screen.width, 1, 0xFFFFFF, 0xFFFFFF, " ", 30) + buffer.square(1, 1, buffer.screen.width, 1, 0xDDDDDD, 0xFFFFFF, " ") local text = #imageList > 0 and ecs.stringLimit("start", imageList[currentImage], 40) or "Viewer" buffer.text(math.floor(buffer.screen.width / 2 - unicode.len(text) / 2), 1, 0x000000, text) buffer.text(2, 1, ecs.colors.red, "⬤")