mirror of
https://github.com/ckaczor/FeedCenter.git
synced 2026-01-14 01:25:38 -05:00
Compare commits
2 Commits
1.2.0.79
...
prerelease
| Author | SHA1 | Date | |
|---|---|---|---|
| 9717e2d6af | |||
| 7ace91684c |
@@ -6,6 +6,7 @@
|
||||
<UseWindowsForms>false</UseWindowsForms>
|
||||
<UseWPF>true</UseWPF>
|
||||
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
|
||||
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<EnableDefaultApplicationDefinition>false</EnableDefaultApplicationDefinition>
|
||||
@@ -39,23 +40,24 @@
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Windows.SnappingWindow" Version="1.0.4" />
|
||||
<PackageReference Include="Dapper" Version="2.1.66" />
|
||||
<PackageReference Include="DebounceThrottle" Version="3.0.1" />
|
||||
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
||||
<PackageReference Include="HtmlAgilityPack" Version="1.12.3" />
|
||||
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.3.2" />
|
||||
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
|
||||
<PackageReference Include="HtmlTextWriter" Version="3.0.2" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
|
||||
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" GeneratePathProperty="true">
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.9" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0" />
|
||||
<PackageReference Include="NameBasedGrid" Version="1.0.0">
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Realm" Version="20.1.0" />
|
||||
<PackageReference Include="Serilog" Version="4.3.0" />
|
||||
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Application.ico" />
|
||||
|
||||
@@ -54,9 +54,6 @@ public partial class MainWindow : IDisposable
|
||||
// Set up the update handler
|
||||
InitializeUpdate();
|
||||
|
||||
// Show the notification icon
|
||||
NotificationIcon.Initialize(this);
|
||||
|
||||
// Load window settings
|
||||
LoadWindowSettings();
|
||||
|
||||
@@ -93,6 +90,16 @@ public partial class MainWindow : IDisposable
|
||||
NewVersionLink.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// Show the notification icon
|
||||
NotificationIcon.Initialize(this);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Logger.Error(e, "");
|
||||
}
|
||||
|
||||
Log.Logger.Information("MainForm creation finished");
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ internal static class NotificationIcon
|
||||
_notificationIcon = new TaskbarIcon { Icon = Resources.Application };
|
||||
_notificationIcon.TrayMouseDoubleClick += HandleNotificationIconDoubleClick;
|
||||
|
||||
// Setup the menu
|
||||
// Set up the menu
|
||||
var contextMenu = new ContextMenu();
|
||||
contextMenu.Opened += HandleContextMenuOpened;
|
||||
|
||||
@@ -76,7 +76,7 @@ internal static class NotificationIcon
|
||||
public static void Dispose()
|
||||
{
|
||||
// Get rid of the icon
|
||||
_notificationIcon.Dispose();
|
||||
_notificationIcon?.Dispose();
|
||||
_notificationIcon = null;
|
||||
|
||||
_mainWindow = null;
|
||||
|
||||
Reference in New Issue
Block a user