Skip to content

Commit

Permalink
Merge release 1.12 into master (#428)
Browse files Browse the repository at this point in the history
Co-authored-by: Kayla Cinnamon <[email protected]>
Co-authored-by: Pankaj Bhojwani <[email protected]>
Co-authored-by: Matt Wojciakowski <[email protected]>
Co-authored-by: Mike Griese <[email protected]>
Co-authored-by: Carlos Zamora <[email protected]>
Co-authored-by: Schuyler Rosefield <[email protected]>
Co-authored-by: PankajBhojwani <[email protected]>
  • Loading branch information
7 people authored Oct 20, 2021
1 parent e14f4d4 commit aa186ea
Show file tree
Hide file tree
Showing 31 changed files with 651 additions and 308 deletions.
5 changes: 5 additions & 0 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
"source_path": "TerminalDocs/customize-settings/profile-settings.md",
"redirect_url": "https://docs.microsoft.com/windows/terminal/customize-settings/profile-general",
"redirect_document_id": true
},
{
"source_path": "TerminalDocs/get-started.md",
"redirect_url": "https://docs.microsoft.com/windows/terminal/install",
"redirect_document_id": true
}
]
}
8 changes: 4 additions & 4 deletions TerminalDocs/TOC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
items:
- name: Overview
href: index.md
- name: Get started
href: get-started.md
- name: Install
href: install.md
- name: Customize settings
items:
- name: Startup
Expand Down Expand Up @@ -42,8 +42,8 @@
href: tips-and-tricks.md
- name: Tutorials
items:
- name: Powerline setup
href: tutorials/powerline-setup.md
- name: Custom prompt setup
href: tutorials/custom-prompt-setup.md
- name: SSH
href: tutorials/ssh.md
- name: Set the tab title
Expand Down
4 changes: 2 additions & 2 deletions TerminalDocs/cascadia-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Windows Terminal Cascadia Code
description: Learn about the different Cascadia Code fonts and how they work with Windows Terminal.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/19/2020
ms.date: 08/30/2021
ms.topic: overview
---

Expand All @@ -24,7 +24,7 @@ There are multiple versions of Cascadia Code available that include ligatures an

## Powerline and programming ligatures

Powerline is a common command-line plugin that allows you to display additional information in your prompt. It uses a few additional glyphs to display this information properly. To learn more about setting up Powerline in your command prompt, visit the [Powerline in Windows Terminal](./tutorials/powerline-setup.md) page.
Powerline is a common command-line plugin that allows you to display additional information in your prompt. It uses a few additional glyphs to display this information properly.

Programming ligatures are glyphs that are created by combining characters. They are most useful when writing code. The "Code" variants include ligatures, whereas the "Mono" variants exclude them.

Expand Down
48 changes: 37 additions & 11 deletions TerminalDocs/command-line-arguments.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Windows Terminal command line arguments
description: Learn how to create command line arguments for Windows Terminal.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/25/2021
ms.date: 10/15/2021
ms.topic: how-to
---

Expand Down Expand Up @@ -38,21 +38,47 @@ Below is the full list of supported commands and options for the `wt` command li
| `--focus`, `-f` | Launches the terminal in the focus mode. Can be combined with `maximized`. |
| `--window`, `-w` `<window-id>` | Launches the terminal in a specific window. |

| Command | Parameters | Description |
| ------- | ---------- | ----------- |
| `new-tab`, `nt` | `--profile, -p profile-name`, `--startingDirectory, -d starting-directory`, `commandline`, `--title`, `--tabColor` | Creates a new tab. |
| `split-pane`, `sp` | `-H, --horizontal`, `-V, --vertical`, `--profile, -p profile-name`, `--startingDirectory, -d starting-directory`, `--title`, `--tabColor`, `--size, -s size`, `commandline`, `-D, --duplicate` | Splits a new pane. |
| `focus-tab`, `ft` | `--target, -t tab-index` | Focuses on a specific tab. |
| `move-focus`, `mf` | `direction` | Move focus between panes in the given direction. Accepts one of `up`, `down`, `left`, `right`. |
### `New-tab` command

