diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a5e235f16..be0da8535a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ## [Unreleased] * Fix an issue where opening up git worktree doesn't show any git info on the editor +* Add a branded sidebar image to the Windows installer and improve icon + ## 1.132.1 * Fix an issue where missing theme variables prevented the project window from initializing. diff --git a/resources/app-icons/beta-next.ico b/resources/app-icons/beta-next.ico index bb0bd83843..3eb06217e3 100644 Binary files a/resources/app-icons/beta-next.ico and b/resources/app-icons/beta-next.ico differ diff --git a/resources/app-icons/beta-next.png b/resources/app-icons/beta-next.png index df77385051..32ba288f07 100644 Binary files a/resources/app-icons/beta-next.png and b/resources/app-icons/beta-next.png differ diff --git a/resources/app-icons/beta.ico b/resources/app-icons/beta.ico index e25a62f346..cc01fd477f 100644 Binary files a/resources/app-icons/beta.ico and b/resources/app-icons/beta.ico differ diff --git a/resources/app-icons/beta.png b/resources/app-icons/beta.png index e2db9a40d7..95d059d20a 100644 Binary files a/resources/app-icons/beta.png and b/resources/app-icons/beta.png differ diff --git a/resources/win/folder.ico b/resources/win/folder.ico deleted file mode 100644 index ad1d9fc952..0000000000 Binary files a/resources/win/folder.ico and /dev/null differ diff --git a/resources/win/installerSidebar-next.bmp b/resources/win/installerSidebar-next.bmp new file mode 100644 index 0000000000..4cc8ccfa66 Binary files /dev/null and b/resources/win/installerSidebar-next.bmp differ diff --git a/resources/win/installerSidebar.bmp b/resources/win/installerSidebar.bmp new file mode 100644 index 0000000000..a38fd03a0d Binary files /dev/null and b/resources/win/installerSidebar.bmp differ diff --git a/resources/win/loading.gif b/resources/win/loading.gif deleted file mode 100644 index 11fd6cb124..0000000000 Binary files a/resources/win/loading.gif and /dev/null differ diff --git a/resources/win/pulsar.visualElementsManifest.xml b/resources/win/pulsar.visualElementsManifest.xml deleted file mode 100644 index 762a597925..0000000000 --- a/resources/win/pulsar.visualElementsManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/resources/win/visualElements/Square150x150Logo.scale-100.png b/resources/win/visualElements/Square150x150Logo.scale-100.png deleted file mode 100644 index 7330dd46c6..0000000000 Binary files a/resources/win/visualElements/Square150x150Logo.scale-100.png and /dev/null differ diff --git a/resources/win/visualElements/Square150x150Logo.scale-125.png b/resources/win/visualElements/Square150x150Logo.scale-125.png deleted file mode 100644 index eaa8d4d3cc..0000000000 Binary files a/resources/win/visualElements/Square150x150Logo.scale-125.png and /dev/null differ diff --git a/resources/win/visualElements/Square150x150Logo.scale-150.png b/resources/win/visualElements/Square150x150Logo.scale-150.png deleted file mode 100644 index 95e70014b2..0000000000 Binary files a/resources/win/visualElements/Square150x150Logo.scale-150.png and /dev/null differ diff --git a/resources/win/visualElements/Square150x150Logo.scale-200.png b/resources/win/visualElements/Square150x150Logo.scale-200.png deleted file mode 100644 index 1d60066970..0000000000 Binary files a/resources/win/visualElements/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/resources/win/visualElements/Square150x150Logo.scale-400.png b/resources/win/visualElements/Square150x150Logo.scale-400.png deleted file mode 100644 index caff091826..0000000000 Binary files a/resources/win/visualElements/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/resources/win/visualElements/Square44x44Logo.scale-100.png b/resources/win/visualElements/Square44x44Logo.scale-100.png deleted file mode 100644 index 8385f6deb7..0000000000 Binary files a/resources/win/visualElements/Square44x44Logo.scale-100.png and /dev/null differ diff --git a/resources/win/visualElements/Square44x44Logo.scale-125.png b/resources/win/visualElements/Square44x44Logo.scale-125.png deleted file mode 100644 index 3495726064..0000000000 Binary files a/resources/win/visualElements/Square44x44Logo.scale-125.png and /dev/null differ diff --git a/resources/win/visualElements/Square44x44Logo.scale-150.png b/resources/win/visualElements/Square44x44Logo.scale-150.png deleted file mode 100644 index 5ced0f71c2..0000000000 Binary files a/resources/win/visualElements/Square44x44Logo.scale-150.png and /dev/null differ diff --git a/resources/win/visualElements/Square44x44Logo.scale-200.png b/resources/win/visualElements/Square44x44Logo.scale-200.png deleted file mode 100644 index 5d31290555..0000000000 Binary files a/resources/win/visualElements/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/resources/win/visualElements/Square44x44Logo.scale-400.png b/resources/win/visualElements/Square44x44Logo.scale-400.png deleted file mode 100644 index 93aba07d82..0000000000 Binary files a/resources/win/visualElements/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/resources/win/visualElements/Square71x71Logo.scale-100.png b/resources/win/visualElements/Square71x71Logo.scale-100.png deleted file mode 100644 index 9bb9958c18..0000000000 Binary files a/resources/win/visualElements/Square71x71Logo.scale-100.png and /dev/null differ diff --git a/resources/win/visualElements/Square71x71Logo.scale-125.png b/resources/win/visualElements/Square71x71Logo.scale-125.png deleted file mode 100644 index 8bc331c238..0000000000 Binary files a/resources/win/visualElements/Square71x71Logo.scale-125.png and /dev/null differ diff --git a/resources/win/visualElements/Square71x71Logo.scale-150.png b/resources/win/visualElements/Square71x71Logo.scale-150.png deleted file mode 100644 index 43801e7cd7..0000000000 Binary files a/resources/win/visualElements/Square71x71Logo.scale-150.png and /dev/null differ diff --git a/resources/win/visualElements/Square71x71Logo.scale-200.png b/resources/win/visualElements/Square71x71Logo.scale-200.png deleted file mode 100644 index 39f787c567..0000000000 Binary files a/resources/win/visualElements/Square71x71Logo.scale-200.png and /dev/null differ diff --git a/resources/win/visualElements/Square71x71Logo.scale-400.png b/resources/win/visualElements/Square71x71Logo.scale-400.png deleted file mode 100644 index d94bbeee19..0000000000 Binary files a/resources/win/visualElements/Square71x71Logo.scale-400.png and /dev/null differ diff --git a/script/electron-builder.js b/script/electron-builder.js index e5206dc7f7..d630e572df 100644 --- a/script/electron-builder.js +++ b/script/electron-builder.js @@ -119,6 +119,9 @@ const ICONS = { svg: `resources/app-icons/${iconName}.svg`, icns: `resources/app-icons/${iconName}.icns` }; +const WINDOWS_INSTALLER_SIDEBAR = ARGS.next + ? 'resources/win/installerSidebar-next.bmp' + : 'resources/win/installerSidebar.bmp'; let options = { @@ -387,6 +390,7 @@ let options = { runAfterFinish: true, createDesktopShortcut: true, createStartMenuShortcut: true, + installerSidebar: WINDOWS_INSTALLER_SIDEBAR, guid: "0949b555-c22c-56b7-873a-a960bdefa81f", // The GUID is generated from Electron-Builder based on our AppID. // Hardcoding it here means it will always be used as generated from the diff --git a/src/reopen-project-menu-manager.js b/src/reopen-project-menu-manager.js index e88d4c265c..f1b920629a 100644 --- a/src/reopen-project-menu-manager.js +++ b/src/reopen-project-menu-manager.js @@ -110,14 +110,7 @@ module.exports = class ReopenProjectMenuManager { .join(', '), description: ReopenProjectMenuManager.taskDescription(project.paths), program: process.execPath, - args: project.paths.map(path => `"${path}"`).join(' '), - iconPath: path.join( - path.dirname(process.execPath), - 'resources', - 'cli', - 'folder.ico' - ), - iconIndex: 0 + args: project.paths.map(path => `"${path}"`).join(' ') })) }, { type: 'recent' },