From 384d39cd6cccc7bfe450203fc65dc036e1b83204 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 11 May 2022 08:08:24 +0300 Subject: [PATCH] Make label of tray item reactive Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../implementations/about-app-tray-item.injectable.ts | 2 +- .../implementations/open-app-tray-item.injectable.ts | 2 +- .../implementations/open-preferences-tray-item.injectable.ts | 2 +- .../implementations/quit-app-separator-tray-item.injectable.ts | 2 +- .../implementations/quit-app-tray-item.injectable.ts | 2 +- src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts | 2 +- .../tray-menu-item/tray-menu-item-registrator.injectable.ts | 2 +- src/main/tray/tray.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts index 67d5312fd5..5e7090c6d4 100644 --- a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts +++ b/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts @@ -21,7 +21,7 @@ const aboutAppTrayItemInjectable = getInjectable({ id: "about-app", parentId: null, orderNumber: 140, - label: `About ${productName}`, + label: computed(() => `About ${productName}`), enabled: computed(() => true), visible: computed(() => true), diff --git a/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts index 60a076180b..5780c45777 100644 --- a/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts +++ b/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts @@ -18,7 +18,7 @@ const openAppTrayItemInjectable = getInjectable({ return { id: "open-app", parentId: null, - label: `Open ${productName}`, + label: computed(() => `Open ${productName}`), orderNumber: 10, enabled: computed(() => true), visible: computed(() => true), diff --git a/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts index 718ac1fd57..73bb524896 100644 --- a/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts +++ b/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts @@ -16,7 +16,7 @@ const openPreferencesTrayItemInjectable = getInjectable({ return { id: "open-preferences", parentId: null, - label: "Preferences", + label: computed(() => "Preferences"), orderNumber: 20, enabled: computed(() => true), visible: computed(() => true), diff --git a/src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts index d95b5fd278..de83a92fe6 100644 --- a/src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts +++ b/src/main/tray/tray-menu-item/implementations/quit-app-separator-tray-item.injectable.ts @@ -10,7 +10,7 @@ const quitAppSeparatorTrayItemInjectable = getInjectable({ id: "quit-app-separator-tray-item", instantiate: () => ({ - id: "quit-app-sepator", + id: "quit-app-separator", parentId: null, orderNumber: 149, enabled: computed(() => true), diff --git a/src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts index c8fbc60caf..e5da828555 100644 --- a/src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts +++ b/src/main/tray/tray-menu-item/implementations/quit-app-tray-item.injectable.ts @@ -17,7 +17,7 @@ const quitAppTrayItemInjectable = getInjectable({ id: "quit-app", parentId: null, orderNumber: 150, - label: "Quit App", + label: computed(() => "Quit App"), enabled: computed(() => true), visible: computed(() => true), separated: true, diff --git a/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts b/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts index ce0392b2a1..e8ecea2f12 100644 --- a/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts +++ b/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts @@ -13,7 +13,7 @@ export interface TrayMenuItem { enabled: IComputedValue; visible: IComputedValue; - label?: string; + label?: IComputedValue; click?: () => Promise | void; tooltip?: string; separator?: boolean; diff --git a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts index a3ed2ce04f..47c0df29d5 100644 --- a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts +++ b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts @@ -47,7 +47,7 @@ const toItemInjectablesFor = (extension: LensMainExtension, installationCounter: separator: registration.type === "separator", - label: registration.label, + label: computed(() => registration.label), tooltip: registration.toolTip, click: () => { diff --git a/src/main/tray/tray.ts b/src/main/tray/tray.ts index 2dbbb73e54..8bb7768583 100644 --- a/src/main/tray/tray.ts +++ b/src/main/tray/tray.ts @@ -72,7 +72,7 @@ const toTrayMenuOptions = (trayMenuItems: TrayMenuItem[]) => { return { id: trayMenuItem.id, - label: trayMenuItem.label, + label: trayMenuItem.label.get(), enabled: trayMenuItem.enabled.get(), toolTip: trayMenuItem.tooltip,