Skip to content

Commit 30aa1fa

Browse files
jjw24jjw24
authored
Merge pull request #3264 from Jack251970/report_window
Improve Report Window Design
2 parents c143aa4 + 3fa8806 commit 30aa1fa

9 files changed

+109
-56
lines changed

‎Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,11 @@
3232
<StackPanel>
3333
<Grid>
3434
<Grid.ColumnDefinitions>
35-
<ColumnDefinition Width="Auto" />
3635
<ColumnDefinition Width="*" />
3736
<ColumnDefinition Width="Auto" />
38-
<ColumnDefinition Width="Auto" />
39-
<ColumnDefinition Width="Auto" />
4037
</Grid.ColumnDefinitions>
4138
<Button
42-
Grid.Column="4"
39+
Grid.Column="1"
4340
Click="BtnCancel_OnClick"
4441
Style="{StaticResource TitleBarCloseButtonStyle}">
4542
<Path

‎Flow.Launcher/CustomShortcutSetting.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,11 @@
3030
<StackPanel>
3131
<Grid>
3232
<Grid.ColumnDefinitions>
33-
<ColumnDefinition Width="Auto" />
3433
<ColumnDefinition Width="*" />
3534
<ColumnDefinition Width="Auto" />
36-
<ColumnDefinition Width="Auto" />
37-
<ColumnDefinition Width="Auto" />
3835
</Grid.ColumnDefinitions>
3936
<Button
40-
Grid.Column="4"
37+
Grid.Column="1"
4138
Click="BtnCancel_OnClick"
4239
Style="{StaticResource TitleBarCloseButtonStyle}">
4340
<Path

‎Flow.Launcher/Languages/en.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@
384384
<system:String x:Key="reportWindow_report_succeed">Report sent successfully</system:String>
385385
<system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
386386
<system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
387+
<system:String x:Key="reportWindow_please_open_issue">Please open new issue in</system:String>
388+
<system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
389+
<system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
387390

388391
<!-- General Notice -->
389392
<system:String x:Key="pleaseWait">Please wait...</system:String>

‎Flow.Launcher/PriorityChangeWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@
2929
<StackPanel>
3030
<Grid>
3131
<Grid.ColumnDefinitions>
32-
<ColumnDefinition Width="Auto" />
3332
<ColumnDefinition Width="*" />
3433
<ColumnDefinition Width="Auto" />
35-
<ColumnDefinition Width="Auto" />
36-
<ColumnDefinition Width="Auto" />
3734
</Grid.ColumnDefinitions>
3835
<Button
39-
Grid.Column="4"
36+
Grid.Column="1"
4037
Click="BtnCancel_OnClick"
4138
Style="{StaticResource TitleBarCloseButtonStyle}">
4239
<Path

‎Flow.Launcher/ReportWindow.xaml

Lines changed: 80 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,82 @@
1-
<Window x:Class="Flow.Launcher.ReportWindow"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
mc:Ignorable="d"
7-
WindowStartupLocation="CenterScreen"
8-
Icon="Images/app_error.png"
9-
Topmost="True"
10-
ResizeMode="NoResize"
11-
Width="600"
12-
Height="455"
13-
Title="{DynamicResource reportWindow_flowlauncher_got_an_error}"
14-
d:DesignHeight="300" d:DesignWidth="600" x:ClassModifier="internal">
15-
<RichTextBox x:Name="ErrorTextbox"
16-
IsDocumentEnabled="True"
17-
VerticalScrollBarVisibility="Auto"
18-
HorizontalScrollBarVisibility="Auto"
19-
FontSize="14"
20-
Margin="10"
21-
BorderThickness="0"/>
1+
<Window
2+
x:Class="Flow.Launcher.ReportWindow"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
Title="{DynamicResource reportWindow_flowlauncher_got_an_error}"
8+
Width="600"
9+
Height="455"
10+
d:DesignHeight="300"
11+
d:DesignWidth="600"
12+
x:ClassModifier="internal"
13+
Background="{DynamicResource PopuBGColor}"
14+
Foreground="{DynamicResource PopupTextColor}"
15+
Icon="/Images/app_error.png"
16+
ResizeMode="NoResize"
17+
Topmost="True"
18+
WindowStartupLocation="CenterScreen"
19+
mc:Ignorable="d">
20+
<WindowChrome.WindowChrome>
21+
<WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
22+
</WindowChrome.WindowChrome>
23+
24+
<Grid>
25+
<Grid.RowDefinitions>
26+
<RowDefinition Height="Auto" />
27+
<RowDefinition Height="*" />
28+
</Grid.RowDefinitions>
29+
<Grid>
30+
<Grid.ColumnDefinitions>
31+
<ColumnDefinition Width="Auto" />
32+
<ColumnDefinition Width="*" />
33+
<ColumnDefinition Width="Auto" />
34+
</Grid.ColumnDefinitions>
35+
<Image
36+
Grid.Column="0"
37+
Width="16"
38+
Height="16"
39+
Margin="10 4 4 4"
40+
RenderOptions.BitmapScalingMode="HighQuality"
41+
Source="/Images/app_error.png" />
42+
<TextBlock
43+
Grid.Column="1"
44+
Margin="4 0 0 0"
45+
VerticalAlignment="Center"
46+
FontSize="12"
47+
Foreground="{DynamicResource Color05B}"
48+
Text="{DynamicResource reportWindow_flowlauncher_got_an_error}" />
49+
<Button
50+
Grid.Column="2"
51+
Click="BtnCancel_OnClick"
52+
Style="{StaticResource TitleBarCloseButtonStyle}">
53+
<Path
54+
Width="46"
55+
Height="32"
56+
Data="M 18,11 27,20 M 18,20 27,11"
57+
Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
58+
StrokeThickness="1">
59+
<Path.Style>
60+
<Style TargetType="Path">
61+
<Style.Triggers>
62+
<DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
63+
<Setter Property="Opacity" Value="0.5" />
64+
</DataTrigger>
65+
</Style.Triggers>
66+
</Style>
67+
</Path.Style>
68+
</Path>
69+
</Button>
70+
</Grid>
71+
<RichTextBox
72+
x:Name="ErrorTextbox"
73+
Grid.Row="1"
74+
Margin="10"
75+
BorderThickness="0"
76+
FontSize="14"
77+
HorizontalScrollBarVisibility="Auto"
78+
IsDocumentEnabled="True"
79+
VerticalScrollBarVisibility="Auto" />
80+
</Grid>
2281

