Skip to content

Commit 2f4a72f

Browse files
arvindshmicrosoftarvindshmicrosoft
committed
Minor edits to visual hints
1 parent c11c724 commit 2f4a72f

4 files changed

Lines changed: 35 additions & 29 deletions

File tree

‎Modern/Dialogs/SQLBuildsDialog.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:ui="http://schemas.modernwpf.com/2019"
55
ui:WindowHelper.UseModernWindowStyle="True"
6-
Title="SQL Server Builds - Download Public PDBs" Height="550" Width="700"
6+
Title="SQL Server Builds — Download PDBs (Ctrl+F to search)" Height="550" Width="700"
77
WindowStartupLocation="CenterOwner" ResizeMode="CanResizeWithGrip">
88
<Window.InputBindings>
99
<KeyBinding Gesture="Ctrl+F" Command="Find"/>
@@ -49,8 +49,8 @@
4949
<TreeView Grid.Row="1" x:Name="treeviewSyms" Margin="0,0,0,8"/>
5050

5151
<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0,0,0,8">
52-
<Button Content="Check PDB availability" Width="150" Margin="0,0,8,0" Click="CheckPDBAvail_Click"/>
53-
<Button x:Name="dnldButton" Content="Download PDBs" Width="120" Margin="0,0,8,0" Click="DownloadPDBs_Click"/>
52+
<Button Content="Check PDB availability" Padding="10,6" Margin="0,0,8,0" Click="CheckPDBAvail_Click"/>
53+
<Button x:Name="dnldButton" Content="Download PDBs" Padding="10,6" Margin="0,0,8,0" Click="DownloadPDBs_Click"/>
5454
</StackPanel>
5555

5656
<TextBlock x:Name="downloadStatus" Grid.Row="3" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>

