This commit is contained in:
Igor Timofeev 2016-06-03 08:31:52 +03:00
parent 4765744bde
commit da050de20e
2 changed files with 8 additions and 5 deletions

View File

@ -335,7 +335,6 @@ fs.makeDirectory(dockPath)
--------------------------СТАДИЯ ЗАГРУЗКИ-----------------------------------
do
local barWidth = math.floor(windowWidth * 2 / 3)
local xBar = math.floor(xSize/2-barWidth/2)
local yBar = yWindowEnd - 3
@ -347,7 +346,7 @@ do
ecs.blankWindow(xWindow,yWindow,windowWidth,windowHeight)
image.draw(math.floor(xSize/2 - 33), yWindow + 2, imageDownloading)
image.draw(math.floor(xSize / 2 - 33), yWindow + 2, imageDownloading)
ecs.colorTextWithBack(xBar, yBar - 1, ecs.colors.gray, ecs.windowColors.background, lang.osInstallation)
ecs.progressBar(xBar, yBar, barWidth, 1, 0xcccccc, ecs.colors.blue, 0)
@ -365,6 +364,7 @@ do
(applications[i].forceDownload)
then
table.insert(thingsToDownload, applications[i])
end
end
for app = 1, #thingsToDownload do
@ -373,6 +373,7 @@ do
local percent = app / #thingsToDownload * 100
ecs.progressBar(xBar, yBar, barWidth, 1, 0xcccccc, ecs.colors.blue, percent)
ecs.error("A<FAEfaefA", thingsToDownload[app].url)
ecs.getOSApplication(thingsToDownload[app])
end
@ -380,8 +381,10 @@ do
end
--Создаем базовые обои рабочего стола
ecs.createShortCut(desktopPath .. "Pictures.lnk", picturesPath)
if downloadWallpapers then ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "Girl.pic") end
if downloadWallpapers then
ecs.createShortCut(desktopPath .. "Pictures.lnk", picturesPath)
ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "Girl.pic")
end
--Автозагрузка
local file = io.open("autorun.lua", "w")

View File

@ -337,7 +337,7 @@ function ecs.getOSApplication(application)
ecs.getFromPastebin(application.url, application.name)
--Если просто какой-то скрипт
elseif application.type == "Script" or application.type == "Library" then
elseif application.type == "Script" or application.type == "Library" or application.type == "Icon" or application.type == "Wallpaper" then
ecs.getFromGitHub(application.url, application.name)
--А если ваще какая-то абстрактная хуйня, либо ссылка на веб, то загружаем по УРЛ-ке