patch

rocksdanister · Apr 25, 2022 · 96caa0b · 96caa0b
1 parent 2798b71
commit 96caa0b
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 33 deletions.
diff --git a/src/livelywpf/UWP/livelyPages/livelyPages.csproj b/src/livelywpf/UWP/livelyPages/livelyPages.csproj
@@ -133,7 +133,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj b/src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj
@@ -137,7 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/livelywpf/livelywpf/Core/Wallpapers/WebProcess.cs b/src/livelywpf/livelywpf/Core/Wallpapers/WebProcess.cs
@@ -68,7 +68,7 @@ public WebProcess(string path, ILibraryModel model, ILivelyScreen display, strin
             ProcessStartInfo start = new ProcessStartInfo
             {
                 Arguments = cmdArgs.ToString(),
-                FileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins", "cef", "LivelyCefSharp.exe"),
+                FileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins", "cef", "Lively.PlayerCefSharp.exe"),
                 RedirectStandardInput = true,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,

diff --git a/src/livelywpf/livelywpf/Core/WinDesktopCore.cs b/src/livelywpf/livelywpf/Core/WinDesktopCore.cs
@@ -13,6 +13,7 @@
 using livelywpf.Views;
 using livelywpf.Views.Dialogues;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -63,14 +64,17 @@ public WinDesktopCore(IUserSettingsService userSettings,
             ScreenHelper.DisplayUpdated += DisplaySettingsChanged_Hwnd;
             WallpaperChanged += SetupDesktop_WallpaperChanged;
 
-            /*
             SystemEvents.SessionSwitch += (s, e) => {
                 if (e.Reason == SessionSwitchReason.SessionUnlock)
                 {
-                    ResetWallpaper();
+                    //Issue: https://github.com/rocksdanister/lively/issues/802
+                    if (!(IntPtr.Equals(DesktopWorkerW, IntPtr.Zero) || NativeMethods.IsWindow(DesktopWorkerW)))
+                    {
+                        Logger.Info("WorkerW invalid after unlock, resetting..");
+                        ResetWallpaper();
+                    }
                 }
             };
-            */
         }
 
         /// <summary>

diff --git a/src/livelywpf/livelywpf/Program.cs b/src/livelywpf/livelywpf/Program.cs
@@ -57,7 +57,7 @@ public static void Main()
             try
             {
                 var server = new PipeServer(Constants.SingleInstance.PipeServerName);
-                server.MessageReceived += Server_MessageReceived1;
+                server.MessageReceived += (s, e) => App.Services.GetRequiredService<ICommandHandler>().ParseArgs(e);
             }
             catch (Exception e)
             {
@@ -84,11 +84,6 @@ public static void Main()
             }
         }
 
-        private static void Server_MessageReceived1(object sender, string[] msg)
-        {
-            App.Services.GetRequiredService<ICommandHandler>().ParseArgs(msg);
-        }
-
 
         private static Views.SetupWizard.SetupView setupWizard = null;
         private static void App_Startup(object sender, StartupEventArgs e)

diff --git a/src/livelywpf/livelywpf/Services/ScreensaverService.cs b/src/livelywpf/livelywpf/Services/ScreensaverService.cs
@@ -187,9 +187,9 @@ private void ShowScreensavers()
                     -1, //topmost
                     userSettings.Settings.WallpaperArrangement != WallpaperArrangement.span ? item.Screen.Bounds.Left : 0,
                     userSettings.Settings.WallpaperArrangement != WallpaperArrangement.span ? item.Screen.Bounds.Top : 0,
-                    0,
-                    0,
-                    0x0001))
+                    item.Screen.Bounds.Width,
+                    item.Screen.Bounds.Height,
+                    userSettings.Settings.WallpaperArrangement != WallpaperArrangement.span ? 0x0040 : 0x0001)) //ignore WxH if span
                 {
                     LogUtil.LogWin32Error("Failed to show screensaver");
                 }

diff --git a/src/livelywpf/livelywpf/Systray.cs b/src/livelywpf/livelywpf/Systray.cs
@@ -106,7 +106,7 @@ private void CreateContextMenu()
 
             _notifyIcon.ContextMenuStrip.Items.Add(new CustomContextMenu.StripSeparatorCustom().stripSeparator);
             _notifyIcon.ContextMenuStrip.Items.Add(Properties.Resources.TextSupport, Properties.Icons.icons8_heart_48).Click += (s, e) =>
-                            Helpers.LinkHandler.OpenBrowser("https://ko-fi.com/rocksdanister");
+                            Helpers.LinkHandler.OpenBrowser("https://rocksdanister.github.io/lively/coffee/");
             _notifyIcon.ContextMenuStrip.Items.Add(new CustomContextMenu.StripSeparatorCustom().stripSeparator);
             _notifyIcon.ContextMenuStrip.Items.Add(Properties.Resources.TitleReportBug, Properties.Icons.icons8_bug_50).Click += (s, e) =>
                             Helpers.LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/wiki/Common-Problems");

