Skip to content

Commit 059a829

Browse files
erikdarlingdataerikdarlingdata
authored
Merge pull request #311 from erikdarlingdata/feature/v2-post-release-fixes
Fix query store regressions TVF and context menu icons
2 parents c65db2b + cca39ec commit 059a829

14 files changed

Lines changed: 184 additions & 60 deletions

‎Dashboard/CollectionLogWindow.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@
88
Background="{DynamicResource BackgroundBrush}">
99
<Window.Resources>
1010
<ContextMenu x:Key="DataGridContextMenu">
11-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
12-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
13-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
11+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
12+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
13+
</MenuItem>
14+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
15+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
16+
</MenuItem>
17+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
18+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
19+
</MenuItem>
1420
<Separator/>
15-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
21+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
22+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
23+
</MenuItem>
1624
</ContextMenu>
1725
</Window.Resources>
1826
<Grid>

‎Dashboard/CollectorScheduleWindow.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@
88
Background="{DynamicResource BackgroundBrush}">
99
<Window.Resources>
1010
<ContextMenu x:Key="DataGridContextMenu">
11-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
12-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
13-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
11+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
12+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
13+
</MenuItem>
14+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
15+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
16+
</MenuItem>
17+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
18+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
19+
</MenuItem>
1420
<Separator/>
15-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
21+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
22+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
23+
</MenuItem>
1624
</ContextMenu>
1725
</Window.Resources>
1826
<Grid Margin="16">

‎Dashboard/Controls/AlertsHistoryContent.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,19 @@
1313

1414
<!-- Context Menu for DataGrid Copy/Export -->
1515
<ContextMenu x:Key="DataGridContextMenu">
16-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
17-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
18-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
16+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
17+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
18+
</MenuItem>
19+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
20+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
21+
</MenuItem>
22+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
23+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
24+
</MenuItem>
1925
<Separator/>
20-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
26+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
27+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
28+
</MenuItem>
2129
</ContextMenu>
2230

2331
<Style x:Key="DefaultRowStyle" TargetType="DataGridRow">

‎Dashboard/MainWindow.xaml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,23 @@
128128
</ListView.ItemTemplate>
129129
<ListView.ContextMenu>
130130
<ContextMenu Opened="ServerContextMenu_Opened">
131-
<MenuItem Header="Open in New Tab" Click="OpenServerTab_Click"/>
132-
<MenuItem Header="Check Connection" Click="CheckConnection_Click"/>
133-
<MenuItem Header="Edit Server..." Click="EditServer_Click"/>
131+
<MenuItem Header="Open in New Tab" Click="OpenServerTab_Click">
132+
<MenuItem.Icon><TextBlock Text="&#x1F5C2;"/></MenuItem.Icon>
133+
</MenuItem>
134+
<MenuItem Header="Check Connection" Click="CheckConnection_Click">
135+
<MenuItem.Icon><TextBlock Text="&#x2705;"/></MenuItem.Icon>
136+
</MenuItem>
137+
<MenuItem Header="Edit Server..." Click="EditServer_Click">
138+
<MenuItem.Icon><TextBlock Text="&#x270F;"/></MenuItem.Icon>
139+
</MenuItem>
134140
<Separator/>
135-
<MenuItem x:Name="ToggleFavoriteMenuItem" Header="Set as Favorite" Click="ToggleFavorite_Click"/>
141+
<MenuItem x:Name="ToggleFavoriteMenuItem" Header="Set as Favorite" Click="ToggleFavorite_Click">
142+
<MenuItem.Icon><TextBlock Text="&#x2B50;"/></MenuItem.Icon>
143+
</MenuItem>
136144
<Separator/>
137-
<MenuItem Header="Remove Server" Click="RemoveServer_Click"/>
145+
<MenuItem Header="Remove Server" Click="RemoveServer_Click">
146+
<MenuItem.Icon><TextBlock Text="&#x1F5D1;"/></MenuItem.Icon>
147+
</MenuItem>
138148
</ContextMenu>
139149
</ListView.ContextMenu>
140150
</ListView>

‎Dashboard/ManageServersWindow.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@
99
<Window.Resources>
1010
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
1111
<ContextMenu x:Key="DataGridContextMenu">
12-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
13-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
14-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
12+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
13+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
14+
</MenuItem>
15+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
16+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
17+
</MenuItem>
18+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
19+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
20+
</MenuItem>
1521
<Separator/>
16-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
22+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
23+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
24+
</MenuItem>
1725
</ContextMenu>
1826
</Window.Resources>
1927
<Grid Margin="16">

‎Lite/Controls/AlertsHistoryTab.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@
1212
</ResourceDictionary.MergedDictionaries>
1313

1414
<ContextMenu x:Key="DataGridContextMenu">
15-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
16-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
17-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
15+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
16+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
17+
</MenuItem>
18+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
19+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
20+
</MenuItem>
21+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
22+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
23+
</MenuItem>
1824
<Separator/>
19-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
25+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
26+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
27+
</MenuItem>
2028
</ContextMenu>
2129

