naming changes

apis/pixelbox.lua

@@ -3,9 +3,9 @@
 ]]
 
 local graphic = require("graphic_handle")
-local api = require("api")
+local api = require("util")
 local EXPECT = require("cc.expect").expect
-local ALGO = require("a-tools.algo")
+local ALGO = require("core.algo")
 
 local PIXELBOX = {}
 local OBJECT = {}

a-tools/algo.lua → core/algo.lua

@@ -6,7 +6,7 @@
     ! sorry for that
 ]]
 
-local api = require("api")
+local api = require("util")
 
 local function get_elipse_points(radius_x,radius_y,xc,yc,filled)
     local rx,ry = math.ceil(math.floor(radius_x-0.5)/2),math.ceil(math.floor(radius_y-0.5)/2)

a-tools/gui_object.lua → core/gui_object.lua

@@ -8,8 +8,8 @@
 --* loads the required modules
 local objects = require("object_loader")
 local graphic = require("graphic_handle")
-local update = require("a-tools.update")
-local api = require("api")
+local update = require("core.update")
+local api = require("util")
 
 local function create_gui_object(term_object,orig,log,event_offset_x,event_offset_y)
     local gui_objects = {}
@@ -510,7 +510,7 @@ local function create_gui_object(term_object,orig,log,event_offset_x,event_offse
         if err then gui.last_err = err end
         --* makes sure the window is visible when execution ends
         execution_window.setVisible(true)
-        if err then log("a Fatal error occured: "..err..debug.traceback(),log.fatal)
+        if err then log("a Fatal error occured: "..err.." "..debug.traceback(),log.fatal)
         else log("finished execution",log.success) end
         log:dump()
         err = nil

a-tools/logger.lua → core/logger.lua

@@ -61,7 +61,7 @@ function index:dump()
     for k,v in ipairs(outputInternal) do
         str = str .. v .. "\n"
     end
-    local file = fs.open(path.."/log.log","w")
+    local file = fs.open(path.."/GuiH.log","w")
     file.write(str)
     file.close()
     return str

a-tools/object-base.lua → core/object-base.lua

@@ -4,7 +4,7 @@
     * for your own custom elements
 ]]
 
-local api = require("api")
+local api = require("util")
 return function(object,data)
     data = data or {}
     if type(data.visible) ~= "boolean" then data.visible = true end

a-tools/update.lua → core/update.lua

@@ -4,7 +4,7 @@
     * also used for event proccessing
 ]]
 
-local api = require("api")
+local api = require("util")
 
 --* definitions for events and what they are
 local events = {

graphic_handle.lua

@@ -4,9 +4,9 @@
     * and draws them
 ]]
 
-local decode_ppm = require "a-tools.luappm"
-local decode_blbfor =  require "a-tools.blbfor".open
-local api = require "api"
+local decode_ppm = require "core.luappm"
+local decode_blbfor =  require "core.blbfor".open
+local api = require "util"
 local expect = require "cc.expect"
 
 local chars = "0123456789abcdef"

main.lua

@@ -3,7 +3,7 @@
     * and load all the nessesary presets and modules, also sets up log
 ]]
 
-local logger = require("a-tools.logger")
+local logger = require("core.logger")
 
 --* gets this files path so it can be later used in package.path
 local path = fs.getDir(select(2,...))
@@ -12,11 +12,11 @@ local log = logger.create_log()
 
 --* puts the internal apis into the apis table cause they may be useful
 local apis = {
-    algo=require("a-tools.algo"),
-    luappm=require("a-tools.luappm"),
-    blbfor=require("a-tools.blbfor"),
+    algo=require("core.algo"),
+    luappm=require("core.luappm"),
+    blbfor=require("core.blbfor"),
     graphic=require("graphic_handle").code,
-    general=require("api")
+    general=require("util")
 }
 local presets={}
 
@@ -53,7 +53,7 @@ local function generate_ui(m,event_offset_x,event_offset_y)
         "%s;/%s/?.lua;/%s/?/init.lua",
         package.path, path,path
     )
-    local create = require("a-tools.gui_object")
+    local create = require("core.gui_object")
     local win = window.create(m,1,1,m.getSize())
     log("creating gui object..",log.update)
     local gui = create(win,m,log,event_offset_x,event_offset_y)

object_loader.lua

@@ -4,7 +4,7 @@
     * gui.create table
 ]]
 
-local api = require("api")
+local api = require("util")
 local path = fs.getDir(select(2,...))
 
 --* function used to dereference

objects/button/logic.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 return function(object,event)
     --* if a click happens on the buttons area
     --* run on_click function

objects/button/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 return function(object,data)
     data = data or {}

objects/circle/graphic.lua

@@ -1,6 +1,6 @@
-local algo = require("a-tools.algo")
+local algo = require("core.algo")
 local graphic = require("graphic_handle").code
-local api = require("api")
+local api = require("util")
 
 return function(object)
     local term = object.canvas.term_object

objects/circle/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 local types = {
     ["left-right"]=true,

objects/ellipse/graphic.lua

@@ -1,6 +1,6 @@
-local algo = require("a-tools.algo")
+local algo = require("core.algo")
 local graphic = require("graphic_handle").code
-local api = require("api")
+local api = require("util")
 
 return function(object)
     local term = object.canvas.term_object

objects/ellipse/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 local types = {
     ["left-right"]=true,

objects/frame/logic.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 return function(object,event)
     object.on_any(object,event)
     local x,y = object.window.getPosition()

objects/frame/object.lua

@@ -1,5 +1,5 @@
-local api = require("api")
-local main = require("a-tools.gui_object")
+local api = require("util")
+local main = require("core.gui_object")
 
 return function(object,data)
     data = data or {}

objects/group/object.lua

@@ -1,5 +1,5 @@
-local api = require("api")
-local main = require("a-tools.gui_object")
+local api = require("util")
+local main = require("core.gui_object")
 
 return function(object,data)
     data = data or {}

objects/inputbox/logic.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 local function depattern(str)
     return str:gsub("[%[%]%(%)%.%+%-%%%$%^%*%?]", "%%%1")

objects/inputbox/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 return function(object,data)
     if type(data.visible) ~= "boolean" then data.visible = true end

objects/progressbar/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 local types = {
     ["left-right"]=true,

objects/rectangle/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 local types = {
     ["left-right"]=true,

objects/script/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 return function(object,data)
     data = data or {}
     if type(data.visible) ~= "boolean" then data.visible = true end

objects/scrollbox/logic.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 return function(object,event)
     if api.is_within_field(

objects/scrollbox/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 return function(object,data)
     data = data or {}
     if type(data.visible) ~= "boolean" then data.visible = true end

objects/switch/logic.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 return function(object,event)
     if api.is_within_field(
         event.x,

objects/switch/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 return function(object,data)
     data = data or {}

objects/text/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 return function(object,data)
     data = data or {}
     if type(data.visible) ~= "boolean" then data.visible = true end

objects/triangle/graphic.lua

@@ -1,4 +1,4 @@
-local algo = require("a-tools.algo")
+local algo = require("core.algo")
 local graphic = require("graphic_handle").code
 
 return function(object)

objects/triangle/object.lua

@@ -1,4 +1,4 @@
-local api = require("api")
+local api = require("util")
 
 local types = {
     ["left-right"]=true,

presets/tex/checker.lua

@@ -1,6 +1,6 @@
 --* builds a checkerboard texture with any amount of colors
 
-local api = require("api")
+local api = require("util")
 local graphic = require("graphic_handle")
 
 return function(...)