diff --git a/api/cg/stdlib.lua b/api/cg/stdlib.lua index 1eb2a5a834..4fc13f3ec0 100644 --- a/api/cg/stdlib.lua +++ b/api/cg/stdlib.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- function helpers local self = ... local function key (str) diff --git a/api/glsl/std.lua b/api/glsl/std.lua index 1aa44785ad..fdc3654dcf 100644 --- a/api/glsl/std.lua +++ b/api/glsl/std.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- function helpers local self = ... local function key (str) diff --git a/api/lua/baselib.lua b/api/lua/baselib.lua index 7fc41832d4..7b769b0546 100644 --- a/api/lua/baselib.lua +++ b/api/lua/baselib.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- function helpers local self = ... local function key (str) diff --git a/doc/license.txt b/doc/license.txt index daf8b34305..097c4783ce 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -33,7 +33,7 @@ http://wxlua.sourceforge.net/ Pre-Built binaries for wxLua/WxWindows - +Original wxLua Lua sample IDE: Lomtick Software J. Winwood & John Labenski luascript at thersgb.net @@ -93,7 +93,7 @@ code and/or adjust the licensing conditions notice accordingly. 2. Lua License ============================================================================= -Copyright: 1994-2006 Lua.org, PUC-Rio. +Copyright: © 1994-2006 Lua.org, PUC-Rio. Homepage: http://www.lua.org License: http://www.lua.org/copyright.html diff --git a/spec/cg.lua b/spec/cg.lua index 55b75435f8..b11b996237 100644 --- a/spec/cg.lua +++ b/spec/cg.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exts = {"cg","cgh","fx","fxh","cgfx","cgfxh",}, lexer = wxstc.wxSTC_LEX_CPP, diff --git a/spec/glsl.lua b/spec/glsl.lua index ce1880b227..a87133a790 100644 --- a/spec/glsl.lua +++ b/spec/glsl.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exts = {"glsl","vert","frag",}, lexer = wxstc.wxSTC_LEX_CPP, diff --git a/spec/html.lua b/spec/html.lua index 3acaf525b5..fbcad998b3 100644 --- a/spec/html.lua +++ b/spec/html.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exts = {"htm","html"}, lexer = wxstc.wxSTC_LEX_HTML, diff --git a/spec/lua.lua b/spec/lua.lua index e6c3bfeefc..99903736c8 100644 --- a/spec/lua.lua +++ b/spec/lua.lua @@ -1,4 +1,5 @@ --- language specification +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- return { exts = {"lua"}, diff --git a/spec/luxres.lua b/spec/luxres.lua index 6a02b64877..9d4d835fac 100644 --- a/spec/luxres.lua +++ b/spec/luxres.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exts = {"prt","shd","mtl"}, lexer = wxstc.wxSTC_LEX_POV, diff --git a/spec/oglgpuprog.lua b/spec/oglgpuprog.lua index bec59725d7..54da9860f2 100644 --- a/spec/oglgpuprog.lua +++ b/spec/oglgpuprog.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { -- unfortunately no good lexer -- ASM comments start with ; diff --git a/spec/sql.lua b/spec/sql.lua index 633aa6c49d..e4ddbd5b34 100644 --- a/spec/sql.lua +++ b/spec/sql.lua @@ -1,4 +1,5 @@ --- language specification +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- return { exts = {"sql"}, diff --git a/spec/text.lua b/spec/text.lua index 9c77800b09..26940e4c29 100644 --- a/spec/text.lua +++ b/spec/text.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exts = {"txt"}, --lexer = wxstc.wxSTC_LEX_POV, diff --git a/src/editor/autocomplete.lua b/src/editor/autocomplete.lua index 04134ef410..32b3fa1c37 100644 --- a/src/editor/autocomplete.lua +++ b/src/editor/autocomplete.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + ------------ -- API diff --git a/src/editor/commands.lua b/src/editor/commands.lua index af3d969d16..ad3fb468f1 100644 --- a/src/editor/commands.lua +++ b/src/editor/commands.lua @@ -1,3 +1,6 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- local frame = ide.frame local splitter = ide.frame.vsplitter.splitter local notebook = splitter.notebook diff --git a/src/editor/debugger.lua b/src/editor/debugger.lua index 49b26a7892..7620437130 100644 --- a/src/editor/debugger.lua +++ b/src/editor/debugger.lua @@ -1,3 +1,6 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- local debugger = {} --debuggerServer = nil -- wxLuaDebuggerServer object when debugging, else nil diff --git a/src/editor/editor.lua b/src/editor/editor.lua index b82133cb99..38a3bf40b8 100644 --- a/src/editor/editor.lua +++ b/src/editor/editor.lua @@ -1,3 +1,6 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- local wxkeywords = nil -- a string of the keywords for scintilla of wxLua's wx.XXX items local in_evt_focus = false -- true when in editor focus event to avoid recursion diff --git a/src/editor/filetree.lua b/src/editor/filetree.lua index 5578074ba6..cc21260785 100644 --- a/src/editor/filetree.lua +++ b/src/editor/filetree.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- -- filetree, treectrl for drive & project -- diff --git a/src/editor/findreplace.lua b/src/editor/findreplace.lua index bd9b03df70..8ce85213c5 100644 --- a/src/editor/findreplace.lua +++ b/src/editor/findreplace.lua @@ -1,3 +1,6 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- ide.findReplace = { dialog = nil, -- the wxDialog for find/replace replace = false, -- is it a find or replace dialog diff --git a/src/editor/gui.lua b/src/editor/gui.lua index 96b9d7255a..41289c689a 100644 --- a/src/editor/gui.lua +++ b/src/editor/gui.lua @@ -1,4 +1,7 @@ --- ---------------------------------------------------------------------------- +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +-- Lomtik Software (J. Winwood & John Labenski) +--------------------------------------------------------- + -- Global variables -- Markers for editor marker margin BREAKPOINT_MARKER = 1 diff --git a/src/editor/ids.lua b/src/editor/ids.lua index 480a614a6a..635d2ad38e 100644 --- a/src/editor/ids.lua +++ b/src/editor/ids.lua @@ -1,3 +1,7 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- Generate a unique new wxWindowID local ID_IDCOUNTER = wx.wxID_HIGHEST + 1 function NewID() diff --git a/src/editor/iofilters.lua b/src/editor/iofilters.lua index b6cc9a0c21..cff4112518 100644 --- a/src/editor/iofilters.lua +++ b/src/editor/iofilters.lua @@ -1,3 +1,5 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- ide.iofilters["GermanUtf8Ascii"] = { @@ -47,7 +49,7 @@ end, -- for i,filter in pairs(ide.iofilters) do - assert(filter.output("",filter.input("","")),"„”","UTF8-ANSI conversion failed: "..(i)) + assert(filter.output("",filter.input("","")),"„”","UTF8-ANSI conversion failed: "..(i)) end -- which: "input" or "output" diff --git a/src/editor/menu.lua b/src/editor/menu.lua index 8d993de663..d7597abb32 100644 --- a/src/editor/menu.lua +++ b/src/editor/menu.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- CONNECTING STUFF -- force all the wxEVT_UPDATE_UI handlers to be called diff --git a/src/editor/menu_debug.lua b/src/editor/menu_debug.lua index b38e09e403..896443310c 100644 --- a/src/editor/menu_debug.lua +++ b/src/editor/menu_debug.lua @@ -1,4 +1,7 @@ --- --------------------------------------------------------------------------- +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- Create the Debug menu and attach the callback functions diff --git a/src/editor/menu_edit.lua b/src/editor/menu_edit.lua index d35eb76105..175edff5cb 100644 --- a/src/editor/menu_edit.lua +++ b/src/editor/menu_edit.lua @@ -1,3 +1,7 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- --------------------------------------------------------------------------- -- Create the Edit menu and attach the callback functions diff --git a/src/editor/menu_file.lua b/src/editor/menu_file.lua index e8666f4243..6579396bc8 100644 --- a/src/editor/menu_file.lua +++ b/src/editor/menu_file.lua @@ -1,4 +1,7 @@ --- --------------------------------------------------------------------------- +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- Create the File menu and attach the callback functions local frame = ide.frame diff --git a/src/editor/menu_help.lua b/src/editor/menu_help.lua index 206d2a051c..b17b5d583a 100644 --- a/src/editor/menu_help.lua +++ b/src/editor/menu_help.lua @@ -1,3 +1,7 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- --------------------------------------------------------------------------- -- Create the Help menu and attach the callback functions @@ -51,7 +55,7 @@ function DisplayAbout(event) - wxLua
+ based on wxLua editor sample
Copyright © 2002-2005 Lomtick Software

