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

Further accessibility fixes #2176

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/PerfView/Dialogs/FileInputAndOutput.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" FlowDirection="RightToLeft">
<Button Margin="10,5,10,5" Width="80" Content="OK" Click="OKClicked"/>
<Button Margin="10,5,10,5" KeyboardNavigation.IsTabStop="False" Width="80" Content="Cancel" Click="CancelClicked"/>
<Button Margin="10,5,10,5" Width="80" Content="Cancel" Click="CancelClicked"/>
</StackPanel>
</Grid>
</src:WindowBase>
Expand Down
10 changes: 5 additions & 5 deletions src/PerfView/Dialogs/ManagePresetsDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</Grid.ColumnDefinitions>

<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="5,0,1,0">
<Hyperlink Command="Help" CommandParameter="Preset" KeyboardNavigation.IsTabStop="False">Name:</Hyperlink>
<Hyperlink Command="Help" CommandParameter="Preset">Name:</Hyperlink>
</TextBlock>
<TextBox Grid.Row="0" Grid.Column="1" Name="PresetName" Margin="10,2,10,2" HorizontalScrollBarVisibility="Hidden">
<TextBox.ToolTip>
Expand All @@ -66,7 +66,7 @@
</TextBox>

<TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="5,0,1,0">
<Hyperlink Command="Help" CommandParameter="GroupPatsTextBox" KeyboardNavigation.IsTabStop="False">GroupPats:</Hyperlink>
<Hyperlink Command="Help" CommandParameter="GroupPatsTextBox">GroupPats:</Hyperlink>
</TextBlock>
<TextBox Grid.Row="1" Grid.Column="1" Name="GroupPatsTextBox" Margin="10,2,10,2" HorizontalScrollBarVisibility="Hidden">
<TextBox.ToolTip>
Expand All @@ -83,7 +83,7 @@
</TextBox.ToolTip>
</TextBox>
<TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="5,0,1,0">
<Hyperlink Command="Help" CommandParameter="FoldPercentTextBox" KeyboardNavigation.IsTabStop="False">Fold%:</Hyperlink>
<Hyperlink Command="Help" CommandParameter="FoldPercentTextBox">Fold%:</Hyperlink>
</TextBlock>
<TextBox Name="FoldPercentTextBox" Grid.Row="2" Grid.Column="1" Margin="10,2,10,2" HorizontalScrollBarVisibility="Hidden">
<TextBox.ToolTip>
Expand All @@ -94,7 +94,7 @@
</TextBox.ToolTip>
</TextBox>
<TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="5,0,1,0">
<Hyperlink Command="Help" CommandParameter="FoldPatsTextBox" KeyboardNavigation.IsTabStop="False">FoldPats:</Hyperlink>
<Hyperlink Command="Help" CommandParameter="FoldPatsTextBox">FoldPats:</Hyperlink>
</TextBlock>
<TextBox Name="FoldRegExTextBox" Grid.Row="3" Grid.Column="1" MinWidth="80" Margin="10,2,10,2" HorizontalScrollBarVisibility="Hidden">
<TextBox.ToolTip>
Expand All @@ -107,7 +107,7 @@
</TextBox.ToolTip>
</TextBox>
<TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Top" Margin="5,0,1,0">
<Hyperlink Command="Help" CommandParameter="Preset" KeyboardNavigation.IsTabStop="False">Comment:</Hyperlink>
<Hyperlink Command="Help" CommandParameter="Preset">Comment:</Hyperlink>
</TextBlock>
<TextBox Name="CommentTextBox" Grid.Row="4" Grid.Column="1" MinWidth="80" Margin="10,2,10,2" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True" Height="72">
<TextBox.ToolTip>
Expand Down
118 changes: 59 additions & 59 deletions src/PerfView/Dialogs/MemoryDataDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
Style="{DynamicResource CustomWindowStyle}"
Background="{StaticResource ControlDarkerBackground}"
Title="Collecting Memory Data"
Width="900" MinWidth="500" Height="400">
Width="900" MinWidth="500" Height="400" MinHeight="400">
<Window.CommandBindings>
<CommandBinding Command="Help" Executed="DoHyperlinkHelp"/>
</Window.CommandBindings>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="100*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
Expand All @@ -25,7 +25,7 @@
<RichTextBox.Document>
<FlowDocument>
<Paragraph>
This dialog give options for collecting Memory (GC Heap) data. Typically simply typing a few characters
This dialog gives options for collecting Memory (GC Heap) data. Typically simply typing a few characters
of the process name in the Filter text box and hitting &lt;Enter&gt; is enough. See
<Hyperlink Command="Help" CommandParameter="CollectingDataGCHeap">Collecting GC Heap Data.</Hyperlink> and
<Hyperlink Command="Help" CommandParameter="UnderstandingPerfDataGCHeap">Understanding GC Heap Data.</Hyperlink>
Expand All @@ -41,7 +41,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="100*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Margin="5,0" Width="100" VerticalAlignment="Center" ToolTip="The file name of the process dump file from which to extract the GC heap.">
<TextBlock Grid.Column="0" Margin="5,0" VerticalAlignment="Center" ToolTip="The file name of the process dump file from which to extract the GC heap.">
<Hyperlink Command="Help" CommandParameter="ProcessDumpTextBox">Process Dump File:</Hyperlink>
</TextBlock>
<TextBox Margin="0,5,5,0" Grid.Column="1" Name="ProcessDumpTextBox" VerticalAlignment="Center" KeyDown="ProcessDumpKeyDown" AutomationProperties.Name="Process Dump File" />
Expand All @@ -51,7 +51,7 @@
<Grid Grid.Row="2" Name="ProcessRow">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="100*"/>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0" Margin="0,5,0,0">
<Grid.ColumnDefinitions>
Expand All @@ -65,25 +65,28 @@
<TextBlock Grid.Column="0" VerticalAlignment="Center" Margin="5,0,0,0" ToolTip="Only processes that match this RegEx filter pattern are displayed.">
<Hyperlink Command="Help" CommandParameter="ProcessFilterTextBox">Filter:</Hyperlink>
</TextBlock>
<TextBox KeyboardNavigation.TabIndex="0" VerticalAlignment="Center" Grid.Column="1" Width="100" Margin="5,0,0,0" Name="FilterTextBox" TextChanged="FilterTextChanged" PreviewKeyDown="FilterTextKeyDown" AutomationProperties.Name="Process Filter"/>
<TextBox VerticalAlignment="Center" Grid.Column="1" Width="100" Margin="5,0,0,0" Name="FilterTextBox" TextChanged="FilterTextChanged" PreviewKeyDown="FilterTextKeyDown" AutomationProperties.Name="Process Filter"/>

