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.

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

Update default settings.json experience #5217

Merged
15 commits merged into from
Apr 9, 2020
Merged

Conversation

carlos-zamora
Copy link
Member

Summary of the Pull Request

Add comments and settings to settings.json for discoverability.

PR Checklist

@carlos-zamora carlos-zamora added Area-User Interface Issues pertaining to the user interface of the Console or Terminal Area-Settings Issues related to settings and customizability, for console or terminal labels Apr 2, 2020
@carlos-zamora
Copy link
Member Author

carlos-zamora commented Apr 2, 2020

I added a bunch of links to https://aka.ms/terminal-documentation. I think we agreed that it would be better to have links to more relevant spots but those need to be created.

@cinnamon-msft could you create those aka.ms links so that I add them in? Or just let me know what to do here.

@DHowett-MSFT Should we be using FW links here instead? I think we said no, but I want to make double-check.

@carlos-zamora carlos-zamora marked this pull request as ready for review April 2, 2020 01:24
Copy link
Member

@zadjii-msft zadjii-msft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want aka.ms links here, but yea we should probably get more of them

@zadjii-msft
Copy link
Member

@msftbot make sure @cinnamon-msft signs off on this

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Apr 2, 2020
@ghost
Copy link

ghost commented Apr 2, 2020

Hello @zadjii-msft!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I'll only merge this pull request if it's approved by @cinnamon-msft

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

src/cascadia/TerminalApp/userDefaults.json Show resolved Hide resolved
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 2, 2020
@cinnamon-msft
Copy link
Contributor

Given the state of our documentation, I can't give specific links. I think just the one aka.ms documentation link is fine.
Also, yes these are aka.ms links, not fwlinks. :)

@DHowett-MSFT
Copy link
Contributor

I don’t think there is value in having a link above every section if every link is just the same link. It’s like saying “look here for specific documentation. NATCH! Got you, here’s the landing page.”

@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 2, 2020
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 2, 2020
@DHowett-MSFT DHowett-MSFT removed the AutoMerge Marked for automatic merge by the bot when requirements are met label Apr 2, 2020
@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 2, 2020
@cinnamon-msft
Copy link
Contributor

I didn't realize we didn't have "requestedTheme" already in the settings.json file. What are your thoughts on adding this setting as well? @microsoft/windows-console-team

@DHowett-MSFT
Copy link
Contributor

Hey, should we rename requestedTheme? It doesn't make a lot of sense ... it's more of an applicationTheme.

@zadjii-msft
Copy link
Member

should we rename requestedTheme? It doesn't make a lot of sense ... it's more of an applicationTheme.

This is probably fine, and would probably still be fine with #3327. I'm mildly worried that renaming the setting now means we're breaking everyone who's got it set currently, unless they manually change it, because we won't be supporting migrating from the old value. We're also breaking other things too so idk

@cinnamon-msft
Copy link
Contributor

I'm okay with changing it.

Copy link
Contributor

@DHowett-MSFT DHowett-MSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAK on the indentattion change unless you can explain what it is and why it is and where it came from, or fix the code to make it do 2 spaces by default.

src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
[
// Copy and paste are bound to Ctrl+Shift+C and Ctrl+Shift+V in your defaults.json
// These bindings additionally bind them to Ctrl+C and Ctrl+V
// To learn more about selection, visit https://aka.ms/terminal-selection
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't necessarily think selection warrants its own URL callout

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was imagining the page would include the following:

  • using the mouse and non-rebindable modifiers
  • HTML Copy
  • SingleLine
  • how selection works with VTMM

Since HTML Copy is being discussed in #5212, I'm wondering if this will help with the discoverability there?

But we are just in the keybindings section so some of that isn't all that relevant. Whatcha think? Is this a valid concern?

src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
@ghost ghost added Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something and removed Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something labels Apr 3, 2020
Co-Authored-By: Dustin L. Howett (MSFT) <duhowett@microsoft.com>
@carlos-zamora carlos-zamora removed the Area-User Interface Issues pertaining to the user interface of the Console or Terminal label Apr 6, 2020
DHowett-MSFT pushed a commit that referenced this pull request Apr 7, 2020
This pull request introduces unexpanded variables (`%DEFAULT_PROFILE%`,
`%VERSION%` and `%PRODUCT%`) to the user settings template and code to
expand them.

While doing this, I ran into a couple things that needed to widen from
accepting strings to accepting string views. I also had to move
application name and version detection up to AppLogic and expose the
AppLogic singleton.

The dynamic profile generation logic had to be moved to before we inject
the templated variables, as the new default profile depends on the
generated dynamic profiles.

References #5189, #5217 (because it has a dependency on `VERSION` and
`PRODUCT`).

## PR Checklist
* [x] Closes #2721 
* [x] CLA signed
* [x] Tests added/passed
* [ ] Requires documentation to be updated
* [x] I've discussed this with core contributors already

## Validation Steps Performed
Deleted my settings and watched them regenerate.
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
src/cascadia/TerminalApp/userDefaults.json Outdated Show resolved Hide resolved
Co-Authored-By: Dustin L. Howett (MSFT) <duhowett@microsoft.com>
@carlos-zamora carlos-zamora added the AutoMerge Marked for automatic merge by the bot when requirements are met label Apr 9, 2020
@ghost
Copy link

ghost commented Apr 9, 2020

Hello @carlos-zamora!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit c65de31 into master Apr 9, 2020
@ghost ghost deleted the dev/cazamor/settings-copy-pasta branch April 9, 2020 23:21
@ghost
Copy link

ghost commented Apr 22, 2020

🎉Windows Terminal Preview v0.11.1121.0 has been released which incorporates this pull request.:tada:

Handy links:

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Settings Issues related to settings and customizability, for console or terminal AutoMerge Marked for automatic merge by the bot when requirements are met
Projects
None yet
6 participants