Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to use new WPILib Logo #683

Merged
merged 1 commit into from
Sep 1, 2024
Merged

Update to use new WPILib Logo #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions vscode-wpilib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -184,7 +184,7 @@
"command": "wpilibcore.startTool",
"title": "%wpilibcore.startTool.title%",
"category": "WPILib",
"icon": "resources/wpilib.svg",
"icon": "resources/wpilib-icon.svg",
"enablement": "isWorkspaceTrusted"
},
{
Expand All @@ -203,7 +203,7 @@
"command": "wpilibcore.deployCode",
"title": "%wpilibcore.deployCode.title%",
"category": "WPILib",
"icon": "resources/wpilib.svg",
"icon": "resources/wpilib-icon.svg",
"enablement": "isWorkspaceTrusted"
},
{
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion vscode-wpilib/resources/webviews/alphaerror.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<body>

<img src="replaceresource/resources/wpilib.svg" width="100" />
<img src="replaceresource/resources/wpilib-generic.svg" height="75" />

<h1>
You still have the WPILib Alpha installed.
Expand Down
2 changes: 1 addition & 1 deletion vscode-wpilib/resources/webviews/gradle2020import.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</head>

<body>
<img src="replaceresource/resources/wpilib.svg" width="100" />
<img src="replaceresource/resources/wpilib-generic.svg" height="75" />

<h1>Welcome to WPILib 2020-2023 Project Importer</h1>

Expand Down
2 changes: 1 addition & 1 deletion vscode-wpilib/resources/webviews/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<h1>WPILib Help</h1>

<img src="replaceresource/resources/wpilib.svg" width="100" />
<img src="replaceresource/resources/wpilib-generic.svg" height="75" />

<p>Welcome to WPILib Help!</p>

Expand Down
2 changes: 1 addition & 1 deletion vscode-wpilib/resources/webviews/projectcreator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</head>

<body>
<img src="replaceresource/resources/wpilib.svg" width="100" />
<img src="replaceresource/resources/wpilib-generic.svg" height="75" />

<h1 data-i18n-trans>Welcome to WPILib New Project Creator</h1>

Expand Down
Binary file removed vscode-wpilib/resources/wpilib-128.png
View file
Open in desktop
Binary file not shown.
101 changes: 101 additions & 0 deletions vscode-wpilib/resources/wpilib-generic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vscode-wpilib/resources/wpilib-icon-128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions vscode-wpilib/resources/wpilib-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 0 additions & 48 deletions vscode-wpilib/resources/wpilib.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion vscode-wpilib/src/cppprovider/headertreeprovider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export class HeaderTreeProvider implements vscode.TreeDataProvider<Entry> {
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<Entry | undefined | null>();
}

Expand Down
2 changes: 1 addition & 1 deletion vscode-wpilib/src/webviews/webviewbase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
Binary file removed vscode-wpilib/wpilib-128.png
View file
Open in desktop
Binary file not shown.
Binary file added vscode-wpilib/wpilib-icon-128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wpilib-utility-standalone/icon.icns
View file
Open in desktop
Binary file not shown.
Binary file added wpilib-utility-standalone/icon.ico
View file
Open in desktop
Binary file not shown.
Binary file added wpilib-utility-standalone/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions wpilib-utility-standalone/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@
"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",
"repository": "https://github.com/wpilibsuite/vscode-wpilib",
"keywords": [],
"author": "WPILib Suite",
"license": "BSD-3-Clause",
"icon": "icon.png",
"devDependencies": {
"@types/glob": "^7.2.0",
"@types/mkdirp": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion wpilib-utility-standalone/projectcreator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</head>

<body>
<img src="./wpilib.svg" width="100" />
<img src="./wpilib-generic.svg" height="75" />

<h1>Welcome to WPILib New Project Creator</h1>

Expand Down
Loading