diff --git a/src/livelywpf/UWP/livelyPages/livelyPages.csproj b/src/livelywpf/UWP/livelyPages/livelyPages.csproj index 31cd3971..38eb88af 100644 --- a/src/livelywpf/UWP/livelyPages/livelyPages.csproj +++ b/src/livelywpf/UWP/livelyPages/livelyPages.csproj @@ -133,7 +133,7 @@ - 6.2.12 + 6.2.13 diff --git a/src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj b/src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj index e6f4f236..2cc2f6ad 100644 --- a/src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj +++ b/src/livelywpf/UWP/livelyUserControls/livelyUserControls.csproj @@ -137,7 +137,7 @@ - 6.2.12 + 6.2.13 diff --git a/src/livelywpf/livelywpf/Core/Wallpapers/WebProcess.cs b/src/livelywpf/livelywpf/Core/Wallpapers/WebProcess.cs index 9ab5d46e..14b95df2 100644 --- 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 index dfb4aad9..a6309f29 100644 --- 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(); + } } }; - */ } /// diff --git a/src/livelywpf/livelywpf/Program.cs b/src/livelywpf/livelywpf/Program.cs index 7f540812..138c38d3 100644 --- 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().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().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 index 67b3bf0a..2359d339 100644 --- 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 index d953b5dc..159d4606 100644 --- 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 index 44d8319b..2d1cb1ca 100644 --- 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 index c997683c..af438031 100644 --- 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 index 7f3458a3..8d38f123 100644 --- 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 index 4fc38f56..3302cdf6 100644 --- a/src/livelywpf/livelywpf/Views/Dialogues/LibraryPreviewView.xaml +++ b/src/livelywpf/livelywpf/Views/Dialogues/LibraryPreviewView.xaml @@ -132,4 +132,4 @@ - + \ No newline at end of file diff --git a/src/livelywpf/livelywpf/Views/MainWindow.xaml b/src/livelywpf/livelywpf/Views/MainWindow.xaml index a648ed85..ddabe04a 100644 --- 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" /> - + \ No newline at end of file diff --git a/src/livelywpf/livelywpf/Views/MainWindow.xaml.cs b/src/livelywpf/livelywpf/Views/MainWindow.xaml.cs index 4adf185a..6ad52e89 100644 --- 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 index 3461cdb1..3242d601 100644 --- a/src/livelywpf/livelywpf/livelywpf.csproj +++ b/src/livelywpf/livelywpf/livelywpf.csproj @@ -10,7 +10,7 @@ livelywpf.Program appicon.ico 1.0.0 - 1.7.4.2 + 1.7.5.2 @@ -28,25 +28,25 @@ - - - + + + - + - + - + diff --git a/src/livelywpf/rootuwp/rootuwp.csproj b/src/livelywpf/rootuwp/rootuwp.csproj index 619bc767..d46e747a 100644 --- a/src/livelywpf/rootuwp/rootuwp.csproj +++ b/src/livelywpf/rootuwp/rootuwp.csproj @@ -147,7 +147,7 @@ - 6.2.12 + 6.2.13 6.1.3