diff --git a/d.ts/antos.d.ts b/d.ts/antos.d.ts index 962442e..8c3a58c 100644 --- a/d.ts/antos.d.ts +++ b/d.ts/antos.d.ts @@ -1140,7 +1140,7 @@ declare namespace OS { * @export * @param {string} app */ - function unloadApp(app: string): void; + function unloadApp(app: string, save?: boolean): void; /** * Create a service process. * diff --git a/src/core/gui.ts b/src/core/gui.ts index 4d9fc45..6bfc8a7 100644 --- a/src/core/gui.ts +++ b/src/core/gui.ts @@ -400,11 +400,43 @@ namespace OS { * @export * @param {string} app */ - export function unloadApp(app: string): void { + export function unloadApp(app: string, save?: boolean): void { PM.killAll(app, true); if (application[app] && application[app].style) { $(application[app].style).remove(); } + if(save) + { + // remove pinned application if any + if(OS.setting.system.startup.pinned) + OS.setting.system.startup.pinned = OS.setting.system.startup.pinned.filter((e) => e != app); + // remove service if it is the service + if(OS.setting.system.startup.services) + OS.setting.system.startup.services = OS.setting.system.startup.services.filter((e) => e != app); + // remove startup app if any + if(OS.setting.system.startup.apps) + OS.setting.system.startup.apps = OS.setting.system.startup.apps.filter((e) => e != app); + // refresh pinned list + announcer.ostrigger("app-pinned", "app-pinned", undefined); + // remove application setting + if(OS.setting.applications[app]) + delete OS.setting.applications[app]; + OS.API.setting() + .then((d) =>{ + if(d.error) + { + announcer.oserror( + __("Error when save system setting {0}:{1}", app, d.error), + undefined); + } + }) + .catch((e)=> { + announcer.oserror( + __("Error when save system setting {0}: {1}", app, e.toString()), + e); + }); + } + delete application[app]; } diff --git a/src/packages/MarketPlace/README.md b/src/packages/MarketPlace/README.md index 5aa89d8..7888bf3 100644 --- a/src/packages/MarketPlace/README.md +++ b/src/packages/MarketPlace/README.md @@ -5,4 +5,5 @@ This application is icluded in the AntOS delivery and cannot be removed/uinstalled by regular user ## Change logs +- 0.2.6-b: improve install process - v0.2.5-b: add README.md \ No newline at end of file diff --git a/src/packages/MarketPlace/main.ts b/src/packages/MarketPlace/main.ts index 12b03da..ef33b89 100644 --- a/src/packages/MarketPlace/main.ts +++ b/src/packages/MarketPlace/main.ts @@ -684,6 +684,10 @@ namespace OS { v.iconclass = "fa fa-adn"; } + if(v.icon) + { + v.icon = `${pth}/${v.icon}`; + } v.path = pth; this.systemsetting.system.packages[ v.pkgname ? v.pkgname : v.app @@ -727,7 +731,7 @@ namespace OS { } } delete this.systemsetting.system.packages[meta.pkgname]; - this._gui.unloadApp(meta.pkgname); + this._gui.unloadApp(meta.pkgname, true); if (meta.download) { this.appDetail(meta); } diff --git a/src/packages/MarketPlace/package.json b/src/packages/MarketPlace/package.json index e94e6a8..07c5887 100644 --- a/src/packages/MarketPlace/package.json +++ b/src/packages/MarketPlace/package.json @@ -7,7 +7,7 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.2.5-a", + "version":"0.2.6-b", "category":"System", "iconclass":"fa fa-shopping-bag", "mimes":["none"], diff --git a/src/packages/Setting/AppAndServiceHandle.ts b/src/packages/Setting/AppAndServiceHandle.ts index b0b9450..ed184f6 100644 --- a/src/packages/Setting/AppAndServiceHandle.ts +++ b/src/packages/Setting/AppAndServiceHandle.ts @@ -101,6 +101,7 @@ namespace OS { text: v.name, app: k, iconclass: v.iconclass, + icon: v.icon }); } } diff --git a/src/packages/Setting/README.md b/src/packages/Setting/README.md index df300c4..04a1632 100644 --- a/src/packages/Setting/README.md +++ b/src/packages/Setting/README.md @@ -10,4 +10,5 @@ In case of system anormaly after the modification, the system settings can be re by simply removing the setting file ## Change logs +-v0.1.2-b: minor bug fix on UI -v0.1.2-b: add README diff --git a/src/packages/Setting/StartupHandle.ts b/src/packages/Setting/StartupHandle.ts index e976240..b43cd39 100644 --- a/src/packages/Setting/StartupHandle.ts +++ b/src/packages/Setting/StartupHandle.ts @@ -102,6 +102,7 @@ namespace OS { text: v.name, app: k, iconclass: v.iconclass, + icon: v.icon }); } } diff --git a/src/packages/Setting/package.json b/src/packages/Setting/package.json index 4fb8634..07f89c8 100644 --- a/src/packages/Setting/package.json +++ b/src/packages/Setting/package.json @@ -6,7 +6,7 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.1.2-b", + "version":"0.1.3-b", "category":"System", "iconclass":"fa fa-wrench", "mimes":["none"]