From 7bc3b59897e4db80e6e909cdb0ef0dc48c0bd3b2 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Wed, 18 Oct 2017 19:04:41 +0300 Subject: [PATCH] herosos --- Applications.cfg | 2 +- Applications/AppMarket/Main.lua | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Applications.cfg b/Applications.cfg index 94680668..15e0ff42 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -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", diff --git a/Applications/AppMarket/Main.lua b/Applications/AppMarket/Main.lua index ae423a84..ff9c38f8 100755 --- a/Applications/AppMarket/Main.lua +++ b/Applications/AppMarket/Main.lua @@ -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