diff --git a/.DS_Store b/.DS_Store index 7295d308..7133356c 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index 28f5d7d8..42363a4b 100644 --- a/Applications.txt +++ b/Applications.txt @@ -834,7 +834,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/PrintImage/Icon.pic", createShortcut="desktop", - version=1.04, + version=1.05, }, { name="MineOS/Applications/Palette", @@ -886,7 +886,7 @@ icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic", createShortcut="dock", forceDownload=true, - version=1.20, + version=1.21, resources={ { name="Localization/Russian.lang", diff --git a/Applications/.DS_Store b/Applications/.DS_Store index 149cfdf5..d837a5d5 100644 Binary files a/Applications/.DS_Store and b/Applications/.DS_Store differ diff --git a/Applications/MineCodeIDE/MineCodeIDE.lua b/Applications/MineCodeIDE/MineCodeIDE.lua index e7a85ba0..aa33821e 100755 --- a/Applications/MineCodeIDE/MineCodeIDE.lua +++ b/Applications/MineCodeIDE/MineCodeIDE.lua @@ -843,7 +843,7 @@ local function createWindow() end mainWindow.bottomToolBar.isHidden = true - mainWindow.leftTreeView = mainWindow:addTreeView(1, 1, 1, 1, config.colorScheme.leftTreeView.background, 0x2D2D2D, 0x2D2D2D, 0xEEEEEE, 0x555555, 0x444444, 0x00DBFF, "/") + mainWindow.leftTreeView = mainWindow:addTreeView(1, 1, 1, 1, config.colorScheme.leftTreeView.background, 0x2D2D2D, 0x2D2D2D, 0xEEEEEE, 0x888888, 0x444444, 0x00DBFF, "/") mainWindow.leftTreeView.onFileSelected = function(path) loadFile(path) end diff --git a/Applications/PrintImage/PrintImage.lua b/Applications/PrintImage/PrintImage.lua index 4c432d17..0bdb990c 100755 --- a/Applications/PrintImage/PrintImage.lua +++ b/Applications/PrintImage/PrintImage.lua @@ -3,20 +3,16 @@ -- package.loaded.windows = nil -local libraries = { - component = "component", - computer = "computer", - unicode = "unicode", - fs = "filesystem", - advancedLua = "advancedLua", - colorlib = "colorlib", - image = "image", - doubleBuffering = "doubleBuffering", - GUI = "GUI", - windows = "windows", -} - -for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil +local component = require("component") +local computer = require("computer") +local unicode = require("unicode") +local fs = require("filesystem") +local advancedLua = require("advancedLua") +local colorlib = require("colorlib") +local image = require("image") +local buffer = require("doubleBuffering") +local GUI = require("GUI") +local windows = require("windows") ----------------------------------------- cyka ----------------------------------------- @@ -324,6 +320,7 @@ createWindow() mainImage = image.load(startImagePath) getStatus() window:draw() +buffer.draw() window:handleEvents()