mikx
/
Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed localised decimal bug and tidied up About Window

This commit is contained in:
Ben 2015-07-03 21:19:25 +01:00
parent 2d448ed850
commit 8f533e8fd7
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Filtration/Properties/AssemblyInfo.cs
View File

@ -50,7 +50,7 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.4.*")] [assembly: AssemblyVersion("0.5.*")]
[assembly: InternalsVisibleTo("Filtration.Tests")] [assembly: InternalsVisibleTo("Filtration.Tests")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

1
Filtration/Resources/ItemBaseTypes.txt
View File

@ -23,6 +23,7 @@ Decoy Totem
Desecrate Desecrate
Determination Determination
Detonate Dead Detonate Dead
Detonate Mines
Devouring Totem Devouring Totem
Discharge Discharge
Discipline Discipline

4
Filtration/ViewModels/MainWindowViewModel.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -139,7 +140,6 @@ namespace Filtration.ViewModels
} }
}); });
CheckForUpdates(); CheckForUpdates();
throw new Exception("Test of dispatcher exception handler");
} }
public RelayCommand OpenScriptCommand { get; private set; } public RelayCommand OpenScriptCommand { get; private set; }
@ -178,7 +178,7 @@ namespace Filtration.ViewModels
{ {
var assembly = Assembly.GetExecutingAssembly(); var assembly = Assembly.GetExecutingAssembly();
var assemblyVersion = FileVersionInfo.GetVersionInfo(assembly.Location); var assemblyVersion = FileVersionInfo.GetVersionInfo(assembly.Location);
var currentVersion = Convert.ToDecimal(assemblyVersion.FileMajorPart + "." + assemblyVersion.FileMinorPart); var currentVersion = Convert.ToDecimal(assemblyVersion.FileMajorPart + CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator + assemblyVersion.FileMinorPart);
var result = await _updateCheckService.GetUpdateData(); var result = await _updateCheckService.GetUpdateData();

2
Filtration/Views/ReplaceColorsWindow.xaml
View File

@ -8,7 +8,7 @@
xmlns:userControls="clr-namespace:Filtration.UserControls" xmlns:userControls="clr-namespace:Filtration.UserControls"
mc:Ignorable="d" mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=viewModels:ReplaceColorsViewModel}" d:DataContext="{d:DesignInstance Type=viewModels:ReplaceColorsViewModel}"
Title="Replace Script Colors" Height="245" Width="515" Title="Replace Script Colors" Height="280" Width="540"
BorderThickness="1" BorderBrush="Black" BorderThickness="1" BorderBrush="Black"
Loaded="ReplaceColorsWindow_OnLoaded" ResizeMode="CanMinimize"> Loaded="ReplaceColorsWindow_OnLoaded" ResizeMode="CanMinimize">
<!--ShowMaxRestoreButton="False"--> <!--ShowMaxRestoreButton="False"-->