Skip to content

Commit 428c1e2

Browse files
CodeDeadCodeDead
authored
Merge pull request #3 from CodeDead/release/1.6.0
Release/1.6.0
2 parents e0aa329 + ba13a6d commit 428c1e2

12 files changed

Lines changed: 37 additions & 34 deletions

‎AniView/AniView.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,16 @@
4848
<ItemGroup>
4949
<Reference Include="CodeDead.UpdateManager, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
5050
<HintPath>..\packages\CodeDead.UpdateManager.1.5.0\lib\net48\CodeDead.UpdateManager.dll</HintPath>
51+
<SpecificVersion>False</SpecificVersion>
5152
</Reference>
52-
<Reference Include="Syncfusion.Licensing, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Syncfusion.Licensing.17.1.0.49\lib\net46\Syncfusion.Licensing.dll</HintPath>
53+
<Reference Include="Syncfusion.Licensing, Version=18.3460.0.48, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Syncfusion.Licensing.18.3.0.48\lib\net46\Syncfusion.Licensing.dll</HintPath>
5455
</Reference>
55-
<Reference Include="Syncfusion.Shared.WPF, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Syncfusion.Shared.WPF.17.1.0.49\lib\net46\Syncfusion.Shared.WPF.dll</HintPath>
56+
<Reference Include="Syncfusion.Shared.WPF, Version=18.3460.0.48, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Syncfusion.Shared.WPF.18.3.0.48\lib\net46\Syncfusion.Shared.WPF.dll</HintPath>
5758
</Reference>
58-
<Reference Include="Syncfusion.Tools.WPF, Version=17.1460.0.49, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Syncfusion.Tools.WPF.17.1.0.49\lib\net46\Syncfusion.Tools.WPF.dll</HintPath>
59+
<Reference Include="Syncfusion.Tools.WPF, Version=18.3460.0.48, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Syncfusion.Tools.WPF.18.3.0.48\lib\net46\Syncfusion.Tools.WPF.dll</HintPath>
6061
</Reference>
6162
<Reference Include="System" />
6263
<Reference Include="System.Drawing" />
@@ -69,8 +70,8 @@
6970
<Reference Include="WindowsBase" />
7071
<Reference Include="PresentationCore" />
7172
<Reference Include="PresentationFramework" />
72-
<Reference Include="XamlAnimatedGif, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\packages\XamlAnimatedGif.1.2.1\lib\net45\XamlAnimatedGif.dll</HintPath>
73+
<Reference Include="XamlAnimatedGif, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\packages\XamlAnimatedGif.1.2.3\lib\net45\XamlAnimatedGif.dll</HintPath>
7475
</Reference>
7576
</ItemGroup>
7677
<ItemGroup>

‎AniView/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<value>True</value>
5454
</setting>
5555
<setting name="StatusBar" serializeAs="String">
56-
<value>True</value>
56+
<value>False</value>
5757
</setting>
5858
<setting name="WindowOpacity" serializeAs="String">
5959
<value>100</value>

‎AniView/App.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
StartupUri="Windows/MainWindow.xaml">
55
<Application.Resources>
6-
6+
77
</Application.Resources>
88
</Application>

‎AniView/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("CodeDead")]
1212
[assembly: AssemblyProduct("AniView")]
13-
[assembly: AssemblyCopyright("Copyright © 2019 CodeDead")]
13+
[assembly: AssemblyCopyright("Copyright © 2020 CodeDead")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -49,5 +49,5 @@
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("1.5.4.0")]
53-
[assembly: AssemblyFileVersion("1.5.4.0")]
52+
[assembly: AssemblyVersion("1.6.0.0")]
53+
[assembly: AssemblyFileVersion("1.6.0.0")]

‎AniView/Properties/Settings.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AniView/Properties/Settings.settings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Value Profile="(Default)">True</Value>
4343
</Setting>
4444
<Setting Name="StatusBar" Type="System.Boolean" Scope="User">
45-
<Value Profile="(Default)">True</Value>
45+
<Value Profile="(Default)">False</Value>
4646
</Setting>
4747
<Setting Name="WindowOpacity" Type="System.Double" Scope="User">
4848
<Value Profile="(Default)">100</Value>

