diff --git a/apps/edit.lua b/apps/edit.lua index a415924..22259bd 100644 --- a/apps/edit.lua +++ b/apps/edit.lua @@ -50,7 +50,8 @@ local complete = { } local clipboard -- do we need a clipboard shim -if not multishell or not multishell.hook then -- is this OpusOS ? +if not multishell or not _G.kernel then -- is this OpusOS ? +debug('nope') if _G.clipboard then -- has it been installed already clipboard = _G.clipboard else @@ -143,7 +144,7 @@ local keyMapping = { -- copy/paste [ 'control-x' ] = 'cut', [ 'control-c' ] = 'copy', - [ 'shift-paste' ] = 'paste_internal', + [ 'control-shift-paste' ] = 'paste_internal', -- file [ 'control-s' ] = 'save', @@ -1031,6 +1032,7 @@ local __actions = { if clipboard then clipboard.setData(text) else +debug(text) os.queueEvent('clipboard_copy', text) end setStatus('shift-^v to paste') diff --git a/etc/apps/opus-apps.db b/etc/apps/opus-apps.db new file mode 100644 index 0000000..451eed6 --- /dev/null +++ b/etc/apps/opus-apps.db @@ -0,0 +1,169 @@ +{ + [ "90ef98d4b6fd15466f0a1f212ec1db8d9ebe018c" ] = { + title = "Turtles", + category = "Apps", + icon = " \0305 \030c \0305 \030 \ +\030d \030c \0305 \030c \0308 \030d\031f\"\ + \0308\031f.\030 \031 \0308\031f.\030 \031 ", + run = "Turtles.lua", + }, + [ "381e3298b2b8f6caeb2208b57d805ada38402f0b" ] = { + category = "Apps", + icon = "\0300\0317if\031 \0307 \ +\0300\0317turt\ +\0300\0317retu", + title = "Scripts", + run = "Script.lua", + }, + fb91e24fa52d8d2b32937bf04d843f730319a902 = { + title = "Update", + category = "System", + icon = "\0301\03171\03180\030 \031 \ +\0301\03181\030 \031 \ +\0301\03170\03180\03171\0307\031f>", + run = "http://pastebin.com/raw/sj4VMVJj", + }, + [ "7ef35cac539f84722b0a988caee03b2df734c56a" ] = { + title = "AppStore", + category = "System", + icon = "\030 \0310=\0300 \030 XX\0300\031f \030 \ +\030 \031f \0300 \030 \ +\030 \031f \0310o \031f \0310o\031f ", + run = "Appstore.lua", + }, + [ "4486006f811b88cacd5f211fd579717e29b600cd" ] = { + title = "Miner", + category = "Apps", + icon = " \0315\\\030 \031 \ + \0304\031f _ \030 \031c/\0315\\\ + \0304 ", + run = "simpleMiner.lua", + requires = 'turtle', + }, + [ "131260cbfbb0c821f8eae5e7c3c296c7aa4d50b9" ] = { + title = "Music", + category = "Apps", + icon = "\030 \031f === \ +\030 \031f | |\ +\030 \031fo| o|\ +", + run = "usr/apps/Music.lua", + requires = 'turtle', + }, +--[[ + [ "81c0d915fa6d82fd30661c5e66e204cea52bb2b5" ] = { + title = "Activity", + category = "Apps", + icon = "\0318/\030f\031 \030 \0318\\\ +\030f \0308\0319o\030f\031 \ +\0318\\\030f\031 \030 \0318/", + run = "storageActivity.lua", + }, + [ "89307d419a2fe4fbb69af92b3d3af27b6ec14d3e" ] = { + title = "Telnet", + category = "Apps", + icon = " \0314>\0310_\ + \031f)))\031 \ +\0314>\0310_\031 ", + run = "telnet.lua", + }, + [ "8a77613b475e46064321fd7da18d126ee35e5066" ] = { + title = "VNC", + category = "Apps", + icon = "\ +\031e\\\031 \031e/\031dn\ + \031e\\/\031 \0319c", + run = "vnc.lua", + }, + [ "8d59207c8a84153b3e9f035cc3b6ec7a23671323" ] = { + title = "Micropaint", + category = "Apps", + icon = "\030 \031f \030f \ +\030 \031f^ \0300 \030f \ +\030 \031fv \0300 \030 ", + run = "http://pastebin.com/raw/tMRzJXx2", + requires = "advancedComputer", + }, +--]] + [ "9e092dda4f0e27d0c7686ddd00272079e678b6e6" ] = { + title = "Storage", + category = "Apps", + icon = "\0307 \ +\0307 \0308\0311 \0305 \0308\031 \0307 \0308 \0301 \ +\0307 ", + run = "chestManager.lua", + requires = 'turtle', + }, + [ "114edfc04a1ab03541bdc80ce064f66a7cfcedbb" ] = { + title = "Recorder", + category = "Apps", + icon = "\030 \031f \031b \031foo \ +\030 \031f \030e\031b \030 \031f/\ +\030 \031b \030e \030 \031f\\", + run = "recorder.lua", + }, + [ "131f0b008f44298812221d120d982940609be781" ] = { + title = "Builder", + category = "Apps", + icon = "\0317_____\ +\030e\031c###\0308\0317=\030e\031c#\ +\030e\031c#\0307\031f.\030e\031c###", + run = "usr/apps/builder.lua", + requires = "turtle", + }, + [ "d8c298dd41e4a4ec20e8307901797b64688b3b77" ] = { + title = "GPS Deploy", + category = "Apps", + run = "http://pastebin.com/raw/VXAyXqBv", + requires = "turtle", + }, + [ "53a5d150062b1e03206b9e15854b81060e3c7552" ] = { + title = "Minesweeper", + category = "Games", + icon = "\030f\031f \03131\0308\031f \030f\031d2\ +\030f\031f \031d2\03131\0308\031f \030f\03131\ +\030f\03131\0308\031f \030f\03131\031e3", + run = "https://pastebin.com/raw/nsKrHTbN", + }, + [ "a2accffe95b2c8be30e8a05e0c6ab7e8f5966f43" ] = { + title = "Strafe", + category = "Games", + icon = "\0308\031f \0300 \0308 \ +\0308\031f \0300 \030f \ +\0300\031f \030f ", + run = "https://pastebin.com/raw/jyDH7mLH", + }, + [ "48d6857f6b2869d031f463b13aa34df47e18c548" ] = { + title = "Breakout", + category = "Games", + icon = "\0301\031f \0309 \030c \030b \030e \030c \0306 \ +\030 \031f \ +\030 \031f \0300 \0310 ", + run = "https://gist.github.com/LDDestroier/c7528d95bc0103545c2a/raw", + }, + [ "d78f28759f255a0db76604ee560b87c4715a0da5" ] = { + title = "Sketch", + category = "Apps", + icon = " \031bskch\ +\0303\031f \030d \ +\030d\031f ", + run = "http://pastebin.com/raw/Mm5hd97E", + }, + [ "58ec8d6e36e346d9f42eb43935652e3e58e2c829" ] = { + category = "Apps", + icon = "\030f\031f \0304 \ +\030f\031dshell]\0304\0314 \ +\0304\031f ", + title = "Mwm", + run = "mwm.lua usr/config/mwm", + }, + [ "8d1b0a73bedc0dc492377c2f6ab880940b97ec6e" ] = { + icon = "\030 \031f \0305 \030 \030d \030 \ +\0305\031f \030d \030 \030d \0305 \030d \ +\030 \031f \030c \030 \0304 \030 \030c \030 ", + category = "Apps", + title = "Treefarm", + run = "treefarm.lua", + requires = "turtle", + }, +}