This commit is contained in:
Igor Timofeev 2018-02-22 16:29:16 +03:00
parent 147a022817
commit f567e71744
6 changed files with 2 additions and 44 deletions

View File

@ -202,14 +202,7 @@ end
stages[2] = function()
addButtonsToStage()
stageContainer:addChild(GUI.image(1, 1, images.OS))
local y = 22
local spaceBetween = 22
local x = math.floor(stageContainer.width / 2 - 15)
stageContainer.downloadWallpapersSwitch = addSwitchToStage(x, y, 0x3392FF, localization.installWallpapers, true)
x = x + spaceBetween
stageContainer.showApplicationsHelpSwitch = addSwitchToStage(x, y, 0x66DB80, localization.showApplicationsHelp, true)
stageContainer.downloadWallpapersSwitch = addSwitchToStage(math.floor(stageContainer.width / 2 - 4), 22, 0x3392FF, localization.installWallpapers, true)
end
------------------------------------------------------------------------------------------------------------------------------------
@ -284,7 +277,6 @@ stages[5] = function()
table.toFile(MineOSPaths.fileVersions, fileVersions)
MineOSCore.properties.wallpaperEnabled = stageContainer.downloadWallpapersSwitch.state
MineOSCore.properties.showHelpOnApplicationStart = stageContainer.showApplicationsHelpSwitch.state
MineOSCore.saveProperties()
local file = io.open("/autorun.lua", "w")

View File

@ -2,7 +2,6 @@
fullInstallation = "Full installation",
mustHaveInstallation = "Install only must-have apps",
installWallpapers = "Download wallpapers",
showApplicationsHelp = "Show applications help",
downloading = "Downloading",
reboot = "Reboot",
needToReboot = "MineOS has been successfully installed, enjoy",

View File

@ -2,7 +2,6 @@
fullInstallation = "Полная установка",
mustHaveInstallation = "Установка основных приложений",
installWallpapers = "Загрузить обои",
showApplicationsHelp = "Помощь в приложениях",
downloading = "Загрузка",
reboot = "Перезагрузить",
needToReboot = "Система установлена, наслаждайтесь",

View File

@ -16,7 +16,6 @@
newWindow = "New window",
launchWithArguments = "Launch with arguments",
dontShowAnymore = "Don't show again",
applicationHelp = "About application",
newName = "New name",
folderName = "Folder name",
fileName = "File name",

View File

@ -16,7 +16,6 @@
newWindow = "Новое окно",
launchWithArguments = "Запустить с аргументами",
dontShowAnymore = "Больше не показывать",
applicationHelp = "О приложении",
newName = "Новое имя",
folderName = "Имя папки",
fileName = "Имя файла",

View File

@ -353,37 +353,7 @@ end
MineOSInterface.iconLaunchers = {}
function MineOSInterface.iconLaunchers.application(icon)
local pathToAboutFile = icon.path .. "/resources/About/" .. MineOSCore.properties.language .. ".txt"
if MineOSCore.properties.showHelpOnApplicationStart and fs.exists(pathToAboutFile) then
local container = MineOSInterface.addUniversalContainer(MineOSInterface.mainContainer, MineOSCore.localization.applicationHelp .. " \"" .. fs.name(icon.path) .. "\"")
local lines = {}
for line in io.lines(pathToAboutFile) do
table.insert(lines, line)
end
container.layout:addChild(GUI.textBox(1, 1, 50, 1, nil, 0xC3C3C3, lines, 1, 0, 0, true, true))
local button = container.layout:addChild(GUI.button(1, 1, 30, 1, 0xE1E1E1, 0x2D2D2D, 0xA5A5A5, 0x2D2D2D, MineOSCore.localization.dontShowAnymore))
local function onExit()
container:delete()
MineOSInterface.safeLaunch((icon.shortcutPath or icon.path) .. "Main.lua")
end
container.panel.eventHandler = function(mainContainer, object, eventData)
if eventData[1] == "touch" then
onExit()
end
end
button.onTouch = function()
MineOSCore.properties.showHelpOnApplicationStart = false
MineOSCore.saveProperties()
onExit()
end
else
MineOSInterface.safeLaunch(icon.path .. "Main.lua")
end
MineOSInterface.safeLaunch(icon.path .. "Main.lua")
end
function MineOSInterface.iconLaunchers.directory(icon)