Skip to content

Commit

Permalink
Bump up version and update README & Fix language load
Browse files Browse the repository at this point in the history
  • Loading branch information
Nullkooland committed Feb 20, 2020
1 parent 1c803f5 commit 2b1b910
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 2 deletions.
Binary file modified GBCLV3/App.xaml
Binary file not shown.
3 changes: 3 additions & 0 deletions GBCLV3/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<PropertyChanged />
</Weavers>
54 changes: 54 additions & 0 deletions GBCLV3/FodyWeavers.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="EventInvokerNames" type="xs:string">
<xs:annotation>
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="CheckForEquality" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>
4 changes: 2 additions & 2 deletions GBCLV3/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
[assembly: AssemblyCopyright("Copyright © Goose Bomb 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("3.0.8.81")]
[assembly: AssemblyFileVersion("3.0.8.81")]
[assembly: AssemblyVersion("3.0.9.104")]
[assembly: AssemblyFileVersion("3.0.9.104")]

[assembly: ComVisible(false)]

Expand Down
5 changes: 5 additions & 0 deletions GBCLV3/Services/ConfigService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public void Load()
Entries.JavaMaxMem = 2048;
}

if (Entries.Build < 104)
{
Entries.Language = null; // Migrate lower version language settings
}

Entries.Build = AssemblyUtil.Build;
}

Expand Down
2 changes: 2 additions & 0 deletions GBCLV3/Services/LanguageService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public LanguageService(ConfigService configService)
_currentLangDict =
Application.LoadComponent(new Uri($"/Resources/Languages/{_config.Language}.xaml", UriKind.Relative)) as
ResourceDictionary;

Application.Current.Resources.MergedDictionaries.Add(_currentLangDict);
}

#endregion
Expand Down
1 change: 1 addition & 0 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
## 运行截图
<img src="./Screenshots/main_zh.png" width="720"/>
<img src="./Screenshots/blur_behind_zh.png" width="720"/>
<img src="./Screenshots/literally_code_behind_zh.png" width="720"/>
<img src="./Screenshots/versions_zh.png" width="720"/>
<img src="./Screenshots/accounts_zh.png" width="720"/>
<img src="./Screenshots/settings_zh.png" width="720"/>
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@

<img src="./Screenshots/main_en.png" width="720"/>
<img src="./Screenshots/blur_behind_en.png" width="720"/>
<img src="./Screenshots/literally_code_behind_en.png" width="720"/>
<img src="./Screenshots/versions_en.png" width="720"/>
<img src="./Screenshots/accounts_en.png" width="720"/>
<img src="./Screenshots/settings_en.png" width="720"/>
Expand Down
Binary file modified Screenshots/blur_behind_en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Screenshots/blur_behind_zh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/literally_code_behind_en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/literally_code_behind_zh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2b1b910

Please sign in to comment.