2382
</Window>

‎Flow.Launcher/ReportWindow.xaml.cs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,21 @@ private void SetException(Exception exception)
4343
var log = directory.GetFiles().OrderByDescending(f => f.LastWriteTime).First();
4444

4545
var websiteUrl = exception switch
46-
{
47-
FlowPluginException pluginException =>GetIssuesUrl(pluginException.Metadata.Website),
48-
_ => Constant.IssuesUrl
49-
};
50-
46+
{
47+
FlowPluginException pluginException =>GetIssuesUrl(pluginException.Metadata.Website),
48+
_ => Constant.IssuesUrl
49+
};
5150

52-
var paragraph = Hyperlink("Please open new issue in: ", websiteUrl);
53-
paragraph.Inlines.Add($"1. upload log file: {log.FullName}\n");
54-
paragraph.Inlines.Add($"2. copy below exception message");
51+
var paragraph = Hyperlink(App.API.GetTranslation("reportWindow_please_open_issue"), websiteUrl);
52+
paragraph.Inlines.Add(string.Format(App.API.GetTranslation("reportWindow_upload_log"), log.FullName));
53+
paragraph.Inlines.Add("\n");
54+
paragraph.Inlines.Add(App.API.GetTranslation("reportWindow_copy_below"));
5555
ErrorTextbox.Document.Blocks.Add(paragraph);
5656

5757
StringBuilder content = new StringBuilder();
5858
content.AppendLine(ErrorReporting.RuntimeInfo());
5959
content.AppendLine(ErrorReporting.DependenciesInfo());
60+
content.AppendLine();
6061
content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
6162
content.AppendLine("Exception:");
6263
content.AppendLine(exception.ToString());
@@ -65,10 +66,12 @@ private void SetException(Exception exception)
6566
ErrorTextbox.Document.Blocks.Add(paragraph);
6667
}
6768

68-
private Paragraph Hyperlink(string textBeforeUrl, string url)
69+
private static Paragraph Hyperlink(string textBeforeUrl, string url)
6970
{
70-
var paragraph = new Paragraph();
71-
paragraph.Margin = new Thickness(0);
71+
var paragraph = new Paragraph
72+
{
73+
Margin = new Thickness(0)
74+
};
7275

7376
var link = new Hyperlink
7477
{
@@ -79,10 +82,16 @@ private Paragraph Hyperlink(string textBeforeUrl, string url)
7982
link.Click += (s, e) => SearchWeb.OpenInBrowserTab(url);
8083

8184
paragraph.Inlines.Add(textBeforeUrl);
85+
paragraph.Inlines.Add(" ");
8286
paragraph.Inlines.Add(link);
8387
paragraph.Inlines.Add("\n");
8488

8589
return paragraph;
8690
}
91+
92+
private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
93+
{
94+
Close();
95+
}
8796
}
8897
}

‎Flow.Launcher/SelectBrowserWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@
2828
<StackPanel>
2929
<Grid>
3030
<Grid.ColumnDefinitions>
31-
<ColumnDefinition Width="Auto" />
3231
<ColumnDefinition Width="*" />
3332
<ColumnDefinition Width="Auto" />
34-
<ColumnDefinition Width="Auto" />
35-
<ColumnDefinition Width="Auto" />
3633
</Grid.ColumnDefinitions>
3734
<Button
38-
Grid.Column="4"
35+
Grid.Column="1"
3936
Click="btnCancel_Click"
4037
Style="{StaticResource TitleBarCloseButtonStyle}">
4138
<Path

‎Flow.Launcher/SelectFileManagerWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@
2828
<StackPanel>
2929
<Grid Grid.Row="0">
3030
<Grid.ColumnDefinitions>
31-
<ColumnDefinition Width="Auto" />
3231
<ColumnDefinition Width="*" />
3332
<ColumnDefinition Width="Auto" />
34-
<ColumnDefinition Width="Auto" />
35-
<ColumnDefinition Width="Auto" />
3633
</Grid.ColumnDefinitions>
3734
<Button
38-
Grid.Column="4"
35+
Grid.Column="1"
3936
Click="btnCancel_Click"
4037
Style="{StaticResource TitleBarCloseButtonStyle}">
4138
<Path

‎Flow.Launcher/WelcomeWindow.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
<ColumnDefinition Width="Auto" />
3737
<ColumnDefinition Width="*" />
3838
<ColumnDefinition Width="Auto" />
39-
<ColumnDefinition Width="Auto" />
40-
<ColumnDefinition Width="Auto" />
4139
</Grid.ColumnDefinitions>
4240
<Image
4341
Grid.Column="0"
@@ -53,9 +51,8 @@
5351
FontSize="12"
5452
Foreground="{DynamicResource Color05B}"
5553
Text="{DynamicResource Welcome_Page1_Title}" />
56-
5754
<Button
58-
Grid.Column="4"
55+
Grid.Column="2"
5956
Click="BtnCancel_OnClick"
6057
Style="{StaticResource TitleBarCloseButtonStyle}">
6158
<Path

0 commit comments

Comments
 (0)