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

Add tooltip text to Color Buttons #6498

Merged
46 commits merged into from
Jul 1, 2020
Merged

Add tooltip text to Color Buttons #6498

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4633580
Add tooltip text to Color Buttons
garciaolais Jun 14, 2020
c360b75
Add fast path to til::bitmap::translate using bitshifts (#6493)
beviu Jun 14, 2020
c0ffc9b
Clear cached runs after translate_y (#6501)
beviu Jun 14, 2020
5e2c4c6
Reintroduce the check for VT_INPUT_MODE in AdaptDispatch (#6485)
DHowett Jun 15, 2020
6d2fc5d
Extract `ActionAndArgs::FromJson` into its own class (#6351)
zadjii-msft Jun 15, 2020
332d174
Fix sending a NUL on alt key up (#6516)
zadjii-msft Jun 15, 2020
888e724
Only snap on key _downs_ (#6517)
zadjii-msft Jun 15, 2020
c1076a8
Fix openSettings misspelling in defaults (#6520)
carlos-zamora Jun 15, 2020
051d2fc
tooltip names defined in Resources
garciaolais Jun 16, 2020
ffaba38
Remove the WinTelnetEngine (#6526)
DHowett Jun 17, 2020
6485a2b
Spec: Advanced Tab Switcher (#3753)
leonMSFT Jun 17, 2020
ca01849
Remove duplicate key
garciaolais Jun 17, 2020
10bc1a6
Introduce JsonUtilsNew as documented in #5875 (#6355)
DHowett Jun 18, 2020
78ca722
Fixed #6377: TerminalCore::_altGrAliasing is undefined by default (#6…
lhecker Jun 18, 2020
4eaa0b8
Use early returns in TermControl::_KeyHandler (#6575)
lhecker Jun 18, 2020
1fdceb0
doc: copyedit the roadmap a little bit (#6587)
ddejohn Jun 19, 2020
e337faa
Add 1.1 blog post to 2.0 roadmap (#6581)
cinnamon-msft Jun 19, 2020
acd3ba7
Update PR template with link to docs (#6583)
cinnamon-msft Jun 19, 2020
4f55568
Improved ATTR_ROW::ReplaceAttrs performance (#6573)
lhecker Jun 19, 2020
dc5baab
Add schema check to PR template (#6599)
carlos-zamora Jun 19, 2020
b91430b
Enable hot reload of renderer settings that aren't already hot reload…
miniksa Jun 19, 2020
15f2535
Improve bitmap::_calculateArea performance (#6572)
lhecker Jun 19, 2020
951f389
Use D2DDeviceContext and friends over D2DRenderTarget (#6527)
miniksa Jun 19, 2020
26d6a37
Always use the dark window borders (#6624)
beviu Jun 22, 2020
e7d3dc5
Recycle assorted rendering components to accelerate drawing (#6483)
miniksa Jun 22, 2020
073e732
Double-click a tab to rename it (#6628)
beviu Jun 22, 2020
81eb135
Spec for unified keybindings and commands, and synthesized action nam…
zadjii-msft Jun 22, 2020
ff23be0
Optimize booleans (#6548)
Jun 22, 2020
b24dbf7
Replace std::map with std::unordered_map (#6640)
ZhaoMJ Jun 23, 2020
58f5d7c
Update _TerminalCursorPositionChanged to use ThrottledFunc (#6492)
beviu Jun 23, 2020
d8810f2
version: bump to 1.2 on master
DHowett Jun 24, 2020
4027ba3
Add keybinding to rename tab (#6557)
ggadget6 Jun 24, 2020
cffd4eb
Revert "Skip ... analysis when the ... text is simple (6206)" (#6665)
DHowett Jun 24, 2020
9215b52
Implement Shift+MultiClick Selection Expansion (#6322)
carlos-zamora Jun 25, 2020
a3a9df8
Add `setTabColor` and `openTabColorPicker` actions (#6567)
zadjii-msft Jun 25, 2020
fefd140
When we add a new tab in compact mode, re-enforce Compact mode (#6670)
DHowett Jun 25, 2020
2fc1ef0
Hardcode the paths to Windows PowerShell and CMD (#6684)
DHowett Jun 26, 2020
aa1ed0a
Add support for the Command Palette (#6635)
zadjii-msft Jun 26, 2020
c4885f1
Restore simple text runs, correct for crashes (#6695)
miniksa Jun 29, 2020
bbf2c70
Update Cascadia Code to 2007.01 (#6721)
DHowett Jun 30, 2020
b24579d
Add support for OSC 52 (copy-to-clipboard) (#5823)
uzxmx Jun 30, 2020
02d5f90
Replace old C headers (xxx.h) with modern ones (cxxx) (#5080)
Jul 1, 2020
f0df154
Improve conpty rendering of default colors in legacy apps (#6698)
j4james Jul 1, 2020
ddbe370
Improve the propagation of color attributes over ConPTY (#6506)
j4james Jul 1, 2020
6b43ace
Refactor TerminalDispatch (graphics) to match AdaptDispatch (#6728)
j4james Jul 1, 2020
101be9c
Merge branch 'dev/garciaolais/color-tooltip' of https://github.com/ga…
DHowett Jul 1, 2020
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
32 changes: 16 additions & 16 deletions src/cascadia/TerminalApp/ColorPickupFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,82 +24,82 @@
<Setter Property="Margin" Value="2"/>
</Style>
</VariableSizedWrapGrid.Resources>
<Button Click="ColorButton_Click" AutomationProperties.Name="Crimson">
<Button Click="ColorButton_Click" AutomationProperties.Name="Crimson" x:Uid="CrimsonColorButton">
<Button.Content>
<Rectangle Fill="Crimson"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="SteelBlue">
<Button Click="ColorButton_Click" AutomationProperties.Name="SteelBlue" x:Uid="SteelBlueColorButton">
<Button.Content>
<Rectangle Fill="SteelBlue"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="MediumSeaGreen">
<Button Click="ColorButton_Click" AutomationProperties.Name="MediumSeaGreen" x:Uid="MediumSeaGreenColorButton">
<Button.Content>
<Rectangle Fill="MediumSeaGreen"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="DarkOrange">
<Button Click="ColorButton_Click" AutomationProperties.Name="DarkOrange" x:Uid="DarkOrangeColorButton">
<Button.Content>
<Rectangle Fill="DarkOrange"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="MediumVioletRed">
<Button Click="ColorButton_Click" AutomationProperties.Name="MediumVioletRed" x:Uid="MediumVioletRedColorButton">
<Button.Content>
<Rectangle Fill="MediumVioletRed"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="DodgerBlue">
<Button Click="ColorButton_Click" AutomationProperties.Name="DodgerBlue" x:Uid="DodgerBlueColorButton">
<Button.Content>
<Rectangle Fill="DodgerBlue"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="LimeGreen">
<Button Click="ColorButton_Click" AutomationProperties.Name="LimeGreen" x:Uid="LimeGreenColorButton">
<Button.Content>
<Rectangle Fill="LimeGreen"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="Yellow">
<Button Click="ColorButton_Click" AutomationProperties.Name="Yellow" x:Uid="YellowColorButton">
<Button.Content>
<Rectangle Fill="Yellow"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="BlueViolet">
<Button Click="ColorButton_Click" AutomationProperties.Name="BlueViolet" x:Uid="BlueVioletColorButton">
<Button.Content>
<Rectangle Fill="BlueViolet"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="SlateBlue">
<Button Click="ColorButton_Click" AutomationProperties.Name="SlateBlue" x:Uid="SlateBlueColorButton">
<Button.Content>
<Rectangle Fill="SlateBlue"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="Lime">
<Button Click="ColorButton_Click" AutomationProperties.Name="Lime" x:Uid="LimeColorButton">
<Button.Content>
<Rectangle Fill="Lime"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="Tan">
<Button Click="ColorButton_Click" AutomationProperties.Name="Tan" x:Uid="TanColorButton">
<Button.Content>
<Rectangle Fill="Tan"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="Magenta">
<Button Click="ColorButton_Click" AutomationProperties.Name="Magenta" x:Uid="MagentaColorButton">
<Button.Content>
<Rectangle Fill="Magenta"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="Cyan">
<Button Click="ColorButton_Click" AutomationProperties.Name="Cyan" x:Uid="CyanColorButton">
<Button.Content>
<Rectangle Fill="Cyan"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="SkyBlue">
<Button Click="ColorButton_Click" AutomationProperties.Name="SkyBlue" x:Uid="SkyBlueColorButton">
<Button.Content>
<Rectangle Fill="SkyBlue"/>
</Button.Content>
</Button>
<Button Click="ColorButton_Click" AutomationProperties.Name="DarkGray">
<Button Click="ColorButton_Click" AutomationProperties.Name="DarkGray" x:Uid="DarkGrayColorButton">
<Button.Content>
<Rectangle Fill="DarkGray"/>
</Button.Content>
Expand Down
48 changes: 48 additions & 0 deletions src/cascadia/TerminalApp/Resources/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,4 +347,52 @@
<value>Command Prompt</value>
<comment>This is the name of "Command Prompt", as localized in Windows. The localization here should match the one in the Windows product for "Command Prompt"</comment>
</data>
<data name="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Crimson</value>
</data>
<data name="SteelBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Steel Blue</value>
</data>
<data name="MediumSeaGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Medium Sea Green</value>
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a dupe of the one above

</data>
<data name="DarkOrangeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Dark Orange</value>
</data>
<data name="MediumVioletRedColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Medium Violet Red</value>
</data>
<data name="DodgerBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Dodger Blue</value>
</data>
<data name="LimeGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Lime Green</value>
</data>
<data name="YellowColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Yellow</value>
</data>
<data name="BlueVioletColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Blue Violet</value>
</data>
<data name="SlateBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Slate Blue</value>
</data>
<data name="LimeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Lime</value>
</data>
<data name="TanColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Tan</value>
</data>
<data name="MagentaColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Magenta</value>
</data>
<data name="CyanColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Cyan</value>
</data>
<data name="SkyBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Sky Blue</value>
</data>
<data name="DarkGrayColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Dark Gray</value>
</data>
</root>