Splash screen: make sure that the copyright and version information are shown on Windows.

agarny · web-flow · commit 282d05fc133e · 2025-01-08T19:14:46.000+13:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -130,3 +130,18 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
                            ${NODE_ADDON_API_DIR})
 
 add_definitions(-DNAPI_VERSION=3)
+
+# Configure our splash screen.
+
+string(TIMESTAMP CURRENT_YEAR "%Y")
+
+if(CURRENT_YEAR EQUAL 2024)
+    set(COPYRIGHT "2024")
+else()
+    set(COPYRIGHT "2024-${CURRENT_YEAR}")
+endif()
+
+set(VERSION ${PROJECT_VERSION})
+
+configure_file(src/main/assets/splashscreen.html.in
+               ${CMAKE_BINARY_DIR}/splashscreen.html)
diff --git a/package.json b/package.json
@@ -26,8 +26,8 @@
     "clean": "node res/clean.js",
     "dev": "pnpm build:libopencor && electron-vite dev --watch",
     "dev:web": "(cd ./src/renderer && vite dev)",
-    "format": "prettier --write . && clang-format -i src/libopencor/src/*",
-    "format:check": "prettier --check . && clang-format --dry-run -Werror src/libopencor/src/*",
+    "format": "prettier --log-level silent --write . && clang-format -i src/libopencor/src/*",
+    "format:check": "prettier --log-level silent --check . && clang-format --dry-run -Werror src/libopencor/src/*",
     "lint": "eslint --fix .",
     "package": "pnpm build && electron-builder",
     "package:linux": "pnpm build && electron-builder --linux",
diff --git a/src/electronapi.ts b/src/electronapi.ts
@@ -6,8 +6,6 @@ interface ElectronAPI {
   disableMenu: () => void
 
   // Renderer process listening to the main process.
-  // Note: no onInitSplashScreenWindow() method since it's only called from our splash screen window and it doesn't seem
-  //       to be able to import this file.
 
   onResetAll: (callback: () => void) => void
   onAbout: (callback: () => void) => void
diff --git a/src/main/SplashScreenWindow.ts b/src/main/SplashScreenWindow.ts
@@ -2,7 +2,7 @@ import { ApplicationWindow } from './ApplicationWindow'
 import { retrieveMainWindowState } from './MainWindow'
 
 export class SplashScreenWindow extends ApplicationWindow {
-  constructor(copyright: string, version: string) {
+  constructor() {
     // Initialise ourselves.
 
     const width = 413 + 24
@@ -22,17 +22,8 @@ export class SplashScreenWindow extends ApplicationWindow {
       alwaysOnTop: true
     })
 
-    this.loadFile('./src/main/assets/splashscreen.html').catch((err: unknown) => {
+    this.loadFile('./out/libOpenCOR/splashscreen.html').catch((err: unknown) => {
       console.error('Failed to load splash screen:', err)
     })
-
-    // Initialise our Web contents.
-
-    this.on('ready-to-show', () => {
-      this.webContents.send('init-splash-screen-window', {
-        copyright: copyright,
-        version: version
-      })
-    })
   }
 }
diff --git a/src/main/assets/splashscreen.html.in b/src/main/assets/splashscreen.html.in
@@ -8,22 +8,19 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     />
-    <link rel="stylesheet" href="splashscreen.css" />
+    <link rel="stylesheet" href="../../src/main/assets/splashscreen.css" />
   </head>
-
   <body>
     <table class="contents">
       <tr>
         <td class="logo" colspan="2">
-          <img class="logo" src="../../renderer/src/assets/logo.svg" />
+          <img class="logo" src="../../src/renderer/src/assets/logo.svg" />
         </td>
       </tr>
       <tr>
-        <td class="copyright">Copyright <span id="copyright" /></td>
-        <td class="version">Version <span id="version" /></td>
+        <td class="copyright">Copyright @COPYRIGHT@</td>
+        <td class="version">Version @VERSION@</td>
       </tr>
     </table>
-
-    <script src="splashscreen.ts"></script>
   </body>
 </html>
diff --git a/src/main/assets/splashscreen.ts b/src/main/assets/splashscreen.ts
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -48,16 +48,7 @@ app
   .then(() => {
     // Create our splash window, if we are not in development mode, and pass it our copyright and version values.
 
-    let splashScreenWindow: SplashScreenWindow = null as unknown as SplashScreenWindow
-
-    if (!isDevMode()) {
-      const currentYear = new Date().getFullYear()
-
-      splashScreenWindow = new SplashScreenWindow(
-        currentYear === 2024 ? '2024' : `2024-${currentYear.toString()}`,
-        app.getVersion()
-      )
-    }
+    const splashScreenWindow: SplashScreenWindow | null = isDevMode() ? null : new SplashScreenWindow()
 
     // Set our app user model id for Windows.
 
diff --git a/src/preload/index.ts b/src/preload/index.ts
@@ -13,10 +13,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
 
   // Renderer process listening to the main process.
 
-  onInitSplashScreenWindow: (callback: (info: unknown) => void) =>
-    ipcRenderer.on('init-splash-screen-window', (_event, info) => {
-      callback(info)
-    }),
   onResetAll: (callback: () => void) =>
     ipcRenderer.on('reset-all', () => {
       callback()
diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -9,7 +9,6 @@
       content="default-src 'self'; script-src 'unsafe-eval'; script-src-elem 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     />
   </head>
-
   <body>
     <div id="app" />
     <script type="module" src="./src/main.ts"></script>
