From 37e600cba97ac34bb5eb862207034cf666f7f8ba Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 5 May 2022 10:10:28 +0300 Subject: [PATCH] Tweak name of timeslot to make it more apparent that new content for application load can be added Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../electron-app/runnables/setup-deep-linking.injectable.ts | 4 ++-- ...developer-tools-in-development-environment.injectable.ts | 4 ++-- .../runnables/setup-device-shutdown.injectable.ts | 4 ++-- .../setup-ipc-main-handlers.injectable.ts | 4 ++-- ...up-main-window-visibility-after-activation.injectable.ts | 4 ++-- src/main/menu/start-application-menu.injectable.ts | 4 ++-- .../setup-listener-for-current-cluster-frame.injectable.ts | 4 ++-- ...n-token.ts => on-load-of-application-injection-token.ts} | 4 ++-- .../runnables/initialize-extensions.injectable.ts | 4 ++-- .../runnables/setup-detector-registry.injectable.ts | 4 ++-- .../runnables/setup-hotbar-store.injectable.ts | 4 ++-- .../runnables/setup-prometheus-registry.injectable.ts | 4 ++-- .../runnables/setup-reactions-in-user-store.injectable.ts | 4 ++-- ...up-runnables-for-after-root-frame-is-ready.injectable.ts | 4 ++-- .../runnables/setup-sentry.injectable.ts | 4 ++-- .../runnables/setup-shell.injectable.ts | 4 ++-- .../setup-syncing-of-general-catalog-entities.injectable.ts | 4 ++-- .../runnables/setup-syncing-of-weblinks.injectable.ts | 4 ++-- .../start-main-application.injectable.ts | 6 +++--- .../start-broadcasting-theme-change.injectable.ts | 4 ++-- .../start-syncing-theme-from-operating-system.injectable.ts | 4 ++-- src/main/tray/start-tray.injectable.ts | 4 ++-- 22 files changed, 45 insertions(+), 45 deletions(-) rename src/main/start-main-application/runnable-tokens/{when-application-is-loading-injection-token.ts => on-load-of-application-injection-token.ts} (70%) diff --git a/src/main/electron-app/runnables/setup-deep-linking.injectable.ts b/src/main/electron-app/runnables/setup-deep-linking.injectable.ts index a5ee9a79a5..47087cd1c1 100644 --- a/src/main/electron-app/runnables/setup-deep-linking.injectable.ts +++ b/src/main/electron-app/runnables/setup-deep-linking.injectable.ts @@ -9,7 +9,7 @@ import loggerInjectable from "../../../common/logger.injectable"; import commandLineArgumentsInjectable from "../../utils/command-line-arguments.injectable"; import { pipeline } from "@ogre-tools/fp"; import { find, startsWith, toLower, map } from "lodash/fp"; -import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; const setupDeepLinkingInjectable = getInjectable({ @@ -64,7 +64,7 @@ const setupDeepLinkingInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupDeepLinkingInjectable; diff --git a/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts b/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts index 7cedd64953..3438bc1428 100644 --- a/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts +++ b/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import loggerInjectable from "../../../common/logger.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ id: "setup-developer-tools-in-development-environment", @@ -34,7 +34,7 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupDeveloperToolsInDevelopmentEnvironmentInjectable; diff --git a/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts b/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts index 7822ff429f..b0b1ee8096 100644 --- a/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts +++ b/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import powerMonitorInjectable from "../features/power-monitor.injectable"; import exitAppInjectable from "../features/exit-app.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; const setupDeviceShutdownInjectable = getInjectable({ id: "setup-device-shutdown", @@ -23,7 +23,7 @@ const setupDeviceShutdownInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupDeviceShutdownInjectable; diff --git a/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts b/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts index 0b58422d58..b25eb86fbb 100644 --- a/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts +++ b/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts @@ -11,7 +11,7 @@ import applicationMenuItemsInjectable from "../../../menu/application-menu-items import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable"; import catalogEntityRegistryInjectable from "../../../catalog/catalog-entity-registry.injectable"; import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; import operatingSystemThemeInjectable from "../../../theme/operating-system-theme.injectable"; const setupIpcMainHandlersInjectable = getInjectable({ @@ -48,7 +48,7 @@ const setupIpcMainHandlersInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, causesSideEffects: true, }); diff --git a/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts b/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts index a818104436..3642fa3c6d 100644 --- a/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts +++ b/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import electronAppInjectable from "../electron-app.injectable"; import loggerInjectable from "../../../common/logger.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({ @@ -29,7 +29,7 @@ const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupMainWindowVisibilityAfterActivationInjectable; diff --git a/src/main/menu/start-application-menu.injectable.ts b/src/main/menu/start-application-menu.injectable.ts index 8cab9bf43a..b241137cec 100644 --- a/src/main/menu/start-application-menu.injectable.ts +++ b/src/main/menu/start-application-menu.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuInjectable from "./application-menu.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../start-main-application/runnable-tokens/on-load-of-application-injection-token"; const startApplicationMenuInjectable = getInjectable({ id: "start-application-menu", @@ -21,7 +21,7 @@ const startApplicationMenuInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default startApplicationMenuInjectable; diff --git a/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts b/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts index 3175067f6f..fa8b36c03a 100644 --- a/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts +++ b/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts @@ -7,7 +7,7 @@ import { IpcRendererNavigationEvents } from "../../../../renderer/navigation/eve import type { ClusterId } from "../../../../common/cluster-types"; import { getInjectable } from "@ogre-tools/injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../runnable-tokens/on-load-of-application-injection-token"; import currentClusterFrameClusterIdStateInjectable from "./current-cluster-frame-cluster-id-state.injectable"; const setupListenerForCurrentClusterFrameInjectable = getInjectable({ @@ -28,7 +28,7 @@ const setupListenerForCurrentClusterFrameInjectable = getInjectable({ causesSideEffects: true, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupListenerForCurrentClusterFrameInjectable; diff --git a/src/main/start-main-application/runnable-tokens/when-application-is-loading-injection-token.ts b/src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts similarity index 70% rename from src/main/start-main-application/runnable-tokens/when-application-is-loading-injection-token.ts rename to src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts index d6f4158f08..35b7a6c0ff 100644 --- a/src/main/start-main-application/runnable-tokens/when-application-is-loading-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts @@ -5,6 +5,6 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { Runnable } from "../../../common/runnable/run-many-for"; -export const whenApplicationIsLoadingInjectionToken = getInjectionToken({ - id: "when-application-is-loading", +export const onLoadOfApplicationInjectionToken = getInjectionToken({ + id: "on-load-of-application", }); diff --git a/src/main/start-main-application/runnables/initialize-extensions.injectable.ts b/src/main/start-main-application/runnables/initialize-extensions.injectable.ts index d3f1161db4..1038a4c189 100644 --- a/src/main/start-main-application/runnables/initialize-extensions.injectable.ts +++ b/src/main/start-main-application/runnables/initialize-extensions.injectable.ts @@ -9,7 +9,7 @@ import loggerInjectable from "../../../common/logger.injectable"; import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable"; import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const initializeExtensionsInjectable = getInjectable({ id: "initialize-extensions", @@ -61,7 +61,7 @@ const initializeExtensionsInjectable = getInjectable({ causesSideEffects: true, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default initializeExtensionsInjectable; diff --git a/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts b/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts index a875bd1ed0..1c91e797f3 100644 --- a/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts +++ b/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts @@ -9,7 +9,7 @@ import { VersionDetector } from "../../cluster-detectors/version-detector"; import { DistributionDetector } from "../../cluster-detectors/distribution-detector"; import { NodesCountDetector } from "../../cluster-detectors/nodes-count-detector"; import detectorRegistryInjectable from "../../cluster-detectors/detector-registry.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupDetectorRegistryInjectable = getInjectable({ id: "setup-detector-registry", @@ -29,7 +29,7 @@ const setupDetectorRegistryInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupDetectorRegistryInjectable; diff --git a/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts b/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts index b4687c0b50..ed35272e40 100644 --- a/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts +++ b/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import hotbarStoreInjectable from "../../../common/hotbar-store.injectable"; import setupSyncingOfGeneralCatalogEntitiesInjectable from "./setup-syncing-of-general-catalog-entities.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupHotbarStoreInjectable = getInjectable({ id: "setup-hotbar-store", @@ -20,7 +20,7 @@ const setupHotbarStoreInjectable = getInjectable({ runAfter: di.inject(setupSyncingOfGeneralCatalogEntitiesInjectable), }), - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupHotbarStoreInjectable; diff --git a/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts b/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts index a637efe524..c3756bb1b1 100644 --- a/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts +++ b/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts @@ -8,7 +8,7 @@ import { PrometheusHelm } from "../../prometheus/helm"; import { PrometheusOperator } from "../../prometheus/operator"; import { PrometheusStacklight } from "../../prometheus/stacklight"; import prometheusProviderRegistryInjectable from "../../prometheus/prometheus-provider-registry.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupPrometheusRegistryInjectable = getInjectable({ id: "setup-prometheus-registry", @@ -27,7 +27,7 @@ const setupPrometheusRegistryInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupPrometheusRegistryInjectable; diff --git a/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts b/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts index c8c78940cf..7ab26a1506 100644 --- a/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts +++ b/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import userStoreInjectable from "../../../common/user-store/user-store.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupReactionsInUserStoreInjectable = getInjectable({ id: "setup-reactions-in-user-store", @@ -19,7 +19,7 @@ const setupReactionsInUserStoreInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupReactionsInUserStoreInjectable; diff --git a/src/main/start-main-application/runnables/setup-runnables-for-after-root-frame-is-ready.injectable.ts b/src/main/start-main-application/runnables/setup-runnables-for-after-root-frame-is-ready.injectable.ts index eecd730d32..82c323c501 100644 --- a/src/main/start-main-application/runnables/setup-runnables-for-after-root-frame-is-ready.injectable.ts +++ b/src/main/start-main-application/runnables/setup-runnables-for-after-root-frame-is-ready.injectable.ts @@ -7,7 +7,7 @@ import { ipcMainOn } from "../../../common/ipc"; import { IpcRendererNavigationEvents } from "../../../renderer/navigation/events"; import { afterRootFrameIsReadyInjectionToken } from "../runnable-tokens/after-root-frame-is-ready-injection-token"; import { runManyFor } from "../../../common/runnable/run-many-for"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupRunnablesForAfterRootFrameIsReadyInjectable = getInjectable({ id: "setup-runnables-for-after-root-frame-is-ready", @@ -31,7 +31,7 @@ const setupRunnablesForAfterRootFrameIsReadyInjectable = getInjectable({ // Direct usage of IPC causesSideEffects: true, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupRunnablesForAfterRootFrameIsReadyInjectable; diff --git a/src/main/start-main-application/runnables/setup-sentry.injectable.ts b/src/main/start-main-application/runnables/setup-sentry.injectable.ts index c0dbb41b4e..e9f0587450 100644 --- a/src/main/start-main-application/runnables/setup-sentry.injectable.ts +++ b/src/main/start-main-application/runnables/setup-sentry.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { initializeSentryReporting } from "../../../common/sentry"; import { init } from "@sentry/electron/main"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupSentryInjectable = getInjectable({ id: "setup-sentry", @@ -18,7 +18,7 @@ const setupSentryInjectable = getInjectable({ causesSideEffects: true, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupSentryInjectable; diff --git a/src/main/start-main-application/runnables/setup-shell.injectable.ts b/src/main/start-main-application/runnables/setup-shell.injectable.ts index c1e17af099..0f23e0f2e8 100644 --- a/src/main/start-main-application/runnables/setup-shell.injectable.ts +++ b/src/main/start-main-application/runnables/setup-shell.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { shellSync } from "../../shell-sync"; import loggerInjectable from "../../../common/logger.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupShellInjectable = getInjectable({ id: "setup-shell", @@ -22,7 +22,7 @@ const setupShellInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, causesSideEffects: true, }); diff --git a/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts b/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts index 50893fe5a9..e44752b324 100644 --- a/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts +++ b/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import syncGeneralCatalogEntitiesInjectable from "../../catalog-sources/sync-general-catalog-entities.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; const setupSyncingOfGeneralCatalogEntitiesInjectable = getInjectable({ id: "setup-syncing-of-general-catalog-entities", @@ -21,7 +21,7 @@ const setupSyncingOfGeneralCatalogEntitiesInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupSyncingOfGeneralCatalogEntitiesInjectable; diff --git a/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts b/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts index 8d8e1e9f5a..0e5ada1b78 100644 --- a/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts +++ b/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; import syncWeblinksInjectable from "../../catalog-sources/sync-weblinks.injectable"; const setupSyncingOfWeblinksInjectable = getInjectable({ @@ -19,7 +19,7 @@ const setupSyncingOfWeblinksInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default setupSyncingOfWeblinksInjectable; diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts index b363ab3e9f..63398096f4 100644 --- a/src/main/start-main-application/start-main-application.injectable.ts +++ b/src/main/start-main-application/start-main-application.injectable.ts @@ -8,7 +8,7 @@ import { runManyFor } from "../../common/runnable/run-many-for"; import { runManySyncFor } from "../../common/runnable/run-many-sync-for"; import { beforeElectronIsReadyInjectionToken } from "./runnable-tokens/before-electron-is-ready-injection-token"; import { beforeApplicationIsLoadingInjectionToken } from "./runnable-tokens/before-application-is-loading-injection-token"; -import { whenApplicationIsLoadingInjectionToken } from "./runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "./runnable-tokens/on-load-of-application-injection-token"; import { afterApplicationIsLoadedInjectionToken } from "./runnable-tokens/after-application-is-loaded-injection-token"; import applicationIsLoadingWindowInjectable from "./lens-window/application-is-loading-window/application-is-loading-window.injectable"; @@ -35,7 +35,7 @@ const startMainApplicationInjectable = getInjectable({ const beforeElectronIsReady = runManySync(beforeElectronIsReadyInjectionToken); const beforeApplicationIsLoading = runMany(beforeApplicationIsLoadingInjectionToken); - const whenApplicationIsLoading = runMany(whenApplicationIsLoadingInjectionToken); + const onLoadOfApplication = runMany(onLoadOfApplicationInjectionToken); const afterApplicationIsLoaded = runMany(afterApplicationIsLoadedInjectionToken); return async () => { @@ -51,7 +51,7 @@ const startMainApplicationInjectable = getInjectable({ await applicationIsLoadingWindow.show(); } - await whenApplicationIsLoading(); + await onLoadOfApplication(); if (!shouldStartHidden) { const deepLinkUrl = getDeepLinkUrl(commandLineArguments); diff --git a/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts b/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts index 02d44cb72b..7794c07bd4 100644 --- a/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts +++ b/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; import broadcastThemeChangeInjectable from "./broadcast-theme-change.injectable"; const startBroadcastingThemeChangeInjectable = getInjectable({ @@ -19,7 +19,7 @@ const startBroadcastingThemeChangeInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default startBroadcastingThemeChangeInjectable; diff --git a/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts b/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts index 344e3e40da..9bf9c5fe49 100644 --- a/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts +++ b/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import syncThemeFromOperatingSystemInjectable from "../../electron-app/features/sync-theme-from-operating-system.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; const startSyncingThemeFromOperatingSystemInjectable = getInjectable({ id: "start-syncing-theme-from-operating-system", @@ -19,7 +19,7 @@ const startSyncingThemeFromOperatingSystemInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default startSyncingThemeFromOperatingSystemInjectable; diff --git a/src/main/tray/start-tray.injectable.ts b/src/main/tray/start-tray.injectable.ts index 5fefc8c1e4..511da22c6c 100644 --- a/src/main/tray/start-tray.injectable.ts +++ b/src/main/tray/start-tray.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import trayInjectable from "./tray.injectable"; -import { whenApplicationIsLoadingInjectionToken } from "../start-main-application/runnable-tokens/when-application-is-loading-injection-token"; +import { onLoadOfApplicationInjectionToken } from "../start-main-application/runnable-tokens/on-load-of-application-injection-token"; const startTrayInjectable = getInjectable({ id: "start-tray", @@ -19,7 +19,7 @@ const startTrayInjectable = getInjectable({ }; }, - injectionToken: whenApplicationIsLoadingInjectionToken, + injectionToken: onLoadOfApplicationInjectionToken, }); export default startTrayInjectable;