Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 03:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge update logic #1266

Browse Source
This commit is contained in:
bao-qian
2017-03-06 01:54:06 +00:00
parent e66f7a206e
commit c41035058a
4 changed files with 3 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Wox/SettingWindow.xaml
View File

@@ -384,8 +384,6 @@
<Button Grid.Row="4" Grid.Column="0"
Content="{DynamicResource checkUpdates}" Click="OnCheckUpdates"
HorizontalAlignment="Left" Margin="10 10 10 10" />
<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding NewVersionTips}"
HorizontalAlignment="Left" Visibility="{Binding NewVersionTipsVisibility}" />
</Grid>
</TabItem>
</TabControl>

12
Wox/SettingWindow.xaml.cs
View File

@@ -306,17 +306,7 @@ namespace Wox
private async void OnCheckUpdates(object sender, RoutedEventArgs e)
{
var version = await Updater.NewVersion();
if (!string.IsNullOrEmpty(version))
{
var newVersion = Updater.NumericVersion(version);
var oldVersion = Updater.NumericVersion(Infrastructure.Constant.Version);
if (newVersion > oldVersion)
{
Updater.UpdateApp();
_viewModel.NewVersionTips = version;
}
}
await Updater.UpdateApp();
}
private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)

13
Wox/ViewModel/SettingWindowViewModel.cs
View File

@@ -6,6 +6,7 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using Wox.Core;
using Wox.Core.Plugin;
using Wox.Core.Resource;
using Wox.Helper;
@@ -319,18 +320,6 @@ namespace Wox.ViewModel
public static string ReleaseNotes => @"https://github.com/Wox-launcher/Wox/releases/latest";
public static string Version => Constant.Version;
public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
private string _newVersionTips;
public string NewVersionTips
{
get { return _newVersionTips; }
set
{
_newVersionTips = string.Format(_translater.GetTranslation("newVersionTips"), value);
NewVersionTipsVisibility = Visibility.Visible;
}
}
public Visibility NewVersionTipsVisibility { get; set; }
#endregion
}
}