TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-08 20:22:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Какие-то фиксы какой-то хуйни

Browse Source
This commit is contained in:
Igor Timofeev 2018-04-22 13:47:20 +03:00
parent 02274c109c
commit a79067b3fa
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Localizations/OS/English.lang
View File

@ -1,4 +1,5 @@
{
downloading = "Downloading in progress",
CPUArchitecture = "CPU architecture",
RAMControl = "RAM control",
packageUnloading = "Automatic unloading",

1
Localizations/OS/Russian.lang
View File

@ -1,4 +1,5 @@
{
downloading = "Идет загрузка файла",
CPUArchitecture = "Архитектура ЦП",
RAMControl = "Управление памятью",
packageUnloading = "Автоматическая выгрузка",

1
OS.lua
View File

@ -1094,7 +1094,6 @@ MineOSCore.localization = MineOSCore.getLocalization(MineOSPaths.localizationFil
createOSWindow()
login()
MineOSNetwork.update()
while true do

4
lib/GUI.lua
View File

@ -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

20
lib/MineOSInterface.lua
View File

@ -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))