From f9fa18585f60cb9f937f94071ccf39539468a74b Mon Sep 17 00:00:00 2001 From: Leonmmcoset Date: Fri, 12 Sep 2025 17:33:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor(installer):=20=E7=A7=BB=E9=99=A4appgui?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=B9=B6=E6=81=A2=E5=A4=8D=E5=8E=9F=E7=94=9F?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=A0=8F=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新安装器版本至1.0.3 Beta 5 - 移除对appgui模块的依赖 - 恢复使用原生term API实现顶部标题栏 - 清理被注释的冗余代码 --- installer.lua | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/installer.lua b/installer.lua index c78ba15..b514a98 100644 --- a/installer.lua +++ b/installer.lua @@ -1,5 +1,5 @@ -- LeonOS installer -local INSTALLER_VERSION = "1.0.3 Beta 4" +local INSTALLER_VERSION = "1.0.3 Beta 5" local DEFAULT_ROM_DIR = "/leonos" term.at(1, y).clearLine() @@ -54,7 +54,6 @@ print("[Installer] Loading done.") print("[Installer] Loading module 8") -- get LeonOS's textutils with its extra utilities local tu = rcload("apis/textutils.lua") -local appgui = rcload("apis/appgui.lua") local function progress(y, a, b) local progress = a/b @@ -67,31 +66,30 @@ local function progress(y, a, b) colors.yellow, "]") end term.write("[Installer] Loading done.\n") --- -- 程序顶部名称栏 --- local term = require("term") --- local colors = require("colors") --- local rc = require("rc") --- -- local appgui = require("appgui") --- -- 保存当前颜色设置 --- local old_fg = term.getTextColor() --- local old_bg = term.getBackgroundColor() +-- 程序顶部名称栏 +local term = require("term") +local colors = require("colors") +local rc = require("rc") +-- local appgui = require("appgui") +-- 保存当前颜色设置 +local old_fg = term.getTextColor() +local old_bg = term.getBackgroundColor() --- -- 设置名称栏颜色并显示 --- term.setTextColor(colors.white) --- term.setBackgroundColor(colors.cyan) --- term.at(1, 1).clearLine() --- term.at(1, 1).write("=== LeonOS Installer ===") +-- 设置名称栏颜色并显示 +term.setTextColor(colors.white) +term.setBackgroundColor(colors.cyan) +term.at(1, 1).clearLine() +term.at(1, 1).write("=== LeonOS Installer ===") --- -- 恢复颜色设置 --- term.setTextColor(old_fg) --- term.setBackgroundColor(old_bg) --- term.at(1, 2) --- -- 只清除顶栏以下的区域 --- for y=2, term.getSize() do --- term.at(1, y).clearLine() --- end --- term.at(1, 2) -appgui.topbar("=== LeonOS Installer ===") +-- 恢复颜色设置 +term.setTextColor(old_fg) +term.setBackgroundColor(old_bg) +term.at(1, 2) +-- 只清除顶栏以下的区域 +for y=2, term.getSize() do + term.at(1, y).clearLine() +end +term.at(1, 2) tu.coloredPrint(colors.yellow, "LeonOS Installer (v"..INSTALLER_VERSION..")\n=======================") tu.coloredPrint("You are going to install LeonOS "..INSTALLER_VERSION.." to your computer.")