Skip to content

Commit 7ad3b31

Browse files
committed
Merge pull request #61 from mgnslndh/master
Fix CrashReportDialog styling
2 parents 2d96eb5 + 973b1f2 commit 7ad3b31

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

Source/Platforms/Wpf/Dialogs/CrashReportDialog.xaml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,65 @@
11
<Window x:Class="Exceptionless.Dialogs.CrashReportDialog"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
Title="[AppName] Error" Height="500" Width="425"
4+
Title="[AppName] Error" Height="525" Width="425"
55
WindowStyle="ToolWindow" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
66
Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
77
FocusManager.FocusedElement="{Binding ElementName=DescriptionTextBox}"
88
Icon="../Images/ErrorFeedback.png">
99
<Grid>
1010
<Grid.RowDefinitions>
11-
<RowDefinition Height="56" />
12-
<RowDefinition Height="451*" />
11+
<RowDefinition Height="60" />
12+
<RowDefinition Height="*" />
1313
<RowDefinition Height="Auto" />
1414
</Grid.RowDefinitions>
1515

1616
<Grid Name="headerGrid" Background="White">
1717
<Grid.ColumnDefinitions>
1818
<ColumnDefinition Width="363*" />
19-
<ColumnDefinition Width="56" />
19+
<ColumnDefinition Width="60" />
2020
</Grid.ColumnDefinitions>
21-
<TextBlock Name="InformationHeaderLabel" TextWrapping="WrapWithOverflow" Margin="6" FontWeight="Bold">
21+
<TextBlock Name="InformationHeaderLabel" TextWrapping="WrapWithOverflow" Margin="12" FontWeight="Bold">
2222
[AppName] has encountered a problem and needs to close. We are sorry for the inconvenience.
2323
</TextBlock>
24-
<Image Name="errorImage" Grid.Column="2" Stretch="Fill"
24+
<Image Name="errorImage" Grid.Column="2"
2525
Source="../Images/ErrorFeedback.png"
2626
HorizontalAlignment="Center" VerticalAlignment="Center" Width="48" Height="48" />
2727
</Grid>
2828

29-
<StackPanel Grid.Row="1" Name="mainStackPanel">
30-
<TextBlock Name="errorMessage" TextWrapping="WrapWithOverflow" Margin="6">
29+
<StackPanel Grid.Row="1" Name="mainStackPanel" Margin="12">
30+
<TextBlock Name="errorMessage" TextWrapping="WrapWithOverflow">
3131
If you were in the middle of something, the information you were working on might be lost.<LineBreak/>
3232
<LineBreak/>
3333
We have created an error report that you can send to us. We will treat this error as confidential and anonymous.<LineBreak/>
3434
<LineBreak/>
35-
To help us diagnose the cause of this error and improve the software, please enter your email address, describe what you were doing when this error occurred, and send this error to us.<LineBreak/>
35+
To help us diagnose the cause of this error and improve the software, please enter your email address, describe what you were doing when this error occurred, and send this error to us.
3636
</TextBlock>
3737

38-
<Label Name="emailAddressLabel" Margin="6,0"
38+
<Label Name="emailAddressLabel"
3939
HorizontalAlignment="Left"
4040
VerticalAlignment="Top"
41+
Margin="0,6,0,0"
4142
Content="Your _email address (optional):" />
4243
<TextBox Name="EmailAddressTextBox"
43-
HorizontalAlignment="Left"
44+
HorizontalAlignment="Stretch"
4445
VerticalAlignment="Top"
45-
Width="358"
46-
Margin="6,0" />
46+
47+
/>
4748

4849
<Label Name="descriptionLabel"
4950
HorizontalAlignment="Left"
50-
VerticalAlignment="Top"
51-
Margin="6,0"
51+
VerticalAlignment="Top"
52+
Margin="0,6,0,0"
5253
Content="_Describe what you were doing when the error occurred (optional): " />
5354
<TextBox Name="DescriptionTextBox"
54-
Height="120" Width="358"
55-
HorizontalAlignment="Left"
55+
Height="120"
56+
HorizontalAlignment="Stretch"
5657
VerticalAlignment="Top"
5758
TextWrapping="Wrap"
5859
VerticalScrollBarVisibility="Auto"
5960
HorizontalScrollBarVisibility ="Visible"
6061
SpellCheck.IsEnabled="True"
61-
Margin="6,0" />
62+
/>
6263

6364
<!--<TextBlock Name="detailTextBlock"
6465
HorizontalAlignment="Left"
@@ -71,16 +72,18 @@
7172
<DockPanel Grid.Row="2" Margin="6">
7273
<Button Name="CancelButton"
7374
DockPanel.Dock="Right"
74-
Height="23" Width="75"
75+
Height="23" MinWidth="75"
7576
HorizontalAlignment="Right"
7677
Margin="4"
78+
Padding="8,0,8,0"
7779
IsCancel="True"
7880
Content="_Cancel" />
7981
<Button Name="SubmitReportButton"
8082
DockPanel.Dock="Right"
81-
Height="23" Width="100"
83+
Height="23" MinWidth="100"
8284
HorizontalAlignment="Right"
8385
Margin="4"
86+
Padding="8,0,8,0"
8487
IsDefault="True"
8588
Content="_Submit Report"
8689
Click="OnSubmitReportButtonClick" />

Source/Platforms/Wpf/ExceptionlessClientExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void RegisterApplicationThreadExceptionHandler(this ExceptionlessC
2323
System.Windows.Forms.Application.ThreadException -= _onApplicationThreadException;
2424
System.Windows.Forms.Application.ThreadException += _onApplicationThreadException;
2525
} catch (Exception ex) {
26-
client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the unobserved task exception event.");
26+
client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the application thread exception event.");
2727
}
2828
}
2929

@@ -55,7 +55,7 @@ public static void RegisterApplicationDispatcherUnhandledExceptionHandler(this E
5555
System.Windows.Application.Current.DispatcherUnhandledException -= _onApplicationDispatcherUnhandledException;
5656
System.Windows.Application.Current.DispatcherUnhandledException += _onApplicationDispatcherUnhandledException;
5757
} catch (Exception ex) {
58-
client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the unobserved task exception event.");
58+
client.Configuration.Resolver.GetLog().Error(typeof(ExceptionlessClientExtensions), ex, "An error occurred while wiring up to the application dispatcher exception event.");
5959
}
6060
}
6161

0 commit comments

Comments
 (0)