‎AniView/Windows/AboutWindow.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
77
xmlns:classes="clr-namespace:AniView.Classes"
88
x:Class="AniView.Windows.AboutWindow"
9-
mc:Ignorable="d" AllowsTransparency="True" Width="380" Height="240" TitleTextAlignment="Center"
9+
mc:Ignorable="d" AllowsTransparency="True" Width="350" Height="240" TitleTextAlignment="Center"
1010
UseLayoutRounding="True" UseNativeChrome="True" Topmost="{classes:SettingsBinder Topmost}"
1111
Title="AniView - About" WindowStartupLocation="CenterScreen" Icon="/AniView;component/aniview.ico">
1212
<Grid VerticalAlignment="Center" HorizontalAlignment="Center">
@@ -30,9 +30,9 @@ AniView was created by DeadLine.<LineBreak />
3030
* icons8 (https://icons8.com)<LineBreak/>
3131
<Bold>Theme:</Bold> Syncfusion<LineBreak />
3232
<Bold>Gif control:</Bold> XamlAnimatedGif<LineBreak />
33-
<Bold>Version:</Bold> 1.5.4.0<LineBreak />
33+
<Bold>Version:</Bold> 1.6.0.0<LineBreak />
3434
<LineBreak />
35-
Copyright © 2019 CodeDead
35+
Copyright © 2020 CodeDead
3636
</TextBlock>
3737
</Grid>
3838
<Grid Grid.Row="1">

‎AniView/Windows/MainWindow.xaml.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Diagnostics;
4-
using System.Diagnostics.CodeAnalysis;
54
using System.IO;
65
using System.Reflection;
76
using System.Windows;
@@ -90,7 +89,7 @@ public MainWindow()
9089
TitleText = "AniView",
9190
UpdateNowText = "Would you like to update AniView now?"
9291
};
93-
_updateManager = new UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/AniView/update.xml", stringVariables, DataType.Xml);
92+
_updateManager = new UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/AniView/update.json", stringVariables, DataType.Json);
9493

9594
InitializeComponent();
9695
ChangeVisualStyle();
@@ -207,6 +206,7 @@ private void LoadImage(string path)
207206
{
208207
if (path == null) return;
209208
if (!File.Exists(path)) return;
209+
if (_currentPath == path) return;
210210

211211
PgbLoading.Visibility = Visibility.Visible;
212212
ImgView.Visibility = Visibility.Collapsed;
@@ -472,7 +472,7 @@ private void BtnEdit_Click(object sender, RoutedEventArgs e)
472472
}
473473

474474
/// <summary>
475-
/// Method that is called when the visibility of the Statusbar should change
475+
/// Method that is called when the visibility of the status bar should change
476476
/// </summary>
477477
/// <param name="sender">The object that called this method</param>
478478
/// <param name="e">The RoutedEventArgs</param>
@@ -646,10 +646,10 @@ private void GridMain_OnDrop(object sender, DragEventArgs e)
646646
/// </summary>
647647
/// <param name="sender">The object that has initialized the method</param>
648648
/// <param name="e">The key event arguments</param>
649-
[SuppressMessage("ReSharper", "SwitchStatementMissingSomeCases")]
650649
private void GridMain_OnKeyDown(object sender, KeyEventArgs e)
651650
{
652651
if (!_arrowKeysEnabled) return;
652+
// ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault
653653
switch (e.Key)
654654
{
655655
case Key.Left:
@@ -691,7 +691,7 @@ private void BtnDonate_Click(object sender, RoutedEventArgs e)
691691
}
692692

693693
/// <summary>
694-
/// Method that is called when the statusbar should be hidden
694+
/// Method that is called when the status bar should be hidden
695695
/// </summary>
696696
/// <param name="sender">The object that called this method</param>
697697
/// <param name="e">The RoutedEventArgs</param>

‎AniView/Windows/SettingsWindow.xaml.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ private void OnMouseDown(object sender, MouseButtonEventArgs e)
109109
/// <param name="e">The routed event arguments</param>
110110
private void BtnReset_OnClick(object sender, RoutedEventArgs e)
111111
{
112+
MessageBoxResult result = MessageBox.Show("Are you sure you want to reset all settings?", "AniView", MessageBoxButton.YesNo);
113+
if (result != MessageBoxResult.Yes) return;
112114
try
113115
{
114116
Properties.Settings.Default.Reset();
@@ -198,7 +200,7 @@ private void SldWindowResize_OnValueChanged(object sender, RoutedPropertyChanged
198200
/// <param name="e">The DependencyPropertyChangedEventArgs</param>
199201
private void BorderThickness_OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
200202
{
201-
long? value = ((IntegerTextBox) d).Value;
203+
long? value = ((IntegerTextBox)d).Value;
202204
if (value != null) BorderThickness = new Thickness(value.Value);
203205
}
204206

‎AniView/app.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3-
<assemblyIdentity version="1.5.4.0" name="AniView.app"/>
3+
<assemblyIdentity version="1.6.0.0" name="AniView.app"/>
44
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
55
<security>
66
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

0 commit comments

Comments
 (0)