Skip to content
This repository was archived by the owner on Feb 7, 2022. It is now read-only.

Commit 6ee50f8

Browse files
ArvinZJCArvinZJC
committed
Release V0.8.4 rather than V0.8.3
1. Accept all changes in V0.8.3. 2. Update README. 3. Upgrade Syncfusion WPF UI from V18.4.0.31 to V18.4.0.34. 4. Drop the feature of generating quick launch shortcuts during setup because of some hard-to-avoid restrictions. 5. Adjust the layout of controls in the tab page to look better especially on a large screen.
1 parent db32582 commit 6ee50f8

20 files changed

+159
-252
lines changed

‎ShSzStockHelper/App.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*
22
* @Description: the back-end code of initialising the app
3-
* @Version: 1.0.9.20201216
3+
* @Version: 1.0.10.20210117
44
* @Author: Arvin Zhao
55
* @Date: 2020-07-08 10:17:48
66
* @Last Editors: Arvin Zhao
7-
* @LastEditTime: 2020-12-16 14:14:55
7+
* @LastEditTime: 2021-01-17 14:14:55
88
*/
99

1010
using Bluegrams.Application;
@@ -36,7 +36,7 @@ public partial class App
3636
/// </summary>
3737
public App()
3838
{
39-
SyncfusionLicenseProvider.RegisterLicense("MzI2OTM0QDMxMzgyZTMzMmUzMGFyTEY5ai9VTGlKRXcrdlpLSjU5VUlHR1ZZZzkxeDlBYzdkMHMvY0d0LzA9"); // Register a Syncfusion license.
39+
SyncfusionLicenseProvider.RegisterLicense("Mzg0NzMzQDMxMzgyZTM0MmUzMEJhOGxxaFdrMUh0VEt1eDVQaUVCU05SKy9yS0k2ZERESmZnRXNkZkEwWXc9"); // Register a Syncfusion license.
4040

4141
string productCompany = null;
4242
var assembly = Assembly.GetEntryAssembly();

‎ShSzStockHelper/README-zhCN.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111

1212
## 注意
1313

14-
1. 截至2020年12月27日，使用Visual Studio 2019和.NET Core 3.1开发表现良好。此外，我要特别感谢Syncfusion提供的[强大的WPF的UI组件库](https://www.syncfusion.com/wpf-ui-controls)，这节省了许多开发时间。
15-
2. 图标资源（除应用程序图标）均来自[Material Design图标库](https://material.io/resources/icons/?style=baseline)和[Flaticon](https://www.flaticon.com/)。
14+
1. 截至2021年1月17日，使用Visual Studio 2019（版本：16.8.4）和Windows呈现基础（WPF，.NET Core 3.1）开发表现良好。此外，我要特别感谢Syncfusion提供的[强大的WPF的UI组件库](https://www.syncfusion.com/wpf-ui-controls)，这节省了许多开发时间。
15+
2. 应用用到的图标资源主要来自[Material Design图标库](https://material.io/resources/icons/?style=baseline)和[Flaticon](https://www.flaticon.com/)。
1616
3. 应用用到的主要的NuGet包参见下面的表格。
1717

1818
| 名称 | 版本 |
1919
| :-- | :--: |
2020
| [HtmlAgilityPack](https://html-agility-pack.net/) | 1.11.29 |
2121
| [Newtonsoft.Json](https://www.newtonsoft.com/json) | 12.0.3 |
2222
| [PortableSettingsProvider](https://github.com/Bluegrams/SettingsProviders) | 0.2.4 |
23-
| Syncfusion.DataGridExcelExport.Wpf | 18.4.0.31 |
24-
| Syncfusion.SfBusyIndicator.WPF | 18.4.0.31 |
25-
| Syncfusion.SfGrid.WPF | 18.4.0.31 |
26-
| Syncfusion.SfInput.WPF | 18.4.0.31 |
27-
| Syncfusion.SfTreeNavigator.WPF | 18.4.0.31 |
28-
| Syncfusion.Themes.MaterialDark.WPF | 18.4.0.31 |
29-
| Syncfusion.Themes.MaterialLight.WPF | 18.4.0.31 |
30-
| Syncfusion.Tools.WPF | 18.4.0.31 |
23+
| Syncfusion.DataGridExcelExport.Wpf | 18.4.0.34 |
24+
| Syncfusion.SfBusyIndicator.WPF | 18.4.0.34 |
25+
| Syncfusion.SfGrid.WPF | 18.4.0.34 |
26+
| Syncfusion.SfInput.WPF | 18.4.0.34 |
27+
| Syncfusion.SfTreeNavigator.WPF | 18.4.0.34 |
28+
| Syncfusion.Themes.MaterialDark.WPF | 18.4.0.34 |
29+
| Syncfusion.Themes.MaterialLight.WPF | 18.4.0.34 |
30+
| Syncfusion.Tools.WPF | 18.4.0.34 |
3131

3232
## 用户界面示例
3333

‎ShSzStockHelper/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ This is the Visual Studio solution folder of the application. It contains code a
1111

1212
## ATTENTION
1313

14-
1. By 27 December 2020, everything looks good with Visual Studio 2019 + WPF with .NET Core 3.1. Additionally, I would like to thankfully acknowledge Syncfusion for [its powerful WPF UI controls and libraries](https://www.syncfusion.com/wpf-ui-controls), which save much development time.
15-
2. Icon images except the icon of the application are from [Material Design Icons](https://material.io/resources/icons/?style=baseline) and [Flaticon](https://www.flaticon.com/).
14+
1. By 17 January 2021, everything looks good with Visual Studio 2019 (Version: 16.8.4) + Windows Presentation Foundation (WPF) with .NET Core 3.1. Additionally, I would like to thankfully acknowledge Syncfusion for [its powerful WPF UI controls and libraries](https://www.syncfusion.com/wpf-ui-controls), which save much development time.
15+
2. Most of icon images used by the application are from [Material Design Icons](https://material.io/resources/icons/?style=baseline) and [Flaticon](https://www.flaticon.com/).
1616
3. The main NuGet packages used in the application are listed in the following table.
1717

1818
| Name | Version |
1919
| :-- | :--: |
2020
| [HtmlAgilityPack](https://html-agility-pack.net/) | 1.11.29 |
2121
| [Newtonsoft.Json](https://www.newtonsoft.com/json) | 12.0.3 |
2222
| [PortableSettingsProvider](https://github.com/Bluegrams/SettingsProviders) | 0.2.4 |
23-
| Syncfusion.DataGridExcelExport.Wpf | 18.4.0.31 |
24-
| Syncfusion.SfBusyIndicator.WPF | 18.4.0.31 |
25-
| Syncfusion.SfGrid.WPF | 18.4.0.31 |
26-
| Syncfusion.SfInput.WPF | 18.4.0.31 |
27-
| Syncfusion.SfTreeNavigator.WPF | 18.4.0.31 |
28-
| Syncfusion.Themes.MaterialDark.WPF | 18.4.0.31 |
29-
| Syncfusion.Themes.MaterialLight.WPF | 18.4.0.31 |
30-
| Syncfusion.Tools.WPF | 18.4.0.31 |
23+
| Syncfusion.DataGridExcelExport.Wpf | 18.4.0.34 |
24+
| Syncfusion.SfBusyIndicator.WPF | 18.4.0.34 |
25+
| Syncfusion.SfGrid.WPF | 18.4.0.34 |
26+
| Syncfusion.SfInput.WPF | 18.4.0.34 |
27+
| Syncfusion.SfTreeNavigator.WPF | 18.4.0.34 |
28+
| Syncfusion.Themes.MaterialDark.WPF | 18.4.0.34 |
29+
| Syncfusion.Themes.MaterialLight.WPF | 18.4.0.34 |
30+
| Syncfusion.Tools.WPF | 18.4.0.34 |
3131

3232
## Partial UI (For Reference Only)
3333

‎ShSzStockHelper/Resources/MaterialDark/Theme.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<Setter Property="IsEnabled" Value="False" />
216216
<Setter Property="Padding" Value="5" />
217217
<Setter Property="SizeMode" Value="Normal" />
218-
<Setter Property="VerticalAlignment" Value="Center" />
218+
<Setter Property="VerticalAlignment" Value="Bottom" />
219219
</Style>
220220

221221
<Style x:Key="PrintPreviewWindowStyle"

‎ShSzStockHelper/Resources/MaterialLight/Theme.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
<Setter Property="IsEnabled" Value="False" />
212212
<Setter Property="Padding" Value="5" />
213213
<Setter Property="SizeMode" Value="Normal" />
214-
<Setter Property="VerticalAlignment" Value="Center" />
214+
<Setter Property="VerticalAlignment" Value="Bottom" />
215215
</Style>
216216

217217
<Style x:Key="PrintPreviewWindowStyle"

‎ShSzStockHelper/Resources/StockSymbolNameData.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎ShSzStockHelper/ShSzStockHelper.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationIcon>AppIcon.ico</ApplicationIcon>
8-
<Version>0.8.3</Version>
8+
<Version>0.8.4</Version>
99
<Authors>Arvin Zhao</Authors>
1010
<Company>ArvinZJC</Company>
1111
<Product>神户座</Product>
12-
<Copyright>© 2020 Arvin Zhao</Copyright>
12+
<Copyright>© 2021 Arvin Zhao</Copyright>
1313
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1414
<Description>This is the package of SH/SZ Stock Helper which is a Windows application that can mainly search strike prices and volumes for the users.</Description>
1515
<PackageIcon>AppIcon.ico</PackageIcon>
@@ -19,23 +19,23 @@
1919
<AssemblyName>ShSzStockHelper</AssemblyName>
2020
<PackageId>ShSzStockHelper</PackageId>
2121
<RepositoryType>Public</RepositoryType>
22-
<AssemblyVersion>0.8.3.0</AssemblyVersion>
23-
<FileVersion>0.8.3.0</FileVersion>
22+
<AssemblyVersion>0.8.4.0</AssemblyVersion>
23+
<FileVersion>0.8.4.0</FileVersion>
2424
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2525
</PropertyGroup>
2626

2727
<ItemGroup>
2828
<PackageReference Include="HtmlAgilityPack" Version="1.11.29" />
2929
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3030
<PackageReference Include="PortableSettingsProvider" Version="0.2.4" />
31-
<PackageReference Include="Syncfusion.DataGridExcelExport.Wpf" Version="18.4.0.31" />
32-
<PackageReference Include="Syncfusion.SfBusyIndicator.WPF" Version="18.4.0.31" />
33-
<PackageReference Include="Syncfusion.SfGrid.WPF" Version="18.4.0.31" />
34-
<PackageReference Include="Syncfusion.SfInput.WPF" Version="18.4.0.31" />
35-
<PackageReference Include="Syncfusion.SfTreeNavigator.WPF" Version="18.4.0.31" />
36-
<PackageReference Include="Syncfusion.Themes.MaterialDark.WPF" Version="18.4.0.31" />
37-
<PackageReference Include="Syncfusion.Themes.MaterialLight.WPF" Version="18.4.0.31" />
38-
<PackageReference Include="Syncfusion.Tools.WPF" Version="18.4.0.31" />
31+
<PackageReference Include="Syncfusion.DataGridExcelExport.Wpf" Version="18.4.0.34" />
32+
<PackageReference Include="Syncfusion.SfBusyIndicator.WPF" Version="18.4.0.34" />
33+
<PackageReference Include="Syncfusion.SfGrid.WPF" Version="18.4.0.34" />
34+
<PackageReference Include="Syncfusion.SfInput.WPF" Version="18.4.0.34" />
35+
<PackageReference Include="Syncfusion.SfTreeNavigator.WPF" Version="18.4.0.34" />
36+
<PackageReference Include="Syncfusion.Themes.MaterialDark.WPF" Version="18.4.0.34" />
37+
<PackageReference Include="Syncfusion.Themes.MaterialLight.WPF" Version="18.4.0.34" />
38+
<PackageReference Include="Syncfusion.Tools.WPF" Version="18.4.0.34" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎ShSzStockHelper/Views/StrikePriceVolumeTab.xaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<Style BasedOn="{StaticResource ToolTipStyle}" TargetType="ToolTip" />
1919
</UserControl.Resources>
2020

21-
<Grid>
21+
<Grid Margin="15">
2222
<Grid.RowDefinitions>
23-
<RowDefinition Height="1*"/>
24-
<RowDefinition Height="8*"/>
25-
<RowDefinition Height="1*"/>
23+
<RowDefinition Height="45"/>
24+
<RowDefinition Height="*"/>
25+
<RowDefinition Height="45"/>
2626
</Grid.RowDefinitions>
2727

28-
<Grid Grid.Row="0" Margin="15,0,15,0">
28+
<Grid Grid.Row="0">
2929
<Grid.ColumnDefinitions>
3030
<ColumnDefinition Width="*"/>
3131
<ColumnDefinition Width="*"/>
@@ -42,14 +42,15 @@
4242
LostFocus="TextBoxSymbol_LostFocus"
4343
MaxDropDownHeight="{Binding MaxDropDownHeight, Source={x:Static properties:Settings.Default}}"
4444
MaxLength="{Binding MaxInputLength, Source={x:Static properties:Settings.Default}}"
45+
Margin="0,7,0,0"
4546
SearchItemPath="Name"
4647
SelectedItemChanged="TextBoxSymbol_SelectedItemChanged"
4748
ShowSuggestionsOnFocus="True"
4849
SuggestionMode="Contains"
4950
TextChanged="TextBoxSymbol_TextChanged"
5051
TextHighlightMode="MultipleOccurrence"
5152
ToolTip="{x:Static properties:Resources.TextBoxSymbol_ToolTip}"
52-
VerticalAlignment="Center"
53+
VerticalAlignment="Top"
5354
Watermark="{x:Static properties:Resources.TextBoxSymbol_WaterMark}"
5455
WatermarkTemplate="{StaticResource TextBoxWatermarkTemplate}">
5556
<syncfusion:SfTextBoxExt.AutoCompleteItemTemplate>
@@ -77,7 +78,7 @@
7778
CustomPattern="{Binding DateDisplayFormat, Source={x:Static properties:Settings.Default}}"
7879
DateTimeChanged="DatePickerStartDate_DateTimeChanged"
7980
IsEmptyDateEnabled="True"
80-
Margin="15,0,0,0"
81+
Margin="15,8,0,0"
8182
MaxDateTime="{x:Static system:DateTime.Now}"
8283
MinDateTime="{Binding MinDate, Source={x:Static properties:Settings.Default}}"
8384
NoneDateText="{x:Static properties:Resources.DatePickerStartDate_WaterMark}"
@@ -86,14 +87,14 @@
8687
ShowMaskOnNullValue="False"
8788
Style="{StaticResource DatePickerStyle}"
8889
ToolTip="{x:Static properties:Resources.DatePickerStartDate_ToolTip}"
89-
VerticalAlignment="Center" />
90+
VerticalAlignment="Top" />
9091

9192
<syncfusion:DateTimeEdit x:Name="DatePickerEndDate"
9293
Grid.Column="2"
9394
CustomPattern="{Binding DateDisplayFormat, Source={x:Static properties:Settings.Default}}"
9495
DateTimeChanged="DatePickerEndDate_DateTimeChanged"
9596
IsEmptyDateEnabled="True"
96-
Margin="15,0,0,0"
97+
Margin="15,8,0,0"
9798
MaxDateTime="{x:Static system:DateTime.Now}"
9899
MinDateTime="{Binding MinDate, Source={x:Static properties:Settings.Default}}"
99100
NoneDateText="{x:Static properties:Resources.DatePickerEndDate_WaterMark}"
@@ -102,7 +103,7 @@
102103
ShowMaskOnNullValue="False"
103104
Style="{StaticResource DatePickerStyle}"
104105
ToolTip="{x:Static properties:Resources.DatePickerEndDate_ToolTip}"
105-
VerticalAlignment="Center"/>
106+
VerticalAlignment="Top"/>
106107

107108
<syncfusion:ButtonAdv x:Name="ButtonSearch"
108109
Grid.Column="3"
@@ -115,7 +116,7 @@
115116
SizeMode="Small"
116117
SmallIcon="{Binding SearchIconUri, Converter={StaticResource IconUriConverter}, Source={x:Static properties:Settings.Default}}"
117118
ToolTip="{x:Static properties:Resources.ButtonSearch_ToolTip}"
118-
VerticalAlignment="Center"/>
119+
VerticalAlignment="Top"/>
119120
</Grid>
120121

121122
<syncfusionNotification:SfBusyIndicator x:Name="BusyIndicatorSearchResultArea"
@@ -124,8 +125,7 @@
124125
Background="Transparent"
125126
BorderBrush="LightGray"
126127
BorderThickness="0.5"
127-
IsBusy="False"
128-
Margin="15,0,15,0">
128+
IsBusy="False">
129129
<syncfusionNotification:SfBusyIndicator.HeaderTemplate>
130130
<DataTemplate>
131131
<TextBlock FontFamily="{Binding DisplayFontFamilyName, Converter={StaticResource FontFamilyNameConverter}, Source={x:Static properties:Settings.Default}}"
@@ -195,7 +195,7 @@
195195
</Grid>
196196
</syncfusionNotification:SfBusyIndicator>
197197

198-
<Grid Grid.Row="2" Margin="15,0,15,0">
198+
<Grid Grid.Row="2">
199199
<Grid.ColumnDefinitions>
200200
<ColumnDefinition Width="*"/>
201201
<ColumnDefinition Width="*"/>

‎ShSzStockHelper/Views/StrikePriceVolumeTab.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*
22
* @Description: the back-end code of the tab of searching for data of strike prices and volumes
3-
* @Version: 1.4.2.20201125
3+
* @Version: 1.4.3.20210117
44
* @Author: Arvin Zhao
55
* @Date: 2020-08-10 13:37:27
66
* @Last Editors: Arvin Zhao
7-
* @LastEditTime: 2020-11-25 13:38:24
7+
* @LastEditTime: 2021-01-17 13:38:24
88
*/
99

1010
using Microsoft.Win32;
@@ -442,7 +442,7 @@ private void TextBoxSymbol_LostFocus(object sender, RoutedEventArgs e)
442442
} // end method TextBoxSymbol_LostFocus
443443

444444
// Perform actions when necessary if the selected item in the auto-complete suggestion list is changed.
445-
private void TextBoxSymbol_SelectedItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
445+
private void TextBoxSymbol_SelectedItemChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
446446
{
447447
if (TextBoxSymbol.SelectedItem != null && Regex.IsMatch(TextBoxSymbol.Text.Trim(), RegularExpressionHasChinese))
448448
TextBoxSymbol.Text = ((StockSymbolNameData) TextBoxSymbol.SelectedItem).Symbol;

‎ShSzStockHelper_Setup/Full Update Logs.docx

317 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)