Skip to content

Commit e0aa329

Browse files
CodeDeadCodeDead
committed
* Added context menu to the statusbar
* Design changes * Updated dependencies
1 parent 228be3e commit e0aa329

8 files changed

Lines changed: 41 additions & 26 deletions

File tree

‎AniView/AniView.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@
4646
<ApplicationManifest>app.manifest</ApplicationManifest>
4747
</PropertyGroup>
4848
<ItemGroup>
49-
<Reference Include="CodeDead.UpdateManager, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\CodeDead.UpdateManager.1.4.4\lib\net48\CodeDead.UpdateManager.dll</HintPath>
49+
<Reference Include="CodeDead.UpdateManager, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\CodeDead.UpdateManager.1.5.0\lib\net48\CodeDead.UpdateManager.dll</HintPath>
5151
</Reference>
52-
<Reference Include="Syncfusion.Licensing, Version=17.1460.0.47, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Syncfusion.Licensing.17.1.0.47\lib\net46\Syncfusion.Licensing.dll</HintPath>
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>
5454
</Reference>
55-
<Reference Include="Syncfusion.Shared.WPF, Version=17.1460.0.47, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Syncfusion.Shared.WPF.17.1.0.47\lib\net46\Syncfusion.Shared.WPF.dll</HintPath>
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>
5757
</Reference>
58-
<Reference Include="Syncfusion.Tools.WPF, Version=17.1460.0.47, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Syncfusion.Tools.WPF.17.1.0.47\lib\net46\Syncfusion.Tools.WPF.dll</HintPath>
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>
6060
</Reference>
6161
<Reference Include="System" />
6262
<Reference Include="System.Drawing" />

‎AniView/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.3.0")]
53-
[assembly: AssemblyFileVersion("1.5.3.0")]
52+
[assembly: AssemblyVersion("1.5.4.0")]
53+
[assembly: AssemblyFileVersion("1.5.4.0")]

‎AniView/Windows/AboutWindow.xaml‎

Lines changed: 5 additions & 5 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="400" Height="250" TitleTextAlignment="Center"
9+
mc:Ignorable="d" AllowsTransparency="True" Width="380" 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">
@@ -25,12 +25,12 @@
2525
<TextBlock Grid.Column="2">
2626
AniView was created by DeadLine.<LineBreak />
2727
<LineBreak />
28-
Images:<LineBreak />
28+
<Bold>Images:</Bold><LineBreak />
2929
* small-n-flat by paomedia<LineBreak />
3030
* icons8 (https://icons8.com)<LineBreak/>
31-
Theme: Syncfusion<LineBreak />
32-
Gif control: XamlAnimatedGif<LineBreak />
33-
Version: 1.5.3.0<LineBreak />
31+
<Bold>Theme:</Bold> Syncfusion<LineBreak />
32+
<Bold>Gif control:</Bold> XamlAnimatedGif<LineBreak />
33+
<Bold>Version:</Bold> 1.5.4.0<LineBreak />
3434
<LineBreak />
3535
Copyright © 2019 CodeDead
3636
</TextBlock>

‎AniView/Windows/MainWindow.xaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<RowDefinition Height="Auto" />
2525
</Grid.RowDefinitions>
2626
<Menu>
27-
<MenuItem Header="File">
27+
<MenuItem Header="_File">
2828
<MenuItem Header="Open" Click="BtnOpen_Click">
2929
<MenuItem.Icon>
3030
<Image Width="16" Height="16" Source="/AniView;component/Resources/Images/open.png" />
@@ -48,14 +48,14 @@
4848
</MenuItem.Icon>
4949
</MenuItem>
5050
</MenuItem>
51-
<MenuItem Header="Edit">
51+
<MenuItem Header="_Edit">
5252
<MenuItem Header="Edit image" Click="BtnEdit_Click">
5353
<MenuItem.Icon>
5454
<Image Width="16" Height="16" Source="/AniView;component/Resources/Images/edit.png" />
5555
</MenuItem.Icon>
5656
</MenuItem>
5757
</MenuItem>
58-
<MenuItem Header="Tools">
58+
<MenuItem Header="_Tools">
5959
<MenuItem Header="File properties" Click="BtnProperties_OnClick">
6060
<MenuItem.Icon>
6161
<Image Width="16" Height="16" Source="/AniView;component/Resources/Images/properties.png" />
@@ -76,7 +76,7 @@
7676
</MenuItem.Icon>
7777
</MenuItem>
7878
</MenuItem>
79-
<MenuItem Header="Help">
79+
<MenuItem Header="_Help">
8080
<MenuItem Header="Help" Click="BtnHelp_Click">
8181
<MenuItem.Icon>
8282
<Image Width="16" Height="16" Source="/AniView;component/Resources/Images/help.png"/>
@@ -157,6 +157,11 @@
157157
</Grid>
158158
</Grid>
159159
<StatusBar x:Name="StbInfo" Grid.Row="3">
160+
<StatusBar.ContextMenu>
161+
<ContextMenu>
162+
<MenuItem Header="Hide" Click="HideStatusbarMenuItem_OnClick" />
163+
</ContextMenu>
164+
</StatusBar.ContextMenu>
160165
<Label x:Name="LblDimensions" Content="" />
161166
<Separator />
162167
<Label x:Name="LblSize" Content="" />

‎AniView/Windows/MainWindow.xaml.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public MainWindow()
9090
TitleText = "AniView",
9191
UpdateNowText = "Would you like to update AniView now?"
9292
};
93-
_updateManager = new UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/AniView/update.xml", stringVariables);
93+
_updateManager = new UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/AniView/update.xml", stringVariables, DataType.Xml);
9494

