new tray icon

nbonamy · Jan 1, 2025 · ad642fa · ad642fa
1 parent 3f91032
commit ad642fa
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 13 deletions.
diff --git a/assets/bulbTemplate.png b/assets/bulbTemplate.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/bulbUpdateTemplate.png b/assets/bulbUpdateTemplate.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/bulbUpdateWhite.png b/assets/bulbUpdateWhite.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/bulbWhite.png b/assets/bulbWhite.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/trayTemplate.png b/assets/trayTemplate.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/trayUpdateTemplate.png b/assets/trayUpdateTemplate.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/trayUpdateWhite.png b/assets/trayUpdateWhite.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/trayWhite.png b/assets/trayWhite.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/forge.config.ts b/forge.config.ts
@@ -80,14 +80,14 @@ const config: ForgeConfig = {
     extendInfo: './build/Info.plist',
     buildVersion: `${process.env.BUILD_NUMBER}`,
     extraResource: [
-      'assets/bulbTemplate.png',
-      'assets/bulbTemplate@2x.png',
-      'assets/bulbUpdateTemplate.png',
-      'assets/bulbUpdateTemplate@2x.png',
-      'assets/bulbWhite.png',
-      'assets/bulbWhite@2x.png',
-      'assets/bulbUpdateWhite.png',
-      'assets/bulbUpdateWhite@2x.png',
+      'assets/trayTemplate.png',
+      'assets/trayTemplate@2x.png',
+      'assets/trayUpdateTemplate.png',
+      'assets/trayUpdateTemplate@2x.png',
+      'assets/trayWhite.png',
+      'assets/trayWhite@2x.png',
+      'assets/trayUpdateWhite.png',
+      'assets/trayUpdateWhite@2x.png',
       'assets/icon.ico',
     ],
     ...osxPackagerConfig,

diff --git a/src/main/tray.ts b/src/main/tray.ts
@@ -41,7 +41,7 @@ export default class {
       trayIcon = nativeImage.createFromPath(trayIconPath);
     } else {
       const iconColor = process.platform === 'linux' ? 'White' : 'Template';
-      const trayIconPath = path.join(assetsFolder, updateAvailable ? `bulbUpdate${iconColor}@2x.png` : `bulb${iconColor}@2x.png`);
+      const trayIconPath = path.join(assetsFolder, updateAvailable ? `trayUpdate${iconColor}@2x.png` : `tray${iconColor}@2x.png`);
       //console.log('trayIconPath', trayIconPath);
       trayIcon = nativeImage.createFromPath(trayIconPath);
       trayIcon.setTemplateImage(true);

diff --git a/src/main/windows/main.ts b/src/main/windows/main.ts
@@ -50,9 +50,9 @@ export const openMainWindow = (opts: CreateWindowOpts = {}) => {
 
     // check
     const config = loadSettings(app);
-    if (config.general.tips.trayIcon) {
-      const systemTray = process.platform === 'darwin' ? 'menu bar' : 'system tray';
-      const message = `You can activate Witsy from the light bulb icon in the ${systemTray}.`;
+    if (config.general.tips.trayIcon === undefined || config.general.tips.trayIcon === true) {
+      const trayIconDesc = process.platform === 'win32' ? 'the icon in the system tray' : 'the fountain pen icon in the menu bar';
+      const message = `You can activate Witsy from ${trayIconDesc}.`;
       const options = {
         buttons: ['OK'],
         message: message,

diff --git a/src/settings/SettingsGeneral.vue b/src/settings/SettingsGeneral.vue
@@ -19,7 +19,7 @@
       <input type="checkbox" v-model="runAtLogin" @change="save" />
     </div>
     <div class="group hide-on-startup">
-      <label>Hide chat on start</label>
+      <label>Hide main window on start</label>
       <input type="checkbox" v-model="hideOnStartup" @change="save" />
     </div>
     <div class="group keep-running">
@@ -92,3 +92,9 @@ defineExpose({ load })
 @import '../../css/tabs.css';
 @import '../../css/form.css';
 </style>
+
+<style scoped>
+form .group label {
+  min-width: 170px;
+}
+</style>