‎Modern/ResolverViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ public string InputText {
112112

113113
// -- Detected SQL Build --
114114
private SQLBuildInfo _detectedBuildInfo;
115-
public SQLBuildInfo DetectedBuildInfo { get => _detectedBuildInfo; private set { SetField(ref _detectedBuildInfo, value, nameof(DetectedBuildInfo)); OnPropertyChanged(nameof(HasDetectedBuild)); OnPropertyChanged(nameof(DetectedBuildVersion)); OnPropertyChanged(nameof(DetectedBuildDetails)); } }
115+
public SQLBuildInfo DetectedBuildInfo { get => _detectedBuildInfo; internal set { SetField(ref _detectedBuildInfo, value, nameof(DetectedBuildInfo)); OnPropertyChanged(nameof(HasDetectedBuild)); OnPropertyChanged(nameof(DetectedBuildVersion)); OnPropertyChanged(nameof(DetectedBuildDetails)); } }
116116
public bool HasDetectedBuild => _detectedBuildInfo != null;
117117
public string DetectedBuildVersion => _detectedBuildInfo?.BuildNumber;
118118
public string DetectedBuildDetails => _detectedBuildInfo != null ? $"{_detectedBuildInfo.ProductMajorVersion} {_detectedBuildInfo.ProductLevel} - {_detectedBuildInfo.Label} ({_detectedBuildInfo.MachineType})" : null;
119119

120120
// -- Detected XML frames with PDB GUID info --
121121
private bool _hasXmlFrameInput;
122-
public bool HasXmlFrameInput { get => _hasXmlFrameInput; private set => SetField(ref _hasXmlFrameInput, value, nameof(HasXmlFrameInput)); }
122+
public bool HasXmlFrameInput { get => _hasXmlFrameInput; internal set => SetField(ref _hasXmlFrameInput, value, nameof(HasXmlFrameInput)); }
123123
private string _detectedPdbModules;
124124
public string DetectedPdbModules { get => _detectedPdbModules; private set => SetField(ref _detectedPdbModules, value, nameof(DetectedPdbModules)); }
125125

‎Modern/Views/ClassicView.xaml‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,25 @@
153153
<DataTrigger Binding="{Binding NeedsBaseAddresses}" Value="True">
154154
<DataTrigger.EnterActions>
155155
<BeginStoryboard x:Name="BaseAddrGlow">
156-
<Storyboard RepeatBehavior="3x">
157-
<ColorAnimation Storyboard.TargetProperty="(Effect).(DropShadowEffect.Color)"
158-
To="Orange" Duration="0:0:0.4" AutoReverse="True"/>
159-
<DoubleAnimation Storyboard.TargetProperty="(Effect).(DropShadowEffect.Opacity)"
160-
To="1" Duration="0:0:0.4" AutoReverse="True"/>
156+
<Storyboard RepeatBehavior="Forever">
157+
<ColorAnimation Storyboard.TargetProperty="(Button.BorderBrush).(SolidColorBrush.Color)"
158+
To="Orange" Duration="0:0:0.5" AutoReverse="True"/>
161159
</Storyboard>
162160
</BeginStoryboard>
163161
</DataTrigger.EnterActions>
164162
<DataTrigger.ExitActions>
165163
<StopStoryboard BeginStoryboardName="BaseAddrGlow"/>
166164
</DataTrigger.ExitActions>
165+
<Setter Property="BorderThickness" Value="2"/>
166+
<Setter Property="BorderBrush">
167+
<Setter.Value>
168+
<SolidColorBrush Color="Transparent"/>
169+
</Setter.Value>
170+
</Setter>
167171
</DataTrigger>
168172
</Style.Triggers>
169173
</Style>
170174
</Button.Style>
171-
<Button.Effect>
172-
<DropShadowEffect Color="Transparent" ShadowDepth="0" BlurRadius="15" Opacity="0"/>
173-
</Button.Effect>
174175
<StackPanel Orientation="Horizontal">
175176
<TextBlock Text="&#xE81C;" FontFamily="Segoe MDL2 Assets" FontSize="13" VerticalAlignment="Center" Margin="0,0,6,0"/>
176177
<TextBlock Text="Enter base addresses..."/>
@@ -198,24 +199,25 @@
198199
<DataTrigger Binding="{Binding HasDetectedBuild}" Value="True">
199200
<DataTrigger.EnterActions>
200201
<BeginStoryboard x:Name="SqlBuildGlow">
201-
<Storyboard RepeatBehavior="3x">
202-
<ColorAnimation Storyboard.TargetProperty="(Effect).(DropShadowEffect.Color)"
203-
To="#40C040" Duration="0:0:0.4" AutoReverse="True"/>
204-
<DoubleAnimation Storyboard.TargetProperty="(Effect).(DropShadowEffect.Opacity)"
205-
To="1" Duration="0:0:0.4" AutoReverse="True"/>
202+
<Storyboard RepeatBehavior="Forever">
203+
<ColorAnimation Storyboard.TargetProperty="(Button.BorderBrush).(SolidColorBrush.Color)"
204+
To="#40C040" Duration="0:0:0.5" AutoReverse="True"/>
206205
</Storyboard>
207206
</BeginStoryboard>
208207
</DataTrigger.EnterActions>
209208
<DataTrigger.ExitActions>
210209
<StopStoryboard BeginStoryboardName="SqlBuildGlow"/>
211210
</DataTrigger.ExitActions>
211+
<Setter Property="BorderThickness" Value="2"/>
212+
<Setter Property="BorderBrush">
213+
<Setter.Value>
214+
<SolidColorBrush Color="Transparent"/>
215+
</Setter.Value>
216+
</Setter>
212217
</DataTrigger>
213218
</Style.Triggers>
214219
</Style>
215220
</Button.Style>
216-
<Button.Effect>
217-
<DropShadowEffect Color="Transparent" ShadowDepth="0" BlurRadius="15" Opacity="0"/>
218-
</Button.Effect>
219221
<StackPanel Orientation="Horizontal">
220222
<TextBlock Text="&#xE896;" FontFamily="Segoe MDL2 Assets" FontSize="13" VerticalAlignment="Center" Margin="0,0,6,0"/>
221223
<TextBlock Text="For a SQL version..."/>
@@ -229,24 +231,25 @@
229231
<DataTrigger Binding="{Binding HasXmlFrameInput}" Value="True">
230232
<DataTrigger.EnterActions>
231233
<BeginStoryboard x:Name="SymSrvGlow">
232-
<Storyboard RepeatBehavior="3x">
233-
<ColorAnimation Storyboard.TargetProperty="(Effect).(DropShadowEffect.Color)"
234-
To="#40C040" Duration="0:0:0.4" AutoReverse="True"/>
235-
<DoubleAnimation Storyboard.TargetProperty="(Effect).(DropShadowEffect.Opacity)"
236-
To="1" Duration="0:0:0.4" AutoReverse="True"/>
234+
<Storyboard RepeatBehavior="Forever">
235+
<ColorAnimation Storyboard.TargetProperty="(Button.BorderBrush).(SolidColorBrush.Color)"
236+
To="#40C040" Duration="0:0:0.5" AutoReverse="True"/>
237237
</Storyboard>
238238
</BeginStoryboard>
239239
</DataTrigger.EnterActions>
240240
<DataTrigger.ExitActions>
241241
<StopStoryboard BeginStoryboardName="SymSrvGlow"/>
242242
</DataTrigger.ExitActions>
243+
<Setter Property="BorderThickness" Value="2"/>
244+
<Setter Property="BorderBrush">
245+
<Setter.Value>
246+
<SolidColorBrush Color="Transparent"/>
247+
</Setter.Value>
248+
</Setter>
243249
</DataTrigger>
244250
</Style.Triggers>
245251
</Style>
246252
</Button.Style>
247-
<Button.Effect>
248-
<DropShadowEffect Color="Transparent" ShadowDepth="0" BlurRadius="15" Opacity="0"/>
249-
</Button.Effect>
250253
<StackPanel Orientation="Horizontal">
251254
<TextBlock Text="&#xE753;" FontFamily="Segoe MDL2 Assets" FontSize="13" VerticalAlignment="Center" Margin="0,0,6,0"/>
252255
<TextBlock Text="MS Symbol Server"/>

‎Modern/Views/ClassicView.xaml.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public ClassicView() {
1212
private void Find_Executed(object sender, ExecutedRoutedEventArgs e) => findBar.Open();
1313

1414
private void UseSymbolServer_Click(object sender, RoutedEventArgs e) {
15+
ViewModel.HasXmlFrameInput = false;
1516
ViewModel.UpdatePdbPath(@"SRV*c:\temp\symcache*https://msdl.microsoft.com/download/symbols");
1617
ViewModel.StatusMessage = "Symbol server path added. Ready to resolve!";
1718
ViewModel.HighlightResolve = true;
@@ -57,6 +58,8 @@ private void BrowseBinaryPath_Click(object sender, RoutedEventArgs e) {
5758
}
5859

5960
private void SelectSQLPDB_Click(object sender, RoutedEventArgs e) {
61+
// Dismiss the banner immediately — user has responded to the hint
62+
ViewModel.DetectedBuildInfo = null;
6063
if (!File.Exists(ResolverViewModel.SqlBuildInfoFileName)) {
6164
MessageBox.Show(Window.GetWindow(this),
6265
$"Could not find the SQL build info JSON file: {ResolverViewModel.SqlBuildInfoFileName}. You might need to manually obtain it from: {ConfigurationManager.AppSettings["SQLBuildInfoURLs"]}",

0 commit comments

Comments
 (0)