Use .ico for Windows (#1097) (#1107)

gravitational · Aug 17, 2022 · 267b353 · 267b353
1 parent f514c1e
commit 267b353
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...eleterm/assets/icon-win-linux/512x512.png → ...es/teleterm/assets/icon-linux/512x512.png b/...eleterm/assets/icon-win-linux/512x512.png → ...es/teleterm/assets/icon-linux/512x512.png
diff --git a/web/packages/teleterm/assets/icon-win.ico b/web/packages/teleterm/assets/icon-win.ico
diff --git a/web/packages/teleterm/assets/icon.ico b/web/packages/teleterm/assets/icon.ico
diff --git a/web/packages/teleterm/package.json b/web/packages/teleterm/package.json
@@ -99,7 +99,7 @@
         "nsis"
       ],
       "artifactName": "${productName} Setup-${version}.${ext}",
-      "icon": "assets/icon-win-linux",
+      "icon": "assets/icon-win.ico",
       "extraResources": [
         {
           "from": "../../../teleport/build/tsh.exe",
@@ -112,7 +112,7 @@
         "deb"
       ],
       "category": "Development",
-      "icon": "assets/icon-win-linux",
+      "icon": "assets/icon-linux",
       "extraResources": [
         {
           "from": "../../../teleport/build/tsh",

diff --git a/web/packages/teleterm/src/mainProcess/windowsManager.ts b/web/packages/teleterm/src/mainProcess/windowsManager.ts
@@ -1,6 +1,7 @@
-import { BrowserWindow, Menu, Rectangle, screen } from 'electron';
-import { getAssetPath } from 'teleterm/mainProcess/runtimeSettings';
 import path from 'path';
+
+import { BrowserWindow, Menu, Rectangle, screen } from 'electron';
+
 import { FileStorage } from 'teleterm/services/fileStorage';
 import { RuntimeSettings } from 'teleterm/mainProcess/types';
 import theme from 'teleterm/ui/ThemeProvider/theme';
@@ -41,7 +42,6 @@ export class WindowsManager {
       minHeight: 300,
       autoHideMenuBar: true,
       title: 'Teleport Connect Preview',
-      icon: getAssetPath('icon.png'),
       webPreferences: {
         devTools: this.settings.dev,
         webgl: false,