<TextBlock Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0" ToolTip="Normally only processed with GC heaps are displayed. Checking this shows all processes.">
<Hyperlink Command="Help" CommandParameter="AllProcsCheckBox">All Procs:</Hyperlink>
</TextBlock>
<CheckBox Grid.Column="3" Name="AllProcsCheckBox" VerticalAlignment="Center" IsChecked="true" Click="AllProcsClick" AutomationProperties.Name="All Processes" />

<TextBlock Grid.Column="4" Margin="15,0,0,0" VerticalAlignment="Center" Name="ElevateWarning">
Only Processes you have perission to inspect to are shown.
<TextBlock Grid.Column="4" Margin="15,0,0,0" VerticalAlignment="Center" Name="ElevateWarning" TextWrapping="Wrap">
Only Processes you have permission to inspect to are shown.
<Hyperlink Click="ElevateToAdminClick">Elevate to Admin</Hyperlink> to see all processes.
</TextBlock>
</Grid>
<ListBox KeyboardNavigation.TabIndex="1" Margin="5,28,5,12" MinHeight="80" Name="Processes" MouseDoubleClick="ProcessesMouseDoubleClick" SelectionChanged="Processes_SelectionChanged" FontFamily="Courier New" Grid.RowSpan="2" AutomationProperties.Name="Processes">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="AutomationProperties.Name" Value="{Binding ShortDescription}" />
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
<Grid Margin="5,11,5,12" Grid.Row="1" VerticalAlignment="Stretch">
<ListBox Name="Processes" MouseDoubleClick="ProcessesMouseDoubleClick" SelectionChanged="Processes_SelectionChanged" FontFamily="Courier New" AutomationProperties.Name="Processes"
Height="{Binding Path=ActualHeight, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}}">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="AutomationProperties.Name" Value="{Binding ShortDescription}" />
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Grid>
</Grid>

<!-- Output Data file row -->
Expand All @@ -94,7 +97,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>

<TextBlock Grid.Column="0" Width="100" Margin="5,0" VerticalAlignment="Center" ToolTip="The name of the data file to create." >
<TextBlock Grid.Column="0" Margin="5,0" VerticalAlignment="Center" ToolTip="The name of the data file to create." >
<Hyperlink Command="Help" CommandParameter="GCHeapDataFileNameTextBox">Output Data File:</Hyperlink>
</TextBlock>
<TextBox Grid.Column="1" Name="DataFileNameTextBox" VerticalAlignment="Center" KeyDown="DataFileKeyDown" AutomationProperties.Name="Output Data Filename" />
Expand All @@ -105,52 +108,49 @@
<!-- Row with FreezeProcess ... -->
<Grid Grid.Row="4" Margin="0,2,0,-1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>