@@ -67,7 +71,7 @@ function DisplayAbout(event) - Licenced under wxWindows Library Licence, Version 3. + wxLua binding licenced under wxWindows Library Licence, Version 3. diff --git a/src/editor/menu_search.lua b/src/editor/menu_search.lua index 28a8adcde0..e06a4a67e2 100644 --- a/src/editor/menu_search.lua +++ b/src/editor/menu_search.lua @@ -1,4 +1,7 @@ --- --------------------------------------------------------------------------- +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- Create the Search menu and attach the callback functions local frame = ide.frame diff --git a/src/editor/menu_tools.lua b/src/editor/menu_tools.lua index 10fb719b4e..4645b4c8b6 100644 --- a/src/editor/menu_tools.lua +++ b/src/editor/menu_tools.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + local frame = ide.frame local menuBar = frame.menuBar diff --git a/src/editor/menu_view.lua b/src/editor/menu_view.lua index a4cc12c1fe..2b4f249b49 100644 --- a/src/editor/menu_view.lua +++ b/src/editor/menu_view.lua @@ -1,3 +1,7 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + local frame = ide.frame local menuBar = frame.menuBar local vsplitter= frame.vsplitter diff --git a/src/editor/output.lua b/src/editor/output.lua index 9166527d3a..aa38da9cf6 100644 --- a/src/editor/output.lua +++ b/src/editor/output.lua @@ -1,3 +1,7 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + local frame = ide.frame local splitter = frame.vsplitter.splitter local notebook = splitter.notebook diff --git a/src/editor/preferences.lua b/src/editor/preferences.lua index c410223752..c24a63a62a 100644 --- a/src/editor/preferences.lua +++ b/src/editor/preferences.lua @@ -1,7 +1,8 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- the preferences dialog - - preferencesDialog = { category = {}; uifactory = {}; diff --git a/src/editor/settings.lua b/src/editor/settings.lua index ed6bb0fb2a..b3a3fd34d4 100644 --- a/src/editor/settings.lua +++ b/src/editor/settings.lua @@ -1,3 +1,7 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- ---------------------------------------------------------------------------- -- Initialize the wxConfig for loading/saving the preferences diff --git a/src/editor/shellbox.lua b/src/editor/shellbox.lua index 7948a1c796..d713efb01c 100644 --- a/src/editor/shellbox.lua +++ b/src/editor/shellbox.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- -- shellbox - a lua testbed environment within estrela -- diff --git a/src/editor/singleinstance.lua b/src/editor/singleinstance.lua index 8a4e3eb665..b56e8f6248 100644 --- a/src/editor/singleinstance.lua +++ b/src/editor/singleinstance.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + --[[ single instance open an UDP port - if it fails it is either because - Estrela is running already diff --git a/src/editor/style.lua b/src/editor/style.lua index 047447124a..bc8836a326 100644 --- a/src/editor/style.lua +++ b/src/editor/style.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + ---------- -- Style -- diff --git a/src/main.lua b/src/main.lua index dc7f2cd4e9..dfb880f456 100644 --- a/src/main.lua +++ b/src/main.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" require("wx") diff --git a/src/misc/util.lua b/src/misc/util.lua index 1d3a99f8c0..077c56ccea 100644 --- a/src/misc/util.lua +++ b/src/misc/util.lua @@ -1,3 +1,8 @@ +-- authors: Lomtik Software (J. Winwood & John Labenski) +-- Luxinia Dev (Eike Decker & Christoph Kubisch) +-- David Manura +--------------------------------------------------------- + -- Equivalent to C's "cond ? a : b", all terms will be evaluated function iff(cond, a, b) if cond then return a else return b end end @@ -32,6 +37,7 @@ char_Sp = string.byte(" ") string_Pathsep = string.char(wx.wxFileName.GetPathSeparator()) stringset_File = '[^"%?%*:\\/<>|]' +-- http://lua-users.org/wiki/EnhancedFileLines function FileLines(f) local CHUNK_SIZE = 1024 local buffer = "" diff --git a/src/preferences/editor.lua b/src/preferences/editor.lua index 1b121054ab..c68e357e63 100644 --- a/src/preferences/editor.lua +++ b/src/preferences/editor.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + preferencesDialog.addCategory { category = "editor"; title = "Editor"; diff --git a/src/preferences/project.lua b/src/preferences/project.lua index db2c430054..00e9d15153 100644 --- a/src/preferences/project.lua +++ b/src/preferences/project.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + preferencesDialog.addCategory { category = "project"; title = "Project"; diff --git a/tools/cg.lua b/tools/cg.lua index 19ecebe605..53bf5a8bad 100644 --- a/tools/cg.lua +++ b/tools/cg.lua @@ -1,7 +1,9 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + local cgbinpath = ide.config.path.cgbin or os.getenv("CG_BIN_PATH") local cgprofile = ide.config.cgprofile or "gp4" - return cgbinpath and { fninit = function(frame,menuBar) diff --git a/tools/dx.lua b/tools/dx.lua index 4df4886765..b321b9008c 100644 --- a/tools/dx.lua +++ b/tools/dx.lua @@ -1,7 +1,9 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + local dxpath = os.getenv("DXSDK_DIR") local dxprofile = ide.config.dxprofile or "dx_4" - return dxpath and { fninit = function(frame,menuBar) diff --git a/tools/luxviewres.lua b/tools/luxviewres.lua index 5364f5ac27..9f86c997d7 100644 --- a/tools/luxviewres.lua +++ b/tools/luxviewres.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exec = { name = "Luxinia Viewer", diff --git a/tools/perforce-edit.lua b/tools/perforce-edit.lua index 48ea5b21d8..338c849db5 100644 --- a/tools/perforce-edit.lua +++ b/tools/perforce-edit.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exec = { name = "Perforce edit", diff --git a/tools/perforce-revert.lua b/tools/perforce-revert.lua index bcd36650ad..480d53a1c4 100644 --- a/tools/perforce-revert.lua +++ b/tools/perforce-revert.lua @@ -1,3 +1,6 @@ +-- authors: Luxinia Dev (Eike Decker & Christoph Kubisch) +--------------------------------------------------------- + return { exec = { name = "Perforce revert",