If you change the title of a tab in Windows Terminal and want that title to persist, you must enable the [suppressApplicationTitle](./customize-settings/actions.md#actions-6) option by setting it to `true`.
| Command | Parameter | Description | Values |
| ------- | ---------- | ----------- | ------ |
| `new-tab`, `nt` | `--profile, -p profile-name` | Creates a new tab based on the profile name assigned. | Profile name |
| `new-tab`, `nt` | `--startingDirectory, -d starting-directory` | Creates a new tab based on the starting directory path assigned. | Directory path |
| `new-tab`, `nt` | `commandline` | Creates a new tab based on the command line assigned. | Executable with optional commands |
| `new-tab`, `nt` | `--title` | Creates a new tab with the title assigned. | Text to use as the tab title |
| `new-tab`, `nt` | `--tabColor` | Creates a new tab with the tab color assigned. | Hex color as #RGB or #RRGGBB |

> [!TIP]
> If you change the title of a tab in Windows Terminal and want that title to persist, you must enable the [suppressApplicationTitle](./customize-settings/actions.md#actions-6) option by setting it to `true`.
### `Split-pane` command

| Command | Parameter | Description | Values |
| ------- | ---------- | ----------- | ------ |
| `split-pane`, `sp` | `-H, --horizontal`, `-V, --vertical` | Creates a new split window pane either horizontally or vertically. | N/A. No additional values to assign. |
| `split-pane`, `sp` | `--profile, -p profile-name` | Creates a new split window pane based on the assigned command line profile. If this parameter is not assigned, the default profile will be used. | Profile name |
| `split-pane`, `sp` | `--startingDirectory, -d starting-directory` | Creates a new split window pane based on the assigned starting directory path. If this parameter is not assigned, the default starting directory will be used. | Directory path |
| `split-pane`, `sp` | `--title` | Creates a new split window pane with the assigned title. | Text to use as the tab title |
| `split-pane`, `sp` | `--tabColor` | Creates a new split window pane with the assigned tab color. | Hex color as #RGB or #RRGGBB |
| `split-pane`, `sp` | `--size, -s size`| Creates a new split window pane with the assigned size. | Float that specifies the portion of the parent pane to use |
| `split-pane`, `sp` | `commandline` | Creates a new split window pane based on the assigned command line. | Executable with optional commands |
| `split-pane`, `sp` | `--duplicate, -D` | Creates a new split window pane that is a duplicate of the current pane. | N/A. No additional values to assign. |

### `Focus-tab` command

| Command | Parameter | Description | Values |
| ------- | ---------- | ----------- | ------ |
| `focus-tab`, `ft` | `--target, -t tab-index` | Focuses on a specific tab according to it's tab index number. | Tab index as an integer |

### `Move-focus` command

| Command | Parameter | Description | Values |
| ------- | ---------- | ----------- | ------ |
| `move-focus`, `mf` | `direction` | Move focus between panes in the given direction. | `up`, `down`, `left`, or `right` values accepted. |

> [!NOTE]
> When opening Windows Terminal from cmd (Command Prompt), if you want to use your custom "cmd" profile settings, you will need to use the command `wt -p cmd`. Otherwise, to run your *default* profile settings, just use `wt cmd`.
> [!IMPORTANT]
> The `-D, --duplicate` parameter for `split-pane` is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
## Command line argument examples

Commands may vary slightly depending on which command line you're using.
Expand Down
2 changes: 1 addition & 1 deletion TerminalDocs/command-palette.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You can add a custom key binding for invoking the command palette in the command

## Adding an icon to a command

You can optionally add an icon to a command defined in your [settings.json](./get-started.md#settings-json-file) that appears in the command palette. This can be done by adding the `icon` property to the action. Icons can be a path to an image, a symbol from [Segoe MDL2 Assets](/windows/uwp/design/style/segoe-ui-symbol-font), or any character, including emojis.
You can optionally add an icon to a command defined in your [settings.json](./install.md#settings-json-file) that appears in the command palette. This can be done by adding the `icon` property to the action. Icons can be a path to an image, a symbol from [Segoe MDL2 Assets](/windows/uwp/design/style/segoe-ui-symbol-font), or any character, including emojis.

```json
{ "icon": "C:\\Images\\my-icon.png", "name": "New tab", "command": "newTab", "keys": "ctrl+shift+t" },
Expand Down
2 changes: 1 addition & 1 deletion TerminalDocs/custom-terminal-gallery/custom-schemes.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Here are some color schemes for you to try or use as the basis of your own desig

## Installing schemes

Copy the JSON from the **"schemes"** section into the correct section in [settings.json](../get-started.md#settings-json-file), for example:
Copy the JSON from the **"schemes"** section into the correct section in [settings.json](../install.md#settings-json-file), for example:

Before:

Expand Down
5 changes: 1 addition & 4 deletions TerminalDocs/custom-terminal-gallery/frosted-glass-theme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@ title: Windows Terminal Frosted Glass Theme
description: This is a sample configuration for a frosted glass theme.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/19/2020
ms.date: 08/30/2021
ms.topic: sample
---

# Frosted Glass Theme in Windows Terminal

The prompt is styled using Powerline and is using the `Cascadia Code PL` font, which can be downloaded from the [Cascadia Code GitHub releases page](https://github.com/microsoft/cascadia-code/releases).

> [!div class="nextstepaction"]
> [Learn how to set up Powerline](./../tutorials/powerline-setup.md)
![Windows Terminal Frosted Glass Theme](./../images/frosted-glass-theme.png)

```json
Expand Down
25 changes: 14 additions & 11 deletions TerminalDocs/custom-terminal-gallery/powerline-in-powershell.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
title: Windows Terminal Powerline in PowerShell
description: This is the configuration and theme for Powerline in PowerShell.
title: Windows Terminal Oh-My-Posh in PowerShell
description: This is the configuration and theme for Oh-My-Posh in PowerShell.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/19/2020
ms.date: 08/30/2021
ms.topic: sample
---

# Powerline in PowerShell theme for Windows Terminal
# Oh-My-Posh in PowerShell theme for Windows Terminal

The prompt is styled using Powerline and is using the `Cascadia Code PL` font, which can be downloaded from the [Cascadia Code GitHub releases page](https://github.com/microsoft/cascadia-code/releases).
The prompt is styled using Oh-My-Posh and is using the `Caskaydia Cove Nerd Font`, which can be downloaded from [Nerd Fonts](https://www.nerdfonts.com/).

> [!div class="nextstepaction"]
> [Learn how to set up Powerline](./../tutorials/powerline-setup.md)
> [Learn how to set up a custom prompt](./../tutorials/custom-prompt-setup.md)
![Windows Terminal Powerline PowerShell](./../images/powerline-powershell.png)
![Windows Terminal Custom Prompt](./../images/custom-prompt.png)

```json
{
Expand All @@ -23,10 +23,13 @@ The prompt is styled using Powerline and is using the `Cascadia Code PL` font, w
{
"name" : "Powershell",
"source" : "Windows.Terminal.PowershellCore",
"acrylicOpacity" : 0.7,
"colorScheme" : "Campbell",
"cursorColor" : "#FFFFFD",
"fontFace" : "Cascadia Code PL",
"acrylicOpacity" : 0.5,
"colorScheme" : "One Half Dark",
"cursorColor" : "#FFFFFF",
"font":
{
"face": "CaskaydiaCove Nerd Font"
},
"useAcrylic" : true
}
]
Expand Down
Loading

0 comments on commit aa186ea

Please sign in to comment.