Skip to content

Commit

Permalink
Merge pull request #5 from AlaricGilbert/dev
Browse files Browse the repository at this point in the history
merge v0.2.2.1
  • Loading branch information
AlaricGilbert authored Feb 4, 2019
2 parents a1b080c + b44ebc5 commit 3d8d142
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 3 deletions.
3 changes: 3 additions & 0 deletions BiliCommenter/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<setting name="AccessKey" serializeAs="String">
<value />
</setting>
<setting name="IsUpgrateNeeded" serializeAs="String">
<value>True</value>
</setting>
</BiliCommenter.Properties.Settings>
</userSettings>
</configuration>
13 changes: 12 additions & 1 deletion BiliCommenter/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,19 @@ public async Task FreshUserInfo()
}
public void Initialize()
{
// Inherit settings.
if (Settings.Default.IsUpgrateNeeded)
{
Settings.Default.Upgrade();
Settings.Default.IsUpgrateNeeded = false;
Settings.Default.Save();
}

// Show the welcome window and hide the main window.
WelcomeWindow.Show();
this.Visibility = Visibility.Hidden;

//Inherit tasks.
// Inherit tasks.
if (Settings.Default.IsInheritTasks)
ReadTasks();

Expand Down Expand Up @@ -168,6 +176,9 @@ public void Initialize()
});
#if !DEBUG
emojiThread.Start(); // do not load the emojis in the debug mode.
#else
this.Visibility = Visibility.Visible;
WelcomeWindow.Close();
#endif
#endregion
}
Expand Down
4 changes: 2 additions & 2 deletions BiliCommenter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.2.0")]
[assembly: AssemblyFileVersion("0.2.2.0")]
[assembly: AssemblyVersion("0.2.2.1")]
[assembly: AssemblyFileVersion("0.2.2.1")]
12 changes: 12 additions & 0 deletions BiliCommenter/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions BiliCommenter/Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
<Setting Name="AccessKey" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="IsUpgrateNeeded" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>
8 changes: 8 additions & 0 deletions What's new.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## 0.2.x - currently mainly supporting version

### 0.2.2.1

New features:

```
Migrate settings from the previous version.
```

### 0.2.2.0

New features:
Expand Down

0 comments on commit 3d8d142

Please sign in to comment.