2230
<Style x:Key="DefaultRowStyle" TargetType="DataGridRow">

‎Lite/Controls/ServerTab.xaml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,29 @@
1111

1212
<!-- Context Menu for DataGrid Copy -->
1313
<ContextMenu x:Key="DataGridContextMenu">
14-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
15-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
16-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
17-
<MenuItem Header="Copy Repro Script" Click="CopyReproScript_Click"/>
14+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
15+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
16+
</MenuItem>
17+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
18+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
19+
</MenuItem>
20+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
21+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
22+
</MenuItem>
23+
<MenuItem Header="Copy Repro Script" Click="CopyReproScript_Click">
24+
<MenuItem.Icon><TextBlock Text="&#x1F4DD;"/></MenuItem.Icon>
25+
</MenuItem>
1826
<Separator/>
19-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
27+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
28+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
29+
</MenuItem>
2030
<Separator/>
21-
<MenuItem Header="View Plan" Click="ViewEstimatedPlan_Click"/>
22-
<MenuItem Header="Get Actual Plan" Click="GetActualPlan_Click"/>
31+
<MenuItem Header="View Plan" Click="ViewEstimatedPlan_Click">
32+
<MenuItem.Icon><TextBlock Text="&#x1F50D;"/></MenuItem.Icon>
33+
</MenuItem>
34+
<MenuItem Header="Get Actual Plan" Click="GetActualPlan_Click">
35+
<MenuItem.Icon><TextBlock Text="&#x25B6;"/></MenuItem.Icon>
36+
</MenuItem>
2337
</ContextMenu>
2438

2539
<Style x:Key="GridRowStyle" TargetType="DataGridRow">

‎Lite/MainWindow.xaml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,23 @@
6969
Background="{DynamicResource BackgroundLightBrush}">
7070
<Border.ContextMenu>
7171
<ContextMenu>
72-
<MenuItem Header="Connect" Click="ServerContextMenu_Connect_Click"/>
73-
<MenuItem Header="Disconnect" Click="ServerContextMenu_Disconnect_Click"/>
72+
<MenuItem Header="Connect" Click="ServerContextMenu_Connect_Click">
73+
<MenuItem.Icon><TextBlock Text="&#x1F517;"/></MenuItem.Icon>
74+
</MenuItem>
75+
<MenuItem Header="Disconnect" Click="ServerContextMenu_Disconnect_Click">
76+
<MenuItem.Icon><TextBlock Text="&#x274C;"/></MenuItem.Icon>
77+
</MenuItem>
7478
<Separator/>
75-
<MenuItem Header="Toggle Favorite" Click="ServerContextMenu_ToggleFavorite_Click"/>
79+
<MenuItem Header="Toggle Favorite" Click="ServerContextMenu_ToggleFavorite_Click">
80+
<MenuItem.Icon><TextBlock Text="&#x2B50;"/></MenuItem.Icon>
81+
</MenuItem>
7682
<Separator/>
77-
<MenuItem Header="Edit..." Click="ServerContextMenu_Edit_Click"/>
78-
<MenuItem Header="Remove" Click="ServerContextMenu_Remove_Click"/>
83+
<MenuItem Header="Edit..." Click="ServerContextMenu_Edit_Click">
84+
<MenuItem.Icon><TextBlock Text="&#x270F;"/></MenuItem.Icon>
85+
</MenuItem>
86+
<MenuItem Header="Remove" Click="ServerContextMenu_Remove_Click">
87+
<MenuItem.Icon><TextBlock Text="&#x1F5D1;"/></MenuItem.Icon>
88+
</MenuItem>
7989
</ContextMenu>
8090
</Border.ContextMenu>
8191
<Grid>

‎Lite/Windows/CollectionLogWindow.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@
1111
<ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
1212
</ResourceDictionary.MergedDictionaries>
1313
<ContextMenu x:Key="DataGridContextMenu">
14-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
15-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
16-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
14+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
15+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
16+
</MenuItem>
17+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
18+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
19+
</MenuItem>
20+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
21+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
22+
</MenuItem>
1723
<Separator/>
18-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
24+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
25+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
26+
</MenuItem>
1927
</ContextMenu>
2028
</ResourceDictionary>
2129
</Window.Resources>

‎Lite/Windows/ManageServersWindow.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@
1212
<ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
1313
</ResourceDictionary.MergedDictionaries>
1414
<ContextMenu x:Key="DataGridContextMenu">
15-
<MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
16-
<MenuItem Header="Copy Row" Click="CopyRow_Click"/>
17-
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
15+
<MenuItem Header="Copy Cell" Click="CopyCell_Click">
16+
<MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
17+
</MenuItem>
18+
<MenuItem Header="Copy Row" Click="CopyRow_Click">
19+
<MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
20+
</MenuItem>
21+
<MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
22+
<MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
23+
</MenuItem>
1824
<Separator/>
19-
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
25+
<MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
26+
<MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
27+
</MenuItem>
2028
</ContextMenu>
2129
</ResourceDictionary>
2230
</Window.Resources>

0 commit comments

Comments
 (0)