diff --git a/src/livelywpf/livelywpf/ViewModels/AboutViewModel.cs b/src/livelywpf/livelywpf/ViewModels/AboutViewModel.cs
@@ -91,7 +91,7 @@ public RelayCommand LicenseDocCommand
                 if (_licenseDocCommand == null)
                 {
                     _licenseDocCommand = new RelayCommand(
-                        param => ShowRtfDocDialog(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Docs", "license.rtf")));
+                        param => LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/blob/core-separation/LICENSE"));
                 }
                 return _licenseDocCommand;
             }
@@ -105,7 +105,7 @@ public RelayCommand AttribDocCommand
                 if (_attribDocCommand == null)
                 {
                     _attribDocCommand = new RelayCommand(
-                        param => ShowRtfDocDialog(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Docs", "attribution.rtf")));
+                        param => LinkHandler.OpenBrowser("https://rocksdanister.github.io/lively/attribution/"));
                 }
                 return _attribDocCommand;
             }
@@ -119,7 +119,7 @@ public RelayCommand PrivacyDocCommand
                 if (_privacyDocCommand == null)
                 {
                     _privacyDocCommand = new RelayCommand(
-                        param => LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/blob/dev-v1.0-fluent-netcore/PRIVACY.md"));
+                        param => LinkHandler.OpenBrowser("https://github.com/rocksdanister/lively/blob/core-separation/PRIVACY.md"));
                 }
                 return _privacyDocCommand;
             }

diff --git a/src/livelywpf/livelywpf/ViewModels/HelpViewModel.cs b/src/livelywpf/livelywpf/ViewModels/HelpViewModel.cs
@@ -88,7 +88,7 @@ public RelayCommand SupportCommand
                 if (_supportCommand == null)
                 {
                     _supportCommand = new RelayCommand(
-                        param => LinkHandler.OpenBrowser("https://ko-fi.com/rocksdanister"));
+                        param => LinkHandler.OpenBrowser("https://rocksdanister.github.io/lively/coffee/"));
                 }
                 return _supportCommand;
             }

diff --git a/src/livelywpf/livelywpf/ViewModels/SettingsViewModel.cs b/src/livelywpf/livelywpf/ViewModels/SettingsViewModel.cs
@@ -901,7 +901,7 @@ public int SelectedScreensaverWaitIndex
                     ScreensaverIdleTime.min45 => 2700000,
                     ScreensaverIdleTime.min60 => 3600000,
                     ScreensaverIdleTime.min120 => 7200000,
-                    _ => 300000,
+                    _ => 0,
                 };
                 if (idleTime != 0)
                 {

diff --git a/src/livelywpf/livelywpf/Views/Dialogues/LibraryPreviewView.xaml b/src/livelywpf/livelywpf/Views/Dialogues/LibraryPreviewView.xaml
@@ -132,4 +132,4 @@
         </ScrollViewer>
 
     </Grid>
-</Window>
+</Window>
diff --git a/src/livelywpf/livelywpf/Views/MainWindow.xaml b/src/livelywpf/livelywpf/Views/MainWindow.xaml
@@ -78,4 +78,4 @@
             Margin="5,5,5,5"
             Navigating="ContentFrame_Navigating" />
     </Grid>
-</Window>
+</Window>
diff --git a/src/livelywpf/livelywpf/Views/MainWindow.xaml.cs b/src/livelywpf/livelywpf/Views/MainWindow.xaml.cs
@@ -46,7 +46,7 @@ public MainWindow(IUserSettingsService userSettings, IDesktopCore desktopCore, S
             this.settingsVm = settingsVm;
 
             InitializeComponent();
-            wallpaperStatusText.Text = desktopCore.Wallpapers.Count.ToString();
+            wallpaperStatusText.Text = $"{desktopCore.Wallpapers.Count} Active Wallpaper(s)";
             desktopCore.WallpaperChanged += SetupDesktop_WallpaperChanged;
             Logger.Debug("MainWindow ctor initialized..");
         }
@@ -222,7 +222,7 @@ private void SetupDesktop_WallpaperChanged(object sender, EventArgs e)
                 {
                     this.Activate();
                 }
-                wallpaperStatusText.Text = desktopCore.Wallpapers.Count.ToString();
+                wallpaperStatusText.Text =  $"{desktopCore.Wallpapers.Count} Active Wallpaper(s)";
             }));
         }
 

diff --git a/src/livelywpf/livelywpf/livelywpf.csproj b/src/livelywpf/livelywpf/livelywpf.csproj
@@ -10,7 +10,7 @@
     <StartupObject>livelywpf.Program</StartupObject>
     <ApplicationIcon>appicon.ico</ApplicationIcon>
     <Version>1.0.0</Version>
-    <AssemblyVersion>1.7.4.2</AssemblyVersion>
+    <AssemblyVersion>1.7.5.2</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
@@ -28,25 +28,25 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="DesktopBridge.Helpers" Version="1.2.2" />
-    <PackageReference Include="Downloader" Version="2.3.0" />
-    <PackageReference Include="H.Hooks" Version="1.4.14" />
-    <PackageReference Include="Magick.NET-Q16-x86" Version="8.4.0" />
+    <PackageReference Include="Downloader" Version="2.3.3" />
+    <PackageReference Include="H.Hooks" Version="1.4.21" />
+    <PackageReference Include="Magick.NET-Q16-x86" Version="11.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.1.2" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.2" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1054.31" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1185.39" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22000.196" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.12" />
+    <PackageReference Include="NLog" Version="4.7.15" />
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="RawInput.Sharp" Version="0.0.4" />
     <PackageReference Include="ScreenRecorderLib" Version="3.1.2" />
     <PackageReference Include="Sentinel.NLogViewer" Version="1.3.3" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="YoutubeExplode" Version="6.0.5" />
+    <PackageReference Include="YoutubeExplode" Version="6.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/livelywpf/rootuwp/rootuwp.csproj b/src/livelywpf/rootuwp/rootuwp.csproj
@@ -147,7 +147,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
       <Version>6.1.3</Version>