From a79067b3fae8e852c5d8d0cfdca641eecf80a216 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 22 Apr 2018 13:47:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D0=BA=D0=B8=D0=B5-=D1=82=D0=BE=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BA=D0=B0=D0=BA=D0=BE=D0=B9?= =?UTF-8?q?-=D1=82=D0=BE=20=D1=85=D1=83=D0=B9=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Localizations/OS/English.lang | 1 + Localizations/OS/Russian.lang | 1 + OS.lua | 1 - lib/GUI.lua | 4 +--- lib/MineOSInterface.lua | 20 ++++++++++++-------- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Localizations/OS/English.lang b/Localizations/OS/English.lang index 9bd66f88..4c1b1d5a 100755 --- a/Localizations/OS/English.lang +++ b/Localizations/OS/English.lang @@ -1,4 +1,5 @@ { + downloading = "Downloading in progress", CPUArchitecture = "CPU architecture", RAMControl = "RAM control", packageUnloading = "Automatic unloading", diff --git a/Localizations/OS/Russian.lang b/Localizations/OS/Russian.lang index 276f31d6..047a4183 100755 --- a/Localizations/OS/Russian.lang +++ b/Localizations/OS/Russian.lang @@ -1,4 +1,5 @@ { + downloading = "Идет загрузка файла", CPUArchitecture = "Архитектура ЦП", RAMControl = "Управление памятью", packageUnloading = "Автоматическая выгрузка", diff --git a/OS.lua b/OS.lua index 3b613edb..e2c703ca 100755 --- a/OS.lua +++ b/OS.lua @@ -1094,7 +1094,6 @@ MineOSCore.localization = MineOSCore.getLocalization(MineOSPaths.localizationFil createOSWindow() login() - MineOSNetwork.update() while true do diff --git a/lib/GUI.lua b/lib/GUI.lua index f6c49bf0..17c6e36d 100755 --- a/lib/GUI.lua +++ b/lib/GUI.lua @@ -2391,16 +2391,14 @@ local function filesystemChooserEventHandler(mainContainer, object, eventData) filesystemDialog.onCancel = function() object.pressed = false - mainContainer:drawOnScreen() end filesystemDialog.onSubmit = function(path) object.path = path filesystemDialog.onCancel() - if object.onSubmit then - object.onSubmit( object.path) + object.onSubmit(object.path) end end diff --git a/lib/MineOSInterface.lua b/lib/MineOSInterface.lua index 61cc3be7..bc5a6766 100755 --- a/lib/MineOSInterface.lua +++ b/lib/MineOSInterface.lua @@ -981,10 +981,14 @@ function MineOSInterface.newFileFromURL(parentWindow, iconField, x, y, path) container.inputFieldURL = container.layout:addChild(GUI.input(1, 1, 36, 3, 0xE1E1E1, 0x696969, 0x696969, 0xE1E1E1, 0x2D2D2D, nil, "URL", false)) container.panel.eventHandler = function(mainContainer, object, eventData) if eventData[1] == "touch" then - if fs.exists(container.inputField.text) then + if fs.exists(path .. container.inputField.text) then container.label.hidden = false mainContainer:drawOnScreen() else + container.layout:deleteChildren(2) + container.layout:addChild(GUI.label(1, 1, container.width, 1, 0x787878, MineOSCore.localization.downloading .. "...")):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top) + mainContainer:drawOnScreen() + local success, reason = require("web").download(container.inputFieldURL.text, path .. container.inputField.text) container:delete() @@ -1008,12 +1012,10 @@ function MineOSInterface.newApplication(parentWindow, iconField, x, y, path) local filesystemChooser = container.layout:addChild(GUI.filesystemChooser(1, 1, 36, 3, 0xE1E1E1, 0x696969, 0x444444, 0x969696, nil, MineOSCore.localization.open, MineOSCore.localization.cancel, MineOSCore.localization.iconPath, "/")) filesystemChooser:addExtensionFilter(".pic") filesystemChooser:moveBackward() - + container.panel.eventHandler = function(mainContainer, object, eventData) - if eventData[1] == "touch" then - container:delete() - - if container.inputField.text then + if eventData[1] == "touch" then + if #container.inputField.text > 0 then local finalPath = path .. container.inputField.text .. ".app/" if checkFileToExists(container, finalPath) then fs.makeDirectory(finalPath) @@ -1023,10 +1025,12 @@ function MineOSInterface.newApplication(parentWindow, iconField, x, y, path) file:write("require(\"GUI\").error(\"Hello world\")") file:close() + container:delete() checkIconConfigCanSavePosition(iconField, x, y, container.inputField.text .. ".app/") computer.pushSignal("MineOSCore", "updateFileList") end else + container:delete() parentWindow:drawOnScreen() end end @@ -1287,8 +1291,8 @@ local function GUICopy(parentContainer, fileList, toPath) local applyYes, breakRecursion local container = MineOSInterface.addUniversalContainer(parentContainer, MineOSCore.localization.copying) - local textBox = container.layout:addChild(GUI.textBox(1, 1, container.width, 1, nil, 0x777777, {}, 1, 0, 0, true, true):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top)) - local switchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 37, 8, 0x66DB80, 0x1E1E1E, 0xE1E1E1, 0x777777, MineOSCore.localization.applyToAll .. ":", false)) + local textBox = container.layout:addChild(GUI.textBox(1, 1, container.width, 1, nil, 0x787878, {}, 1, 0, 0, true, true):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top)) + local switchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 37, 8, 0x66DB80, 0x1E1E1E, 0xE1E1E1, 0x787878, MineOSCore.localization.applyToAll .. ":", false)) container.panel.eventHandler = nil local buttonsLayout = container.layout:addChild(GUI.layout(1, 1, 1, 1, 1, 1))