From 0545030e35373d33a908ec96fdbf39bdd2a7d60b Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Mon, 16 Jan 2017 23:55:24 +0300 Subject: [PATCH] affaef --- .DS_Store | Bin 18436 -> 18436 bytes Applications.txt | 2 +- Applications/.DS_Store | Bin 79876 -> 79876 bytes Applications/MineCodeIDE/MineCodeIDE.lua | 8 +++----- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.DS_Store b/.DS_Store index bdefa5348c1c3d8b00a20533103fd14d205d9262..02c3c69102ee5080828fb8fa208b3fb7f1a4aae1 100644 GIT binary patch delta 27 jcmZpfz}PZ@al>Op4r6lz9R))(lgav49-EDoE~)|meg_Du delta 18 acmZpfz}PZ@al>Q9$?8@Cn~jw&ssaE;KL;TI diff --git a/Applications.txt b/Applications.txt index f8f42111..1f5904b5 100644 --- a/Applications.txt +++ b/Applications.txt @@ -886,7 +886,7 @@ icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic", createShortcut="dock", forceDownload=true, - version=1.31, + version=1.32, resources={ { name="Localization/Russian.lang", diff --git a/Applications/.DS_Store b/Applications/.DS_Store index b8c7ac7fc7330fe3fe1c718df1348e062276dbe4..9c8b9fcb9023651e6c68fe8f9835c093fc39ab62 100644 GIT binary patch delta 26 icmZqqz|!)8Wy6x~?8fE>ItqqnlOH&EZvL`epaB4w6bm{4 delta 26 icmZqqz|!)8Wy6x~>_%pmItoU{lLh~HZvL`epaB4v3=1p( diff --git a/Applications/MineCodeIDE/MineCodeIDE.lua b/Applications/MineCodeIDE/MineCodeIDE.lua index 793f6418..18730696 100755 --- a/Applications/MineCodeIDE/MineCodeIDE.lua +++ b/Applications/MineCodeIDE/MineCodeIDE.lua @@ -153,7 +153,6 @@ local function showErrorMessage(text) mainWindow.errorMessage.errorTextBox.height = mainWindow.errorMessage.height - 2 mainWindow.titleTextBox.colors.background, mainWindow.titleTextBox.colors.text = colors.title.warning.background, colors.title.warning.text - mainWindow.titleTextBox.colors.sides = colors.title.warning.sides for i = 1, 3 do component.computer.beep(1500, 0.08) end mainWindow.errorMessage.isHidden = false @@ -161,7 +160,6 @@ end local function hideErrorMessage() mainWindow.titleTextBox.colors.background, mainWindow.titleTextBox.colors.text = colors.title.default.background, colors.title.default.text - mainWindow.titleTextBox.colors.sides = colors.title.default.sides mainWindow.errorMessage.isHidden = true end @@ -862,12 +860,12 @@ local function createWindow() mainWindow.topToolBar = mainWindow:addContainer(1, 2, 1, 3) mainWindow.topToolBar.backgroundPanel = mainWindow.topToolBar:addPanel(1, 1, 1, 3, colors.topToolBar) mainWindow.titleTextBox = mainWindow.topToolBar:addTextBox(1, 1, 1, 3, 0x0, 0x0, {}, 1):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top) - mainWindow.titleTextBox.colors.sides = colors.title.default.sides local titleTextBoxOldDraw = mainWindow.titleTextBox.draw mainWindow.titleTextBox.draw = function(titleTextBox) titleTextBoxOldDraw(titleTextBox) - buffer.square(titleTextBox.x, titleTextBox.y, 1, titleTextBox.height, mainWindow.titleTextBox.colors.sides, titleTextBox.colors.text, " ") - buffer.square(titleTextBox.x + titleTextBox.width - 1, titleTextBox.y, 1, titleTextBox.height, mainWindow.titleTextBox.colors.sides, titleTextBox.colors.text, " ") + local sidesColor = mainWindow.errorMessage.isHidden and colors.title.default.sides or colors.title.warning.sides + buffer.square(titleTextBox.x, titleTextBox.y, 1, titleTextBox.height, sidesColor, titleTextBox.colors.text, " ") + buffer.square(titleTextBox.x + titleTextBox.width - 1, titleTextBox.y, 1, titleTextBox.height, sidesColor, titleTextBox.colors.text, " ") end mainWindow.runButton = mainWindow.topToolBar:addAdaptiveButton(1, 1, 3, 1, 0x4B4B4B, 0xEEEEEE, 0xCCCCCC, 0x444444, "▷")