diff --git a/src/apps/components/shell/Shell.svelte b/src/apps/components/shell/Shell.svelte index c148db790..11985c07e 100755 --- a/src/apps/components/shell/Shell.svelte +++ b/src/apps/components/shell/Shell.svelte @@ -14,6 +14,7 @@ const { process }: AppComponentProps = $props(); const { userPreferences, startMenuOpened, actionCenterOpened, username, FullscreenCount } = process; + const { InitComplete } = Daemon; let currentDesktop = $state(); @@ -28,27 +29,29 @@ }); -
0} -> -
- - - -
- - - {#if Daemon.userInfo.isSystem} -
- ArcOS v{ArcOSVersion}-{ArcMode()}_{ArcBuild()}
- {Daemon.username}@{Server.hostname}
- THIS IS A SYSTEM ACCOUNT. WATCH OUT. -
- {/if} +{#if $InitComplete} +
0} + > +
+ + + +
+ + + {#if Daemon.userInfo.isSystem} +
+ ArcOS v{ArcOSVersion}-{ArcMode()}_{ArcBuild()}
+ {Daemon.username}@{Server.hostname}
+ THIS IS A SYSTEM ACCOUNT. WATCH OUT. +
+ {/if} +
+
+ +
-
- -
-
+{/if} diff --git a/src/apps/components/shell/Shell/ActionCenter.svelte b/src/apps/components/shell/Shell/ActionCenter.svelte index 61f288b08..3acd66d19 100755 --- a/src/apps/components/shell/Shell/ActionCenter.svelte +++ b/src/apps/components/shell/Shell/ActionCenter.svelte @@ -3,7 +3,6 @@ import type { BooleanStore } from "$types/shared/writable"; import type { UserPreferencesStore } from "$types/user"; import { QuickSettings } from "../store"; - import CardStack from "./ActionCenter/CardStack.svelte"; import Clock from "./ActionCenter/Clock.svelte"; import Notifications from "./ActionCenter/Notifications.svelte"; import QuickSetting from "./ActionCenter/QuickSetting.svelte"; @@ -22,9 +21,6 @@
- {#if !process.safeMode} - - {/if}
{#if !process.safeMode} diff --git a/src/apps/components/shell/Shell/ActionCenter/CardStack.svelte b/src/apps/components/shell/Shell/ActionCenter/CardStack.svelte deleted file mode 100755 index 27d0a6c74..000000000 --- a/src/apps/components/shell/Shell/ActionCenter/CardStack.svelte +++ /dev/null @@ -1,67 +0,0 @@ - - -
- -
- {#if userDaemon} - - - - {:else} -
- ERR_NO_DAEMON -
-
- ERR_NO_DAEMON -
-
- ERR_NO_DAEMON -
- {/if} -
-
diff --git a/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Gallery.svelte b/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Gallery.svelte deleted file mode 100755 index 08509a383..000000000 --- a/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Gallery.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - -
chooseImage(), - icon: "pencil", - }, - { - caption: "Remove image", - action: () => ($userPreferences.shell.actionCenter.galleryImage = ""), - icon: "x", - }, - ], - process, - ]} -> - {#if !loading} - {#if noImage} - - - {:else if errored} - -

Image not found!

- - {/if} - {:else} - - {/if} -
diff --git a/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Notes.svelte b/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Notes.svelte deleted file mode 100755 index 83f1957ac..000000000 --- a/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Notes.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - -
- -
diff --git a/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Weather.svelte b/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Weather.svelte deleted file mode 100755 index b8f2b317d..000000000 --- a/src/apps/components/shell/Shell/ActionCenter/CardStack/Cards/Weather.svelte +++ /dev/null @@ -1,95 +0,0 @@ - - -
{ - refresh(true); - }, - icon: "rotate-cw", - }, - { - caption: "Change location...", - icon: "map-pin", - action: () => { - changeLocation(); - }, - }, - ], - process, - ]} -> - {#if $userPreferences.shell.actionCenter.weatherLocation.name === "unset"} -

Set-up weather

- - {:else if !loading} - {#if data} - {#if data.icon && data.iconColor} - - {/if} -

- {data.temperature.toFixed(1)} °C -

-

- - {#if data.condition} - - {data.condition} - - {/if} -

- {:else} -

Failed to get weather info

- - {/if} - {:else} - - {/if} -
diff --git a/src/apps/components/shell/Shell/ActionCenter/CardStack/Indicator.svelte b/src/apps/components/shell/Shell/ActionCenter/CardStack/Indicator.svelte deleted file mode 100755 index a119ce3e2..000000000 --- a/src/apps/components/shell/Shell/ActionCenter/CardStack/Indicator.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - -
- {#each new Array(max).fill(0) as _, i} -
- {/each} -
diff --git a/src/apps/components/shell/Shell/Taskbar.svelte b/src/apps/components/shell/Shell/Taskbar.svelte index ec1b118f3..8b10b6a80 100755 --- a/src/apps/components/shell/Shell/Taskbar.svelte +++ b/src/apps/components/shell/Shell/Taskbar.svelte @@ -9,6 +9,7 @@ import StartButton from "./Taskbar/StartButton.svelte"; import Clock from "./Taskbar/SystemArea/Clock.svelte"; import SystemTray from "./Taskbar/SystemTray.svelte"; + import TaskbarWeatherApplet from "./Taskbar/TaskbarWeatherApplet.svelte"; import WorkspaceManagerButton from "./Taskbar/WorkspaceManagerButton.svelte"; const { process }: { process: IShellRuntime } = $props(); @@ -26,6 +27,7 @@ + {#snippet ifActive(service: ITrayHostService)} diff --git a/src/apps/components/shell/Shell/Taskbar/TaskbarWeatherApplet.svelte b/src/apps/components/shell/Shell/Taskbar/TaskbarWeatherApplet.svelte new file mode 100644 index 000000000..b1ebc4fbb --- /dev/null +++ b/src/apps/components/shell/Shell/Taskbar/TaskbarWeatherApplet.svelte @@ -0,0 +1,97 @@ + + +{#if $userPreferences.weatherSettings.displayMode !== "disabled"} +
refresh(), + icon: "rotate-cw", + }, + { + caption: "Change location...", + icon: "map-pin", + action: () => changeLocation(), + }, + ], + process, + ]} + > + {#if $userPreferences.weatherSettings.name === "unset"} +

Set-up weather

+ + {:else if data} + {#if data.icon && data.iconColor} + + {/if} + {#if $userPreferences.weatherSettings.displayMode !== "onlyTemperature"} +
+

+ {data.temperature.toFixed(1)} °C +

+

+ + {#if $userPreferences.weatherSettings.displayMode === "withCity" && city} + + {city} + + {:else if $userPreferences.weatherSettings.displayMode === "withCondition" && data.condition} + + {data.condition} + + {/if} +

+
+ {:else} +

+ {data.temperature.toFixed(1)} °C + +

+ {/if} + {:else} +

Failed to get weather info

+ + {/if} +
+{/if} diff --git a/src/apps/components/shell/runtime.ts b/src/apps/components/shell/runtime.ts index 0934d47b5..4891fd25c 100755 --- a/src/apps/components/shell/runtime.ts +++ b/src/apps/components/shell/runtime.ts @@ -9,9 +9,7 @@ import { UserPaths } from "$ts/user/store"; import { Store } from "$ts/writable"; import type { AppKeyCombinations } from "$types/apps/accelerator"; import type { AppContextMenu, AppProcessData } from "$types/apps/app"; -import type { SearchItem } from "$types/services/search"; import type { RecursiveDirectoryReadReturn } from "$types/system/fs"; -import type { Workspace } from "$types/user"; import { ShellAccelerators } from "./accelerators"; import { ShellContextMenu } from "./context"; @@ -46,25 +44,6 @@ export class ShellRuntime extends AppProcess implements IShellRuntime { this.setSource(__SOURCE__); } - gotReadySignal(): Promise { - throw new Error("Method not implemented."); - } - deleteWorkspace(workspace: Workspace): Promise { - throw new Error("Method not implemented."); - } - MutateIndex(e: KeyboardEvent): void | -1 { - throw new Error("Method not implemented."); - } - Trigger(result: SearchItem): Promise { - throw new Error("Method not implemented."); - } - Submit(): void { - throw new Error("Method not implemented."); - } - changeShell(id: string): Promise { - throw new Error("Method not implemented."); - } - async start() { if (Stack.getProcess(+Env.get("shell_pid"))) return false; @@ -201,9 +180,6 @@ export class ShellRuntime extends AppProcess implements IShellRuntime { }); } - //#endregion - //#region STARTMENU - public async refreshStartMenu(): Promise { try { const tree = await Fs.tree(this.STARTMENU_FOLDER); @@ -220,12 +196,6 @@ export class ShellRuntime extends AppProcess implements IShellRuntime { } } - //#endregion - //#region CALENDAR - - //#endregion - //#region WEATHER - async exit() { this.startMenuOpened.set(false); // First close the start menu await this.spawnOverlayApp("ExitApp", this.pid); // Then spawn the exit overlay @@ -254,6 +224,4 @@ export class ShellRuntime extends AppProcess implements IShellRuntime { this.FullscreenCount.set(fullscreenCount); } - - //#endregion } diff --git a/src/apps/user/mediaplayer/MediaPlayer.svelte b/src/apps/user/mediaplayer/MediaPlayer.svelte index 87f113e5f..c3a55560d 100755 --- a/src/apps/user/mediaplayer/MediaPlayer.svelte +++ b/src/apps/user/mediaplayer/MediaPlayer.svelte @@ -58,7 +58,7 @@ {style} >
-
diff --git a/src/apps/user/settings/Settings/Page/Shell.svelte b/src/apps/user/settings/Settings/Page/Shell.svelte index 6b3aa9313..bfb939109 100755 --- a/src/apps/user/settings/Settings/Page/Shell.svelte +++ b/src/apps/user/settings/Settings/Page/Shell.svelte @@ -30,14 +30,11 @@ - + {#if $battery} + + {/if} + + +