<TextBlock Grid.Column="1" VerticalAlignment="Center" Margin="5,0,5,0" ToolTip="If the heap has more object than this (in Kilo objects) than this, only a sample is taken." >
<WrapPanel Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If object count exceeds this (in thousands), old events are discarded.">
<Hyperlink Command="Help" CommandParameter="MaxDumpTextBox">Max Dump<LineBreak/>K Objs:</Hyperlink>
</TextBlock>
<TextBox Grid.Column="2" Name="MaxDumpTextBox" VerticalAlignment="Center" Width="50" Margin="5,0" AutomationProperties.Name="Maximum dump size in kilo objects"/>

<TextBlock Grid.Column="3" VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If checked the process will be frozen during the dump.">
<Hyperlink Command="Help" CommandParameter="FreezeCheckBox">Freeze:</Hyperlink>
</TextBlock>
<CheckBox Grid.Column="4" Name="FreezeCheckBox" VerticalAlignment="Center" Margin="0,0,10,0" AutomationProperties.Name="Freeze"/>

<!-- TODO FIX NOW Add DumpData back in.
<TextBlock Grid.Column="5" VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If checked the data in objects as well as the connectivity information is dumped.">
<Hyperlink Command="Help" CommandParameter="DumpDataCheckBox">Dump<LineBreak/>Data:</Hyperlink>
</TextBlock>
<CheckBox Grid.Column="6" Name="DumpDataCheckBox" VerticalAlignment="Center" Margin="0,0,10,0"/>
-->

<TextBlock Grid.Column="7" VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If checked Dump will be in Clr Profiler format.">
<Hyperlink Command="Help" CommandParameter="SaveETLCheckBox">Save<LineBreak/>ETL:</Hyperlink>
</TextBlock>
<CheckBox Grid.Column="8" Name="SaveETLCheckBox" VerticalAlignment="Center" Margin="0,0,10,0" AutomationProperties.Name="Save ETL"/>

<Button Name="GCButton" Grid.Column="12" Margin="5,0,20,5" Width="60" VerticalAlignment="Center" Click="GCButtonClick"
ToolTip="Causes a GC to happen in the selected process">Force GC</Button>
<Button Grid.Column="13" Margin="5,0,5,5" Width="100" VerticalAlignment="Center" Click="DumpClick" IsDefault="True"
ToolTip="Take a Heap Snapshot of the selected process leaving the dialog box open. Double Click will close after dump." >Dump GC Heap</Button>
<Button Grid.Column="14" Margin="5,0,5,5" Width="50" VerticalAlignment="Center" Click="CloseClick" >Close</Button>
</TextBlock>
<TextBox Name="MaxDumpTextBox" VerticalAlignment="Center" Width="50" Margin="5,0" AutomationProperties.Name="Max Dump K Objs"/>
</StackPanel>

<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If checked, freezes the process during the collection.">
<Hyperlink Command="Help" CommandParameter="FreezeCheckBox">Freeze:</Hyperlink>
</TextBlock>
<CheckBox Name="FreezeCheckBox" VerticalAlignment="Center" Margin="0,0,10,0" AutomationProperties.Name="Freeze"/>
</StackPanel>

<!-- TODO FIX NOW Add DumpData back in.
<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If checked will dump additional data." >
<Hyperlink Command="Help" CommandParameter="DumpDataCheckBox">Dump Data:</Hyperlink>
</TextBlock>
<CheckBox Name="DumpDataCheckBox" VerticalAlignment="Center" Margin="0,0,10,0" AutomationProperties.Name="Dump Data"/>
</StackPanel>
-->

<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Margin="5,0,2,0" ToolTip="If checked Dump will be in Clr Profiler format.">
<Hyperlink Command="Help" CommandParameter="SaveETLCheckBox">Save<LineBreak/>ETL:</Hyperlink>
</TextBlock>
<CheckBox Name="SaveETLCheckBox" VerticalAlignment="Center" Margin="0,0,10,0" AutomationProperties.Name="Save ETL"/>
</StackPanel>
</WrapPanel>

<WrapPanel Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center">
<Button Name="GCButton" Margin="5,0,20,5" VerticalAlignment="Center" Click="GCButtonClick"
ToolTip="Causes a GC to happen in the selected process">Force GC</Button>
<Button Margin="5,0,5,5" VerticalAlignment="Center" Click="DumpClick" IsDefault="True"
ToolTip="Take a Heap Snapshot of the selected process leaving the dialog box open. Double Click will close after dump.">Dump GC Heap</Button>
<Button Margin="5,0,5,5" VerticalAlignment="Center" Click="CloseClick">Close</Button>
</WrapPanel>
</Grid>

<Rectangle Grid.Row="5" Fill="#FF727171" Margin="0,8,0,0" Height="1"/>
Expand Down
Loading