From 712ffdb97c43fcda11af0ce2379b78e4349222fd Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Fri, 11 Jan 2019 10:01:06 -0500 Subject: [PATCH] package manager ui update --- sys/apps/PackageManager.lua | 13 +++++++------ sys/boot/kiosk.boot | 5 +---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/apps/PackageManager.lua b/sys/apps/PackageManager.lua index 29f3db4..f332f1a 100644 --- a/sys/apps/PackageManager.lua +++ b/sys/apps/PackageManager.lua @@ -10,7 +10,7 @@ UI:configure('PackageManager', ...) local page = UI.Page { grid = UI.ScrollingGrid { - x = 2, ex = -12, y = 2, ey = 7, + x = 2, ex = 14, y = 2, ey = -5, values = { }, columns = { { heading = 'Package', key = 'name' }, @@ -20,13 +20,13 @@ local page = UI.Page { help = 'Select a package', }, add = UI.Button { - x = -10, y = 4, + x = 2, y = -3, text = 'Install', event = 'action', help = 'Install or update', }, remove = UI.Button { - x = -10, y = 6, + x = 12, y = -3, text = 'Remove ', event = 'action', operation = 'uninstall', @@ -34,12 +34,13 @@ local page = UI.Page { help = 'Remove', }, description = UI.TextArea { - x = 2, y = 9, ey = -4, + x = 16, y = 3, ey = -5, + marginRight = 0, marginLeft = 0, --backgroundColor = colors.white, }, load = UI.Button { - x = 2, y = -3, - text = 'Update package list', + x = 22, y = -3, + text = 'Update packages', event = 'reload', help = 'Download the latest package list', }, diff --git a/sys/boot/kiosk.boot b/sys/boot/kiosk.boot index cc79101..26b6602 100644 --- a/sys/boot/kiosk.boot +++ b/sys/boot/kiosk.boot @@ -7,10 +7,7 @@ local term = _G.term local mon = peripheral.find('monitor') if mon then term.redirect(mon) - if not settings.get('kiosk.textscale') then - settings.set('kiosk.textscale', .5) - end - mon.setTextScale(settings.get('kiosk.textscale') or .5) + mon.setTextScale(tonumber(settings.get('kiosk.textscale')) or 1) parallel.waitForAny( function()