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

herosos

Browse Source
This commit is contained in:
Igor Timofeev 2017-10-18 19:04:41 +03:00
parent 8370ef6e30
commit 7bc3b59897
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Applications.cfg
View File

@ -980,7 +980,7 @@
type="Application",
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/AppMarket/Icon.pic",
forceDownload=true,
version=1.72,
version=1.73,
resources={
{
path="/Update.pic",

12
Applications/AppMarket/Main.lua
View File

@ -35,8 +35,8 @@ local function newApp(x, y, width, applicationListElement, hideDownloadButton)
app.icon.image = image.load(temproraryIconPath)
end
app.downloadButton = app:addChild(GUI.button(1, 1, 13, 1, 0x66DB80, 0xFFFFFF, 0x339240, 0xFFFFFF, localization.download))
app.downloadButton.localPosition.x = app.width - app.downloadButton.width + 1
app.downloadButton = app:addChild(GUI.roundedButton(1, 1, 13, 1, 0x66DB80, 0xFFFFFF, 0x339240, 0xFFFFFF, localization.download))
app.downloadButton.localPosition.x = app.width - app.downloadButton.width
app.downloadButton.onTouch = function()
app.downloadButton.disabled = true
app.downloadButton.colors.disabled.background, app.downloadButton.colors.disabled.text = 0xBBBBBB, 0xFFFFFF
@ -115,7 +115,7 @@ local function displayApps(fromPage, typeFilter, nameFilter, updateCheck)
buffer.draw()
return
else
window.contentContainer:addChild(GUI.button(math.floor(window.contentContainer.width / 2 - 10), y, 20, 1, 0xBBBBBB, 0xFFFFFF, 0x999999, 0xFFFFFF, localization.updateAll)).onTouch = function()
window.contentContainer:addChild(GUI.roundedButton(math.floor(window.contentContainer.width / 2 - 9), y, 18, 1, 0xBBBBBB, 0xFFFFFF, 0x999999, 0xFFFFFF, localization.updateAll)).onTouch = function()
y = addUpdateImage()
local progressBarWidth = math.floor(window.contentContainer.width * 0.65)
@ -177,10 +177,10 @@ local function displayApps(fromPage, typeFilter, nameFilter, updateCheck)
end
-- Pages buttons CYKA
local buttonWidth, text = 7, localization.page .. fromPage
local buttonWidth, text = 5, localization.page .. fromPage
local textLength = unicode.len(text)
local x = math.floor(window.contentContainer.width / 2 - (buttonWidth * 2 + textLength + 4) / 2)
window.contentContainer:addChild(GUI.button(x, y, buttonWidth, 1, 0xBBBBBB, 0xFFFFFF, 0x999999, 0xFFFFFF, "<")).onTouch = function()
window.contentContainer:addChild(GUI.roundedButton(x, y, buttonWidth, 1, 0xBBBBBB, 0xFFFFFF, 0x999999, 0xFFFFFF, "<")).onTouch = function()
if fromPage > 1 then
displayApps(fromPage - 1, typeFilter, nameFilter)
end
@ -190,7 +190,7 @@ local function displayApps(fromPage, typeFilter, nameFilter, updateCheck)
window.contentContainer:addChild(GUI.label(x, y, textLength, 1, 0x3C3C3C, text))
x = x + textLength + 2
window.contentContainer:addChild(GUI.button(x, y, buttonWidth, 1, 0xBBBBBB, 0xFFFFFF, 0x999999, 0xFFFFFF, ">")).onTouch = function()
window.contentContainer:addChild(GUI.roundedButton(x, y, buttonWidth, 1, 0xBBBBBB, 0xFFFFFF, 0x999999, 0xFFFFFF, ">")).onTouch = function()
displayApps(fromPage + 1, typeFilter, nameFilter)
end