From e9559165a443d4df65a279668dd774be790bc521 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Thu, 11 Jul 2019 00:42:57 -0600 Subject: [PATCH] icon transparency --- sys/apps/Overview.lua | 4 --- sys/etc/apps.db | 69 ++++++++++++---------------------------- sys/etc/fstab | 3 +- sys/modules/opus/nft.lua | 37 +++++++++------------ 4 files changed, 37 insertions(+), 76 deletions(-) diff --git a/sys/apps/Overview.lua b/sys/apps/Overview.lua index bfcbbb3..8cd2c92 100644 --- a/sys/apps/Overview.lua +++ b/sys/apps/Overview.lua @@ -155,10 +155,6 @@ local page = UI.Page { }, } -if extSupport then - page.container.backgroundColor = colors.black -end - local function loadApplications() local requirements = { turtle = not not turtle, diff --git a/sys/etc/apps.db b/sys/etc/apps.db index edfabba..7bf79ab 100644 --- a/sys/etc/apps.db +++ b/sys/etc/apps.db @@ -3,17 +3,13 @@ title = "Packages", category = "System", run = "PackageManager.lua", - iconExt = "\030c\0317\151\131\131\131\0307\031c\148\ -\030c\0317\151\131\0310\143\0317\131\0307\031c\148\ -\0307\031c\138\030f\0317\151\131\131\131", + iconExt = "\030c\0317\151\131\131\131\0307\031c\148\010\030c\0317\151\131\0310\143\0317\131\0307\031c\148\010\0307\031c\138\030 \0317\151\131\131\131", }, [ "b2efeaa1a7d6d2185ea02473cf758203dfcea3fe" ] = { title = "Cloud", category = "Apps", run = "cshell.lua", - iconExt = "\0300\031f\159\131\135\0310\128\128\031f\139\131\030f\0310\144\ -\0300\128\031f\137\144\0310\128\030a\136\149\133\0300\128\ -\0300\031f\144\134\136\132\031a\142\138\138\030f\0310\159", + iconExt = "\0300\031 \159\131\135\0310\128\128\031 \139\131\030 \0310\144\010\0300\128\031f\137\144\0310\128\030a\136\149\133\0300\128\010\0300\031 \144\031f\134\136\132\031a\142\138\138\030 \0310\159", }, [ "53ebc572b4a44802ba114729f07bdaaf5409a9d7" ] = { title = "Network", @@ -21,9 +17,7 @@ icon = "\0304 \030 \ \030f \0304 \0307 \030 \031 \031f)\ \030f \0304 \0307 \030 \031f)", - iconExt = "\030 \031f \0305\031f\140\030f\0315\137\144\ -\030 \031f\030f\0314\131\131\0304\031f\148\030 \0305\155\150\149\ -\030 \031f\030f\0310\147\0300\031f\141\0304\149\0307\0318\149\030 ", + iconExt = "\030 \031 \128\128\128\128\0305\140\030 \0315\137\144\010\0314\131\131\0304\031f\148\030 \031 \128\0305\155\150\149\010\147\0300\031f\141\0304\149\0307\0318\149\030 \031 \128\128\128", run = "Network.lua", }, c7116629a6a855cb774d9c7c8ad822fd83c71fb5 = { @@ -32,9 +26,7 @@ icon = "\0304\031f \030f\0310o..\0304\031f \ \0304\031f \030f\0310.o.\0304\031f \ \0304\031f - ", - iconExt = "\0307\031f\135\0300\0317\159\0307\0310\144\031f\139\ -\0300\0317\131\0307\0310\147\0300\0317\156\131\ -\130\143\143\129", + iconExt = "\0307\031 \135\0300\0317\159\0307\0310\144\031 \139\010\0300\0317\131\0307\0310\147\0300\0317\156\131\010\030 \130\143\143\129", run = "rom/programs/reboot", }, fb91e24fa52d8d2b32937bf04d843f730319a902 = { @@ -43,9 +35,7 @@ icon = "\0301\03171\03180\030 \031 \ \0301\03181\030 \031 \ \0301\03170\03180\03171\0307\031f>", - iconExt = "\031f\128\0313\152\131\131\132\031f\128\ -\0313\139\159\129\0303\031f\159\129\139\ -\031f\128\0313\136\0303\031f\143\143\030f\0313\134\031f\128", + iconExt = "\030 \031 \128\0313\152\131\131\132\031 \128\010\030 \0313\139\159\129\0303\031 \159\129\139\010\030 \031 \128\0313\136\0303\031 \143\143\030 \0313\134\031 \128", run = "update update", }, c47ae15370cfe1ed2781eedc1dc2547d12d9e972 = { @@ -54,9 +44,7 @@ icon = " \031f?\031 \ \031f?\031 \ \031f?", - iconExt = "\0300\031f\129\030f\0310\131\0300\031f\148\030f\0310\148\ -\030 \031 \0300\031f\131\030f\0310\142\129\ -\030 \031 \0300\031f\131\030f\128", + iconExt = "\0300\031 \129\030 \0310\131\0300\031 \148\030 \0310\148\010\030 \031 \128\0300\131\030 \0310\142\129\010\030 \031 \128\0300\131\030 \128\128", run = "Help.lua", }, b0832074630eb731d7fbe8074de48a90cd9bb220 = { @@ -65,9 +53,7 @@ icon = "\030f \ \030f\0310lua>\031 \ \030f ", - iconExt = "\0300\031f\151\030f\128\0300\159\159\159\030f\0310\144\0304\031f\159\030f\128\ -\0300\031f\149\030f\128\0300\149\149\151\145\030f\128\0314\153\ -\130\131\130\131\130\131\0314\130\031f\128", + iconExt = "\0300\031 \151\030 \128\0300\159\159\159\030 \0310\144\0304\031 \159\030 \128\010\0300\031 \149\030 \128\0300\149\149\151\145\030 \128\0314\153\010\030 \130\131\130\131\130\131\0314\130\031 \128", run = "Lua.lua", }, bc0792d8dc81e8aa30b987246a5ce97c40cd6833 = { @@ -76,9 +62,7 @@ icon = " \0307\031f| \ \0307\031f---o\030 \031 \ \0307\031f| ", - iconExt = "\0318\138\0308\031f\130\0318\128\031f\129\030f\0318\133\ -\0318\143\0308\128\0317\143\0318\128\030f\143\ -\0318\138\135\143\139\133", + iconExt = "\030 \0318\138\0308\031 \130\0318\128\031 \129\030 \0318\133\010\030 \0318\143\0308\128\0317\143\0318\128\030 \143\010\030 \0318\138\135\143\139\133", run = "System.lua", }, [ "2a4d562b1d9a9c90bdede6fac8ce4f7402462b86" ] = { @@ -87,23 +71,20 @@ icon = "\030f\031f \0315/\ \030f\031f \0315/\\/ \ \030f\0315/\031f ", - iconExt = "\031f\128\128\0305\159\030f\128\0305\159\030f\0315\134\031f\128\ -\031f\128\0315\152\129\137\0305\031f\158\139\030f\0317 \ -\0315\134\031f\128\128\128\128\0305\154\030f\0317 ", + iconExt = "\030 \031 \128\128\0305\159\030 \128\0305\159\030 \0315\134\031 \128\010\030 \031 \128\0315\152\129\137\0305\031 \158\139\030 \128\010\030 \0315\134\031 \128\128\128\128\0305\154\030 \128", run = "Tasks.lua", }, [ "a0365977708b7387ee9ce2c13e5820e6e11732cb" ] = { title = "Pain", category = "Apps", - icon = "\030 \031f\0307\031f\159\030 \159\030 \ -\030 \031f\0308\031f\135\0307\0318\144\140\030f\0317\159\143\031c\139\0302\135\030f\0312\157\ -\030 \031f\030f\0318\143\133\0312\136\0302\031f\159\159\143\131\030f\0312\132", + iconExt = "\0307\031 \159\030 \128\128\128\128\128\128\128\010\0308\031 \135\0307\0318\144\140\030 \0317\159\143\031c\139\0302\135\030 \0312\157\010\030 \0318\143\133\0312\136\0302\031 \159\159\143\131\030 \0312\132", run = "pain", }, [ "6a381ca189cbddd63737cbaf6e8b593844ce467ba52b1c5e5e05d8f29864385d" ] = { title = "Sniffer", category = "Apps", icon = "\31\102\128\128\128\128\31\53\149\30\53\31\102\154\30\102\31\53\137\10\30\52\31\102\159\31\52\128\128\30\102\144\31\53\130\30\53\31\102\155\140\10\31\52\151\30\52\31\102\148\30\102\31\52\151\30\52\31\102\148\30\102\128\128\128", + iconExt = "\030 \031 \128\128\128\128\0315\149\0305\031 \154\030 \0315\137\010\0304\031 \159\0314\128\128\030 \144\0315\130\0305\031 \155\140\010\0314\151\0304\031f\148\030f\0314\151\0304\031f\148\030 \031 \128\128\128", run = "Sniff.lua", }, [ "01c933b2a36ad8ed2d54089cb2903039046c1216" ] = { @@ -120,9 +101,7 @@ icon = "\0300\0317==\031 \0307 \ \0300\0317====\ \0300\0317====", - iconExt = "\030 \031f\0300\031f\136\140\132\0308\130\030f\0318\144\ -\030 \031f\030f\0310\157\0300\031f\147\030f\0310\142\143\149\ -\030 \031f\0300\031f\136\140\132\140\030f\0310\149", + iconExt = "\0300\031f\136\140\132\0308\031 \130\030 \0318\144\010\157\0300\031f\147\030f\0310\142\143\030 \149\010\0300\031f\136\140\132\140\030 \0310\149", run = "Files.lua", }, [ "7fddb7d8d1d60b1eeefa9af01082e0811d4b484d" ] = { @@ -131,23 +110,19 @@ icon = "\0304\031f \ \0304\031f \030f\0310zz\031 \ \0304\031f \030f ", - iconExt = "\030e\031f\135\030f\031e\148\030e\128\031f\151\139\ -\030e\031e\128\030f\031f\128\031e\143\031f\128\030e\031e\128\ -\031e\139\030e\031f\130\131\129\030f\031e\135", + iconExt = "\030e\031 \135\030 \031e\148\030e\128\031 \151\139\010\030e\031e\128\030 \031 \128\031e\143\031 \128\030e\031e\128\010\030 \031e\139\030e\031 \130\131\129\030 \031e\135", run = "/rom/programs/shutdown", }, - bdc1fd5d3c0f3dcfd55d010426e61bf9451e680d = { + [ "bdc1fd5d3c0f3dcfd55d010426e61bf9451e680d" ] = { title = "Shell", category = "Apps", icon = "\0304 \030 \ \0304 \030f\0314> \0310_\031 \ \0304 \030f \030 ", - iconExt = "\030f\0314\151\131\131\131\131\ -\030f\0314\149\030f\0314> \0310_ \ -\030f\0314\149\030f ", + iconExt = "\030f\0314\151\131\131\131\131\010\030f\0314\149\030f\0314> \0310_ \010\030f\0314\149\030f ", run = "shell", }, - b77aad5fb24921ef76ac8f3e500ed93fddae8f2a = { + [ "b77aad5fb24921ef76ac8f3e500ed93fddae8f2a" ] = { title = "Redirection", category = "Games", icon = "\0307 \0308 \0307 \ @@ -156,7 +131,7 @@ run = "rom/programs/fun/advanced/redirection", requires = 'advanced', }, - f39d173d91c22348565c20283b89d4d1cabd3b7e = { + [ "f39d173d91c22348565c20283b89d4d1cabd3b7e" ] = { title = "Falling", category = "Games", icon = "\030f \0302 \ @@ -165,7 +140,7 @@ run = "rom/programs/pocket/falling", requires = 'advancedPocket', }, - db56e2e1db9f7accfc37f2b132d27505c66ba521 = { + [ "db56e2e1db9f7accfc37f2b132d27505c66ba521" ] = { title = "Adventure", category = "Games", icon = "\030f\0310You \031 \ @@ -179,9 +154,7 @@ icon = "\030d \030 \030e \030 \ \030d \030 \ \030d ", - iconExt = "\030 \031f\0305\031f\151\030f\0315\135\131\0305\031f\146\ -\030 \031f\030f\0315\130\141\0305\031f\139\030f\0315\130\ -\030 \031f\0305\031f\146\143\030f\0315\158\031e\130", + iconExt = "\0305\031 \151\030 \0315\135\131\0305\031 \146\010\030 \0315\130\141\0305\031 \139\030 \0315\130\010\0305\031 \146\143\030 \0315\158\031e\130", run = "/rom/programs/fun/worm", }, [ "9f46ca3ef617166776ef6014a58d4e66859caa62" ] = { @@ -190,9 +163,7 @@ icon = " \030f \ \030f \0307 \ \030f \0307 \0300 ", - iconExt = "\031f\128\0307\143\131\131\131\131\143\030f\128\ -\0307\031f\129\0317\128\0319\136\0309\031b\136\132\0307\0319\132\0317\128\031f\130\ -\0317\130\143\0307\128\128\128\128\030f\143\129", + iconExt = "\030 \031 \128\0307\143\131\131\131\131\143\030 \128\010\0307\031 \129\0317\128\0319\136\0309\031b\136\132\0307\0319\132\0317\128\031 \130\010\030 \0317\130\143\0307\128\128\128\128\030 \143\129", run = "/rom/programs/fun/dj", }, } diff --git a/sys/etc/fstab b/sys/etc/fstab index deeac19..235ecf0 100644 --- a/sys/etc/fstab +++ b/sys/etc/fstab @@ -1,4 +1,5 @@ sys/apps/pain.lua urlfs https://github.com/LDDestroier/CC/raw/master/pain.lua sys/apps/update.lua urlfs http://pastebin.com/raw/UzGHLbNC sys/apps/Enchat.lua urlfs https://raw.githubusercontent.com/LDDestroier/enchat/master/enchat3.lua -sys/apps/cloud.lua urlfs https://cloud-catcher.squiddev.cc/cloud.lua \ No newline at end of file +sys/apps/cloud.lua urlfs https://cloud-catcher.squiddev.cc/cloud.lua +sys/apps/ntftrans.lua urlfs https://pastebin.com/raw/e8XrzeDY \ No newline at end of file diff --git a/sys/modules/opus/nft.lua b/sys/modules/opus/nft.lua index 52d5c6c..4fd8d02 100644 --- a/sys/modules/opus/nft.lua +++ b/sys/modules/opus/nft.lua @@ -34,30 +34,23 @@ function NFT.parse(imageText) --As we're no longer 1-1, we keep track of what index to write to local writeIndex = 1 --Tells us if we've hit a 30 or 31 (BG and FG respectively)- next char specifies the curr colour - local bgNext, fgNext = false, false - --The current background and foreground colours - local currBG, currFG = nil,nil - for i = 1, #sLine do - local nextChar = string.sub(sLine, i, i) - if nextChar:byte() == 30 then - bgNext = true - elseif nextChar:byte() == 31 then - fgNext = true - elseif bgNext then - currBG = getColourOf(nextChar) - bgNext = false - elseif fgNext then - currFG = getColourOf(nextChar) - fgNext = false + + local tcol, bcol = colors.white,colors.black + local cx, sx = 1, 0 + while sx < #sLine do + sx = sx + 1 + if sLine:sub(sx,sx) == "\30" then + bcol = getColourOf(sLine:sub(sx+1,sx+1)) + sx = sx + 1 + elseif sLine:sub(sx,sx) == "\31" then + tcol = getColourOf(sLine:sub(sx+1,sx+1)) + sx = sx + 1 else - --if nextChar ~= " " and currFG == nil then - -- any color not in range is considered transparent - -- currFG = _G.colors.white - --end - image.bg[num][writeIndex] = currBG - image.fg[num][writeIndex] = currFG - image.text[num][writeIndex] = nextChar + image.bg[num][writeIndex] = bcol + image.fg[num][writeIndex] = tcol + image.text[num][writeIndex] = sLine:sub(sx,sx) writeIndex = writeIndex + 1 + cx = cx + 1 end end image.height = num