diff --git a/.DS_Store b/.DS_Store index 81758e41..e315e779 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index 32f84aac..3dcf0001 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.03, + version=1.04, }, { name="MineOS/Applications/Palette", diff --git a/Applications/.DS_Store b/Applications/.DS_Store index 63c3d2f3..b28c3214 100644 Binary files a/Applications/.DS_Store and b/Applications/.DS_Store differ diff --git a/Applications/PrintImage/PrintImage.lua b/Applications/PrintImage/PrintImage.lua index 43b7a085..4c432d17 100755 --- a/Applications/PrintImage/PrintImage.lua +++ b/Applications/PrintImage/PrintImage.lua @@ -203,7 +203,7 @@ local function createWindow() y = y + 2 window.shadeContainer:addLabel(3, y, window.shadeContainer.width, 1, 0xCCCCCC, "Image path:") - window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, startImagePath, nil, nil, true).validator = function(text) + window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, startImagePath, nil, true).validator = function(text) if text and fs.exists(text) then if unicode.sub(text, -4, -1) == ".pic" then mainImage = image.load(text) @@ -219,7 +219,7 @@ local function createWindow() y = y + 2 window.shadeContainer:addLabel(3, y, window.shadeContainer.width, 1, 0xCCCCCC, "Material:") - local mainMaterialTextBox = window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, config.mainMaterial, nil, nil, false) + local mainMaterialTextBox = window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, config.mainMaterial, nil, false) mainMaterialTextBox.onInputFinished = function() config.mainMaterial = mainMaterialTextBox.text save() @@ -227,7 +227,7 @@ local function createWindow() y = y + 2 window.shadeContainer:addLabel(3, y, window.shadeContainer.width, 1, 0xCCCCCC, "Print name:") - local printNameTextBox = window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, config.printName, nil, nil, false) + local printNameTextBox = window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, config.printName, nil, false) printNameTextBox.onInputFinished = function() config.printName = printNameTextBox.text save() @@ -248,7 +248,6 @@ local function createWindow() config.showGrid = gridSwitch.state save() window:draw() - buffer.draw() end y = y + 4 @@ -262,7 +261,7 @@ local function createWindow() end y = y + 2 window.shadeContainer:addLabel(3, y, window.shadeContainer.width, 1, 0xCCCCCC, "Material:") - local frameMaterialTextBox = window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, config.frame.material, nil, nil, false) + local frameMaterialTextBox = window.shadeContainer:addInputTextBox(window.shadeContainer.width - textBoxesWidth - 1, y, textBoxesWidth, 1, 0xEEEEEE, 0x555555, 0xEEEEEE, 0x262626, config.frame.material, nil, false) frameMaterialTextBox.onInputFinished = function() config.frame.material = frameMaterialTextBox.text save() @@ -312,7 +311,6 @@ local function createWindow() getPrinters() getStatus() window:draw() - buffer.draw() end end end @@ -326,7 +324,6 @@ createWindow() mainImage = image.load(startImagePath) getStatus() window:draw() -buffer.draw() window:handleEvents()