From e376997bc9aa13477eb6be15a87ca2a29eca2596 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Mon, 9 Jan 2017 22:14:52 +0300
Subject: [PATCH] aefaf

---
 .DS_Store                                     | Bin 18436 -> 18436 bytes
 Applications.txt                              |   2 +-
 Applications/.DS_Store                        | Bin 77828 -> 77828 bytes
 Applications/Control2/Control2.lua            |  41 ++++++++----------
 .../Control2/Modules/00_LuaConsole.lua        |   3 +-
 5 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 164a098331d2cd09ee5ef60a564b648cb4eaca79..12863e33c8fe1a1deeb08fcdbaa31f43c4405ad9 100644
GIT binary patch
delta 747
zcmZvZOK1~87{}+IChbhKp_2-lY&M8#HAd3dS}jU32Gcezu@o_}zEIO<h1EQoY!neR
zK6>!rBe+y76^pl`R4T!P&zp~vR46`*2T$Jgpr9Vz&DMkB9A^0b|C#Um=J$<PFkZpj
zWUKe$$XG^EOYQB8u+&*?^$nCY+69Lg?TIey)e8P8?Gq1|zc9AY%$-ewTl6sgfF4Mv
zO7dVntsGJ0bj=an;z~;Q8+x=T>$@onKCzYY6iukgDcMZn7Xpl{EOAW9Ej<kiA<EM%
znMsYv88cgl&`Eim4WE#Us*>NBGu19(Gj$@!_KfDUSvglyO}Sg#O8F~#&?vqmrIv=q
z<eZ$=-Z)p-$<k_xtktq>I?8X!NAj6`CEv*p@{{}mV1X4jG{XZ4UIefKo!EpfbfX8o
zh@l^Y*o|TA#XcN{f}_YFi{m(hGS1@yE@1-KaRZZ>!F@c&6FkK;yu>^{n6)if>LEsm
zHWPASQET@}+JN8gz4CwfQmjALG*B)0ZP4c1T;-%rN<LZpId53-xJB10pCEAJgfSPF
zJ`>3=1*kq3ZmESrPzo8;d7bIjXr>vrnXZn}m;kq$ZnvQ0i!)wth7oDIL6cMSvR~qM
zMrq66B-^xIf#u}@)?*8{A%dt*s}Doii3E~5uR}Vk5sX4c4tW$%L<y&LW@mA(#_Te#
zqJnFf!cE-5G;ZS#?qU}AFo%bDRO9#@ukr35hVegb7^jsGyf<K08`sTRwQthu>Wk2X
Oqgn{|S<EOLX1@VaC#e?z

delta 619
zcmZ`%OK4L;6rH27yk|%AURpykiIgTaFQKXZh<|AtT4QSs3dVmm#?BKSHi;&&3qgZg
z5I;!l;6g-HC@SKo8l+f1xD&*Mpqnmj*D6>SE?hWC3a*^Ry>QN4&N<vWTEu7(6E~Vf
zqvl!Yj8YM?^@xVLb)sWMtBuxEr})TRh5Z&c(|PNtWoA_!-_&?InKHjPG~MoUGdjqV
zc{7&bWu9v<6t%)EcQbaN%=BbUS-GNA;6@*#@tk$a)ROZb0|uq>V^*4LIkh_49Hwm7
zaPo*btZ`M2wMwD3cFOjQnAx0_NoxaTRD!G5P_}m{lS)Z<IUV77SWM~O0CTg5qU<X>
zh;T0T{oP}KNcs7@gOyJFga{sJFMKA`WR`p<KgdrqM}7lX3Jp3O@W4P2A#`9Z)?))U
zq8I%bz&6CN8-qB61P;T(3FMH+Nu0q2T*75s!F7z|9`54-p5Zx4c!Rfik58D!OjUdV
zs-5(SOpP70qRr<Ookp$r;BeJ!>Fc*|{kM!6<D!_W3)nqw=Au5@R9S*XM6f>Ltu-2`
zqW(8si|7hD4;pBZ3AzxG{x>6v?bv~xh|3HKBryaI6KNbrwvyvC3OI{%I4^TtMG@C9
zhMTyB+qi?fc!)=Mf~T0kOHAPvUW-l3n#C%gyYwsc*jAccIlg3(t5;tfmA5ofdKdnR
J(qv~${R`I=n0){M

diff --git a/Applications.txt b/Applications.txt
index 3316ef66..5cda39be 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -616,7 +616,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/Control2/Icon.pic",
     createShortcut="desktop",
-    version=1.02,
+    version=1.03,
     resources={
       {
         name="LuaLogo.pic",
diff --git a/Applications/.DS_Store b/Applications/.DS_Store
index e3f387a2ff63783e8239996b57a2fae6b84c34d8..92fbffe86ec464873609fd4d50c0e4dce358ceb3 100644
GIT binary patch
delta 18
acmZp9z|!)7Wy4K}$=&4vn>8J8zXJeP>j`B5

delta 23
fcmZp9z|!)7Wy4Je4r60e9R))}v&|13l-~mYZ)6Dv

diff --git a/Applications/Control2/Control2.lua b/Applications/Control2/Control2.lua
index aaf38f00..08431cd4 100755
--- a/Applications/Control2/Control2.lua
+++ b/Applications/Control2/Control2.lua
@@ -14,24 +14,24 @@ local window = {}
 
 -----------------------------------------------------------------------------------------------------------------------------
 
-local function loadModule(moduleID)
-	if fs.exists(window.modules[moduleID].path) then
-		local success, reason = dofile(window.modules[moduleID].path)
-		if success then
-			window.modules[moduleID].module = success
-			window.modules[moduleID].module.execute(window)
-		else
-			error("Error due module execution: " .. reason)
-		end
-	else
-		error("Mudule file \"" .. window.modules[moduleID].path "\" doesn't exists")
-	end
-end
-
 local function createWindow()
 	window = windows.empty("auto", "auto", math.floor(buffer.screen.width * 0.8), math.floor(buffer.screen.height * 0.7), 78, 24)
 	window:addPanel(1, 1, window.width, window.height, 0xEEEEEE).disabled = true
-	window.tabBar = window:addTabBar(1, 1, window.width, 3, 1, 0xDDDDDD, 0x262626, 0xCCCCCC, 0x262626, "Интерпретатор Lua", "События", "Память", "Диски", "BIOS")
+	
+	window.resourcesPath = MineOSCore.getCurrentApplicationResourcesDirectory()
+	window.modules = {}
+	local moduleNames = {}
+	for file in fs.list(window.resourcesPath .. "Modules/") do
+		local module, reason = dofile(window.resourcesPath .. "Modules/" .. file)
+		if module then
+			table.insert(window.modules, module)
+			table.insert(moduleNames, module.name)
+		else
+			error("Error due module execution: " .. reason)
+		end
+	end
+
+	window.tabBar = window:addTabBar(1, 1, window.width, 3, 1, 0xDDDDDD, 0x262626, 0xCCCCCC, 0x262626, table.unpack(moduleNames))
 	window.tabBar.onTabSwitched = function(object, eventData)
 		
 	end
@@ -39,20 +39,13 @@ local function createWindow()
 		window:close()
 	end
 	window.drawingArea = window:addContainer(1, 4, window.width, window.height - 3, 0xEEEEEE)
-	
-	window.resourcesPath = MineOSCore.getCurrentApplicationResourcesDirectory()
-	window.modules = {}
-	for file in fs.list(window.resourcesPath .. "Modules/") do
-		table.insert(window.modules, {
-			path = window.resourcesPath .. "Modules/" .. file
-		})
-	end
+
+	window.modules[1].execute(window)
 end
 
 -----------------------------------------------------------------------------------------------------------------------------
 
 createWindow()
-loadModule(1)
 window.drawShadow = true
 window:draw()
 buffer.draw()
diff --git a/Applications/Control2/Modules/00_LuaConsole.lua b/Applications/Control2/Modules/00_LuaConsole.lua
index 73f41e8f..964cbcd9 100644
--- a/Applications/Control2/Modules/00_LuaConsole.lua
+++ b/Applications/Control2/Modules/00_LuaConsole.lua
@@ -1,12 +1,11 @@
 
-local args = {...}
 local buffer = require("doubleBuffering")
 local GUI = require("GUI")
 local image = require("image")
 local unicode = require("unicode")
 
 local module = {
-	name = "Интерпретатор Lua2"
+	name = "Интерпретатор Lua"
 }
 
 ----------------------------------------------------------------------------------------------------------------------------