diff --git a/vscode-wpilib/package.json b/vscode-wpilib/package.json
index 6a56bd6c..34bf41da 100644
--- a/vscode-wpilib/package.json
+++ b/vscode-wpilib/package.json
@@ -6,7 +6,7 @@
"version": "0.1.0",
"publisher": "wpilibsuite",
"license": "BSD-3-Clause",
- "icon": "wpilib-128.png",
+ "icon": "wpilib-icon-128.png",
"engines": {
"vscode": "^1.57.0"
},
@@ -102,7 +102,7 @@
"wpilib.additionalGradleArguments": {
"type": "string",
"default": "",
- "description": "For debugging only, passes extra arguments to gradle invokations",
+ "description": "For debugging only, passes extra arguments to gradle invocations",
"scope": "resource"
},
"wpilib.autoSaveOnDeploy": {
@@ -184,7 +184,7 @@
"command": "wpilibcore.startTool",
"title": "%wpilibcore.startTool.title%",
"category": "WPILib",
- "icon": "resources/wpilib.svg",
+ "icon": "resources/wpilib-icon.svg",
"enablement": "isWorkspaceTrusted"
},
{
@@ -203,7 +203,7 @@
"command": "wpilibcore.deployCode",
"title": "%wpilibcore.deployCode.title%",
"category": "WPILib",
- "icon": "resources/wpilib.svg",
+ "icon": "resources/wpilib-icon.svg",
"enablement": "isWorkspaceTrusted"
},
{
@@ -282,27 +282,27 @@
"command": "wpilibcore.createCommand",
"title": "%wpilibcore.createCommand.title%",
"category": "WPILib",
- "icon": "resources/wpilib.svg",
+ "icon": "resources/wpilib-icon.svg",
"enablement": "isWorkspaceTrusted"
},
{
"command": "wpilibcore.cancelTasks",
"title": "%wpilibcore.cancelTasks.title%",
"category": "WPILib",
- "icon": "resources/wpilib.svg",
+ "icon": "resources/wpilib-icon.svg",
"enablement": "isWorkspaceTrusted"
},
{
"command": "wpilibcore.help",
"title": "%wpilibcore.help.title%",
"category": "WPILib",
- "icon": "resources/wpilib.svg"
+ "icon": "resources/wpilib-icon.svg"
},
{
"command": "wpilibcore.openCommandPalette",
"title": "%wpilibcore.openCommandPalette.title%",
"category": "WPILib",
- "icon": "resources/wpilib.svg"
+ "icon": "resources/wpilib-icon.svg"
},
{
"command": "wpilibcore.refreshCppProperties",
diff --git a/vscode-wpilib/resources/webviews/alphaerror.html b/vscode-wpilib/resources/webviews/alphaerror.html
index 138dfcac..ad2fa32f 100644
--- a/vscode-wpilib/resources/webviews/alphaerror.html
+++ b/vscode-wpilib/resources/webviews/alphaerror.html
@@ -7,7 +7,7 @@
-
You still have the WPILib Alpha installed.
diff --git a/vscode-wpilib/resources/webviews/gradle2020import.html b/vscode-wpilib/resources/webviews/gradle2020import.html
index 2291509e..7856575b 100644
--- a/vscode-wpilib/resources/webviews/gradle2020import.html
+++ b/vscode-wpilib/resources/webviews/gradle2020import.html
@@ -15,7 +15,7 @@
- Welcome to WPILib 2020-2023 Project Importer
diff --git a/vscode-wpilib/resources/webviews/help.html b/vscode-wpilib/resources/webviews/help.html
index d3588cda..fbc2eea6 100644
--- a/vscode-wpilib/resources/webviews/help.html
+++ b/vscode-wpilib/resources/webviews/help.html
@@ -9,7 +9,7 @@
WPILib Help
- Welcome to WPILib Help!
diff --git a/vscode-wpilib/resources/webviews/projectcreator.html b/vscode-wpilib/resources/webviews/projectcreator.html
index 81b6d4df..880b050b 100644
--- a/vscode-wpilib/resources/webviews/projectcreator.html
+++ b/vscode-wpilib/resources/webviews/projectcreator.html
@@ -15,7 +15,7 @@
- Welcome to WPILib New Project Creator
diff --git a/vscode-wpilib/resources/wpilib-128.png b/vscode-wpilib/resources/wpilib-128.png
deleted file mode 100644
index 0169c0dc..00000000
Binary files a/vscode-wpilib/resources/wpilib-128.png and /dev/null differ
diff --git a/vscode-wpilib/resources/wpilib-generic.svg b/vscode-wpilib/resources/wpilib-generic.svg
new file mode 100644
index 00000000..fcd6e4c5
--- /dev/null
+++ b/vscode-wpilib/resources/wpilib-generic.svg
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vscode-wpilib/resources/wpilib.svg b/vscode-wpilib/resources/wpilib.svg
deleted file mode 100644
index 465a60f6..00000000
--- a/vscode-wpilib/resources/wpilib.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vscode-wpilib/src/cppprovider/headertreeprovider.ts b/vscode-wpilib/src/cppprovider/headertreeprovider.ts
index 6dc2982e..15f2f5d9 100644
--- a/vscode-wpilib/src/cppprovider/headertreeprovider.ts
+++ b/vscode-wpilib/src/cppprovider/headertreeprovider.ts
@@ -116,7 +116,7 @@ export class HeaderTreeProvider implements vscode.TreeDataProvider {
private wpilibIcon: vscode.Uri;
constructor(resourceRoot: string) {
- this.wpilibIcon = vscode.Uri.file(path.join(resourceRoot, 'wpilib.svg'));
+ this.wpilibIcon = vscode.Uri.file(path.join(resourceRoot, 'wpilib-icon.svg'));
this._onDidChangeFile = new vscode.EventEmitter();
}
diff --git a/vscode-wpilib/src/webviews/webviewbase.ts b/vscode-wpilib/src/webviews/webviewbase.ts
index 263ace31..c4f068f7 100644
--- a/vscode-wpilib/src/webviews/webviewbase.ts
+++ b/vscode-wpilib/src/webviews/webviewbase.ts
@@ -56,7 +56,7 @@ export abstract class WebViewBase {
reveal?: boolean, options?: vscode.WebviewPanelOptions & vscode.WebviewOptions) {
if (this.webview === undefined) {
this.webview = vscode.window.createWebviewPanel(this.veiwType, this.title, showOptions, options);
- this.webview.iconPath = vscode.Uri.file(path.join(this.resourceRoot, 'wpilib-128.png'));
+ this.webview.iconPath = vscode.Uri.file(path.join(this.resourceRoot, 'wpilib-icon-128.png'));
this.replaceResources(this.webview.webview);
this.webview.webview.html = this.html;
this.webview.onDidDispose(() => {
diff --git a/vscode-wpilib/wpilib-128.png b/vscode-wpilib/wpilib-128.png
deleted file mode 100644
index 0169c0dc..00000000
Binary files a/vscode-wpilib/wpilib-128.png and /dev/null differ
diff --git a/vscode-wpilib/wpilib-icon-128.png b/vscode-wpilib/wpilib-icon-128.png
new file mode 100644
index 00000000..70f19c8d
Binary files /dev/null and b/vscode-wpilib/wpilib-icon-128.png differ
diff --git a/wpilib-utility-standalone/icon.icns b/wpilib-utility-standalone/icon.icns
new file mode 100644
index 00000000..375d5229
Binary files /dev/null and b/wpilib-utility-standalone/icon.icns differ
diff --git a/wpilib-utility-standalone/icon.ico b/wpilib-utility-standalone/icon.ico
new file mode 100644
index 00000000..1575304d
Binary files /dev/null and b/wpilib-utility-standalone/icon.ico differ
diff --git a/wpilib-utility-standalone/icon.png b/wpilib-utility-standalone/icon.png
new file mode 100644
index 00000000..fa691a7e
Binary files /dev/null and b/wpilib-utility-standalone/icon.png differ
diff --git a/wpilib-utility-standalone/package.json b/wpilib-utility-standalone/package.json
index d54508a8..1d398b6a 100644
--- a/wpilib-utility-standalone/package.json
+++ b/wpilib-utility-standalone/package.json
@@ -8,9 +8,9 @@
"lint": "eslint .",
"start": "npm run compile && electron ./out/main.js",
"watch": "tsc -watch -p ./",
- "packageWindows": "electron-packager . wpilibutility --platform=win32 --overwrite --out ./build",
- "packageLinux": "electron-packager . wpilibutility --platform=linux --overwrite --out ./build",
- "packageMac": "electron-packager . wpilibutility --platform=darwin --arch=universal --overwrite --out ./build",
+ "packageWindows": "electron-packager . wpilibutility --platform=win32 --overwrite --icon=icon.ico --out ./build",
+ "packageLinux": "electron-packager . wpilibutility --platform=linux --overwrite --icon=icon.png --out ./build",
+ "packageMac": "electron-packager . wpilibutility --platform=darwin --arch=universal --icon=icon.icns --overwrite --out ./build",
"signMac": "electron-osx-sign build/wpilibutility-darwin-universal/wpilibutility.app --entitlements=macOS/WPILibStandaloneUtility.entitlements --entitlements-inherit=macOS/WPILibStandaloneUtility.entitlements --hardened-runtime=true --no-gatekeeper-assess"
},
"main": "out/main.js",
@@ -18,6 +18,7 @@
"keywords": [],
"author": "WPILib Suite",
"license": "BSD-3-Clause",
+ "icon": "icon.png",
"devDependencies": {
"@types/glob": "^7.2.0",
"@types/mkdirp": "^1.0.2",
diff --git a/wpilib-utility-standalone/projectcreator.html b/wpilib-utility-standalone/projectcreator.html
index 777ab8c3..f8717b48 100644
--- a/wpilib-utility-standalone/projectcreator.html
+++ b/wpilib-utility-standalone/projectcreator.html
@@ -22,7 +22,7 @@
- Welcome to WPILib New Project Creator
diff --git a/wpilib-utility-standalone/vendordeps.html b/wpilib-utility-standalone/vendordeps.html
index 4948641f..bbbb5f05 100644
--- a/wpilib-utility-standalone/vendordeps.html
+++ b/wpilib-utility-standalone/vendordeps.html
@@ -22,7 +22,7 @@
- Welcome to WPILib Vendor Dependencies Editor
diff --git a/wpilib-utility-standalone/wpilib-generic.svg b/wpilib-utility-standalone/wpilib-generic.svg
new file mode 100644
index 00000000..fcd6e4c5
--- /dev/null
+++ b/wpilib-utility-standalone/wpilib-generic.svg
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+ 
+ 