9595
InitializeComponent();
9696
ChangeVisualStyle();
@@ -690,6 +690,16 @@ private void BtnDonate_Click(object sender, RoutedEventArgs e)
690690
}
691691
}
692692

693+
/// <summary>
694+
/// Method that is called when the statusbar should be hidden
695+
/// </summary>
696+
/// <param name="sender">The object that called this method</param>
697+
/// <param name="e">The RoutedEventArgs</param>
698+
private void HideStatusbarMenuItem_OnClick(object sender, RoutedEventArgs e)
699+
{
700+
MniStatusbar.IsChecked = false;
701+
}
702+
693703
/// <summary>
694704
/// Event that is fired when the MainWindow is closing
695705
/// </summary>

‎AniView/Windows/SettingsWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:bind="clr-namespace:AniView.Classes"
77
AllowsTransparency="True" TitleTextAlignment="Center"
88
xmlns:syncfusion="http://schemas.syncfusion.com/wpf" x:Class="AniView.Windows.SettingsWindow"
9-
mc:Ignorable="d" Width="450" Height="350"
9+
mc:Ignorable="d" Width="450" Height="320"
1010
UseLayoutRounding="True" UseNativeChrome="True"
1111
Closing="SettingsWindow_OnClosing" Topmost="{bind:SettingsBinder Topmost}"
1212
Title="AniView - Settings" Icon="/AniView;component/aniview.ico" WindowStartupLocation="CenterScreen">

‎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.3.0" name="AniView.app"/>
3+
<assemblyIdentity version="1.5.4.0" name="AniView.app"/>
44
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
55
<security>
66
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

‎AniView/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CodeDead.UpdateManager" version="1.4.4" targetFramework="net48" />
4-
<package id="Syncfusion.Licensing" version="17.1.0.47" targetFramework="net48" />
5-
<package id="Syncfusion.Shared.WPF" version="17.1.0.47" targetFramework="net48" />
6-
<package id="Syncfusion.Tools.WPF" version="17.1.0.47" targetFramework="net48" />
3+
<package id="CodeDead.UpdateManager" version="1.5.0" targetFramework="net48" />
4+
<package id="Syncfusion.Licensing" version="17.1.0.49" targetFramework="net48" />
5+
<package id="Syncfusion.Shared.WPF" version="17.1.0.49" targetFramework="net48" />
6+
<package id="Syncfusion.Tools.WPF" version="17.1.0.49" targetFramework="net48" />
77
<package id="XamlAnimatedGif" version="1.2.1" targetFramework="net472" />
88
</packages>

0 commit comments

Comments
 (0)