From 94ae287a03412e2907b4d4d39fd3710ee2c61a49 Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 25 May 2022 15:47:02 +0800 Subject: [PATCH 1/3] add open help center step in walkthrough --- package.json | 21 ++++++- package.nls.json | 2 +- walkthrough/helpCenter.svg | 107 ++++++++++++++++++++++++++++++++++ walkthrough/helpCenterMac.svg | 106 +++++++++++++++++++++++++++++++++ 4 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 walkthrough/helpCenter.svg create mode 100644 walkthrough/helpCenterMac.svg diff --git a/package.json b/package.json index c274e890..64dabf87 100644 --- a/package.json +++ b/package.json @@ -118,9 +118,20 @@ "title": "Explore more Java resources", "description": "%walkthrough.java.more%", "media": { - "svg": "walkthrough/ok.svg", + "svg": "walkthrough/helpCenter.svg", "altText": "Explore more Java resources" - } + }, + "when": "!isMac" + }, + { + "id": "java.moreForMac", + "title": "Explore more Java resources", + "description": "%walkthrough.java.more%", + "media": { + "svg": "walkthrough/helpCenterMac.svg", + "altText": "Explore more Java resources" + }, + "when": "isMac" } ] } @@ -280,6 +291,12 @@ ], "priority": "option" } + ], + "keybindings":[ + { + "command": "java.welcome", + "key": "shift+f1" + } ] }, "scripts": { diff --git a/package.nls.json b/package.nls.json index c81c5462..71c7324e 100644 --- a/package.nls.json +++ b/package.nls.json @@ -11,5 +11,5 @@ "walkthrough.java.extensions": "Install extensions to support additional frameworks such as Spring Boot, Application Servers, key mappings and so on.\n[Browse Recommended Extensions](command:toSide:java.extGuide)", - "walkthrough.java.more": "- 🎉 If you want to run your project with a specific runtime, you can [Configure Java Runtime](command:toSide:java.runtime).\n\n- 🎉 Visit [Dev Blogs](https://aka.ms/java-walkthrough-devblogs) to keep up-to-date with our latest product updates and announcements.\n\n- ✨ Discover more shortcuts and features in [Help Center](command:toSide:java.welcome.fromWalkthrough) or check documentation for tips and troubleshooting.\n\n- ✨ Report issues and feedback at our [Github repository](https://aka.ms/java-walkthrough-issue)." + "walkthrough.java.more": "✨ Help Center provides tips, resources and links to help you get answers to the most common questions to learn Java on VS Code.\n[Open Help Center](command:java.welcome.fromWalkthrough)" } diff --git a/walkthrough/helpCenter.svg b/walkthrough/helpCenter.svg new file mode 100644 index 00000000..54d6a93c --- /dev/null +++ b/walkthrough/helpCenter.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/walkthrough/helpCenterMac.svg b/walkthrough/helpCenterMac.svg new file mode 100644 index 00000000..7fb3a93b --- /dev/null +++ b/walkthrough/helpCenterMac.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5fd4b391c7b4db1cad415559ae59734b37bc7490 Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 1 Jun 2022 16:04:43 +0800 Subject: [PATCH 2/3] use `java.welcome` command in all places --- package.nls.json | 2 +- src/welcome/assets/components/Header.tsx | 1 - walkthrough/helpCenter.svg | 2 +- walkthrough/helpCenterMac.svg | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.nls.json b/package.nls.json index 71c7324e..fa7c1572 100644 --- a/package.nls.json +++ b/package.nls.json @@ -11,5 +11,5 @@ "walkthrough.java.extensions": "Install extensions to support additional frameworks such as Spring Boot, Application Servers, key mappings and so on.\n[Browse Recommended Extensions](command:toSide:java.extGuide)", - "walkthrough.java.more": "✨ Help Center provides tips, resources and links to help you get answers to the most common questions to learn Java on VS Code.\n[Open Help Center](command:java.welcome.fromWalkthrough)" + "walkthrough.java.more": "✨ Help Center provides tips, resources and links to help you get answers to the most common questions to learn Java on VS Code.\n[Open Help Center](command:java.welcome)" } diff --git a/src/welcome/assets/components/Header.tsx b/src/welcome/assets/components/Header.tsx index 0e8d7dab..1bd492ca 100644 --- a/src/welcome/assets/components/Header.tsx +++ b/src/welcome/assets/components/Header.tsx @@ -15,7 +15,6 @@ export default class Header extends React.Component { const subtitle = Check our {blogsLink} to see what's new; return (
- logo
{title} {subtitle} diff --git a/walkthrough/helpCenter.svg b/walkthrough/helpCenter.svg index 54d6a93c..5f34bd53 100644 --- a/walkthrough/helpCenter.svg +++ b/walkthrough/helpCenter.svg @@ -1,6 +1,6 @@ - + diff --git a/walkthrough/helpCenterMac.svg b/walkthrough/helpCenterMac.svg index 7fb3a93b..748e68cd 100644 --- a/walkthrough/helpCenterMac.svg +++ b/walkthrough/helpCenterMac.svg @@ -1,6 +1,6 @@ - + From 25a1bf88e8fcc73462fd21c61d742371a8021796 Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 1 Jun 2022 16:09:04 +0800 Subject: [PATCH 3/3] remove logo declaration --- src/welcome/assets/components/Header.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/welcome/assets/components/Header.tsx b/src/welcome/assets/components/Header.tsx index 1bd492ca..df0ea53e 100644 --- a/src/welcome/assets/components/Header.tsx +++ b/src/welcome/assets/components/Header.tsx @@ -4,7 +4,6 @@ import * as React from "react"; import { encodeCommandUriWithTelemetry } from "../../../utils/webview"; import { WEBVIEW_ID } from "../utils"; -const logo = require("../../../../logo.svg"); const DEV_BLOG_LINK = "https://devblogs.microsoft.com/?s=Java+on+Visual+Studio+Code"; export default class Header extends React.Component {