From 8b781d7fb3f7ee5b1f327f7960e25a8f3e9def47 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Tue, 25 Apr 2017 09:18:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.cfg | 2 +- MineOS/OS.lua | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Applications.cfg b/Applications.cfg index 1d16ed95..3aee2114 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -5,7 +5,7 @@ about="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/MineOS/About/", type="Script", forceDownload=true, - version=3.54, + version=3.55, }, { path="/MineOS/Pictures/MoonTouch.pic", diff --git a/MineOS/OS.lua b/MineOS/OS.lua index 902a401a..531d5e36 100755 --- a/MineOS/OS.lua +++ b/MineOS/OS.lua @@ -458,12 +458,12 @@ local function createWorkspace() local item1 = workspace.menu:addItem("MineOS", 0x000000) item1.onTouch = function() local menu = GUI.contextMenu(item1.x, item1.y + 1) - menu:addItem(MineOSCore.localization.aboutSystem).onTouch = function() - ecs.prepareToExit() - print(copyright) - ecs.waitForTouchOrClick() - buffer.draw(true) - end + -- menu:addItem(MineOSCore.localization.aboutSystem).onTouch = function() + -- ecs.prepareToExit() + -- print(copyright) + -- ecs.waitForTouchOrClick() + -- buffer.draw(true) + -- end menu:addItem(MineOSCore.localization.updates).onTouch = function() MineOSCore.safeLaunch("/MineOS/Applications/AppMarket.app/Main.lua", "updateCheck") end @@ -549,6 +549,9 @@ local function createWorkspace() _G.OSSettings.screensaver, _G.OSSettings.screensaverDelay = comboBox.items[comboBox.currentItem].text, slider.value end MineOSCore.saveOSSettings() + + workspace:draw() + buffer.draw() end end menu:addItem(MineOSCore.localization.colorScheme).onTouch = function() @@ -557,14 +560,23 @@ local function createWorkspace() local backgroundColorSelector = container.layout:addColorSelector(1, 1, 36, 3, workspace.background.colors.background, MineOSCore.localization.backgroundColor) local interfaceColorSelector = container.layout:addColorSelector(1, 1, 36, 3, workspace.menu.colors.default.background, MineOSCore.localization.interfaceColor) + backgroundColorSelector.onTouch = function() + _G.OSSettings.backgroundColor, _G.OSSettings.interfaceColor = backgroundColorSelector.color, interfaceColorSelector.color + workspace.background.colors.background, workspace.menu.colors.default.background = _G.OSSettings.backgroundColor, _G.OSSettings.interfaceColor + MineOSCore.saveOSSettings() + + workspace:draw() + buffer.draw() + end + interfaceColorSelector.onTouch = backgroundColorSelector.onTouch + workspace:draw() buffer.draw() container.panel.onTouch = function() workspace:deleteChildren(#workspace.children) - _G.OSSettings.backgroundColor, _G.OSSettings.interfaceColor = backgroundColorSelector.color, interfaceColorSelector.color - workspace.background.colors.background, workspace.menu.colors.default.background = _G.OSSettings.backgroundColor, _G.OSSettings.interfaceColor - MineOSCore.saveOSSettings() + workspace:draw() + buffer.draw() end end menu:addItem(MineOSCore.localization.contextMenuRemoveWallpaper, workspace.wallpaper.isHidden).onTouch = function()